April 2012 - rhq-commits - Fedora Mailing-Lists

[rhq] Branch 'rc/jon3.1.0.GA' - 105 commits - etc/eclipse-tools etc/scripts modules/core modules/enterprise modules/helpers modules/plugins

by John Sanda

etc/eclipse-tools/maven/RHQ | 13 etc/scripts/jboss-as-spawn.sh | 113 modules/core/dbutils/pom.xml | 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/MD5Task.java | 2 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Table.java | 6 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/scripts/dbsetup/alert-schema.xml | 6 modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 38 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 7 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 21 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/Property.java | 2 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/resource/composite/PlatformMetricsSummary.java | 23 modules/core/domain/src/main/java/org/rhq/core/domain/util/PasswordObfuscationUtility.java | 136 modules/core/domain/src/test/java/org/rhq/core/domain/util/PasswordObfuscationUtilityTest.java | 144 modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java | 13 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/configuration/ListPropertySimpleWrapper.java | 69 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java | 76 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 | 214 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java | 248 + modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java | 173 modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java | 54 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 62 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 59 modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java | 7 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/obfuscation/Obfuscator.java | 102 modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java | 77 modules/enterprise/agent/src/etc/product_connectors/README.txt | 20 modules/enterprise/gui/coregui/pom.xml | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/core/RHQDomain.gwt.xml | 4 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 | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 2468 ++++++++++ modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js | 455 + modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt | 22 modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 21 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java | 7 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java | 11 modules/helpers/pom.xml | 1 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 | 46 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/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java | 69 modules/plugins/jboss-as-5/pom.xml | 14 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 109 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java | 105 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java | 12 modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 5 modules/plugins/jboss-as-7/pom.xml | 39 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java | 101 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineOption.java | 43 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 25 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 361 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 132 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 231 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 156 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java | 7 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 237 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java | 76 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java | 3 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java | 260 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java | 15 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/IspnComponent.java | 7 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 | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java | 81 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 34 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 8 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java | 4 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 8 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java | 21 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java | 6 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadPoolComponent.java | 4 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadsComponent.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java | 103 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java | 298 + 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 | 110 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/ReadChildrenResources.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadResource.java | 2 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/resources/META-INF/rhq-plugin.xml | 1524 +++--- modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java | 104 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java | 4 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java | 141 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java | 26 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java | 56 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/UploadAndDeployTest.java | 5 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java | 92 modules/plugins/jboss-as-7/src/test/resources/host3.xml | 91 modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 852 +-- 135 files changed, 10075 insertions(+), 2923 deletions(-) New commits: commit 65b1b87ad153c36c7cb51b26ebd7d60f377630c6 Merge: 877a0aa 26cbde9 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Apr 27 22:28:29 2012 -0400 Merge branch 'master' into rc/jon3.1.0.GA commit 26cbde9ab726fbf1c34e7e7f03f498e2530e72a3 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Apr 27 19:56:52 2012 -0400 [Bug 816680 - Child availability still up with down parent after shutdown operation on AS5] Availability checking work. - remove some confusion between use of null and UNKNOWN - remove some confusion around NOT UP and DOWN - improve some logic around deferring to a parent's DOWN status - protect against invalid return values from AvailabilityFacet.getAvailability() impls diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java index 9fbf014..ae6bafc 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java @@ -39,7 +39,8 @@ public interface AvailabilityFacet { * entity running inside it. Availability for all child resources would automatically be set to * {@link AvailabilityType#DOWN down} in this case. * - * @return {@link AvailabilityType#UP} if the resource can be accessed; otherwise {@link AvailabilityType#DOWN} + * @return {@link AvailabilityType#UP} if the resource can be accessed; otherwise {@link AvailabilityType#DOWN}. + * Any other return value is invalid. */ AvailabilityType getAvailability(); } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java index 24fdcf5..661dd20 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java @@ -261,24 +261,25 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo // find out what the avail was the last time we checked it. this may be null Availability previous = this.inventoryManager.getAvailabilityIfKnown(resource); - AvailabilityType current = (null == previous) ? null : previous.getAvailabilityType(); + AvailabilityType current = (null == previous) ? AvailabilityType.UNKNOWN : previous.getAvailabilityType(); - // regardless of whether the avail schedule is met, we still must check avail if isForce is true or if - // it's a full report and we don't yet have an avail for the resource. - if (!checkAvail && (isForced || (scan.isFull && null == previous))) { - checkAvail = true; - } + // If the resource's parent is DOWN, the rules are that the resource and all of the parent's other + // descendants, must also be DOWN. So, there's no need to even ask the resource component + // for its current availability - its current avail is set to the parent avail type and that's that. + // Otherwise, checkAvail as needed. + if (deferToParent || (AvailabilityType.DOWN == parentAvailType)) { + current = parentAvailType; + ++scan.numDeferToParent; - if (checkAvail) { - if (deferToParent || (AvailabilityType.UP != parentAvailType)) { - // If the resource's parent is not up, the rules are that the resource and all of the parent's other - // descendants, must also be of the parent avail type, so there's no need to even ask the resource component - // for its current availability - its current avail is set to the parent avail type and that's that. - current = parentAvailType; - ++scan.numDeferToParent; + } else { + // regardless of whether the avail schedule is met, we still must check avail if isForce is true or if + // it's a full report and we don't yet have an avail for the resource. + if (!checkAvail && (isForced || (scan.isFull && null == previous))) { + checkAvail = true; + } - } else { - current = null; + if (checkAvail) { + current = AvailabilityType.UNKNOWN; try { ++scan.numGetAvailabilityCalls; @@ -288,11 +289,11 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo // down (this is for the case when a plugin component can't start for whatever reason // or is just slow to start) if (resourceContainer.getResourceComponentState() == ResourceComponentState.STARTED) { - current = resourceComponent.getAvailability(); + current = safeGetAvailability(resourceComponent); } else { this.inventoryManager.activateResource(resource, resourceContainer, false); if (resourceContainer.getResourceComponentState() == ResourceComponentState.STARTED) { - current = resourceComponent.getAvailability(); + current = safeGetAvailability(resourceComponent); } } } catch (Throwable t) { @@ -308,18 +309,17 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo } } } - } - if (null == current) { - if (log.isDebugEnabled()) { - log.debug("Protecting against null getAvailability(). Setting DOWN to " + resource); + // Assume DOWN if for some reason the avail check failed + if (AvailabilityType.UNKNOWN == current) { + current = AvailabilityType.DOWN; } - current = AvailabilityType.DOWN; } } // Add the availability to the report if it changed from its previous state or if this is a full report. // Update the resource container only if the avail has changed. - boolean availChanged = (null != current && (null == previous) || (current != previous.getAvailabilityType())); + boolean availChanged = (null != current && AvailabilityType.UNKNOWN != current && (null == previous || current != previous + .getAvailabilityType())); if (availChanged || scan.isFull) { Availability availability; @@ -351,6 +351,22 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo return; } + private AvailabilityType safeGetAvailability(AvailabilityFacet component) { + AvailabilityType availType = component.getAvailability(); + switch (availType) { + case UP: + return AvailabilityType.UP; + case DOWN: + return AvailabilityType.DOWN; + default: + if (log.isDebugEnabled()) { + log.debug("ResourceComponent " + component + " getAvailability() returned " + availType + + ". This is invalid and is being replaced with DOWN."); + } + return AvailabilityType.DOWN; + } + } + /** * This tells the executor to send a full availability report the next time it sends one. Public-scoped so tests * can call this. commit b6aa68d296a9d27334ba578c8deb9efcbdc1ef9a Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 17:48:22 2012 -0400 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 diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 7fe7f5f..7285cec 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -240,7 +240,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent private void setStartScriptPluginConfigProps(ProcessInfo process, AS7CommandLine commandLine, Configuration pluginConfig) { StartScriptConfiguration startScriptConfig = new StartScriptConfiguration(pluginConfig); - ProcessInfo parentProcess = process.getParentProcess(); + ProcessInfo parentProcess = getPotentialStartScriptProcess(process); File startScript = ServerStartScriptDiscoveryUtility.getStartScript(parentProcess); if (startScript == null) { @@ -268,6 +268,8 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent startScriptConfig.setStartScriptArgs(startScriptArgs); } + protected abstract ProcessInfo getPotentialStartScriptProcess(ProcessInfo process); + private void setUserAndPasswordPluginConfigProps(ServerPluginConfiguration serverPluginConfig, HostConfiguration hostConfig, File baseDir) { Properties mgmtUsers = getManagementUsers(hostConfig, getMode(), baseDir); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java index 7886190..455717d 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java @@ -114,4 +114,11 @@ public class HostControllerDiscovery extends BaseProcessDiscovery { return resourceDetails; } + @Override + protected ProcessInfo getPotentialStartScriptProcess(ProcessInfo serverProcess) { + // If the server was started via domain.sh/bat, its parent process will be the process controller JVM, and the + // process controller JVM's parent process will be domain.sh/bat. + return serverProcess.getParentProcess().getParentProcess(); + } + } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java index 136a0af..f23c6e3 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java @@ -111,4 +111,10 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { return resourceDetails; } + @Override + protected ProcessInfo getPotentialStartScriptProcess(ProcessInfo process) { + // If the server was started via standalone.sh/bat, its parent process will be standalone.sh/bat. + return process.getParentProcess(); + } + } commit 651d54d74878daaba714b3096c6dd8ebf63be436 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 17:46:15 2012 -0400 fix a couple bugs, refactor a couple things, and add javadoc diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index 819e1e1..576ae41 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -32,6 +32,8 @@ import java.util.Map; import java.util.Set; import org.hyperic.sigar.ProcExe; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.rhq.core.system.ProcessInfo; @@ -43,15 +45,19 @@ import org.rhq.core.system.ProcessInfo; */ public class ServerStartScriptDiscoveryUtility { + private static final boolean OS_IS_WINDOWS = (File.separatorChar == '\\'); + private static final char OPTION_PREFIX = (OS_IS_WINDOWS) ? '/' : '-'; + // Generic OS-level PATH setting for LINUX. For Windows the PATH must be generated when we have // the system env vars. It will be of the form %SystemRoot%\\system32;%SystemRoot%; - private static final String CORE_ENV_VAR_PATH_LINUX = "/bin:/usr/bin"; + private static final String CORE_ENV_VAR_PATH_UNIX = "/bin:/usr/bin"; // Generic OS-level env vars that should be in every process's environment. private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList("PATH", "LD_LIBRARY_PATH")); + static { - if (File.separatorChar == '\\') { + if (OS_IS_WINDOWS) { CORE_ENV_VAR_NAME_INCLUDES.add("OS"); // many batch files use this to figure out if the OS type is NT or 9x CORE_ENV_VAR_NAME_INCLUDES.add("SYSTEMROOT"); // required on Windows to avoid winsock create errors } @@ -60,32 +66,32 @@ public class ServerStartScriptDiscoveryUtility { private ServerStartScriptDiscoveryUtility() { } + /** + * If the specified process is a script, return the path to the script - the returned path will be absolute and + * canonical if possible, or, if it is not a script, return <code>null</code>. + * + * @param serverParentProcess the parent process of a server (e.g. JBoss AS) process + * + * @return if the specified process is a script (the returned path will be absolute and + * canonical if possible), the path to the script, otherwise <code>null</code> + */ + @Nullable public static File getStartScript(ProcessInfo serverParentProcess) { // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" // Windows: "cmd.exe [options] standalone.bat --server-config=standalone-full.xml" - int startScriptIndex = 1; String[] serverParentProcessCommandLine = serverParentProcess.getCommandLine(); - - // advance past cmd.exe options. options start with '/' - if (File.separatorChar == '\\') { - for (; (startScriptIndex < serverParentProcessCommandLine.length); ++startScriptIndex) { - if (!serverParentProcessCommandLine[startScriptIndex].startsWith("/")) { - break; - } - } - } - - String startScript = (serverParentProcessCommandLine.length > startScriptIndex) ? serverParentProcessCommandLine[startScriptIndex] - : null; + Integer startScriptIndex = getStartScriptIndex(serverParentProcessCommandLine); File startScriptFile; - - if (isScript(startScript)) { - // The parent process is a script - excellent! + if (startScriptIndex != null) { + // The process is a script - excellent! + String startScript = (serverParentProcessCommandLine.length > startScriptIndex) ? serverParentProcessCommandLine[startScriptIndex] + : null; startScriptFile = new File(startScript); if (!startScriptFile.isAbsolute()) { ProcExe parentProcessExe = serverParentProcess.getExecutable(); if (parentProcessExe == null) { + // TODO: This isn't really generic startScriptFile = new File("bin", startScriptFile.getName()); } else { String cwd = parentProcessExe.getCwd(); @@ -102,52 +108,79 @@ public class ServerStartScriptDiscoveryUtility { return startScriptFile; } + /** + * Returns the list of arguments that should be passed to the start script for the specified server (e.g. JBoss AS) + * process in order to start a functionally equivalent server instance. + * + * @param serverParentProcess the parent process of a server (e.g. JBoss AS) process + * @param serverArgs the subset of arguments from the server (e.g. JBoss AS) process that should be used if the + * parent process is not a script + * @param optionExcludes options that should be excluded from the returned arguments if the parent process is not a + * script + * + * @return the list of arguments that should be passed to the start script for the specified server (e.g. JBoss AS) + * process in order to start a functionally equivalent server instance + */ + @NotNull public static List<String> getStartScriptArgs(ProcessInfo serverParentProcess, List<String> serverArgs, Set<CommandLineOption> optionExcludes) { - // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" - // Windows: "standalone.bat --server-config=standalone-full.xml" - int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; String[] startScriptCommandLine = serverParentProcess.getCommandLine(); - String startScript = (startScriptCommandLine.length > startScriptIndex) ? startScriptCommandLine[startScriptIndex] - : null; + Integer startScriptIndex = getStartScriptIndex(startScriptCommandLine); List<String> startScriptArgs = new ArrayList<String>(); - if (isScript(startScript)) { + if (startScriptIndex != null) { // Skip past the script to get the arguments that were passed to the script. for (int i = (startScriptIndex + 1); i < startScriptCommandLine.length; i++) { startScriptArgs.add(startScriptCommandLine[i]); } } else { - for (int i = 0, serverArgsSize = serverArgs.size(); i < serverArgsSize; i++) { - String serverArg = serverArgs.get(i); - // Skip any options that the start script will take care of specifying. - CommandLineOption option = null; - for (CommandLineOption optionExclude : optionExcludes) { - if ((optionExclude.getShortName() != null && (serverArg.equals('-' + optionExclude.getShortName()) || serverArg - .startsWith('-' + optionExclude.getShortName() + "="))) - || ((optionExclude.getLongName() != null) && (serverArg.equals("--" - + optionExclude.getLongName()) || serverArg.startsWith("--" + optionExclude.getLongName() - + "=")))) { - option = optionExclude; - break; + if ((optionExcludes != null) && !optionExcludes.isEmpty()) { + for (int i = 0, serverArgsSize = serverArgs.size(); i < serverArgsSize; i++) { + String serverArg = serverArgs.get(i); + // Skip any options that the start script will take care of specifying. + CommandLineOption option = null; + for (CommandLineOption optionExclude : optionExcludes) { + if ((optionExclude.getShortName() != null && (serverArg.equals('-' + optionExclude.getShortName()) || serverArg + .startsWith('-' + optionExclude.getShortName() + "="))) + || ((optionExclude.getLongName() != null) && (serverArg.equals("--" + + optionExclude.getLongName()) || serverArg.startsWith("--" + optionExclude.getLongName() + + "=")))) { + option = optionExclude; + break; + } } - } - if (option != null) { - if (option.isExpectsValue() - && ((i + 1) < serverArgsSize) - && (((option.getShortName() != null) && serverArg.equals('-' + option.getShortName())) || (option - .getLongName() != null) && serverArg.equals("--" + option.getLongName()))) { - // If the option expects a value and the delimiter is a space, skip the next argument too. - i++; + if (option != null) { + if (option.isExpectsValue() + && ((i + 1) < serverArgsSize) + && (((option.getShortName() != null) && serverArg.equals('-' + option.getShortName())) || (option + .getLongName() != null) && serverArg.equals("--" + option.getLongName()))) { + // If the option expects a value and the delimiter is a space, skip the next argument too. + i++; + } + } else { + startScriptArgs.add(serverArg); } - } else { - startScriptArgs.add(serverArg); } + } else { + startScriptArgs.addAll(serverArgs); } } return startScriptArgs; } + /** + * Returns the set of environment variables that should be passed to the start script for the specified server + * (e.g. JBoss AS) process in order to start a functionally equivalent server instance. + * + * @param serverProcess a server (e.g. JBoss AS) process + * @param serverParentProcess the parent process of the server (e.g. JBoss AS) process + * @param envVarNameIncludes the names of the variables that should be included in the returned map, in addition to + * a core set of OS-level variables (PATH, LD_LIBRARY_PATH, etc.) + * + * @return the set of environment variables that should be passed to the start script for the specified server + * (e.g. JBoss AS) process + */ + @NotNull public static Map<String, String> getStartScriptEnv(ProcessInfo serverProcess, ProcessInfo serverParentProcess, Set<String> envVarNameIncludes) { Map<String, String> processEnvVars; @@ -157,7 +190,8 @@ public class ServerStartScriptDiscoveryUtility { processEnvVars = serverProcess.getEnvironmentVariables(); } - List<String> fullEnvVarNameIncludes = new ArrayList<String>(envVarNameIncludes); + List<String> fullEnvVarNameIncludes = (envVarNameIncludes != null) ? + new ArrayList<String>(envVarNameIncludes) : new ArrayList<String>(); // Add the core includes at the end of the list, since end users will probably be more interested in the // app-specific env vars. fullEnvVarNameIncludes.addAll(CORE_ENV_VAR_NAME_INCLUDES); @@ -178,15 +212,37 @@ public class ServerStartScriptDiscoveryUtility { String path = systemRoot + "\\system32;" + systemRoot; startScriptEnv.put("PATH", path); } else { - startScriptEnv.put("PATH", CORE_ENV_VAR_PATH_LINUX); + startScriptEnv.put("PATH", CORE_ENV_VAR_PATH_UNIX); } return startScriptEnv; } - private static boolean isScript(String startScript) { + @Nullable + private static Integer getStartScriptIndex(String[] serverParentProcessCommandLine) { + // Assuming the specified process actually is a script, it will look something like this: + // UNIX: "/bin/sh [options] ./standalone.sh --server-config=standalone-full.xml" + // Windows: "cmd.exe [options] standalone.bat --server-config=standalone-full.xml" + + if (serverParentProcessCommandLine.length == 1) { + // The command line is an executable with no arguments - there's no way it's a script, so return null. + return null; + } + + int startScriptIndex; + // Advance past any shell (e.g. /bin/sh or cmd.exe) options. + for (startScriptIndex = 1; (startScriptIndex < serverParentProcessCommandLine.length); ++startScriptIndex) { + if (serverParentProcessCommandLine[startScriptIndex].charAt(0) != OPTION_PREFIX) { + break; + } + } + String possibleStartScript = serverParentProcessCommandLine[startScriptIndex]; + return (isScript(possibleStartScript)) ? startScriptIndex : null; + } + + private static boolean isScript(String filePath) { // TODO: What if CygWin was used to start AS7 on Windows via a shell script? - return (startScript != null) && (startScript.endsWith(".sh") || startScript.endsWith(".bat")); + return (filePath != null) && (filePath.endsWith(".sh") || filePath.matches(".*\\.((bat)|(cmd))$(?i)")); } } commit e69ef1e6945f9ec15f7509d77dd4441b3e1206c5 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 17:13:51 2012 -0400 temporarily disable testAllResourceComponentsStarted test until the PC shutdown issue has been fixed diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java index c6cb36a..0f797d8 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java @@ -1,3 +1,21 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.modules.plugins.jbossas7.itest; import java.util.HashMap; @@ -6,11 +24,13 @@ import java.util.Map; import org.testng.annotations.Test; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.plugin.testutil.AbstractAgentPluginTest; import org.rhq.modules.plugins.jbossas7.itest.domain.ManagedServerTest; import org.rhq.test.arquillian.RunDiscovery; /** - * Generic AS7 plugin tests. + * AS7 plugin tests that are not specific to particular Resource types. The tests delegate to methods in + * {@link AbstractAgentPluginTest}, which provides generic impls of such tests. * * @author Ian Springer */ @@ -18,15 +38,16 @@ import org.rhq.test.arquillian.RunDiscovery; public class GenericJBossAS7PluginTest extends AbstractJBossAS7PluginTest { // ****************************** LIFECYCLE ****************************** // - @Test(priority = 1) + // TODO: Re-enable this once the PC shutdown issue has been fixed. + @Test(priority = 1, enabled = false) @RunDiscovery public void testAllResourceComponentsStarted() throws Exception { - Thread.sleep(30*1000L); assertAllResourceComponentsStarted(); } // ******************************* METRICS ******************************* // @Test(priority = 2) + @RunDiscovery public void testAllMetricsHaveNonNullValues() throws Exception { Map<ResourceType, String[]> excludedMetricNamesByType = new HashMap<ResourceType, String[]>(); // It's normal for the "startTime" trait to be null for a Managed Server that is down/disabled. commit 4a28ce1dd2e2acfa8d8c00f1985120e2be821b91 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Apr 27 15:48:36 2012 -0500 Subsystem updates for discovery on the resource tree. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 81083c7..1ccd2cd 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2051,11 +2051,9 @@ discovery="SubsystemDiscovery" class="BaseComponent" singleton="true" - description="General settings of the JCA engine. Not necessarily for end-users" - > + description="General settings of the JCA engine. Not necessarily for end-users"> <runs-inside> - <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> </runs-inside> @@ -2064,21 +2062,14 @@ </plugin-configuration> <resource-configuration> - <c:simple-property name="default-workmanager-short-running-thread-pool" required="true" type="string" readOnly="true" - description="Specify the name of short running thread pool"/> - <c:simple-property name="default-workmanager-long-running-thread-pool" required="true" type="string" readOnly="true" - description="Specify the name of long running thread pool"/> - <c:simple-property name="bean-validation-enabled" required="true" type="boolean" readOnly="true" - description="Specify whether bean validation is enabled"/> + <c:simple-property name="default-workmanager-short-running-thread-pool" required="true" type="string" readOnly="true" description="Specify the name of short running thread pool"/> + <c:simple-property name="default-workmanager-long-running-thread-pool" required="true" type="string" readOnly="true" description="Specify the name of long running thread pool"/> + <c:simple-property name="bean-validation-enabled" required="true" type="boolean" readOnly="true" description="Specify whether bean validation is enabled"/> <c:simple-property name="archive-validation-enabled" type="boolean" readOnly="true" description="Enabling the validation"/> - <c:simple-property name="archive-validation-fail-on-error" type="boolean" readOnly="true" defaultValue="true" - description="Should an archive validation error report fail the deployment. Default: true"/> - <c:simple-property name="archive-validation-fail-on-warn" type="boolean" readOnly="true" defaultValue="false" - description="Should an archive validation warning report fail the deployment. Default: false"/> - <c:simple-property name="cached-connection-manager-debug" type="boolean" readOnly="true" defaultValue="false" - description="enable/disable debug information logging for cached connection manager"/> - <c:simple-property name="cached-connection-manager-error" type="boolean" readOnly="true" defaultValue="false" - description="enable/disable error information logging for cached connection manager"/> + <c:simple-property name="archive-validation-fail-on-error" type="boolean" readOnly="true" defaultValue="true" description="Should an archive validation error report fail the deployment. Default: true"/> + <c:simple-property name="archive-validation-fail-on-warn" type="boolean" readOnly="true" defaultValue="false" description="Should an archive validation warning report fail the deployment. Default: false"/> + <c:simple-property name="cached-connection-manager-debug" type="boolean" readOnly="true" defaultValue="false" description="enable/disable debug information logging for cached connection manager"/> + <c:simple-property name="cached-connection-manager-error" type="boolean" readOnly="true" defaultValue="false" description="enable/disable error information logging for cached connection manager"/> </resource-configuration> </service> @@ -2950,6 +2941,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=naming"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <operation name="jndi-view" displayName="JNDIView" description="Peek at the JNDI tree"> @@ -4305,6 +4297,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=jpa" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> commit 70ea9ac32b250b0aa96db1215efe5f4720483745 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Apr 27 22:20:40 2012 +0200 [BZ 801638] - adding a sample CLI script that can make an AS7 standalone server join a cluster (and copy over the deployments to it). diff --git a/modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js b/modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js new file mode 100644 index 0000000..c629fe6 --- /dev/null +++ b/modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js @@ -0,0 +1,455 @@ +/** + * This script can be used to add a standalone vJBoss AS7 server into a cluster. + * + * All the functions with names starting with an underscore are considered + * private. + * + * @author: Lukas Krejci + */ + +/** + * This function adds an AS7 server to a cluster with another AS7 instance, using + * the provided node name as its identifier. + * <p> + * This method only makes the new member use the same configuration as the existing + * member and synchronizes its jgroups, messaging and modcluster socket bindings + * with the cluster. Optionally it also copies over all the deployments to the + * new member. + * <p> + * The configurations are therefore assumed to be otherwise compatible - i.e. + * the infinispan cache containers should be configured correctly (or left at + * default values, which are configured correctly), etc. + * + * @param newAs7Resource the resource proxy of the AS7 instance to add + * @param newNodeName the node name, i.e. unique identification, of the new member + * in the cluster + * @param existingClusterMemberResource an AS7 instance that belongs to a cluster + * the new member should join into. + * @param copyDeployments whether or not to copy the deployments from the existing + * member to the new member + */ +function addToCluster(newAs7Resource, newNodeName, existingClusterMemberResource, copyDeployments) { + println("Reading config of the existing cluster member"); + var clusterConfig = _getClusterSignificantConfig(existingClusterMemberResource); + + println("Reading config of the new member"); + var memberConfig = _getClusterSignificantConfig(newAs7Resource); + + var memberResourceConfiguration = newAs7Resource.resourceConfiguration; + + if (memberConfig['config'] != clusterConfig['config']) { + println("The configurations of the servers differ.\n" + + "The new cluster member's configuration will be changed to match the configuration of the existing member."); + + //switch to the same configuration + var pluginConfig = newAs7Resource.pluginConfiguration; + pluginConfig.getSimple('config').setValue(clusterConfig['config']); + newAs7Resource.updatePluginConfiguration(pluginConfig); + + //we need to restart straight away so that we see the changes to the + //rest of the configuration caused by the change of current config. + println("Restarting the new cluster member to switch it to the new configuration."); + newAs7Resource.restart(); + + //refresh the resource + newAs7Resource = ProxyFactory.getResource(newAs7Resource.id); + + //refresh the cluster specific config after the restart with the new + //config + memberConfig = _getClusterSignificantConfig(newAs7Resource); + memberResourceConfiguration = newAs7Resource.resourceConfiguration; + } + + //now check what's the node name we see + if (memberConfig['node-name'] != newNodeName) { + println("Updating the node name of the new cluster member from '" + memberConfig['node-name'] + "' to '" + newNodeName + "'"); + _updateNodeName(memberResourceConfiguration, newNodeName); + newAs7Resource.updateResourceConfiguration(memberResourceConfiguration); + } + + //now apply the socket binding changes for jgroups and other cluster + //significant subsystems + //first find the socket binding group config in the new member + for(i in newAs7Resource.children) { + var child = newAs7Resource.children[i]; + if (child.resourceType.name == 'SocketBindingGroup' && + child.resourceType.plugin == 'jboss-as-7') { + + println("Updating socket bindings of jgroups, messaging and modcluster subsystems"); + + var portOffset = javascriptString(child.resourceConfiguration.getSimpleValue('port-offset', '0')); + var clusterMemberPortOffset = clusterConfig['port-offset']; + + var newConfig = child.resourceConfiguration.deepCopy(false); + + _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['jgroups']); + _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['messaging']); + _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['modcluster']); + + child.updateResourceConfiguration(newConfig); + } + } + + println("Restarting the new member for the new socket bindings to take effect."); + newAs7Resource.restart(); + + if (copyDeployments) { + println("Copying the deployments to the new cluster member..."); + copyDeployments(existingClusterMemberResource, newAs7Resource); + + println("Restarting the new cluster member."); + newAs7Resource.restart(); + } +} + +/** + * Copies all deployments from the source to the target. Both resources must + * be standalone AS7 servers. + * + * @param sourceAS7 the resource id or object of the source AS7 standalone instance + * @param targetAS7 the resource id or object of the target AS7 standalone instance + */ +function copyDeployments(sourceAS7, targetAS7) { + if (typeof sourceAS7 == 'object') { + sourceAS7 = sourceAS7.id; + } + + if (typeof targetAS7 == 'object') { + targetAS7 = targetAS7.id; + } + + var deploymentResourceType = ResourceTypeManager.getResourceTypeByNameAndPlugin('Deployment', 'jboss-as-7'); + + var deploymentsCrit = new ResourceCriteria; + deploymentsCrit.addFilterParentResourceId(sourceAS7); + deploymentsCrit.addFilterResourceTypeId(deploymentResourceType.id); + + var unlimitedPageControl = PageControl.unlimitedInstance; + + var sourceDeployments = ResourceManager.findResourcesByCriteria(deploymentsCrit); + var iterator = sourceDeployments.iterator(); + while (iterator.hasNext()) { + var deploymentResource = iterator.next(); + //get a resource proxy for easy access to configurations, etc. + deploymentResource = ProxyFactory.getResource(deploymentResource.id); + + println("Copying deployment " + deploymentResource.name); + + var installedPackage = ContentManager.getBackingPackageForResource(deploymentResource.id); + var content = ContentManager.getPackageBytes(deploymentResource.id, installedPackage.id); + + var runtimeName = deploymentResource.resourceConfiguration.getSimpleValue('runtime-name', deploymentResource.name); + + var deploymentConfiguration = new Configuration; + deploymentConfiguration.put(new PropertySimple('runtimeName', runtimeName)); + + //so now we have both metadata and the data of the deployment, let's + //push a copy of it to the target server + var history = ResourceFactoryManager.createPackageBackedResource(targetAS7, + deploymentResourceType.id, deploymentResource.name, + deploymentResource.pluginConfiguration, + installedPackage.packageVersion.generalPackage.name, + installedPackage.packageVersion.version, + installedPackage.packageVersion.architecture.id, + deploymentConfiguration, content, null); + + while (history.status.name() == 'IN_PROGRESS') { + java.lang.Thread.sleep(1000); + //the API for checking the create histories is kinda weird.. + var histories = ResourceFactoryManager.findCreateChildResourceHistory(targetAS7, null, null, unlimitedPageControl); + var hit = histories.iterator(); + var found = false; + while(hit.hasNext()) { + var h = hit.next(); + + if (h.id == history.id) { + history = h; + found = true; + break; + } + } + + if (!found) { + throw "The history object for the deployment seems to have disappeared, this is very strange."; + } + } + + println("Deployment finished with status: " + history.status.toString() + + (history.status.name() == 'SUCCESS' ? "." : (", error message: " + history.errorMessage + "."))); + } +} + +/** + * The config properties of AS7 can have a form of ${propertyName:defaultvalue}. + * Because we can't figure out the value of the property if it is defined, + * (or get at its default value), we return the following hash from this function + * { + * property : propertyName, + * value : defaultvalue + * } + * + * At least one of the keys in the above hash will have a value. + */ +function _parseValueFromExpr(expr) { + var strExpr = expr + ''; + if (strExpr.indexOf('${') == 0) { + var colonIdx = strExpr.indexOf(':'); + if (colonIdx == -1) { + return { 'property' : expr }; + } else { + var property = strExpr.substring(2, colonIdx); + var value = strExpr.substring(colonIdx + 1, strExpr.length - 1); + + return { 'property' : property, 'value' : value }; + } + } else { + return { 'value' : expr }; + } +} + +/** + * This converts the result of _parseValueFromExpr() function back into the + * ${property:defaultvalue} format. + */ +function _composeValueExpr(parsedValue) { + if (parsedValue.property == undefined) { + return parsedValue.value; + } else { + return '${' + parsedValue.property + ':' + parsedValue.value + '}'; + } +} + +function _updateNodeName(serverResourceConfiguration, newNodeName) { + //define it as a system prop + var systemProps = serverResourceConfiguration.getList('*2'); + if (systemProps == null) { + systemProps = new PropertyList('*2'); + serverResourceConfiguration.put(systemProps); + } + + var it = systemProps.list.iterator(); + var updated = false; + while (it.hasNext()) { + var systemProp = it.next(); + var systemPropName = systemProp.getSimpleValue('name', null); + if (systemPropName == 'jboss.node.name') { + var systemPropValue = systemProp.getSimple('value'); + if (systemPropValue == null) { + systemPropValue = new PropertySimple('value', newNodeName); + systemProp.put(systemPropValue); + } else { + systemPropValue.setValue(newNodeName); + } + + updated = true; + break; + } + } + + if (!updated) { + var systemProp = new PropertyMap('*:name'); + systemProp.put(new PropertySimple('name', 'jboss.node.name')); + systemProp.put(new PropertySimple('value', newNodeName)); + systemProps.add(systemProp); + } +} + +function _updateSocketBindings(socketBindingsConfig, portOffset, clusterMemberPortOffset, socketBindingConfig) { + portOffset = _parseValueFromExpr(portOffset); + clusterMemberPortOffset = _parseValueFromExpr(clusterMemberPortOffset); + + var portOffsetValue = portOffset.value != undefined ? portOffset.value : 0; + var clusterMemberPortOffsetValue = clusterMemberPortOffset.value != undefined ? + clusterMemberPortOffset.value : 0; + + var portOffsetDiff = clusterMemberPortOffsetValue - portOffsetValue; + + var ports = socketBindingsConfig.get('*'); + var portIterator = ports.list.iterator(); + + var appliedProperties = []; + + while (portIterator.hasNext()) { + var port = portIterator.next(); + + var name = port.getSimpleValue('name', null); + + if (socketBindingConfig[name] != undefined) { + //k, this is a significant config, port it over + + //compute the value of the ports + if (socketBindingConfig[name]['fixed-port'] == 'true') { + port.put(new PropertySimple('port:expr', socketBindingConfig[name]['port:expr'])); + port.put(new PropertySimple('multicast-port:expr', socketBindingConfig[name]['multicast-port:expr'])); + port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address'])); + port.put(new PropertySimple('fixed-port', 'true')); + } else { + var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']); + if (portExprToUse.value != undefined) { + portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + ''; + } + + var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']); + if (multicastPortExprToUse.value != undefined) { + multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + ''; + } + + port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse))); + port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse))); + port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address'])); + port.put(new PropertySimple('fixed-port', 'false')); + } + appliedProperties.push(name); + } + } + + //I need contains() and Rhino's Array object apparently doesn't have indexOf() + //which I could otherwise use. + appliedProperties = java.util.Arrays.asList(appliedProperties); + + //now add to the list the props that were not there + for(name in socketBindingConfig) { + if (appliedProperties.contains(name)) { + continue; + } + + var port = new PropertyMap; + ports.add(port); + + port.put(new PropertySimple('name', name)); + port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address'])); + port.put(new PropertySimple('fixed-port', socketBindingConfig[name]['fixed-port'])); + + var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']); + if (portExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) { + portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + ''; + } + + var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']); + if (multicastPortExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) { + multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + ''; + } + + port.put(new PropertySimple('port:expr'), _composeValueExpr(portExprToUse)); + port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse))); + } +} + + +/** + * Returns a javascript hash of configuration properties significant for the + * cluster configuration. + * + * This method is quite simplistic - it merely reads out the important socket + * bindings and Infinispan configuration properties. + * + * It doesn't try to be smart about specifying which concrete caches and cache + * containers are used for individual subsystems like EJB3, JPA or web apps. + * + * @param resource the resource proxy of the AS7 + */ +function _getClusterSignificantConfig(as7Resource) { + var ret = {}; + + ret['config'] = javascriptString(as7Resource.pluginConfiguration.getSimpleValue('config', null)); + + ret['node-name'] = javascriptString(as7Resource.resourceConfiguration.getSimpleValue('node-name', null)); + + //the standalone server has a single socket binding group + for(var i in as7Resource.children) { + var child = as7Resource.children[i]; + if (child.resourceType.plugin != 'jboss-as-7') { + continue; + } + if (child.resourceType.name == 'SocketBindingGroup') { + ret['port-offset'] = javascriptString(child.resourceConfiguration.getSimpleValue('port-offset', '0')); + var ports = child.resourceConfiguration.get('*'); + var portIterator = ports.list.iterator(); + + var jgroups = {}; + var messaging = {}; + var modcluster = {}; + + ret['jgroups'] = jgroups; + ret['messaging'] = messaging; + ret['modcluster'] = modcluster; + + while (portIterator.hasNext()) { + var port = portIterator.next(); + var name = javascriptString(port.getSimpleValue('name', null)); + + if (name.indexOf('jgroups') == 0) { + jgroups[name] = _getSocketBinding(port); + } else if (name.indexOf('messaging') == 0) { + messaging[name] = _getSocketBinding(port); + } else if (name.indexOf('modcluster') == 0) { + modcluster[name] = _getSocketBinding(port); + } + } + } else if (child.resourceType.name == 'Infinispan') { + var ispn = {}; + ret['infinispan'] = ispn; + + //This has disappeared + //ispn['default-cache-container'] = javascriptString(child.defaultCacheContainer.value); + var cacheContainers = {}; + ispn['cache-containers'] = cacheContainers; + + for(cc in child.children) { + var cacheContainer = child.children[cc]; + + var caches = {}; + + cacheContainers[cacheContainer.name] = { + 'default-cache' : javascriptString(cacheContainer.resourceConfiguration.getSimpleValue('default-cache', null)), + 'aliases' : _asArray(cacheContainer.resourceConfiguration.get('aliases')), + 'caches' : caches + }; + + for (c in cacheContainer.children) { + var cache = cacheContainer.children[c]; + + caches[cache.name] = { + '_flavor' : javascriptString(cache.resourceConfiguration.getSimpleValue('_flavor', null)), + 'batching' : javascriptString(cache.resourceConfiguration.getSimpleValue('batching', null)), + 'indexing' : javascriptString(cache.resourceConfiguration.getSimpleValue('indexing', null)), + 'mode' : javascriptString(cache.resourceConfiguration.getSimpleValue('mode', null)) + }; + } + } + } + } + + return ret; +} + +function _getSocketBinding(port) { + return { + 'port:expr' : javascriptString(port.getSimpleValue('port:expr', '0')), + 'multicast-port:expr' : javascriptString(port.getSimpleValue('multicast-port:expr', null)), + 'multicast-address' : javascriptString(port.getSimpleValue('multicast-address', null)), + 'fixed-port' : javascriptString(port.getSimpleValue('fixed-port', null)) + }; +} + +function javascriptString(string) { + return string == null || string == undefined ? string : string + ''; +} + +function _asArray(propertyList) { + var ret = []; + if (propertyList == undefined || propertyList == null) { + return ret; + } + + var it = propertyList.list.iterator(); + while (it.hasNext()) { + var prop = it.next(); + + if (prop instanceof PropertySimple) { + ret.push(javascriptString(prop.stringValue)); + } + } + + return ret; +} commit d3927476f7f8f4f6172a1d92ee636ee853f931f7 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Apr 27 22:16:26 2012 +0200 [BZ 816593][BZ 816587] - Deployments now correctly advertise their content packages (we only support archived deployments for now). Also added support for retrieving the package bits. diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/Base64.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/Base64.java deleted file mode 100644 index e01f0fb..0000000 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/Base64.java +++ /dev/null @@ -1,319 +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. - */ -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.rhq.core.db.ant; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; - -/** - * Class to Base64 encode strings. - */ -public class Base64 { - private static final char[] S_BASE64CHAR = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', - 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '+', '/' }; - private static final char S_BASE64PAD = '='; - private static final byte[] S_DECODETABLE = new byte[128]; - - static { - for (int i = 0; i < S_DECODETABLE.length; i++) { - S_DECODETABLE[i] = Byte.MAX_VALUE; // 127 - } - - for (int i = 0; i < S_BASE64CHAR.length; i++) // 0 to 63 - { - S_DECODETABLE[S_BASE64CHAR[i]] = (byte) i; - } - } - - private static int decode0(char[] ibuf, byte[] obuf, int wp) { - int outlen = 3; - if (ibuf[3] == S_BASE64PAD) { - outlen = 2; - } - - if (ibuf[2] == S_BASE64PAD) { - outlen = 1; - } - - int b0 = S_DECODETABLE[ibuf[0]]; - int b1 = S_DECODETABLE[ibuf[1]]; - int b2 = S_DECODETABLE[ibuf[2]]; - int b3 = S_DECODETABLE[ibuf[3]]; - switch (outlen) { - case 1: { - obuf[wp] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); - return 1; - } - - case 2: { - obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); - obuf[wp] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); - return 2; - } - - case 3: { - obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); - obuf[wp++] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); - obuf[wp] = (byte) (((b2 << 6) & 0xc0) | (b3 & 0x3f)); - return 3; - } - - default: { - throw new RuntimeException("Internal Errror"); - } - } - } - - /** - */ - public static byte[] decode(char[] data, int off, int len) { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[(len / 4 * 3) + 3]; - int obufcount = 0; - for (int i = off; i < (off + len); i++) { - char ch = data[i]; - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - obufcount += decode0(ibuf, obuf, obufcount); - } - } - } - - if (obufcount == obuf.length) { - return obuf; - } - - byte[] ret = new byte[obufcount]; - System.arraycopy(obuf, 0, ret, 0, obufcount); - return ret; - } - - /** - */ - public static byte[] decode(String data) { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[(data.length() / 4 * 3) + 3]; - int obufcount = 0; - for (int i = 0; i < data.length(); i++) { - char ch = data.charAt(i); - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - obufcount += decode0(ibuf, obuf, obufcount); - } - } - } - - if (obufcount == obuf.length) { - return obuf; - } - - byte[] ret = new byte[obufcount]; - System.arraycopy(obuf, 0, ret, 0, obufcount); - return ret; - } - - /** - */ - public static void decode(char[] data, int off, int len, OutputStream ostream) throws IOException { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[3]; - for (int i = off; i < (off + len); i++) { - char ch = data[i]; - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - int obufcount = decode0(ibuf, obuf, 0); - ostream.write(obuf, 0, obufcount); - } - } - } - } - - /** - */ - public static void decode(String data, OutputStream ostream) throws IOException { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[3]; - for (int i = 0; i < data.length(); i++) { - char ch = data.charAt(i); - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - int obufcount = decode0(ibuf, obuf, 0); - ostream.write(obuf, 0, obufcount); - } - } - } - } - - /** - * Returns base64 representation of specified byte array. - */ - public static String encode(byte[] data) { - return encode(data, 0, data.length); - } - - /** - * Returns base64 representation of specified byte array. - */ - public static String encode(byte[] data, int off, int len) { - if (len <= 0) { - return ""; - } - - char[] out = new char[(len / 3 * 4) + 4]; - int rindex = off; - int windex = 0; - int rest = len - off; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[windex++] = S_BASE64CHAR[i >> 18]; - out[windex++] = S_BASE64CHAR[(i >> 12) & 0x3f]; - out[windex++] = S_BASE64CHAR[(i >> 6) & 0x3f]; - out[windex++] = S_BASE64CHAR[i & 0x3f]; - rindex += 3; - rest -= 3; - } - - if (rest == 1) { - int i = data[rindex] & 0xff; - out[windex++] = S_BASE64CHAR[i >> 2]; - out[windex++] = S_BASE64CHAR[(i << 4) & 0x3f]; - out[windex++] = S_BASE64PAD; - out[windex++] = S_BASE64PAD; - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[windex++] = S_BASE64CHAR[i >> 10]; - out[windex++] = S_BASE64CHAR[(i >> 4) & 0x3f]; - out[windex++] = S_BASE64CHAR[(i << 2) & 0x3f]; - out[windex++] = S_BASE64PAD; - } - - return new String(out, 0, windex); - } - - /** - * Outputs base64 representation of the specified byte array to a byte stream. - */ - public static void encode(byte[] data, int off, int len, OutputStream ostream) throws IOException { - if (len <= 0) { - return; - } - - byte[] out = new byte[4]; - int rindex = off; - int rest = len - off; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[0] = (byte) S_BASE64CHAR[i >> 18]; - out[1] = (byte) S_BASE64CHAR[(i >> 12) & 0x3f]; - out[2] = (byte) S_BASE64CHAR[(i >> 6) & 0x3f]; - out[3] = (byte) S_BASE64CHAR[i & 0x3f]; - ostream.write(out, 0, 4); - rindex += 3; - rest -= 3; - } - - if (rest == 1) { - int i = data[rindex] & 0xff; - out[0] = (byte) S_BASE64CHAR[i >> 2]; - out[1] = (byte) S_BASE64CHAR[(i << 4) & 0x3f]; - out[2] = (byte) S_BASE64PAD; - out[3] = (byte) S_BASE64PAD; - ostream.write(out, 0, 4); - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[0] = (byte) S_BASE64CHAR[i >> 10]; - out[1] = (byte) S_BASE64CHAR[(i >> 4) & 0x3f]; - out[2] = (byte) S_BASE64CHAR[(i << 2) & 0x3f]; - out[3] = (byte) S_BASE64PAD; - ostream.write(out, 0, 4); - } - } - - /** - * Outputs base64 representation of the specified byte array to a character stream. - */ - public static void encode(byte[] data, int off, int len, Writer writer) throws IOException { - if (len <= 0) { - return; - } - - char[] out = new char[4]; - int rindex = off; - int rest = len - off; - int output = 0; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[0] = S_BASE64CHAR[i >> 18]; - out[1] = S_BASE64CHAR[(i >> 12) & 0x3f]; - out[2] = S_BASE64CHAR[(i >> 6) & 0x3f]; - out[3] = S_BASE64CHAR[i & 0x3f]; - writer.write(out, 0, 4); - rindex += 3; - rest -= 3; - output += 4; - if ((output % 76) == 0) { - writer.write("\n"); - } - } - - if (rest == 1) { - int i = data[rindex] & 0xff; - out[0] = S_BASE64CHAR[i >> 2]; - out[1] = S_BASE64CHAR[(i << 4) & 0x3f]; - out[2] = S_BASE64PAD; - out[3] = S_BASE64PAD; - writer.write(out, 0, 4); - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[0] = S_BASE64CHAR[i >> 10]; - out[1] = S_BASE64CHAR[(i >> 4) & 0x3f]; - out[2] = S_BASE64CHAR[(i << 2) & 0x3f]; - out[3] = S_BASE64PAD; - writer.write(out, 0, 4); - } - } -} \ No newline at end of file diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java index 824b777..2de2c86 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java @@ -24,6 +24,8 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; +import org.rhq.core.util.Base64; + /** * Encrypts a string. You can optionally have it base64 encode the MD5 string (which is the default). Set the "base64" * attribute to "false" if you do not want the string base64 encoded. diff --git a/modules/core/util/src/main/java/org/rhq/core/util/Base64.java b/modules/core/util/src/main/java/org/rhq/core/util/Base64.java new file mode 100644 index 0000000..34a3035 --- /dev/null +++ b/modules/core/util/src/main/java/org/rhq/core/util/Base64.java @@ -0,0 +1,319 @@ +/* + * 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. + */ +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package org.rhq.core.util; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; + +/** + * Class to Base64 encode strings. + */ +public class Base64 { + private static final char[] S_BASE64CHAR = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', + 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', '+', '/' }; + private static final char S_BASE64PAD = '='; + private static final byte[] S_DECODETABLE = new byte[128]; + + static { + for (int i = 0; i < S_DECODETABLE.length; i++) { + S_DECODETABLE[i] = Byte.MAX_VALUE; // 127 + } + + for (int i = 0; i < S_BASE64CHAR.length; i++) // 0 to 63 + { + S_DECODETABLE[S_BASE64CHAR[i]] = (byte) i; + } + } + + private static int decode0(char[] ibuf, byte[] obuf, int wp) { + int outlen = 3; + if (ibuf[3] == S_BASE64PAD) { + outlen = 2; + } + + if (ibuf[2] == S_BASE64PAD) { + outlen = 1; + } + + int b0 = S_DECODETABLE[ibuf[0]]; + int b1 = S_DECODETABLE[ibuf[1]]; + int b2 = S_DECODETABLE[ibuf[2]]; + int b3 = S_DECODETABLE[ibuf[3]]; + switch (outlen) { + case 1: { + obuf[wp] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); + return 1; + } + + case 2: { + obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); + obuf[wp] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); + return 2; + } + + case 3: { + obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); + obuf[wp++] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); + obuf[wp] = (byte) (((b2 << 6) & 0xc0) | (b3 & 0x3f)); + return 3; + } + + default: { + throw new RuntimeException("Internal Errror"); + } + } + } + + /** + */ + public static byte[] decode(char[] data, int off, int len) { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[(len / 4 * 3) + 3]; + int obufcount = 0; + for (int i = off; i < (off + len); i++) { + char ch = data[i]; + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + obufcount += decode0(ibuf, obuf, obufcount); + } + } + } + + if (obufcount == obuf.length) { + return obuf; + } + + byte[] ret = new byte[obufcount]; + System.arraycopy(obuf, 0, ret, 0, obufcount); + return ret; + } + + /** + */ + public static byte[] decode(String data) { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[(data.length() / 4 * 3) + 3]; + int obufcount = 0; + for (int i = 0; i < data.length(); i++) { + char ch = data.charAt(i); + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + obufcount += decode0(ibuf, obuf, obufcount); + } + } + } + + if (obufcount == obuf.length) { + return obuf; + } + + byte[] ret = new byte[obufcount]; + System.arraycopy(obuf, 0, ret, 0, obufcount); + return ret; + } + + /** + */ + public static void decode(char[] data, int off, int len, OutputStream ostream) throws IOException { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[3]; + for (int i = off; i < (off + len); i++) { + char ch = data[i]; + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + int obufcount = decode0(ibuf, obuf, 0); + ostream.write(obuf, 0, obufcount); + } + } + } + } + + /** + */ + public static void decode(String data, OutputStream ostream) throws IOException { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[3]; + for (int i = 0; i < data.length(); i++) { + char ch = data.charAt(i); + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + int obufcount = decode0(ibuf, obuf, 0); + ostream.write(obuf, 0, obufcount); + } + } + } + } + + /** + * Returns base64 representation of specified byte array. + */ + public static String encode(byte[] data) { + return encode(data, 0, data.length); + } + + /** + * Returns base64 representation of specified byte array. + */ + public static String encode(byte[] data, int off, int len) { + if (len <= 0) { + return ""; + } + + char[] out = new char[(len / 3 * 4) + 4]; + int rindex = off; + int windex = 0; + int rest = len - off; + while (rest >= 3) { + int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); + out[windex++] = S_BASE64CHAR[i >> 18]; + out[windex++] = S_BASE64CHAR[(i >> 12) & 0x3f]; + out[windex++] = S_BASE64CHAR[(i >> 6) & 0x3f]; + out[windex++] = S_BASE64CHAR[i & 0x3f]; + rindex += 3; + rest -= 3; + } + + if (rest == 1) { + int i = data[rindex] & 0xff; + out[windex++] = S_BASE64CHAR[i >> 2]; + out[windex++] = S_BASE64CHAR[(i << 4) & 0x3f]; + out[windex++] = S_BASE64PAD; + out[windex++] = S_BASE64PAD; + } else if (rest == 2) { + int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); + out[windex++] = S_BASE64CHAR[i >> 10]; + out[windex++] = S_BASE64CHAR[(i >> 4) & 0x3f]; + out[windex++] = S_BASE64CHAR[(i << 2) & 0x3f]; + out[windex++] = S_BASE64PAD; + } + + return new String(out, 0, windex); + } + + /** + * Outputs base64 representation of the specified byte array to a byte stream. + */ + public static void encode(byte[] data, int off, int len, OutputStream ostream) throws IOException { + if (len <= 0) { + return; + } + + byte[] out = new byte[4]; + int rindex = off; + int rest = len - off; + while (rest >= 3) { + int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); + out[0] = (byte) S_BASE64CHAR[i >> 18]; + out[1] = (byte) S_BASE64CHAR[(i >> 12) & 0x3f]; + out[2] = (byte) S_BASE64CHAR[(i >> 6) & 0x3f]; + out[3] = (byte) S_BASE64CHAR[i & 0x3f]; + ostream.write(out, 0, 4); + rindex += 3; + rest -= 3; + } + + if (rest == 1) { + int i = data[rindex] & 0xff; + out[0] = (byte) S_BASE64CHAR[i >> 2]; + out[1] = (byte) S_BASE64CHAR[(i << 4) & 0x3f]; + out[2] = (byte) S_BASE64PAD; + out[3] = (byte) S_BASE64PAD; + ostream.write(out, 0, 4); + } else if (rest == 2) { + int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); + out[0] = (byte) S_BASE64CHAR[i >> 10]; + out[1] = (byte) S_BASE64CHAR[(i >> 4) & 0x3f]; + out[2] = (byte) S_BASE64CHAR[(i << 2) & 0x3f]; + out[3] = (byte) S_BASE64PAD; + ostream.write(out, 0, 4); + } + } + + /** + * Outputs base64 representation of the specified byte array to a character stream. + */ + public static void encode(byte[] data, int off, int len, Writer writer) throws IOException { + if (len <= 0) { + return; + } + + char[] out = new char[4]; + int rindex = off; + int rest = len - off; + int output = 0; + while (rest >= 3) { + int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); + out[0] = S_BASE64CHAR[i >> 18]; + out[1] = S_BASE64CHAR[(i >> 12) & 0x3f]; + out[2] = S_BASE64CHAR[(i >> 6) & 0x3f]; + out[3] = S_BASE64CHAR[i & 0x3f]; + writer.write(out, 0, 4); + rindex += 3; + rest -= 3; + output += 4; + if ((output % 76) == 0) { + writer.write("\n"); + } + } + + if (rest == 1) { + int i = data[rindex] & 0xff; + out[0] = S_BASE64CHAR[i >> 2]; + out[1] = S_BASE64CHAR[(i << 4) & 0x3f]; + out[2] = S_BASE64PAD; + out[3] = S_BASE64PAD; + writer.write(out, 0, 4); + } else if (rest == 2) { + int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); + out[0] = S_BASE64CHAR[i >> 10]; + out[1] = S_BASE64CHAR[(i >> 4) & 0x3f]; + out[2] = S_BASE64CHAR[(i << 2) & 0x3f]; + out[3] = S_BASE64PAD; + writer.write(out, 0, 4); + } + } +} \ No newline at end of file diff --git a/modules/core/util/src/main/java/org/rhq/core/util/ByteUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/ByteUtil.java new file mode 100644 index 0000000..3600d7e --- /dev/null +++ b/modules/core/util/src/main/java/org/rhq/core/util/ByteUtil.java @@ -0,0 +1,59 @@ +/* + * 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.core.util; + +/** + * Utilities for working with bytes and byte arrays. + * + * @author Lukas Krejci + */ +public class ByteUtil { + + private static final char[] HEX_DIGITS = "0123456789abcdef".toCharArray(); + + private ByteUtil() { + + } + + /** + * Converts the byte array into a string of hexadecimal numbers. + * Each byte in the array is represented by exactly two characters + * in the resulting string, which form a hexadecimal number with the + * value that represents the bits in the byte. + * + * @param bytes + * @return a string of hexadecimal numbers representing the bytes + */ + public static String toHexString(byte[] bytes) { + char[] str = new char[bytes.length * 2]; + + for (int i = 0; i < bytes.length; ++i) { + byte b = bytes[i]; + + int lower = b & 0x0f; + int upper = (b & 0xf0) >>> 4; + + str[2 * i] = HEX_DIGITS[upper]; + str[2 * i + 1] = HEX_DIGITS[lower]; + } + + return new String(str); + } +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java index 09c25cd..851937b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java @@ -43,12 +43,12 @@ import org.rhq.core.clientapi.server.core.ConnectAgentRequest; import org.rhq.core.clientapi.server.core.ConnectAgentResults; import org.rhq.core.clientapi.server.core.CoreServerService; import org.rhq.core.clientapi.server.core.PingRequest; -import org.rhq.core.db.ant.Base64; import org.rhq.core.domain.cloud.PartitionEventType; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.cloud.composite.FailoverListComposite; import org.rhq.core.domain.plugin.Plugin; import org.rhq.core.domain.resource.Agent; +import org.rhq.core.util.Base64; import org.rhq.core.util.exception.WrappedRemotingException; import org.rhq.enterprise.communications.command.client.RemoteInputStream; import org.rhq.enterprise.server.alert.engine.AlertConditionCacheManagerLocal; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java index f8d48ec..9771cee 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java @@ -1,9 +1,13 @@ package org.rhq.modules.plugins.jbossas7; +import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -25,9 +29,17 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.content.ContentFacet; import org.rhq.core.pluginapi.content.ContentServices; +import org.rhq.core.pluginapi.content.FileContentDelegate; import org.rhq.core.pluginapi.inventory.CreateResourceReport; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ResourceComponent; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.Base64; +import org.rhq.core.util.ByteUtil; +import org.rhq.core.util.file.ContentFileInfo; +import org.rhq.core.util.file.JarContentFileInfo; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.ComplexResult; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -40,10 +52,17 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Deal with deployments * @author Heiko W. Rupp */ -public class DeploymentComponent extends BaseComponent implements OperationFacet, ContentFacet { +public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> implements OperationFacet, ContentFacet { private boolean verbose = ASConnection.verbose; - + private File deploymentFile; + + @Override + public void start(ResourceContext<ResourceComponent<?>> context) throws InvalidPluginConfigurationException, Exception { + super.start(context); + deploymentFile = determineDeploymentFile(); + } + @Override public AvailabilityType getAvailability() { Operation op = new ReadAttribute(getAddress(),"enabled"); @@ -170,59 +189,170 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet @Override public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) { - return null; // TODO: Customise this generated block + RemovePackagesResponse response = new RemovePackagesResponse(ContentResponseResult.NOT_PERFORMED); + response.setOverallRequestErrorMessage("Removal of packages backing the deployments is not supported."); + return response; } @Override public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) { + if (deploymentFile == null) { + return Collections.emptySet(); + } + + String name = getDeploymentName(); + String sha256 = getSHA256(deploymentFile); + String version = getVersion(sha256); + + PackageDetailsKey key = new PackageDetailsKey(name, version, type.getName(), "noarch"); + ResourcePackageDetails details = new ResourcePackageDetails(key); + + details.setDisplayVersion(getDisplayVersion(deploymentFile)); + details.setFileCreatedDate(null); //TODO figure this out from Sigar somehow? + details.setFileName(name); + details.setFileSize(deploymentFile.length()); + details.setInstallationTimestamp(deploymentFile.lastModified()); + details.setLocation(deploymentFile.getAbsolutePath()); + details.setSHA256(sha256); + + return Collections.singleton(details); + } - Set<ResourcePackageDetails> details = new HashSet<ResourcePackageDetails>(); - - // PackageType = "Deployment" - Address address1 = getAddress().getParent(); - Operation op = new ReadChildrenResources(address1,"deployment"); - ComplexResult cres = getASConnection().executeComplex(op); - - if (cres==null) - return details; - - if (!cres.isSuccess()) - return details; - - Map<String,Object> deployments = cres.getResult(); - for (String key : deployments.keySet()) { - Map<String,Object> deployment = (Map<String, Object>) deployments.get(key); - log.info("Discover package [" + key + "] for type [" + type + "]"); - - List<Map> contentList = (List<Map>) deployment.get("content"); - if (contentList!=null) { - - Map<String,Map> hashMap = contentList.get(0); - Map<String,String> bvMap = hashMap.get("hash"); - String content; - if (bvMap!=null) { - content = bvMap.get("BYTES_VALUE"); - } - else { - content = hashMap.get("relative-to") + File.separator + hashMap.get("path"); - } - PackageDetailsKey pdKey = new PackageDetailsKey(key, - content, // no way to obtain the user defined version from the server - type.getName(), - "noarch" - ); - ResourcePackageDetails detail = new ResourcePackageDetails(pdKey); - detail.setSHA256(content); - - details.add(detail); + @Override + public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) { + try { + return deploymentFile == null ? new ByteArrayInputStream(new byte[0]) : new FileInputStream(deploymentFile); + } catch (FileNotFoundException e) { + throw new IllegalStateException("Deployment file seems to have disappeared"); + } + } + + private File determineDeploymentFile() { + Operation op = new ReadAttribute(getAddress(), "content"); + Result result = getASConnection().execute(op); + + @SuppressWarnings("unchecked") + List<Map<String, Object>> content = (List<Map<String, Object>>) result.getResult(); + if (content.isEmpty()) { + log.warn("Could not determine the location of the deployment - the content descriptor wasn't found for deployment" + getAddress() + "."); + return null; + } + + Boolean archive = (Boolean) content.get(0).get("archive"); + if (archive != null && !archive) { + log.debug("Exploded deployments not supported for retrieving the content."); + return null; + } + + File deploymentFile = null; + if (content.get(0).containsKey("path")) { + String path = (String) content.get(0).get("path"); + String relativeTo = (String) content.get(0).get("relative-to"); + deploymentFile = getDeploymentFileFromPath(relativeTo, path); + } else if (content.get(0).containsKey("hash")) { + @SuppressWarnings("unchecked") + String base64Hash = ((Map<String, String>)content.get(0).get("hash")).get("BYTES_VALUE"); + byte[] hash = Base64.decode(base64Hash); + Address contentPathAddress = new Address("core-service", "server-environment"); + op = new ReadAttribute(contentPathAddress, "content-dir"); + result = getASConnection().execute(op); + + String contentPath = (String) result.getResult(); + deploymentFile = getDeploymentFileFromHash(hash, contentPath); + } else { + log.warn("Failed to determine the deployment file of " + getAddress() + " deployment. Neither path nor hash attributes were available."); + } + + return deploymentFile; + } + + private File getDeploymentFileFromPath(String relativeTo, String path) { + if (relativeTo == null || relativeTo.trim().isEmpty()) { + return new File(path); + } else { + //Transform the property name into the name used in the server environment + if (relativeTo.startsWith("jboss.server")) { + relativeTo = relativeTo.substring("jboss.server.".length()); + relativeTo = relativeTo.replace('.', '-'); + + //now look for the transformed relativeTo in the server environment + Operation op = new ReadAttribute(new Address("core-service", "server-environment"), relativeTo); + Result res = getASConnection().execute(op); + + relativeTo = (String) res.getResult(); + + return new File(relativeTo, path); + } else { + log.warn("Unsupported property used as a base for deployment path specification: " + relativeTo); + return null; + } + } + } + + private File getDeploymentFileFromHash(byte[] hash, String contentPath) { + String hashStr = ByteUtil.toHexString(hash); + + String head = hashStr.substring(0, 2); + String tail = hashStr.substring(2); + + File hashPath = new File(new File(head, tail), "content"); + + return new File(contentPath, hashPath.getPath()); + } + + /** + * Retrieve SHA256 for a deployed app. + * + * Shamelessly copied from the AS5 plugin. + * + * @param file application file + * @return SHA256 of the content + */ + private String getSHA256(File file) { + String sha256 = null; + + try { + FileContentDelegate fileContentDelegate = new FileContentDelegate(); + sha256 = fileContentDelegate.retrieveDeploymentSHA(file, context.getResourceDataDirectory()); + } catch (Exception iex) { + if (log.isDebugEnabled()) { + log.debug("Problem calculating digest of package [" + file.getPath() + "]." + iex.getMessage()); } } - return details; + return sha256; } - @Override - public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) { - return null; // TODO: Customise this generated block + /** + * Shamelessly copied from the AS5 plugin. + * + * @param sha256 + * @return + */ + private static String getVersion(String sha256) { + return "[sha256=" + sha256 + "]"; + } + + /** + * Retrieve the display version for the component. The display version should be stored + * in the manifest of the application (implementation and/or specification version). + * It will attempt to retrieve the version for both archived or exploded deployments. + * + * Shamelessly copied from the AS5 plugin + * + * @param file component file + * @return + */ + private String getDisplayVersion(File file) { + //JarContentFileInfo extracts the version from archived and exploded deployments + ContentFileInfo contentFileInfo = new JarContentFileInfo(file); + return contentFileInfo.getVersion(null); + } + + private String getDeploymentName() { + Operation op = new ReadAttribute(getAddress(), "name"); + Result res = getASConnection().execute(op); + + return (String) res.getResult(); } } commit b118bbbebaa12bba82d02d0ff79c306e76081ddd Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 13:10:54 2012 -0400 [BZ 815889] fix for rtfilter subsystem (apparently implementing the config writer is not optional) (https://bugzilla.redhat.com/show_bug.cgi?id=815889) diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java index 06a300b..0e985d8 100644 --- a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java @@ -38,8 +38,8 @@ import org.jboss.staxmapper.XMLExtendedStreamWriter; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; -import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -73,7 +73,7 @@ public class RtFilterExtension implements Extension { protected static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME); private static final String RESOURCE_NAME = RtFilterExtension.class.getPackage().getName() + ".LocalDescriptions"; - public static final Map<String, String> INIT_PARAMS = new HashMap<String, String>(); + public static final Map<String, String> INIT_PARAMS = new LinkedHashMap<String, String>(); public static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String keyPrefix) { String prefix = SUBSYSTEM_NAME + (keyPrefix == null ? "" : "." + keyPrefix); @@ -199,7 +199,23 @@ public class RtFilterExtension implements Extension { @Override public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { context.startSubsystemElement(RtFilterExtension.NAMESPACE, false); - writer.writeEndElement(); + + for (String paramName : INIT_PARAMS.keySet()) { + writer.writeStartElement("init-param"); + + writer.writeStartElement("param-name"); + writer.writeCharacters(paramName); + writer.writeEndElement(); // param-name + + writer.writeStartElement("param-value"); + String paramValue = INIT_PARAMS.get(paramName); + writer.writeCharacters(paramValue); + writer.writeEndElement(); // param-value + + writer.writeEndElement(); // init-param + } + + writer.writeEndElement(); // subsystem } } diff --git a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java index aee7a6b..9ed5100 100644 --- a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java +++ b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java @@ -31,7 +31,7 @@ import org.testng.annotations.Test; * * @author Ian Springer */ -@Test(enabled = false) +@Test(enabled = true) public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest { public SubsystemXmlParsingTest() { @@ -44,6 +44,7 @@ public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest { super.initializeParser(); } + @Override public void testSubsystem() throws Exception { super.testSubsystem(); } commit c828332bccc0ca270839ed9a7eeecd3a88a119ed Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Apr 27 11:38:15 2012 -0500 Add managed runtime property for discovery purposes for managed servers. Hardened the detection for managed servers runtime. And removed unneeded Host Controller parents. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java index d06567d..4db21ba 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java @@ -98,8 +98,10 @@ public class SubsystemDiscovery implements ResourceDiscoveryComponent<BaseCompon // path correction for managed servers, where the config is below host=x,server-config=y but // the runtime resource is below host=x,server=y - path = path.replaceAll(",server-config=", ",server="); - parentPath = parentPath.replaceAll(",server-config=", ",server="); + if (path.startsWith("host=")) { + path = path.replaceAll(",server-config=", ",server="); + parentPath = parentPath.replaceAll(",server-config=", ",server="); + } } if (Boolean.getBoolean("as7plugin.verbose")) diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index c48b453..81083c7 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -1618,10 +1618,12 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=messaging"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="HornetQ" @@ -2209,6 +2211,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=datasources"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="DataSource (Managed)" @@ -2826,6 +2829,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=webservices"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration>  - <echo>Deploying static downloadable content</echo> + <echo>Deploying static downloadable content...</echo> <copy todir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads" verbose="true" failonerror="false"> - <fileset dir="${basedir}/src/main/downloadable-resources" /> + <fileset dir="${basedir}/src/main/downloadable-resources" /> </copy>  @@ -435,19 +435,23 @@ </target> <target name="package-connectors"> - <echo>Deploying the response-time servlet filter connectors ...</echo> + <echo>Deploying the response-time (RT) servlet filter connectors ...</echo> <delete file="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip" /> <zip destfile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip"> - <zipfileset dir="${basedir}/../../agent/src/etc/product_connectors"> - <include name="README.txt" /> - </zipfileset> - <zipfileset dir="${settings.localRepository}/org/rhq/rhq-rtfilter/${project.version}"> + <zipfileset dir="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}"> <include name="rhq-rtfilter-${project.version}.jar" /> </zipfileset> <zipfileset dir="${settings.localRepository}/commons-logging/commons-logging/1.1.1"> <include name="commons-logging-1.1.1.jar" /> </zipfileset> </zip> + +  + <copy file="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}/rhq-rtfilter-${project.version}.zip" + tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/rhq-rtfilter-module.zip" /> + + <copy file="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter-subsystem/${project.version}/rhq-rtfilter-subsystem-${project.version}.zip" + tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/rhq-rtfilter-subsystem-module.zip" /> </target> <target name="prepare-bin-dir"> @@ -842,7 +846,7 @@ rhq.autoinstall.public-endpoint-address= undeploy-ds, prepare-web-services-2" description="If this is a release build, make sure it is properly prepared."> - <echo>Adding license headers files...</echo> + <echo>Adding license files...</echo> <copy todir="${project.build.outputDirectory}"> <fileset dir="${basedir}/../../../.." includes="LICENSE*" /> </copy> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 797f302..1f3754d 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -29,6 +29,7 @@ <modules> <module>rtfilter</module> + <module>rtfilter-subsystem</module>  + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-subsystem-test</artifactId> + <version>${version.jboss.as}</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java new file mode 100644 index 0000000..06a300b --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java @@ -0,0 +1,207 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.controller.Extension; +import org.jboss.as.controller.ExtensionContext; +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.SubsystemRegistration; +import org.jboss.as.controller.descriptions.StandardResourceDescriptionResolver; +import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler; +import org.jboss.as.controller.parsing.ExtensionParsingContext; +import org.jboss.as.controller.parsing.ParseUtils; +import org.jboss.as.controller.persistence.SubsystemMarshallingContext; +import org.jboss.as.controller.registry.ManagementResourceRegistration; +import org.jboss.as.controller.registry.OperationEntry; +import org.jboss.dmr.ModelNode; +import org.jboss.staxmapper.XMLElementReader; +import org.jboss.staxmapper.XMLElementWriter; +import org.jboss.staxmapper.XMLExtendedStreamReader; +import org.jboss.staxmapper.XMLExtendedStreamWriter; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; + +/** + * A JBoss AS7 extension that configures the RHQ response-time servlet filter for all deployed webapps. + * + * @author Ian Springer + */ +public class RtFilterExtension implements Extension { + + /** + * The name space used for the {@code subsystem} element + */ + public static final String NAMESPACE = "urn:rhq:rtfilter:1.0"; + + /** + * The name of our subsystem within the model. + */ + public static final String SUBSYSTEM_NAME = "rhq-rtfilter"; + + private final SubsystemReader reader = new SubsystemReader(); + private final SubsystemWriter writer = new SubsystemWriter(); + + protected static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME); + private static final String RESOURCE_NAME = RtFilterExtension.class.getPackage().getName() + ".LocalDescriptions"; + + public static final Map<String, String> INIT_PARAMS = new HashMap<String, String>(); + + public static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String keyPrefix) { + String prefix = SUBSYSTEM_NAME + (keyPrefix == null ? "" : "." + keyPrefix); + return new StandardResourceDescriptionResolver(prefix, RESOURCE_NAME, RtFilterExtension.class.getClassLoader(), + true, false); + } + + @Override + public void initializeParsers(ExtensionParsingContext context) { + context.setSubsystemXmlMapping(SUBSYSTEM_NAME, NAMESPACE, reader); + } + + @Override + public void initialize(ExtensionContext context) { + final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, 1, 0); + final ManagementResourceRegistration registration = + subsystem.registerSubsystemModel(RtFilterSubsystemDefinition.INSTANCE); + registration.registerOperationHandler(DESCRIBE, GenericSubsystemDescribeHandler.INSTANCE, + GenericSubsystemDescribeHandler.INSTANCE, false, OperationEntry.EntryType.PRIVATE); + subsystem.registerXMLElementWriter(writer); + } + + /** + * The subsystem reader, which uses STAX to read the subsystem XML. + */ + private static class SubsystemReader implements XMLStreamConstants, XMLElementReader<List<ModelNode>> { + + /** + * {@inheritDoc} + */ + @Override + public void readElement(XMLExtendedStreamReader reader, List<ModelNode> list) throws XMLStreamException { + INIT_PARAMS.clear(); + + // Parse the 'subsystem' element... + ParseUtils.requireNoAttributes(reader); + + list.add(createAddSubsystemOperation()); + + // Read the child elements + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { + if (reader.getLocalName().equals("init-param")) { + readInitParam(reader); + } else { + throw ParseUtils.unexpectedElement(reader); + } + // TODO: Add support for configuring filter mappings. + } + } + + private void readInitParam(XMLExtendedStreamReader reader) throws XMLStreamException { + String id = null; + for (int i = 0; i < reader.getAttributeCount(); i++) { + if (reader.getAttributeLocalName(i).equals("id")) { + if (id != null) { + throw ParseUtils.unexpectedAttribute(reader, i); + } + id = reader.getAttributeValue(i); + } else { + throw ParseUtils.unexpectedAttribute(reader, i); + } + } + + String description = null; + String paramName = null; + String paramValue = null; + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { + if (reader.isStartElement()) { + if (reader.getLocalName().equals("description")) { + if (description != null) { + throw ParseUtils.unexpectedElement(reader); + } + description = reader.getElementText(); + } else if (reader.getLocalName().equals("param-name")) { + if (paramName != null) { + throw ParseUtils.unexpectedElement(reader); + } + paramName = reader.getElementText(); + } else if (reader.getLocalName().equals("param-value")) { + if (paramValue != null) { + throw ParseUtils.unexpectedElement(reader); + } + paramValue = reader.getElementText(); + } else { + throw ParseUtils.unexpectedElement(reader); + } + } + } + + Set<String> missingRequiredElements = new HashSet<String>(); + if (paramName == null) { + missingRequiredElements.add("param-name"); + } + if (paramValue == null) { + missingRequiredElements.add("param-value"); + } + if (!missingRequiredElements.isEmpty()) { + throw ParseUtils.missingRequiredElement(reader, missingRequiredElements); + } + + // There's no need for us to expose the init params via the AS7 management model. Just store them in a + // static Map that RtFilterDeploymentUnitProcessor will be able to access. + INIT_PARAMS.put(paramName, paramValue); + } + + private static ModelNode createAddSubsystemOperation() { + final ModelNode subsystem = new ModelNode(); + subsystem.get(OP).set(ADD); + subsystem.get(OP_ADDR).add(SUBSYSTEM, SUBSYSTEM_NAME); + return subsystem; + } + + } + + /** + * The subsystem writer, which uses STAX to write the subsystem XML. + */ + private static class SubsystemWriter implements XMLStreamConstants, XMLElementWriter<SubsystemMarshallingContext> { + + /** + * {@inheritDoc} + */ + @Override + public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { + context.startSubsystemElement(RtFilterExtension.NAMESPACE, false); + writer.writeEndElement(); + } + + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemAdd.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemAdd.java new file mode 100644 index 0000000..d767e17 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemAdd.java @@ -0,0 +1,69 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import java.util.List; + +import org.jboss.as.controller.AbstractBoottimeAddStepHandler; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.ServiceVerificationHandler; +import org.jboss.as.server.AbstractDeploymentChainStep; +import org.jboss.as.server.DeploymentProcessorTarget; +import org.jboss.dmr.ModelNode; +import org.jboss.msc.service.ServiceController; + +import org.rhq.helpers.rtfilter.subsystem.deployment.RtFilterDeploymentUnitProcessor; + +/** + * Handler responsible for adding the rqh-rtfilter-subsystem resource to the model + * + * @author Ian Springer + */ +class RtFilterSubsystemAdd extends AbstractBoottimeAddStepHandler { + + static final RtFilterSubsystemAdd INSTANCE = new RtFilterSubsystemAdd(); + + private RtFilterSubsystemAdd() { + } + + /** {@inheritDoc} */ + @Override + protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException { + model.setEmptyObject(); + } + + /** {@inheritDoc} */ + @Override + public void performBoottime(OperationContext context, ModelNode operation, ModelNode model, + ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) + throws OperationFailedException { + + // Add our deployment processor + //see SubDeploymentProcessor for explanation of the phases + context.addStep(new AbstractDeploymentChainStep() { + public void execute(DeploymentProcessorTarget processorTarget) { + processorTarget.addDeploymentProcessor(RtFilterDeploymentUnitProcessor.PHASE, + RtFilterDeploymentUnitProcessor.PRIORITY, new RtFilterDeploymentUnitProcessor()); + + } + }, OperationContext.Stage.RUNTIME); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemDefinition.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemDefinition.java new file mode 100644 index 0000000..ce5cee0 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemDefinition.java @@ -0,0 +1,45 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.controller.SimpleResourceDefinition; +import org.jboss.as.controller.registry.ManagementResourceRegistration; + +/** + * Definition of the rhq-rtfilter-subsystem resource. + * + * @author Ian Springer + */ +public class RtFilterSubsystemDefinition extends SimpleResourceDefinition { + + public static final RtFilterSubsystemDefinition INSTANCE = new RtFilterSubsystemDefinition(); + + private RtFilterSubsystemDefinition() { + super(RtFilterExtension.SUBSYSTEM_PATH, + RtFilterExtension.getResourceDescriptionResolver(null), + RtFilterSubsystemAdd.INSTANCE, + RtFilterSubsystemRemove.INSTANCE); + } + + @Override + public void registerOperations(ManagementResourceRegistration resourceRegistration) { + super.registerOperations(resourceRegistration); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemRemove.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemRemove.java new file mode 100644 index 0000000..242f1f1 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemRemove.java @@ -0,0 +1,44 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.controller.AbstractRemoveStepHandler; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.dmr.ModelNode; + +/** + * Handler responsible for removing the rqh-rtfilter-subsystem resource from the model + * + * @author Ian Springer + */ +class RtFilterSubsystemRemove extends AbstractRemoveStepHandler { + + static final RtFilterSubsystemRemove INSTANCE = new RtFilterSubsystemRemove(); + + private RtFilterSubsystemRemove() { + } + + @Override + protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException { + //Remove any services installed by the corresponding add handler here + //context.removeService(ServiceName.of("some", "name")); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/deployment/RtFilterDeploymentUnitProcessor.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/deployment/RtFilterDeploymentUnitProcessor.java new file mode 100644 index 0000000..d8bce4e --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/deployment/RtFilterDeploymentUnitProcessor.java @@ -0,0 +1,141 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem.deployment; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.jboss.as.ee.structure.DeploymentType; +import org.jboss.as.ee.structure.DeploymentTypeMarker; +import org.jboss.as.server.deployment.DeploymentPhaseContext; +import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.server.deployment.DeploymentUnitProcessingException; +import org.jboss.as.server.deployment.DeploymentUnitProcessor; +import org.jboss.as.server.deployment.Phase; +import org.jboss.as.web.deployment.WarMetaData; +import org.jboss.logging.Logger; +import org.jboss.metadata.javaee.spec.ParamValueMetaData; +import org.jboss.metadata.web.spec.FilterMappingMetaData; +import org.jboss.metadata.web.spec.FilterMetaData; +import org.jboss.metadata.web.spec.FiltersMetaData; +import org.jboss.metadata.web.spec.WebMetaData; + +import org.rhq.helpers.rtfilter.filter.RtFilter; +import org.rhq.helpers.rtfilter.subsystem.RtFilterExtension; + +/** + * A deployment unit processor that configures the RHQ RT filter on each WAR that is deployed. + * + * @author Ian Springer + */ +public class RtFilterDeploymentUnitProcessor implements DeploymentUnitProcessor { + + private static final String RT_FILTER_NAME = "RHQ Response-Time Filter"; + private final Logger log = Logger.getLogger(RtFilterDeploymentUnitProcessor.class); + + /** + * See {@link Phase} for descriptions of the different phases. + */ + public static final Phase PHASE = Phase.DEPENDENCIES; + + /** + * The relative order of this processor within the {@link #PHASE}. + * The current number is large enough for it to happen after all + * the standard deployment unit processors that come with JBoss AS. + */ + public static final int PRIORITY = 0x4000; + + @Override + public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { + final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); + if (isWar(deploymentUnit)) { + log.debug("Configuring RHQ response-time servlet filter for WAR " + deploymentUnit.getName() + "..."); + + final WarMetaData warMetaData = deploymentUnit.getAttachment(WarMetaData.ATTACHMENT_KEY); + WebMetaData webMetaData = warMetaData.getSharedWebMetaData(); + + FilterMetaData rtFilter = null; + FiltersMetaData filters = webMetaData.getFilters(); + if (filters != null) { + for (FilterMetaData filter : filters) { + if (RtFilter.class.getName().equals(filter.getFilterClass())) { + // the filter's already configured in this webapp. + rtFilter = filter; + break; + } + } + } else { + filters = new FiltersMetaData(); + webMetaData.setFilters(filters); + } + if (rtFilter == null) { + rtFilter = new FilterMetaData(); + rtFilter.setFilterName(RT_FILTER_NAME); + rtFilter.setFilterClass(RtFilter.class.getName()); + filters.add(rtFilter); + } + + List<ParamValueMetaData> initParams = rtFilter.getInitParam(); + if (initParams == null) { + initParams = new ArrayList<ParamValueMetaData>(); + rtFilter.setInitParam(initParams); + } + for (String paramName : RtFilterExtension.INIT_PARAMS.keySet()) { + ParamValueMetaData initParam = new ParamValueMetaData(); + initParam.setParamName(paramName); + String paramValue = RtFilterExtension.INIT_PARAMS.get(paramName); + initParam.setParamValue(paramValue); + initParams.add(initParam); + } + + boolean filterMappingAlreadyConfigured = false; + List<FilterMappingMetaData> filterMappings = webMetaData.getFilterMappings(); + if (filterMappings != null) { + for (FilterMappingMetaData filterMapping : filterMappings) { + if (filterMapping.getFilterName().equals(rtFilter.getFilterName())) { + // a mapping for the filter's already configured in this webapp. + filterMappingAlreadyConfigured = true; + break; + } + } + } else { + filterMappings = new ArrayList<FilterMappingMetaData>(); + webMetaData.setFilterMappings(filterMappings); + } + + if (!filterMappingAlreadyConfigured) { + FilterMappingMetaData filterMapping = new FilterMappingMetaData(); + filterMapping.setFilterName(rtFilter.getFilterName()); + filterMapping.setUrlPatterns(Arrays.asList("/*")); + filterMappings.add(filterMapping); + } + } + } + + @Override + public void undeploy(DeploymentUnit context) { + return; + } + + private static boolean isWar(final DeploymentUnit deploymentUnit) { + return (DeploymentTypeMarker.isType(DeploymentType.WAR, deploymentUnit)); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/modules/helpers/rtfilter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension new file mode 100644 index 0000000..1c3a869 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension @@ -0,0 +1 @@ +org.rhq.helpers.rtfilter.subsystem.RtFilterExtension diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/module/main/module.xml b/modules/helpers/rtfilter-subsystem/src/main/resources/module/main/module.xml new file mode 100644 index 0000000..3a2dd34 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/module/main/module.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.0" name="${moduleName}"> + + <resources> + <resource-root path="${project.build.finalName}.jar"/> + </resources> + + <dependencies> +  + <module name="javax.api"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.vfs"/> + +  + <module name="org.jboss.metadata"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.web"/> + <module name="org.rhq.helpers.rhq-rtfilter"/> + </dependencies> + +</module> diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/org/rhq/helpers/rtfilter/subsystem/LocalDescriptions.properties b/modules/helpers/rtfilter-subsystem/src/main/resources/org/rhq/helpers/rtfilter/subsystem/LocalDescriptions.properties new file mode 100644 index 0000000..e60d1d7 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/org/rhq/helpers/rtfilter/subsystem/LocalDescriptions.properties @@ -0,0 +1,3 @@ +rhq-rtfilter=RHQ Response-Time Servlet Filter Subsystem +rhq-rtfilter.add=Operation Adds subsystem +rhq-rtfilter.remove=Operation Removes subsystem diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/schema/rtfilter-subsystem.xsd b/modules/helpers/rtfilter-subsystem/src/main/resources/schema/rtfilter-subsystem.xsd new file mode 100644 index 0000000..16cb468 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/schema/rtfilter-subsystem.xsd @@ -0,0 +1,129 @@ +<xsd:schema + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:org.rhq:rtfilter:1.0" + xmlns="urn:rhq:rtfilter:1.0" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + +  + <xsd:element name="subsystem" type="subsystemType"/> + + <xsd:complexType name="subsystemType"> + <xsd:sequence> + <xsd:element name="init-param" + type="param-valueType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + The init-param element contains a name/value pair as + an initialization param of the RHQ response-time servlet filter + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + +  + + <xsd:complexType name="param-valueType"> + <xsd:annotation> + <xsd:documentation> + This type is a general type that can be used to declare + parameter/value lists. + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:element name="description" + type="descriptionType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="param-name" + type="string"> + <xsd:annotation> + <xsd:documentation> + The param-name element contains the name of a + parameter. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="param-value" + type="xsdStringType"> + <xsd:annotation> + <xsd:documentation> + The param-value element contains the value of a + parameter. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +  + + <xsd:complexType name="descriptionType"> + <xsd:annotation> + <xsd:documentation> + + The description type is used by a description element to + provide text describing the parent element. The elements + that use this type should include any information that the + Deployment Component's Deployment File file producer wants + to provide to the consumer of the Deployment Component's + Deployment File (i.e., to the Deployer). Typically, the + tools used by such a Deployment File consumer will display + the description when processing the parent element that + contains the description. + + The lang attribute defines the language that the + description is provided in. The default value is "en" (English). + + </xsd:documentation> + </xsd:annotation> + <xsd:simpleContent> + <xsd:extension base="xsdStringType"> + <xsd:attribute ref="xml:lang"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +  + + <xsd:complexType name="string"> + <xsd:annotation> + <xsd:documentation> + + This is a special string datatype that is defined by J2EE as + a base type for defining collapsed strings. When schemas + require trailing/leading space elimination as well as + collapsing the existing whitespace, this base type may be + used. + + </xsd:documentation> + </xsd:annotation> + <xsd:simpleContent> + <xsd:extension base="xsd:token"> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +  + + <xsd:complexType name="xsdStringType"> + <xsd:annotation> + <xsd:documentation> + This type adds an "id" attribute to xsd:string. + </xsd:documentation> + </xsd:annotation> + <xsd:simpleContent> + <xsd:extension base="xsd:string"> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +</xsd:schema> diff --git a/modules/helpers/rtfilter-subsystem/src/main/scripts/module-assembly.xml b/modules/helpers/rtfilter-subsystem/src/main/scripts/module-assembly.xml new file mode 100644 index 0000000..5570b77 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/scripts/module-assembly.xml @@ -0,0 +1,31 @@ +<?xml version="1.0"?> + +<assembly> + <id>module-assembly</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>${project.build.finalName}-module</baseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}/module</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}</outputDirectory> + <includes> + <include>main/module.xml</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <directory>${project.build.directory}</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}/main</outputDirectory> + <includes> + <include>${project.build.finalName}.jar</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + </fileSets> +</assembly> + diff --git a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java new file mode 100644 index 0000000..aee7a6b --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java @@ -0,0 +1,67 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest; + +import java.io.IOException; + +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + +/** + * Test for parsing of the subsystem XML. + * + * @author Ian Springer + */ +@Test(enabled = false) +public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest { + + public SubsystemXmlParsingTest() { + super(RtFilterExtension.SUBSYSTEM_NAME, new RtFilterExtension()); + } + + @Override + @BeforeTest + public void initializeParser() throws Exception { + super.initializeParser(); + } + + public void testSubsystem() throws Exception { + super.testSubsystem(); + } + + @Override + @AfterTest + public void cleanup() throws Exception { + super.cleanup(); + } + + @Override + protected String getSubsystemXml() throws IOException { + return "<subsystem xmlns=\"" + RtFilterExtension.NAMESPACE + "\">" + + "<init-param>" + + "<param-name>foo</param-name>" + + "<param-value>bar</param-value>" + + "</init-param>" + + "</subsystem>"; + } + +} diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 761f3ec..6683a46 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -1,4 +1,6 @@ -<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"> +<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> @@ -8,16 +10,14 @@ <version>4.4.0-SNAPSHOT</version> </parent> - <groupId>org.rhq</groupId> + <groupId>org.rhq.helpers</groupId> <artifactId>rhq-rtfilter</artifactId> - <packaging>jar</packaging> - <name>RHQ rtfilter</name> - <description>Filter to gather response time metrics from web applcations</description> + <name>RHQ Response-Time Filter</name> + <description>a servlet filter that logs response times for HTTP requests to JEE web applications</description> <properties> - <final.name>rhq-rtfilter</final.name> - <war.dir>${basedir}/target/${final.name}</war.dir> + <moduleName>${groupId}.${artifactId}</moduleName> </properties> <dependencies> @@ -41,16 +41,44 @@ </dependencies> <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> <configuration> - <optimize>false</optimize> +  <source>1.4</source> <target>1.4</target> </configuration> </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/scripts/module-assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>module-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/modules/helpers/rtfilter/src/main/resources/module/main/module.xml b/modules/helpers/rtfilter/src/main/resources/module/main/module.xml new file mode 100644 index 0000000..1d0075c --- /dev/null +++ b/modules/helpers/rtfilter/src/main/resources/module/main/module.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.0" name="${moduleName}"> + + <resources> + <resource-root path="${project.build.finalName}.jar"/> + </resources> + + <dependencies> + <module name="javax.servlet.api"/> + <module name="javax.api"/> + <module name="org.apache.commons.logging"/> + </dependencies> + +</module> diff --git a/modules/helpers/rtfilter/src/main/scripts/module-assembly.xml b/modules/helpers/rtfilter/src/main/scripts/module-assembly.xml new file mode 100644 index 0000000..5570b77 --- /dev/null +++ b/modules/helpers/rtfilter/src/main/scripts/module-assembly.xml @@ -0,0 +1,31 @@ +<?xml version="1.0"?> + +<assembly> + <id>module-assembly</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>${project.build.finalName}-module</baseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}/module</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}</outputDirectory> + <includes> + <include>main/module.xml</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <directory>${project.build.directory}</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}/main</outputDirectory> + <includes> + <include>${project.build.finalName}.jar</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + </fileSets> +</assembly> + commit 1e48ab86c6423839d8693894aab79fd8bb8c60de Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Apr 27 11:50:08 2012 -0400 - Remove JAVA_OPTS from AS5 and AS7 startScriptEnv discovery as it will end up hiding changes to run.conf, which will likely be the preferred mechanism for setting the java options. It can still be added manually to the connection property if desired. - Also, ignore the discovered PATH and set to a minimal PATH required for startup; "/bin:/usr/bin" for linux and, lazily set using SYSTEMROOT env var, "%SYSTEMROOT%\system32:%SYSTEMROOT%" for Windows. This considerably shortens the PATH length, avoiding LongString limits and unnecessary entries, while still providing a predictable PATH for restart. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index 3209557..819e1e1 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -43,11 +43,13 @@ import org.rhq.core.system.ProcessInfo; */ public class ServerStartScriptDiscoveryUtility { + // Generic OS-level PATH setting for LINUX. For Windows the PATH must be generated when we have + // the system env vars. It will be of the form %SystemRoot%\\system32;%SystemRoot%; + private static final String CORE_ENV_VAR_PATH_LINUX = "/bin:/usr/bin"; + // Generic OS-level env vars that should be in every process's environment. - private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList( - "PATH", - "LD_LIBRARY_PATH" - )); + private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList("PATH", + "LD_LIBRARY_PATH")); static { if (File.separatorChar == '\\') { CORE_ENV_VAR_NAME_INCLUDES.add("OS"); // many batch files use this to figure out if the OS type is NT or 9x @@ -55,7 +57,6 @@ public class ServerStartScriptDiscoveryUtility { } } - private ServerStartScriptDiscoveryUtility() { } @@ -169,6 +170,17 @@ public class ServerStartScriptDiscoveryUtility { startScriptEnv.put(envVarName, envVarValue); } } + + // Add the fixed PATH + if (File.separatorChar == '\\') { + String systemRoot = processEnvVars.get("SYSTEMROOT"); + systemRoot = (systemRoot == null) ? "C:\\Windows" : systemRoot; + String path = systemRoot + "\\system32;" + systemRoot; + startScriptEnv.put("PATH", path); + } else { + startScriptEnv.put("PATH", CORE_ENV_VAR_PATH_LINUX); + } + return startScriptEnv; } diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index d333463..31c6ab3 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -131,8 +131,12 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom private static final Set<CommandLineOption> START_SCRIPT_OPTION_EXCLUDES = new HashSet<CommandLineOption>(); static { + // Note that JAVA_OPTS is not included on purpose. If present the setting will override that + // which is set in run.conf or possibly in a custom script. We opt to let run.conf provide the setting + // as that is quite likely what users will expect. JAVA_OPTS can be added manually to the + // startScriptEnv settings at which time it would provide an override. Not discovering JAVA_OPTS also + // avoids issues with duplicate settings, due to manipulations made to it by run.conf. START_SCRIPT_ENV_VAR_NAMES.addAll(Arrays.asList( // - "JAVA_OPTS", // "JAVA_HOME", // "JAVA", // "JAVAC_JAR", // diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index d28cfb1..7fe7f5f 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -87,7 +87,6 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent "PROFILER", // "JAVA_HOME", // "JAVA", // - "JAVA_OPTS", // "PRESERVE_JAVA_OPTS", // "PROCESS_CONTROLLER_JAVA_OPTS", // "HOST_CONTROLLER_JAVA_OPTS", // commit 24fc319f79585970163ff8aade0ac8a17c23b75a Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Apr 26 12:21:42 2012 -0400 trivial - remove some dev logging diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java index f98bf19..e439250 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java @@ -75,7 +75,6 @@ public class JBossInstanceInfo { String[] args = this.processInfo.getCommandLine(); Map<String, String> envVars = this.processInfo.getEnvironmentVariables(); - printEnvVars(envVars); for (i = 0; i < args.length; i++) { if (args[i].equals(JBOSS_MAIN_CLASS_NAME)) { @@ -318,20 +317,13 @@ public class JBossInstanceInfo { } } - private void printEnvVars(Map<String, String> envVars) { - log.info("******** Env Vars=" + envVars); - } - private void printSysProps(String[] commandLine) { - if (null != commandLine) { - log.info("******** commandLine=" + Arrays.toString(commandLine)); - } - //if (log.isDebugEnabled()) { + if (log.isDebugEnabled()) { printSysProp(JBossProperties.HOME_DIR); printSysProp(JBossProperties.SERVER_HOME_DIR); printSysProp(JBossProperties.SERVER_NAME); printSysProp(JBossProperties.BIND_ADDRESS); - //} + } } private void printSysProp(String name) { commit bc7689cb215dd918de822d70e69294332b1397fc Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Apr 27 09:55:21 2012 +0200 There is no "MaxWaitCount". Sort alphabetically to match the :read-resource output diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 9dd66a0..c48b453 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -253,19 +253,18 @@ <metric property="PreparedStatementCacheAccessCount" measurementType="trendsup" description="The number of times that the statement cache was accessed"/> <metric property="PreparedStatementCacheDeleteCount" measurementType="trendsup" description="The number of statements discarded from the cache"/> <metric property="PreparedStatementCacheHitCount" measurementType="trendsup" description="The number of times that statements from the cache were used"/> - <metric property="AverageBlockingTime" units="milliseconds" description="The average time spent blocking for a connection"/> - <metric property="MaxWaitTime" units="milliseconds" description="The maximum wait time for a connection" displayType="summary"/> <metric property="ActiveCount" description="The active count"/> + <metric property="AvailableCount" description="The available count" units="none"/> + <metric property="AverageBlockingTime" units="milliseconds" description="The average time spent blocking for a connection"/> + <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> <metric property="CreatedCount" description="The created count" measurementType="trendsup"/> + <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> <metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/> - <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/> - <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> - <metric property="AvailableCount" description="The available count" units="none"/> <metric property="MaxUsedCount" description="The maximum number of connections used"/> + <metric property="MaxWaitTime" units="milliseconds" description="The maximum wait time for a connection" displayType="summary"/> <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/> + <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> <metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/> - <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> - <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> <metric property="connectionAvailable" displayName="Connection Available?" dataType="trait" displayType="summary" defaultInterval="300000"/> <metric property="min-pool-size" displayName="Min Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The min pool size setting"/> <metric property="max-pool-size" displayName="Max Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The max pool size setting"/> commit a3caf42516c75e993a2bc52f35ec60b64de4a71f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Apr 26 22:44:12 2012 -0500 Add subsystems to Managed Server tree. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 63783ff..9dd66a0 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2822,6 +2822,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -2941,6 +2942,7 @@ <runs-inside> <parent-resource-type name="Host" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4051,7 +4053,9 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> + <plugin-configuration> <c:simple-property name="path" default="subsystem=jacorb" readOnly="true"/> </plugin-configuration> @@ -4115,6 +4119,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4140,6 +4145,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4264,6 +4270,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4287,6 +4294,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4308,6 +4316,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4351,6 +4360,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4375,6 +4385,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4726,6 +4737,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -4816,6 +4828,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -5012,6 +5025,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -5037,6 +5051,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -5202,6 +5217,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -5314,6 +5330,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -5341,6 +5358,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -5432,6 +5450,7 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> commit 4e3e89230a7e2bce78269bb87e37d473e907ddd6 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Apr 26 22:36:26 2012 -0500 [BZ 806240] Split Datasources subsystem into three resources based on the parent server. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index ac6f365..63783ff 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -246,6 +246,437 @@ </c:map-property> '> +<!ENTITY datasourceMetrics ' + <metric property="PreparedStatementCacheCurrentSize" description="The number of prepared and callable statements currently cached in the statement cache"/> + <metric property="PreparedStatementCacheMissCount" measurementType="trendsup" description="The number of times that a statement request could not be satisfied with a statement from the cache"/> + <metric property="PreparedStatementCacheAddCount" description="The number of statements added to the statement cache"/> + <metric property="PreparedStatementCacheAccessCount" measurementType="trendsup" description="The number of times that the statement cache was accessed"/> + <metric property="PreparedStatementCacheDeleteCount" measurementType="trendsup" description="The number of statements discarded from the cache"/> + <metric property="PreparedStatementCacheHitCount" measurementType="trendsup" description="The number of times that statements from the cache were used"/> + <metric property="AverageBlockingTime" units="milliseconds" description="The average time spent blocking for a connection"/> + <metric property="MaxWaitTime" units="milliseconds" description="The maximum wait time for a connection" displayType="summary"/> + <metric property="ActiveCount" description="The active count"/> + <metric property="CreatedCount" description="The created count" measurementType="trendsup"/> + <metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/> + <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/> + <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> + <metric property="AvailableCount" description="The available count" units="none"/> + <metric property="MaxUsedCount" description="The maximum number of connections used"/> + <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/> + <metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/> + <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> + <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> + <metric property="connectionAvailable" displayName="Connection Available?" dataType="trait" displayType="summary" defaultInterval="300000"/> + <metric property="min-pool-size" displayName="Min Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The min pool size setting"/> + <metric property="max-pool-size" displayName="Max Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The max pool size setting"/> +'> + +<!ENTITY datasourceEnableDisableOperations ' + <operation name="enable" description="Enables the data-source"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + <operation name="disable" description="Disables the XA data-source"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> +'> + +<!ENTITY datasourceTestFlushOperations ' + <operation name="flush-all-connection-in-pool" description="Flushes the pool for all connections"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="flush-idle-connection-in-pool" description="Flushes the pool for idle connections"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="test-connection-in-pool" description="Tests if a connection can be obtained"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> +'> + +<!ENTITY datasourceReadWriteConfiguration ' + <resource-configuration> + <c:simple-property name="connection-url" required="true" type="string" readOnly="true" description="The JDBC driver connection URL"/> + <c:simple-property name="driver-name" required="true" type="string" description="Name of the (existing) JDBC driver to use" readOnly="true"> + <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/> + </c:simple-property> + <c:simple-property name="driver-class" required="false" type="string" readOnly="true" description="The fully qualified name of the JDBC driver class"/> + <c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/> + <c:simple-property name="driver" required="false" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use with this format: driver-name>#major-version.minor-version where driver-name is the fully qualified name of the JDBC driver class"/> + <c:simple-property name="user-name" type="string" readOnly="true" required="false" description="Specify the username used when creating a new connection."/> + <c:simple-property name="password" type="password" readOnly="true" required="false" description="Specify the password used when creating a new connection."/> + <c:simple-property name="new-connection-sql" type="string" readOnly="true" required="false" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/> + <c:simple-property name="url-delimiter" type="string" readOnly="true" description="Specifies the delimiter for URLs in connection-url for HA datasources" required="false"/> + <c:simple-property name="url-selector-strategy-class-name" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy" required="false"/> + <c:simple-property name="use-java-context" type="boolean" readOnly="true" required="false" description="Setting this to false will bind the DataSource into global JNDI;"/> + <c:simple-property name="enabled" type="boolean" readOnly="true" required="false" description="Specifies if the datasource should be enabled"/> + <c:simple-property name="max-pool-size" type="integer" readOnly="false" required="false" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> + <c:simple-property name="min-pool-size" type="integer" readOnly="false" required="false" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/> + <c:simple-property name="pool-prefill" type="boolean" readOnly="false" required="false" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/> + <c:simple-property name="pool-use-strict-min" type="boolean" readOnly="false" required="false" description="Define if the min-pool-size should be considered a strictly."/> + <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> + <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="true" description="re-authentication plugin implementation provided for specific purpose (i.e vendor)"/> +  + <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly"> + <c:property-options> + <c:option value="FailingConnectionOnly"/> + <c:option value="IdleConnections"/> + <c:option value="EntirePool"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="prepared-statements-cacheSize" type="long" readOnly="true" required="false" description="The number of prepared statements per connection in an LRU cache"/> + <c:simple-property name="share-prepared-statements" type="boolean" readOnly="true" required="false" description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> + <c:simple-property name="track-statements" type="string" readOnly="true" required="false" description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> + <c:simple-property name="allocation-retry" type="integer" readOnly="true" required="false" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> + <c:simple-property name="allocation-retry-wait-millis" type="long" readOnly="true" required="false" description="Indicates the time in milliseconds to wait between retrying to allocate a connection."/> + <c:simple-property name="blocking-timeout-wait-millis" type="long" readOnly="false" required="false" description="The blocking-timeout-millis element indicates the maximum time in milliseconds to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for a permit for a connection, and will never throw an exception if creating a new connection takes an inordinately long time."/> + <c:simple-property name="idle-timeout-minutes" type="long" readOnly="false" required="false" description="The idle-timeout-minutes elements indicates the maximum time in minutes a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes of any pool. Changing this value require a server restart."/> + <c:simple-property name="query-timeout" type="long" readOnly="true" required="false" description="Any configured query timeout in seconds The default is no timeout"/> + <c:simple-property name="use-try-lock" type="long" readOnly="true" required="false" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/> + <c:simple-property name="set-tx-query-timeout" type="boolean" readOnly="true" required="false" description="Whether to set the query timeout based on the time remaining until transaction timeout, any configured query timeout will be used if there is no transaction."/> + <c:simple-property name="transaction-isolation" type="string" readOnly="true" required="false" description="Set java.sql.Connection transaction isolation level to use. The constants defined by transaction-isolation-values are the possible transaction isolation levels."> + <c:property-options> + <c:option value="TRANSACTION_READ_UNCOMMITTED"/> + <c:option value="TRANSACTION_READ_COMMITTED"/> + <c:option value="TRANSACTION_REPEATABLE_READ"/> + <c:option value="TRANSACTION_SERIALIZABLE"/> + <c:option value="TRANSACTION_NONE"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="check-valid-connection-sql" type="string" readOnly="true" required="false" description="Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is taken from pool for use."/> + <c:simple-property name="exception-sorter-class-name" type="string" readOnly="true" required="false" description="An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a boolean isExceptionFatal(SQLException e) method to validate is an exception should be broadcast to all javax.resource.spi.ConnectionEventListener as a connectionErrorOccurred"/> + <c:simple-property name="stale-connection-checker-class-name" type="string" readOnly="true" required="false" description="An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides a boolean isStaleConnection(SQLException e) method which if it it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException"/> + <c:simple-property name="valid-connection-checker-class-name" type="string" readOnly="true" required="false" description="An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides a SQLException isValidConnection(Connection e) method to validate is a connection is valid. An exception means the connection is destroyed. This overrides the check-valid-connection-sql when present."/> + <c:simple-property name="background-validation-minutes" type="long" readOnly="false" required="false" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> + <c:simple-property name="background-validation" type="boolean" readOnly="false" required="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> + <c:simple-property name="use-fast-fail" type="boolean" readOnly="false" required="false" description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> + <c:simple-property name="validate-on-match" type="boolean" readOnly="true" required="false" description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> + <c:simple-property name="spy" type="boolean" readOnly="true" required="false" description="whatever spy or not the jdbc connection"/> + <c:simple-property name="use-ccm" type="boolean" readOnly="true" required="false" description="Enable the use of a cached connection manager"/> + <c:group name="children:connection-properties:pname+-" displayName="Connection Properties"> + <c:list-property name="*1" displayName="Connection Property" readOnly="false" required="false"> + <c:map-property name="*:pname" displayName="Name" readOnly="false"> + <c:simple-property name="pname" displayName="Property-Name" readOnly="true"/> + <c:simple-property name="value" displayName="Value" /> + </c:map-property> + </c:list-property> + </c:group> + </resource-configuration> +'> + +<!ENTITY datasourceReadOnlyConfiguration ' + <resource-configuration> + <c:simple-property name="connection-url" required="true" type="string" readOnly="true" description="The JDBC driver connection URL"/> + <c:simple-property name="driver-name" required="true" type="string" description="Name of the (existing) JDBC driver to use" readOnly="true"> + <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/> + </c:simple-property> + <c:simple-property name="driver-class" required="false" type="string" readOnly="true" description="The fully qualified name of the JDBC driver class"/> + <c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/> + <c:simple-property name="driver" required="false" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use with this format: driver-name>#major-version.minor-version where driver-name is the fully qualified name of the JDBC driver class"/> + <c:simple-property name="user-name" type="string" readOnly="true" required="false" description="Specify the username used when creating a new connection."/> + <c:simple-property name="password" type="password" readOnly="true" required="false" description="Specify the password used when creating a new connection."/> + <c:simple-property name="new-connection-sql" type="string" readOnly="true" required="false" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/> + <c:simple-property name="url-delimiter" type="string" readOnly="true" description="Specifies the delimiter for URLs in connection-url for HA datasources" required="false"/> + <c:simple-property name="url-selector-strategy-class-name" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy" required="false"/> + <c:simple-property name="use-java-context" type="boolean" readOnly="true" required="false" description="Setting this to false will bind the DataSource into global JNDI;"/> + <c:simple-property name="enabled" type="boolean" readOnly="true" required="false" description="Specifies if the datasource should be enabled"/> + <c:simple-property name="max-pool-size" type="integer" readOnly="true" required="false" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> + <c:simple-property name="min-pool-size" type="integer" readOnly="true" required="false" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/> + <c:simple-property name="pool-prefill" type="boolean" readOnly="true" required="false" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/> + <c:simple-property name="pool-use-strict-min" type="boolean" readOnly="true" required="false" description="Define if the min-pool-size should be considered a strictly."/> + <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> + <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="true" description="re-authentication plugin implementation provided for specific purpose (i.e vendor)"/> +  + <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly"> + <c:property-options> + <c:option value="FailingConnectionOnly"/> + <c:option value="IdleConnections"/> + <c:option value="EntirePool"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="prepared-statements-cacheSize" type="long" readOnly="true" required="false" description="The number of prepared statements per connection in an LRU cache"/> + <c:simple-property name="share-prepared-statements" type="boolean" readOnly="true" required="false" description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> + <c:simple-property name="track-statements" type="string" readOnly="true" required="false" description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> + <c:simple-property name="allocation-retry" type="integer" readOnly="true" required="false" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> + <c:simple-property name="allocation-retry-wait-millis" type="long" readOnly="true" required="false" description="Indicates the time in milliseconds to wait between retrying to allocate a connection."/> + <c:simple-property name="blocking-timeout-wait-millis" type="long" readOnly="true" required="false" description="The blocking-timeout-millis element indicates the maximum time in milliseconds to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for a permit for a connection, and will never throw an exception if creating a new connection takes an inordinately long time."/> + <c:simple-property name="idle-timeout-minutes" type="long" readOnly="true" required="false" description="The idle-timeout-minutes elements indicates the maximum time in minutes a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes of any pool. Changing this value require a server restart."/> + <c:simple-property name="query-timeout" type="long" readOnly="true" required="false" description="Any configured query timeout in seconds The default is no timeout"/> + <c:simple-property name="use-try-lock" type="long" readOnly="true" required="false" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/> + <c:simple-property name="set-tx-query-timeout" type="boolean" readOnly="true" required="false" description="Whether to set the query timeout based on the time remaining until transaction timeout, any configured query timeout will be used if there is no transaction."/> + <c:simple-property name="transaction-isolation" type="string" readOnly="true" required="false" description="Set java.sql.Connection transaction isolation level to use. The constants defined by transaction-isolation-values are the possible transaction isolation levels."> + <c:property-options> + <c:option value="TRANSACTION_READ_UNCOMMITTED"/> + <c:option value="TRANSACTION_READ_COMMITTED"/> + <c:option value="TRANSACTION_REPEATABLE_READ"/> + <c:option value="TRANSACTION_SERIALIZABLE"/> + <c:option value="TRANSACTION_NONE"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="check-valid-connection-sql" type="string" readOnly="true" required="false" description="Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is taken from pool for use."/> + <c:simple-property name="exception-sorter-class-name" type="string" readOnly="true" required="false" description="An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a boolean isExceptionFatal(SQLException e) method to validate is an exception should be broadcast to all javax.resource.spi.ConnectionEventListener as a connectionErrorOccurred"/> + <c:simple-property name="stale-connection-checker-class-name" type="string" readOnly="true" required="false" description="An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides a boolean isStaleConnection(SQLException e) method which if it it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException"/> + <c:simple-property name="valid-connection-checker-class-name" type="string" readOnly="true" required="false" description="An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides a SQLException isValidConnection(Connection e) method to validate is a connection is valid. An exception means the connection is destroyed. This overrides the check-valid-connection-sql when present."/> + <c:simple-property name="background-validation-minutes" type="long" readOnly="true" required="false" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> + <c:simple-property name="background-validation" type="boolean" readOnly="true" required="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> + <c:simple-property name="use-fast-fail" type="boolean" readOnly="true" required="false" description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> + <c:simple-property name="validate-on-match" type="boolean" readOnly="true" required="false" description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> + <c:simple-property name="spy" type="boolean" readOnly="true" required="false" description="whatever spy or not the jdbc connection"/> + <c:simple-property name="use-ccm" type="boolean" readOnly="true" required="false" description="Enable the use of a cached connection manager"/> + <c:group name="children:connection-properties:pname+-" displayName="Connection Properties"> + <c:list-property name="*1" displayName="Connection Property" readOnly="true" required="false"> + <c:map-property name="*:pname" displayName="Name" readOnly="true"> + <c:simple-property name="pname" displayName="Property-Name" readOnly="true"/> + <c:simple-property name="value" displayName="Value" /> + </c:map-property> + </c:list-property> + </c:group> + </resource-configuration> +'> + + +<!ENTITY xaDatasourceReadWriteConfiguration ' + <resource-configuration> + <c:simple-property name="xa-datasource-class" required="true" type="string" readOnly="true" description="The fully qualified name of the javax.sql.XADataSource implementation"/> + <c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/> + <c:simple-property name="driver-name" required="true" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit"> + <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/> + </c:simple-property> + <c:simple-property name="user-name" required="false" type="string" readOnly="true" description="Specify the username used when creating a new connection."/> + <c:simple-property name="password" required="false" type="string" readOnly="true" description="Specify the password used when creating a new connection."/> + <c:simple-property name="new-connection-sql" required="false" type="string" readOnly="true" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/> + <c:simple-property name="url-delimiter" required="false" type="string" readOnly="true" description="Specifies the delimiter for URLs in connection-url for HA datasources"/> + <c:simple-property name="url-selector-strategy-class-name" required="false" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy"/> + <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" description="Setting this to false will bind the DataSource into global JNDI;"/> + <c:simple-property name="enabled" required="false" type="boolean" readOnly="true" description="Specifies if the datasource should be enabled"/> + <c:simple-property name="max-pool-size" required="false" type="integer" readOnly="false" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> + <c:simple-property name="min-pool-size" required="false" type="integer" readOnly="false" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/> + <c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="false" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/> + <c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="false" description="Define if the min-pool-size should be considered a strictly."/> + <c:simple-property name="interleaving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/> + <c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="true" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different context"/> + <c:simple-property name="pad-xid" required="false" type="boolean" readOnly="true" description="Should the Xid be padded"/> + <c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="true" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/> + <c:simple-property name="wrap-xa-datasource" required="false" type="boolean" readOnly="true" description="Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance"/> + <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> + <c:simple-property name="recovery-plugin-class-name" required="false" type="string" readOnly="true" description="recovery plugin implementation provided for specific purpose (i.e vendor)"/> + <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="true" description="re-authentication plugin implementation provided for specific purpose (i.e vendor)"/> +  + <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" + description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly"> + <c:property-options> + <c:option value="FailingConnectionOnly"/> + <c:option value="IdleConnections"/> + <c:option value="EntirePool"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="prepared-statements-cacheSize" required="false" type="long" readOnly="true" description="The number of prepared statements per connection in an LRU cache"/> + <c:simple-property name="share-prepared-statements" required="false" type="boolean" readOnly="true" description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> + <c:simple-property name="track-statements" required="false" type="string" readOnly="true" description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> + <c:simple-property name="allocation-retry" required="false" type="integer" readOnly="true" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> + <c:simple-property name="allocation-retry-wait-millis" required="false" type="long" readOnly="true" description="he allocation retry wait millis element indicates the time in milliseconds to wait between retrying to allocate a connection."/> + <c:simple-property name="blocking-timeout-wait-millis" required="false" type="long" readOnly="false" description="The blocking-timeout-millis element indicates the maximum time in milliseconds to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for a permit for a connection, and will never throw an exception if creating a new connection takes an inordinately long time."/> + <c:simple-property name="idle-timeout-minutes" required="false" type="long" readOnly="false" description="The idle-timeout-minutes elements indicates the maximum time in minutes a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes of any pool. Changing this value require a server restart."/> + <c:simple-property name="query-timeout" required="false" type="long" readOnly="true" description="Any configured query timeout in seconds The default is no timeout"/> + <c:simple-property name="use-try-lock" required="false" type="long" readOnly="true" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/> + <c:simple-property name="set-tx-query-timeout" required="false" type="boolean" readOnly="true" description="Whether to set the query timeout based on the time remaining until transaction timeout, any configured query timeout will be used if there is no transaction."/> + <c:simple-property name="transaction-isolation" required="false" type="string" readOnly="true" description="Set java.sql.Connection transaction isolation level to use. The constants defined by transaction-isolation-values are the possible transaction isolation levels."> + <c:property-options> + <c:option value="TRANSACTION_READ_UNCOMMITTED"/> + <c:option value="TRANSACTION_READ_COMMITTED"/> + <c:option value="TRANSACTION_REPEATABLE_READ"/> + <c:option value="TRANSACTION_SERIALIZABLE"/> + <c:option value="TRANSACTION_NONE"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="check-valid-connection-sql" required="false" type="string" readOnly="true" description="Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is taken from pool for use."/> + <c:simple-property name="exception-sorter-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a boolean isExceptionFatal(SQLException e) method to validate is an exception should be broadcast to all javax.resource.spi.ConnectionEventListener as a connectionErrorOccurred"/> +  + <c:simple-property name="stale-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides a boolean isStaleConnection(SQLException e) method which if it it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException"/> +  + <c:simple-property name="valid-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides a SQLException isValidConnection(Connection e) method to validate is a connection is valid. An exception means the connection is destroyed. This overrides the check-valid-connection-sql when present."/> +  + <c:simple-property name="background-validation-minutes" required="false" type="long" readOnly="false" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> + <c:simple-property name="background-validation" required="false" type="boolean" readOnly="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> + <c:simple-property name="use-fast-fail" required="false" type="boolean" readOnly="false" description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> + <c:simple-property name="validate-on-match" required="false" type="boolean" readOnly="true" description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> + <c:simple-property name="xa-resource-timeout" required="false" type="integer" readOnly="true" description="Passed to XAResource.setTransactionTimeout() Default is zero which does not invoke the setter. In seconds"/> + <c:simple-property name="spy" required="false" type="boolean" readOnly="true" description="whatever spy or not the jdbc connection"/> + <c:simple-property name="use-ccm" required="false" type="boolean" readOnly="true" description="Enable the use of a cached connection manager"/> + <c:simple-property name="recovery-username" required="false" type="string" readOnly="true" description="username used to try connection recovery"/> + <c:simple-property name="recovery-password" required="false" type="string" readOnly="true" description="password used to try connection recovery"/> + <c:simple-property name="recovery-security-domain" required="false" type="string" readOnly="true" description="security-domain used to try connection recovery"/> +  + <c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/> + + <c:group name="children:xa-datasource-properties:key+-" displayName="XA Datasource Properties"> + <c:list-property name="*2" displayName="Properties" required="false" readOnly="false"> + <c:map-property name="*:key" displayName="Name" readOnly="false"> + <c:simple-property name="key" displayName="Property-Name" readOnly="false"/> + <c:simple-property name="value" displayName="Value" readOnly="false"/> + </c:map-property> + </c:list-property> + </c:group> + </resource-configuration> +'> + +<!ENTITY xaDatasourceReadOnlyConfiguration ' + <resource-configuration> + <c:simple-property name="xa-datasource-class" required="true" type="string" readOnly="true" description="The fully qualified name of the javax.sql.XADataSource implementation"/> + <c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/> + <c:simple-property name="driver-name" required="true" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit"> + <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/> + </c:simple-property> + <c:simple-property name="user-name" required="false" type="string" readOnly="true" description="Specify the username used when creating a new connection."/> + <c:simple-property name="password" required="false" type="string" readOnly="true" description="Specify the password used when creating a new connection."/> + <c:simple-property name="new-connection-sql" required="false" type="string" readOnly="true" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/> + <c:simple-property name="url-delimiter" required="false" type="string" readOnly="true" description="Specifies the delimiter for URLs in connection-url for HA datasources"/> + <c:simple-property name="url-selector-strategy-class-name" required="false" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy"/> + <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" description="Setting this to false will bind the DataSource into global JNDI;"/> + <c:simple-property name="enabled" required="false" type="boolean" readOnly="true" description="Specifies if the datasource should be enabled"/> + <c:simple-property name="max-pool-size" required="false" type="integer" readOnly="true" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> + <c:simple-property name="min-pool-size" required="false" type="integer" readOnly="true" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/> + <c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="true" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/> + <c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="true" description="Define if the min-pool-size should be considered a strictly."/> + <c:simple-property name="interleaving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/> + <c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="true" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different context"/> + <c:simple-property name="pad-xid" required="false" type="boolean" readOnly="true" description="Should the Xid be padded"/> + <c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="true" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/> + <c:simple-property name="wrap-xa-datasource" required="false" type="boolean" readOnly="true" description="Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance"/> + <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> + <c:simple-property name="recovery-plugin-class-name" required="false" type="string" readOnly="true" description="recovery plugin implementation provided for specific purpose (i.e vendor)"/> + <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="true" description="re-authentication plugin implementation provided for specific purpose (i.e vendor)"/> +  + <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" + description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly"> + <c:property-options> + <c:option value="FailingConnectionOnly"/> + <c:option value="IdleConnections"/> + <c:option value="EntirePool"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="prepared-statements-cacheSize" required="false" type="long" readOnly="true" description="The number of prepared statements per connection in an LRU cache"/> + <c:simple-property name="share-prepared-statements" required="false" type="boolean" readOnly="true" description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> + <c:simple-property name="track-statements" required="false" type="string" readOnly="true" description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> + <c:simple-property name="allocation-retry" required="false" type="integer" readOnly="true" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> + <c:simple-property name="allocation-retry-wait-millis" required="false" type="long" readOnly="true" description="he allocation retry wait millis element indicates the time in milliseconds to wait between retrying to allocate a connection."/> + <c:simple-property name="blocking-timeout-wait-millis" required="false" type="long" readOnly="true" description="The blocking-timeout-millis element indicates the maximum time in milliseconds to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for a permit for a connection, and will never throw an exception if creating a new connection takes an inordinately long time."/> + <c:simple-property name="idle-timeout-minutes" required="false" type="long" readOnly="true" description="The idle-timeout-minutes elements indicates the maximum time in minutes a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes of any pool. Changing this value require a server restart."/> + <c:simple-property name="query-timeout" required="false" type="long" readOnly="true" description="Any configured query timeout in seconds The default is no timeout"/> + <c:simple-property name="use-try-lock" required="false" type="long" readOnly="true" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/> + <c:simple-property name="set-tx-query-timeout" required="false" type="boolean" readOnly="true" description="Whether to set the query timeout based on the time remaining until transaction timeout, any configured query timeout will be used if there is no transaction."/> + <c:simple-property name="transaction-isolation" required="false" type="string" readOnly="true" description="Set java.sql.Connection transaction isolation level to use. The constants defined by transaction-isolation-values are the possible transaction isolation levels."> + <c:property-options> + <c:option value="TRANSACTION_READ_UNCOMMITTED"/> + <c:option value="TRANSACTION_READ_COMMITTED"/> + <c:option value="TRANSACTION_REPEATABLE_READ"/> + <c:option value="TRANSACTION_SERIALIZABLE"/> + <c:option value="TRANSACTION_NONE"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="check-valid-connection-sql" required="false" type="string" readOnly="true" description="Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is taken from pool for use."/> + <c:simple-property name="exception-sorter-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a boolean isExceptionFatal(SQLException e) method to validate is an exception should be broadcast to all javax.resource.spi.ConnectionEventListener as a connectionErrorOccurred"/> +  + <c:simple-property name="stale-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides a boolean isStaleConnection(SQLException e) method which if it it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException"/> +  + <c:simple-property name="valid-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides a SQLException isValidConnection(Connection e) method to validate is a connection is valid. An exception means the connection is destroyed. This overrides the check-valid-connection-sql when present."/> +  + <c:simple-property name="background-validation-minutes" required="false" type="long" readOnly="true" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> + <c:simple-property name="background-validation" required="false" type="boolean" readOnly="true" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> + <c:simple-property name="use-fast-fail" required="false" type="boolean" readOnly="true" description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> + <c:simple-property name="validate-on-match" required="false" type="boolean" readOnly="true" description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> + <c:simple-property name="xa-resource-timeout" required="false" type="integer" readOnly="true" description="Passed to XAResource.setTransactionTimeout() Default is zero which does not invoke the setter. In seconds"/> + <c:simple-property name="spy" required="false" type="boolean" readOnly="true" description="whatever spy or not the jdbc connection"/> + <c:simple-property name="use-ccm" required="false" type="boolean" readOnly="true" description="Enable the use of a cached connection manager"/> + <c:simple-property name="recovery-username" required="false" type="string" readOnly="true" description="username used to try connection recovery"/> + <c:simple-property name="recovery-password" required="false" type="string" readOnly="true" description="password used to try connection recovery"/> + <c:simple-property name="recovery-security-domain" required="false" type="string" readOnly="true" description="security-domain used to try connection recovery"/> +  + <c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/> + + <c:group name="children:xa-datasource-properties:key+-" displayName="XA Datasource Properties"> + <c:list-property name="*2" displayName="Properties" required="false" readOnly="true"> + <c:map-property name="*:key" displayName="Name" readOnly="true"> + <c:simple-property name="key" displayName="Property-Name" readOnly="true"/> + <c:simple-property name="value" displayName="Value" readOnly="true"/> + </c:map-property> + </c:list-property> + </c:group> + </resource-configuration> +'> + ]> <plugin name="jboss-as-7" displayName="JBoss Application Server 7.x" @@ -1651,398 +2082,173 @@ </service> - <service name="Datasources" + + <service name="Datasources (Standalone)" discovery="SubsystemDiscovery" class="DatasourceComponent" singleton="true" - description="Datasources subsystem" - > + description="Datasources subsystem for Standalone servers."> + + <runs-inside> + <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + </runs-inside> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="subsystem=datasources"/> + </plugin-configuration> + +  + + <service name="DataSource (Standalone)" + discovery="SubsystemDiscovery" + class="DatasourceComponent" + description="A non-XA data source" + createDeletePolicy="both"> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="data-source"/> + </plugin-configuration> + + &datasourceEnableDisableOperations; + &datasourceTestFlushOperations; + + &datasourceMetrics; + + &datasourceReadWriteConfiguration; + </service> + + <service name="XADataSource (Standalone)" + discovery="SubsystemDiscovery" + class="DatasourceComponent" + description="An XA data source" + createDeletePolicy="both"> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="xa-data-source"/> + </plugin-configuration> + + &datasourceEnableDisableOperations; + &datasourceTestFlushOperations; + + &datasourceMetrics; + + &xaDatasourceReadWriteConfiguration; + </service> + + </service> + + + <service name="Datasources (Profile)" + discovery="SubsystemDiscovery" + class="DatasourceComponent" + singleton="true" + description="Datasources subsystem for profile."> + + <runs-inside> + <parent-resource-type name="Profile" plugin="jboss-as-7"/> + </runs-inside> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="subsystem=datasources"/> + </plugin-configuration> + + <service name="DataSource (Profile)" + discovery="SubsystemDiscovery" + class="DatasourceComponent" + description="A non-XA data source" + createDeletePolicy="both"> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="data-source"/> + </plugin-configuration> + + &datasourceEnableDisableOperations; + + &datasourceReadWriteConfiguration; + </service> + + <service name="XADataSource (Profile)" + discovery="SubsystemDiscovery" + class="DatasourceComponent" + description="An XA data source" + createDeletePolicy="both"> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="xa-data-source"/> + </plugin-configuration> + + &datasourceEnableDisableOperations; + + &xaDatasourceReadWriteConfiguration; + </service> + + </service> + + + <service name="Datasources (Managed)" + discovery="SubsystemDiscovery" + class="DatasourceComponent" + singleton="true" + description="Datasources subsystem for Managed servers."> <runs-inside> - <parent-resource-type name="Profile" plugin="jboss-as-7"/> - <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=datasources"/> </plugin-configuration> -  - - - <service name="DataSource" + <service name="DataSource (Managed)" discovery="SubsystemDiscovery" class="DatasourceComponent" description="A non-XA data source" - createDeletePolicy="both" - > + createDeletePolicy="neither"> <plugin-configuration> <c:simple-property name="path" readOnly="true" default="data-source"/> </plugin-configuration> - <operation name="enable" description="Enables the data-source"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - <operation name="disable" description="Disables the XA data-source"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="flush-all-connection-in-pool" description="Flushes the pool for all connections"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="flush-idle-connection-in-pool" description="Flushes the pool for idle connections"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="test-connection-in-pool" description="Tests if a connection can be obtained"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <metric property="PreparedStatementCacheCurrentSize" - description="The number of prepared and callable statements currently cached in the statement cache"/> - <metric property="PreparedStatementCacheMissCount" measurementType="trendsup" - description="The number of times that a statement request could not be satisfied with a statement from the cache"/> - <metric property="PreparedStatementCacheAddCount" - description="The number of statements added to the statement cache"/> - <metric property="PreparedStatementCacheAccessCount" measurementType="trendsup" - description="The number of times that the statement cache was accessed"/> - <metric property="PreparedStatementCacheDeleteCount" measurementType="trendsup" - description="The number of statements discarded from the cache"/> - <metric property="PreparedStatementCacheHitCount" measurementType="trendsup" - description="The number of times that statements from the cache were used"/> - <metric property="AverageBlockingTime" units="milliseconds" - description="The average time spent blocking for a connection"/> - <metric property="ActiveCount" - description="The active count"/> - <metric property="CreatedCount" description="The created count" measurementType="trendsup"/> - <metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/> - <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> - <metric property="AvailableCount" description="The available count" units="none"/> - <metric property="MaxUsedCount" description="The maximum number of connections used"/> - <metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/> - <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> - <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> - <metric property="connectionAvailable" displayName="Connection Available?" dataType="trait" displayType="summary" defaultInterval="300000"/> - <metric property="min-pool-size" displayName="Min Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The min pool size setting"/> - <metric property="max-pool-size" displayName="Max Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The max pool size setting"/> + &datasourceTestFlushOperations; - <resource-configuration> - <c:simple-property name="connection-url" required="true" type="string" readOnly="true" description="The JDBC driver connection URL"/> - <c:simple-property name="driver-name" required="true" type="string" description="Name of the (existing) JDBC driver to use" readOnly="true"> - <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/> - </c:simple-property> - <c:simple-property name="driver-class" required="false" type="string" readOnly="true" - description="The fully qualified name of the JDBC driver class"/> - <c:simple-property name="jndi-name" required="true" type="string" readOnly="true" - description="Specifies the JNDI name for the datasource"/> - <c:simple-property name="driver" required="false" type="string" readOnly="true" - description="Defines the JDBC driver the datasource should use with this format: driver-name>#major-version.minor-version where driver-name is the fully qualified name of the JDBC driver class"/> - <c:simple-property name="user-name" type="string" readOnly="true" required="false" - description="Specify the username used when creating a new connection."/> - <c:simple-property name="password" type="password" readOnly="true" required="false" - description="Specify the password used when creating a new connection."/> - <c:simple-property name="new-connection-sql" type="string" readOnly="true" required="false" - description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/> - <c:simple-property name="url-delimiter" type="string" readOnly="true" - description="Specifies the delimiter for URLs in connection-url for HA datasources" required="false"/> - <c:simple-property name="url-selector-strategy-class-name" type="string" readOnly="true" - description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy" required="false"/> - <c:simple-property name="use-java-context" type="boolean" readOnly="true" required="false" - description="Setting this to false will bind the DataSource into global JNDI;"/> - <c:simple-property name="enabled" type="boolean" readOnly="true" required="false" description="Specifies if the datasource should be enabled"/> - <c:simple-property name="max-pool-size" type="integer" readOnly="false" required="false" - description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> - <c:simple-property name="min-pool-size" type="integer" readOnly="false" required="false" - description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/> - <c:simple-property name="pool-prefill" type="boolean" readOnly="false" required="false" - description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/> - <c:simple-property name="pool-use-strict-min" type="boolean" readOnly="false" required="false" - description="Define if the min-pool-size should be considered a strictly."/> - <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> - <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="true" description="re-authentication plugin implementation provided for specific purpose (i.e vendor)"/> -  - <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" - description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly"> - <c:property-options> - <c:option value="FailingConnectionOnly"/> - <c:option value="IdleConnections"/> - <c:option value="EntirePool"/> - </c:property-options> - </c:simple-property> + &datasourceMetrics; - <c:simple-property name="prepared-statements-cacheSize" type="long" readOnly="true" required="false" - description="The number of prepared statements per connection in an LRU cache"/> - <c:simple-property name="share-prepared-statements" type="boolean" readOnly="true" required="false" - description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> - <c:simple-property name="track-statements" type="string" readOnly="true" required="false" - description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> - <c:simple-property name="allocation-retry" type="integer" readOnly="true" required="false" - description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> - <c:simple-property name="allocation-retry-wait-millis" type="long" readOnly="true" required="false" - description="Indicates the time in milliseconds to wait between retrying to allocate a connection."/> - <c:simple-property name="blocking-timeout-wait-millis" type="long" readOnly="false" required="false" - description="The blocking-timeout-millis element indicates the maximum time in milliseconds to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for a permit for a connection, and will never throw an exception if creating a new connection takes an inordinately long time."/> - <c:simple-property name="idle-timeout-minutes" type="long" readOnly="false" required="false" - description="The idle-timeout-minutes elements indicates the maximum time in minutes a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes of any pool. Changing this value require a server restart."/> - <c:simple-property name="query-timeout" type="long" readOnly="true" required="false" - description="Any configured query timeout in seconds The default is no timeout"/> - <c:simple-property name="use-try-lock" type="long" readOnly="true" required="false" - description="Any configured timeout for internal locks on the resource adapter objects in seconds"/> - <c:simple-property name="set-tx-query-timeout" type="boolean" readOnly="true" required="false" - description="Whether to set the query timeout based on the time remaining until transaction timeout, any configured query timeout will be used if there is no transaction."/> - <c:simple-property name="transaction-isolation" type="string" readOnly="true" required="false" - description="Set java.sql.Connection transaction isolation level to use. The constants defined by transaction-isolation-values are the possible transaction isolation levels."> - <c:property-options> - <c:option value="TRANSACTION_READ_UNCOMMITTED"/> - <c:option value="TRANSACTION_READ_COMMITTED"/> - <c:option value="TRANSACTION_REPEATABLE_READ"/> - <c:option value="TRANSACTION_SERIALIZABLE"/> - <c:option value="TRANSACTION_NONE"/> - </c:property-options> - </c:simple-property> - <c:simple-property name="check-valid-connection-sql" type="string" readOnly="true" required="false" - description="Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is taken from pool for use."/> - <c:simple-property name="exception-sorter-class-name" type="string" readOnly="true" required="false" - description="An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a boolean isExceptionFatal(SQLException e) method to validate is an exception should be broadcast to all javax.resource.spi.ConnectionEventListener as a connectionErrorOccurred"/> - <c:simple-property name="stale-connection-checker-class-name" type="string" readOnly="true" required="false" - description="An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides a boolean isStaleConnection(SQLException e) method which if it it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException"/> - <c:simple-property name="valid-connection-checker-class-name" type="string" readOnly="true" required="false" - description="An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides a SQLException isValidConnection(Connection e) method to validate is a connection is valid. An exception means the connection is destroyed. This overrides the check-valid-connection-sql when present."/> - <c:simple-property name="background-validation-minutes" type="long" readOnly="false" required="false" - description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> - <c:simple-property name="background-validation" type="boolean" readOnly="false" required="false" - description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> - <c:simple-property name="use-fast-fail" type="boolean" readOnly="false" required="false" - description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> - <c:simple-property name="validate-on-match" type="boolean" readOnly="true" required="false" - description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> - <c:simple-property name="spy" type="boolean" readOnly="true" required="false" - description="whatever spy or not the jdbc connection"/> - <c:simple-property name="use-ccm" type="boolean" readOnly="true" required="false" description="Enable the use of a cached connection manager"/> - <c:group name="children:connection-properties:pname+-" displayName="Connection Properties"> - <c:list-property name="*1" displayName="Connection Property" readOnly="false" required="false"> - <c:map-property name="*:pname" displayName="Name" readOnly="false"> - <c:simple-property name="pname" displayName="Property-Name" readOnly="true"/> - <c:simple-property name="value" displayName="Value" /> - </c:map-property> - </c:list-property> - </c:group> - </resource-configuration> + &datasourceReadOnlyConfiguration; </service> - <service name="XADataSource" + <service name="XADataSource (Managed)" discovery="SubsystemDiscovery" class="DatasourceComponent" description="An XA data source" - createDeletePolicy="both" - > + createDeletePolicy="neither"> <plugin-configuration> <c:simple-property name="path" readOnly="true" default="xa-data-source"/> </plugin-configuration> - <operation name="enable" description="Enables the data-source"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - <operation name="disable" description="Disables the XA data-source"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="flush-all-connection-in-pool" description="Flushes the pool for all connections"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="flush-idle-connection-in-pool" description="Flushes the pool for idle connections"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="test-connection-in-pool" description="Tests if a connection can be obtained"> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <metric property="PreparedStatementCacheCurrentSize" - description="The number of prepared and callable statements currently cached in the statement cache"/> - <metric property="PreparedStatementCacheMissCount" measurementType="trendsup" - description="The number of times that a statement request could not be satisfied with a statement from the cache"/> - <metric property="PreparedStatementCacheAddCount" - description="The number of statements added to the statement cache"/> - <metric property="PreparedStatementCacheAccessCount" measurementType="trendsup" - description="The number of times that the statement cache was accessed"/> - <metric property="PreparedStatementCacheDeleteCount" measurementType="trendsup" - description="The number of statements discarded from the cache"/> - <metric property="PreparedStatementCacheHitCount" measurementType="trendsup" - description="The number of times that statements from the cache were used"/> - <metric property="AverageBlockingTime" units="milliseconds" - description="The average time spent blocking for a connection"/> - <metric property="MaxWaitTime" units="milliseconds" - description="The maximum wait time for a connection" displayType="summary"/> - <metric property="ActiveCount" - description="The active count"/> - <metric property="CreatedCount" description="The created count" measurementType="trendsup"/> - <metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/> - <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/> - <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> - <metric property="AvailableCount" description="The available count" units="none"/> - <metric property="MaxUsedCount" description="The maximum number of connections used"/> - <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/> - <metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/> - <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> - <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> - <metric property="connectionAvailable" displayName="Connection Available?" dataType="trait" displayType="summary" defaultInterval="300000"/> - <metric property="min-pool-size" displayName="Min Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The min pool size setting"/> - <metric property="max-pool-size" displayName="Max Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The max pool size setting"/> - - <resource-configuration> - <c:simple-property name="xa-datasource-class" required="true" type="string" readOnly="true" description="The fully qualified name of the javax.sql.XADataSource implementation"/> - <c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/> - <c:simple-property name="driver-name" required="true" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit"> - <c:option-source target="resource" expression="type=^Deployment$" filter=".*\.jar"/> - </c:simple-property> - <c:simple-property name="user-name" required="false" type="string" readOnly="true" description="Specify the username used when creating a new connection."/> - <c:simple-property name="password" required="false" type="string" readOnly="true" description="Specify the password used when creating a new connection."/> - <c:simple-property name="new-connection-sql" required="false" type="string" readOnly="true" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/> - <c:simple-property name="url-delimiter" required="false" type="string" readOnly="true" description="Specifies the delimiter for URLs in connection-url for HA datasources"/> - <c:simple-property name="url-selector-strategy-class-name" required="false" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy"/> - <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" description="Setting this to false will bind the DataSource into global JNDI;"/> - <c:simple-property name="enabled" required="false" type="boolean" readOnly="true" description="Specifies if the datasource should be enabled"/> - <c:simple-property name="max-pool-size" required="false" type="integer" readOnly="false" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> - <c:simple-property name="min-pool-size" required="false" type="integer" readOnly="false" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/> - <c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="false" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/> - <c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="false" description="Define if the min-pool-size should be considered a strictly."/> - <c:simple-property name="interleaving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/> - <c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="true" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different context"/> - <c:simple-property name="pad-xid" required="false" type="boolean" readOnly="true" description="Should the Xid be padded"/> - <c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="true" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/> - <c:simple-property name="wrap-xa-datasource" required="false" type="boolean" readOnly="true" description="Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance"/> - <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> - <c:simple-property name="recovery-plugin-class-name" required="false" type="string" readOnly="true" description="recovery plugin implementation provided for specific purpose (i.e vendor)"/> - <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="true" description="re-authentication plugin implementation provided for specific purpose (i.e vendor)"/> -  - <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" - description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly"> - <c:property-options> - <c:option value="FailingConnectionOnly"/> - <c:option value="IdleConnections"/> - <c:option value="EntirePool"/> - </c:property-options> - </c:simple-property> - <c:simple-property name="prepared-statements-cacheSize" required="false" type="long" readOnly="true" description="The number of prepared statements per connection in an LRU cache"/> - <c:simple-property name="share-prepared-statements" required="false" type="boolean" readOnly="true" description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> - <c:simple-property name="track-statements" required="false" type="string" readOnly="true" description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> - <c:simple-property name="allocation-retry" required="false" type="integer" readOnly="true" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> - <c:simple-property name="allocation-retry-wait-millis" required="false" type="long" readOnly="true" description="he allocation retry wait millis element indicates the time in milliseconds to wait between retrying to allocate a connection."/> - <c:simple-property name="blocking-timeout-wait-millis" required="false" type="long" readOnly="false" description="The blocking-timeout-millis element indicates the maximum time in milliseconds to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for a permit for a connection, and will never throw an exception if creating a new connection takes an inordinately long time."/> - <c:simple-property name="idle-timeout-minutes" required="false" type="long" readOnly="false" description="The idle-timeout-minutes elements indicates the maximum time in minutes a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes of any pool. Changing this value require a server restart."/> - <c:simple-property name="query-timeout" required="false" type="long" readOnly="true" description="Any configured query timeout in seconds The default is no timeout"/> - <c:simple-property name="use-try-lock" required="false" type="long" readOnly="true" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/> - <c:simple-property name="set-tx-query-timeout" required="false" type="boolean" readOnly="true" description="Whether to set the query timeout based on the time remaining until transaction timeout, any configured query timeout will be used if there is no transaction."/> - <c:simple-property name="transaction-isolation" required="false" type="string" readOnly="true" description="Set java.sql.Connection transaction isolation level to use. The constants defined by transaction-isolation-values are the possible transaction isolation levels."> - <c:property-options> - <c:option value="TRANSACTION_READ_UNCOMMITTED"/> - <c:option value="TRANSACTION_READ_COMMITTED"/> - <c:option value="TRANSACTION_REPEATABLE_READ"/> - <c:option value="TRANSACTION_SERIALIZABLE"/> - <c:option value="TRANSACTION_NONE"/> - </c:property-options> - </c:simple-property> - <c:simple-property name="check-valid-connection-sql" required="false" type="string" readOnly="true" description="Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is taken from pool for use."/> - <c:simple-property name="exception-sorter-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a boolean isExceptionFatal(SQLException e) method to validate is an exception should be broadcast to all javax.resource.spi.ConnectionEventListener as a connectionErrorOccurred"/> -  - <c:simple-property name="stale-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides a boolean isStaleConnection(SQLException e) method which if it it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException"/> -  - <c:simple-property name="valid-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides a SQLException isValidConnection(Connection e) method to validate is a connection is valid. An exception means the connection is destroyed. This overrides the check-valid-connection-sql when present."/> -  - <c:simple-property name="background-validation-minutes" required="false" type="long" readOnly="false" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> - <c:simple-property name="background-validation" required="false" type="boolean" readOnly="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> - <c:simple-property name="use-fast-fail" required="false" type="boolean" readOnly="false" description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> - <c:simple-property name="validate-on-match" required="false" type="boolean" readOnly="true" description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> - <c:simple-property name="xa-resource-timeout" required="false" type="integer" readOnly="true" description="Passed to XAResource.setTransactionTimeout() Default is zero which does not invoke the setter. In seconds"/> - <c:simple-property name="spy" required="false" type="boolean" readOnly="true" description="whatever spy or not the jdbc connection"/> - <c:simple-property name="use-ccm" required="false" type="boolean" readOnly="true" description="Enable the use of a cached connection manager"/> - <c:simple-property name="recovery-username" required="false" type="string" readOnly="true" description="username used to try connection recovery"/> - <c:simple-property name="recovery-password" required="false" type="string" readOnly="true" description="password used to try connection recovery"/> - <c:simple-property name="recovery-security-domain" required="false" type="string" readOnly="true" description="security-domain used to try connection recovery"/> -  - <c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/> + &datasourceTestFlushOperations; + &datasourceMetrics; - <c:group name="children:xa-datasource-properties:key+-" displayName="XA Datasource Properties"> - <c:list-property name="*2" displayName="Properties" required="false" readOnly="false"> - <c:map-property name="*:key" displayName="Name" readOnly="false"> - <c:simple-property name="key" displayName="Property-Name" readOnly="false"/> - <c:simple-property name="value" displayName="Value" readOnly="false"/> - </c:map-property> - </c:list-property> - </c:group> - </resource-configuration> + &xaDatasourceReadOnlyConfiguration; </service> -  - </service> - <service name="JVM Definition (Host)" description="A JVM Definition on Host level, that can serve as templates for server groups and managed servers" discovery="SubsystemDiscovery" commit 0ec7ccc6aefe364b5b0541b708854dcf82e0dc5d Author: John Sanda <jsanda(a)redhat.com> Date: Thu Apr 26 16:47:39 2012 -0400 undoing change to enable animal sniffer plugin by default By setting the skip property in the plugin configuration in the root pom that caused the plugin to execute in the server/container module where we don't want it to run. This in turn caused the build to fail. diff --git a/pom.xml b/pom.xml index c6a51ba..7a5091c 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,6 @@ <shrinkwrap.version>1.0.0</shrinkwrap.version> <shrinkwrap.resolver.version>2.0.0-alpha-1</shrinkwrap.resolver.version> <animal.sniffer.version>1.7</animal.sniffer.version> - <animal.sniffer.skip>false</animal.sniffer.skip> <rhq.db.admin.username>rhqadmin</rhq.db.admin.username> <rhq.db.admin.password>rhqadmin</rhq.db.admin.password> @@ -1044,7 +1043,6 @@ <artifactId>java16</artifactId> <version>1.0</version> </signature> - <skip>${animal.sniffer.skip}</skip> </configuration> <phase>process-classes</phase> <goals> commit b51438adadf70d67751369759ab50586ffdad3b3 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Apr 26 12:51:01 2012 -0700 Revert "[BZ 805545] Improved the usability of the Resource Metric Collection Schedule table." This reverts commit a0f5661578404b47511e05145e1648eeffc30cdb. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java index a5d932a..f5e4dbb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java @@ -18,25 +18,20 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common; +import java.util.ArrayList; +import java.util.List; + import com.smartgwt.client.data.SortSpecifier; -import com.smartgwt.client.types.ListGridEditEvent; -import com.smartgwt.client.types.RowEndEditAction; import com.smartgwt.client.types.SortDirection; -import com.smartgwt.client.widgets.form.fields.CheckboxItem; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; + import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.MeasurementScheduleCriteria; -import org.rhq.enterprise.gui.coregui.client.components.form.DurationItem; -import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit; import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.util.Log; - -import java.util.ArrayList; -import java.util.List; -import java.util.TreeSet; /** * A view that displays a non-paginated table of {@link org.rhq.core.domain.measurement.MeasurementSchedule measurement @@ -79,50 +74,32 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { protected void configureTable() { ArrayList<ListGridField> listGridFields = getDataSource().getListGridFields(); getListGrid().setFields(listGridFields.toArray(new ListGridField[listGridFields.size()])); - getListGrid().setCanEdit(true); - getListGrid().setModalEditing(true); - //getListGrid().setEditByCell(true); - getListGrid().setEditEvent(ListGridEditEvent.CLICK); - getListGrid().setAutoSaveEdits(false); - getListGrid().setListEndEditAction(RowEndEditAction.DONE); - setupTableInteractions(this.hasWriteAccess); + super.configureTable(); - } + } protected void setupTableInteractions(final boolean hasWriteAccess) { - ListGridField enabledField = getListGrid().getField(SchedulesDataSource.ATTR_ENABLED); - CheckboxItem enabledCheckboxItem = new CheckboxItem(); - enabledCheckboxItem.addChangeHandler(new com.smartgwt.client.widgets.form.fields.events.ChangeHandler() { - @Override - public void onChange(com.smartgwt.client.widgets.form.fields.events.ChangeEvent event) { - boolean enabled = Boolean.valueOf(event.getItem().getValue() + ""); - Log.debug("Enabled/Disable Measurement: "+event.getItem().getFieldName()+ Boolean.valueOf(event.getItem().getValue() + "")); - - ListGridRecord[] records = getListGrid().getSelectedRecords(); - Log.debug(" * Number of Records selected: "+records.length); - Log.debug(" * Number of Records selected: "+records[0].getAttributeAsString(SchedulesDataSource.ATTR_DISPLAY_NAME)); - if(!enabled){ - enableSchedules(); - }else { - disableSchedules(); - } + addTableAction(extendLocatorId("Enable"), MSG.common_button_enable(), null, new TableAction() { + public boolean isEnabled(ListGridRecord[] selection) { + return ((selection.length >= 1) && hasWriteAccess); } - }); - enabledField.setEditorType(enabledCheckboxItem); - ListGridField intervalField = getListGrid().getField(SchedulesDataSource.ATTR_INTERVAL); - - TreeSet<TimeUnit> supportedUnits = new TreeSet<TimeUnit>(); - supportedUnits.add(TimeUnit.SECONDS); - supportedUnits.add(TimeUnit.MINUTES); - supportedUnits.add(TimeUnit.HOURS); - supportedUnits.add(TimeUnit.DAYS); - DurationItem durationItem = new DurationItem("duration","Duration", - TimeUnit.MILLISECONDS, supportedUnits, false, false, this); - intervalField.setEditorType(durationItem); + public void executeAction(ListGridRecord[] selection, Object actionValue) { + enableSchedules(); + } + }); + addTableAction(extendLocatorId("Disable"), MSG.common_button_disable(), null, new TableAction() { + public boolean isEnabled(ListGridRecord[] selection) { + return ((selection.length >= 1) && hasWriteAccess); + } + public void executeAction(ListGridRecord[] selection, Object actionValue) { + disableSchedules(); + } + }); + addExtraWidget(new UpdateCollectionIntervalWidget(this.getLocatorId(), this), true); } protected abstract void enableSchedules(int[] measurementDefinitionIds, diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java index 92292d1..e73cb66 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common; +import java.util.ArrayList; + import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; @@ -26,6 +28,7 @@ import com.smartgwt.client.rpc.RPCResponse; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; + import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.Criteria; import org.rhq.core.domain.criteria.MeasurementScheduleCriteria; @@ -38,9 +41,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import java.util.ArrayList; - - /** * A server-side SmartGWT DataSource for reading and updating {@link MeasurementScheduleComposite}s. * @@ -97,11 +97,8 @@ public class SchedulesDataSource extends RPCDataSource<MeasurementScheduleCompos fields.add(intervalField); displayNameField.setWidth("20%"); - displayNameField.setCanEdit(false); descriptionField.setWidth("40%"); - descriptionField.setCanEdit(false); typeField.setWidth("10%"); - typeField.setCanEdit(false); enabledField.setWidth("10%"); intervalField.setWidth("*"); commit 3fbbca34d9bb1ad11cf13045ae687ed04d453fe9 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Apr 26 12:46:18 2012 -0700 Revert "[BZ 805545] Improve the usability of the Resource Metric Collection Schedule table. Make the collection intervals update properly after in-place edit." This reverts commit a3fcd70ab1ec92d8b258f4c1f928ee32e4f40d2e. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java index 9d029ef..a5d932a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java @@ -23,11 +23,12 @@ import com.smartgwt.client.types.ListGridEditEvent; import com.smartgwt.client.types.RowEndEditAction; import com.smartgwt.client.types.SortDirection; import com.smartgwt.client.widgets.form.fields.CheckboxItem; -import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.MeasurementScheduleCriteria; +import org.rhq.enterprise.gui.coregui.client.components.form.DurationItem; +import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync; @@ -35,6 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.util.Log; import java.util.ArrayList; import java.util.List; +import java.util.TreeSet; /** * A view that displays a non-paginated table of {@link org.rhq.core.domain.measurement.MeasurementSchedule measurement @@ -79,6 +81,7 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { getListGrid().setFields(listGridFields.toArray(new ListGridField[listGridFields.size()])); getListGrid().setCanEdit(true); getListGrid().setModalEditing(true); + //getListGrid().setEditByCell(true); getListGrid().setEditEvent(ListGridEditEvent.CLICK); getListGrid().setAutoSaveEdits(false); getListGrid().setListEndEditAction(RowEndEditAction.DONE); @@ -95,7 +98,11 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { @Override public void onChange(com.smartgwt.client.widgets.form.fields.events.ChangeEvent event) { boolean enabled = Boolean.valueOf(event.getItem().getValue() + ""); + Log.debug("Enabled/Disable Measurement: "+event.getItem().getFieldName()+ Boolean.valueOf(event.getItem().getValue() + "")); + ListGridRecord[] records = getListGrid().getSelectedRecords(); + Log.debug(" * Number of Records selected: "+records.length); + Log.debug(" * Number of Records selected: "+records[0].getAttributeAsString(SchedulesDataSource.ATTR_DISPLAY_NAME)); if(!enabled){ enableSchedules(); }else { @@ -107,16 +114,14 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { ListGridField intervalField = getListGrid().getField(SchedulesDataSource.ATTR_INTERVAL); - final ScheduleTableCollectionWidget collectionIntervalWidget = new ScheduleTableCollectionWidget("collectionInterval", this); - - collectionIntervalWidget.addChangeHandler(new com.smartgwt.client.widgets.form.fields.events.ChangeHandler() { - @Override - public void onChange(ChangeEvent event) { - Log.debug(" Collection Interval: "+ collectionIntervalWidget.getValue()); - updateSchedules(collectionIntervalWidget.getInterval()); - } - }); - intervalField.setEditorType(collectionIntervalWidget); + TreeSet<TimeUnit> supportedUnits = new TreeSet<TimeUnit>(); + supportedUnits.add(TimeUnit.SECONDS); + supportedUnits.add(TimeUnit.MINUTES); + supportedUnits.add(TimeUnit.HOURS); + supportedUnits.add(TimeUnit.DAYS); + DurationItem durationItem = new DurationItem("duration","Duration", + TimeUnit.MILLISECONDS, supportedUnits, false, false, this); + intervalField.setEditorType(durationItem); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/ScheduleTableCollectionWidget.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/ScheduleTableCollectionWidget.java deleted file mode 100644 index 6600cf8..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/ScheduleTableCollectionWidget.java +++ /dev/null @@ -1,179 +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.coregui.client.inventory.common; - -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.CanvasItem; -import com.smartgwt.client.widgets.form.fields.SelectItem; -import com.smartgwt.client.widgets.form.fields.SpinnerItem; -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.ShowValueEvent; -import com.smartgwt.client.widgets.form.fields.events.ShowValueHandler; -import com.smartgwt.client.widgets.form.validator.IntegerRangeValidator; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; - -import java.util.LinkedHashMap; - -/** - * This widget is used inside the ListGrid controls when editing the collection interval - * in place. It shows up inside the grid cell when you click on it to edit the cell. The - * control consists of a collection interval spinner for entering the collection interval - * time period and a unit of measure SelectItem to choose the time measurement units. - * - * @author Mike Thompson - */ -public class ScheduleTableCollectionWidget extends CanvasItem { - private static final Messages MSG = CoreGUI.getMessages(); - - private static final String UNITS_SECONDS = "s"; - private static final String UNITS_MINUTES = "m"; - private static final String UNITS_HOURS = "h"; - - private DynamicForm form; - private SpinnerItem collectionIntervalSpinnerItem = new SpinnerItem(); - private IntegerRangeValidator integerRangeValidator = new IntegerRangeValidator(); - private SelectItem unitsItem = new SelectItem(); - - // Maps values to labels for the units select list. - private static final LinkedHashMap<String, String> VALUE_MAP = new LinkedHashMap<String, String>(); - static { - VALUE_MAP.put(UNITS_SECONDS, MSG.common_unit_seconds()); - VALUE_MAP.put(UNITS_MINUTES, MSG.common_unit_minutes()); - VALUE_MAP.put(UNITS_HOURS, MSG.common_unit_hours()); - } - - private AbstractSchedulesView schedulesView; - - public ScheduleTableCollectionWidget(String locatorId, final AbstractSchedulesView schedulesView) { - super(locatorId); - this.schedulesView = schedulesView; - - form = new LocatableDynamicForm("collectionIntervalForm"); - form.setNumCols(2); - collectionIntervalSpinnerItem.setWidth(50); - collectionIntervalSpinnerItem.setShowTitle(false); - integerRangeValidator.setMin(1); - integerRangeValidator.setMax(10000000); // avoids exceptions if someone enters really large nums; no one needs to go higher anyway - collectionIntervalSpinnerItem.setValidators(integerRangeValidator); - collectionIntervalSpinnerItem.addChangedHandler(new ChangedHandler() { - @Override - public void onChanged(ChangedEvent changedEvent) { - Long collectionInterval = Long.valueOf(changedEvent.getItem().getValue() + ""); - Log.debug("Collection interval value Changed to: " + collectionInterval + " " + unitsItem.getValueAsString()); - schedulesView.updateSchedules(convertToMillis(collectionInterval, unitsItem.getValueAsString())); - } - }); - - // Specify a null title so no label is rendered to the left of the combo box. - unitsItem.setValueMap(VALUE_MAP); - unitsItem.setDefaultValue(UNITS_MINUTES); - unitsItem.setShowTitle(false); - unitsItem.setWidth(100); - unitsItem.addChangedHandler(new ChangedHandler() { - @Override - public void onChanged(ChangedEvent event) { - - Long collectionInterval = Long.valueOf(collectionIntervalSpinnerItem.getValueAsString()); - Log.debug("Collection interval units changed to: " + unitsItem.getValueAsString()); - String value = (String) event.getValue(); - if (value.equals(UNITS_SECONDS)) { - integerRangeValidator.setMin(30); - } else { - integerRangeValidator.setMin(1); - } - schedulesView.updateSchedules(convertToMillis(collectionInterval, unitsItem.getValueAsString())); - } - }); - - addShowValueHandler(new ShowValueHandler() { - @Override - public void onShowValue(ShowValueEvent event) { - Integer rawValue = (Integer) event.getDataValue(); - convertToProperUnits(rawValue); - } - }); - - if (!schedulesView.hasWriteAccess()) { - collectionIntervalSpinnerItem.setDisabled(true); - unitsItem.setDisabled(true); - } - - form.setFields(collectionIntervalSpinnerItem, unitsItem); - setCanvas(form); - } - - private void convertToProperUnits(long milliseconds){ - if (milliseconds > 1000) { - long seconds = milliseconds / 1000; - if (seconds >= 60) { - long minutes = seconds / 60; - seconds = seconds % 60; - if (minutes > 60) { - long hours = minutes / 60; - collectionIntervalSpinnerItem.setValue(hours); - minutes = minutes % 60; - unitsItem.setValue(UNITS_HOURS); - collectionIntervalSpinnerItem.setStep(1); - } - if (minutes != 0) { - collectionIntervalSpinnerItem.setValue(minutes); - unitsItem.setValue(UNITS_MINUTES); - collectionIntervalSpinnerItem.setStep(5); - } - } - if (seconds != 0) { - unitsItem.setValue(UNITS_SECONDS); - collectionIntervalSpinnerItem.setValue(seconds); - collectionIntervalSpinnerItem.setStep(5); - } - } - } - - private long convertToMillis(long collectionInterval, String timeUnitString){ - long millis = 0; - - if(timeUnitString.equals(UNITS_SECONDS)){ - millis = collectionInterval * 1000; - - }else if(timeUnitString.equals(UNITS_MINUTES)){ - millis = collectionInterval * (60 * 1000); - - }else if(timeUnitString.equals(UNITS_HOURS)){ - millis = collectionInterval * (60 * 60 * 1000); - } - return millis; - - } - - - public Long getInterval() { - - if (collectionIntervalSpinnerItem.getValue() == null || !collectionIntervalSpinnerItem.validate()) { - return null; - } - Long intervalValue = Long.valueOf(collectionIntervalSpinnerItem.getValueAsString()); - return convertToMillis(intervalValue, unitsItem.getValueAsString()); - } - -} - commit f066513279c222f9cd5cbb8be72157b3eb73ac80 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Apr 26 21:49:33 2012 +0200 Disable so that Jenkins is happy. Revisit and re-enable again. diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index 57e381e..6e54814 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -119,7 +119,7 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { assertEquals(avail, AvailabilityType.UP); } - @Test(priority = 6, enabled = true) + @Test(priority = 6, enabled = false) public void testSystemPropertiesSettings() throws Exception { Configuration config = loadResourceConfiguration(getServerResource()); commit d5e0cb3eb718ede569417b8bbc4f144e477c55b0 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Apr 26 15:50:01 2012 -0400 fixing typo from previous commit diff --git a/pom.xml b/pom.xml index 3677370..c6a51ba 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ <shrinkwrap.version>1.0.0</shrinkwrap.version> <shrinkwrap.resolver.version>2.0.0-alpha-1</shrinkwrap.resolver.version> <animal.sniffer.version>1.7</animal.sniffer.version> - <animal.sniffer.skip>false</animal.sniffer.false> + <animal.sniffer.skip>false</animal.sniffer.skip> <rhq.db.admin.username>rhqadmin</rhq.db.admin.username> <rhq.db.admin.password>rhqadmin</rhq.db.admin.password> commit ca8c8e90921fc2fa8e658efe8a9dd553d3ca76b2 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Apr 26 15:42:09 2012 -0400 Make running the animal sniffer plugin configurable We want the plugin configurable so that we can disable it for JON builds. diff --git a/pom.xml b/pom.xml index 7a5091c..3677370 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,7 @@ <shrinkwrap.version>1.0.0</shrinkwrap.version> <shrinkwrap.resolver.version>2.0.0-alpha-1</shrinkwrap.resolver.version> <animal.sniffer.version>1.7</animal.sniffer.version> + <animal.sniffer.skip>false</animal.sniffer.false> <rhq.db.admin.username>rhqadmin</rhq.db.admin.username> <rhq.db.admin.password>rhqadmin</rhq.db.admin.password> @@ -1043,6 +1044,7 @@ <artifactId>java16</artifactId> <version>1.0</version> </signature> + <skip>${animal.sniffer.skip}</skip> </configuration> <phase>process-classes</phase> <goals> commit 3e9bbe41ad1cd836a8fe2cdc852fb5cf6af0c700 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Apr 26 11:52:47 2012 -0400 Use File.separatorChar instead of File.pathSeparatorChar. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index 4c1edc8..3209557 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -49,7 +49,7 @@ public class ServerStartScriptDiscoveryUtility { "LD_LIBRARY_PATH" )); static { - if (File.pathSeparatorChar == '\\') { + if (File.separatorChar == '\\') { CORE_ENV_VAR_NAME_INCLUDES.add("OS"); // many batch files use this to figure out if the OS type is NT or 9x CORE_ENV_VAR_NAME_INCLUDES.add("SYSTEMROOT"); // required on Windows to avoid winsock create errors } diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index df9e9a5..d333463 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -146,7 +146,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom )); // If OS is Windows, add env vars that are only used by the batch files. - if (File.pathSeparatorChar == '\\') { + if (File.separatorChar == '\\') { START_SCRIPT_ENV_VAR_NAMES.add("ECHO"); START_SCRIPT_ENV_VAR_NAMES.add("NOPAUSE"); } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index a6ee7bb..d28cfb1 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -101,7 +101,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent )); // If OS is Windows, add env vars that are only used by the batch files. - if (File.pathSeparatorChar == '\\') { + if (File.separatorChar == '\\') { START_SCRIPT_ENV_VAR_NAMES.add("ECHO"); START_SCRIPT_ENV_VAR_NAMES.add("NOPAUSE"); } commit c13e725fccf69873c2992ce1fdc151462e8745f1 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Apr 26 11:50:55 2012 -0400 Improve description for startScriptArgs property. diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index 55c4e6c..3170de5 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -962,8 +962,9 @@ type="longString" default="" description="The arguments that the Start and Restart operations will pass to the server - start script. Each argument should be on a new line. - For example: -b 127.0.0.2" /> + start script. Each argument should be on a new line. For example: --host=127.0.0.2 . + As an exception, a space delimited option can have its value on the same line, or + on a new line. For example: -b 127.0.0.2" /> <c:simple-property name="shutdownScript" displayName="Shutdown Script" type="file" required="false" description="The path to the script used by the Shut Down operation to shut down this JBossAS server commit 8c93936d1b2805eb59ff75078833ff7848797e04 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Apr 26 10:29:43 2012 -0400 - Add synchronized block to getAvailabilitySchedule to make its side-effect of setting a default value safe. Also, remove a piece of unreachable code. - Make null handling more explicit in updateMeasurementSchedule(). Update jdoc, protect against NPE. diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index af9972c..25aed16 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -240,23 +240,21 @@ public class ResourceContainer implements Serializable { public MeasurementScheduleRequest getAvailabilitySchedule() { // platforms don't have a schedule but other types should. If one has not yet been set (this can - // happen in various upgrade scenarios) set one, using a default interval. - if (null == availabilitySchedule) { - MeasurementScheduleRequest request = null; - switch (this.resource.getResourceType().getCategory()) { - case PLATFORM: - break; - case SERVER: - availabilitySchedule = new MeasurementScheduleRequest(-1, MeasurementDefinition.AVAILABILITY_NAME, - MeasurementDefinition.AVAILABILITY_DEFAULT_PERIOD_SERVER, true, DataType.AVAILABILITY); - break; - case SERVICE: - availabilitySchedule = new MeasurementScheduleRequest(-1, MeasurementDefinition.AVAILABILITY_NAME, - MeasurementDefinition.AVAILABILITY_DEFAULT_PERIOD_SERVICE, true, DataType.AVAILABILITY); - break; - } - if (null != request) { - setAvailabilitySchedule(request); + // happen in various upgrade scenarios) set one, using a default interval. + synchronized (this) { + if (null == availabilitySchedule) { + switch (this.resource.getResourceType().getCategory()) { + case PLATFORM: + break; + case SERVER: + availabilitySchedule = new MeasurementScheduleRequest(-1, MeasurementDefinition.AVAILABILITY_NAME, + MeasurementDefinition.AVAILABILITY_DEFAULT_PERIOD_SERVER, true, DataType.AVAILABILITY); + break; + case SERVICE: + availabilitySchedule = new MeasurementScheduleRequest(-1, MeasurementDefinition.AVAILABILITY_NAME, + MeasurementDefinition.AVAILABILITY_DEFAULT_PERIOD_SERVICE, true, DataType.AVAILABILITY); + break; + } } } @@ -286,23 +284,22 @@ public class ResourceContainer implements Serializable { * * @param measurementScheduleUpdate the updates to the current measurementSchedule * - * @return true if the schedule was updated successfully, false otherwise + * @return true if the schedule was updated successfully, false otherwise or if measurementScheduleUpdate is null */ public boolean updateMeasurementSchedule(Set<MeasurementScheduleRequest> measurementScheduleUpdate) { + if (null == measurementScheduleUpdate) { + return false; + } + // this should not happen but if it does, protect against it because it will sink the agent - if (null != measurementScheduleUpdate) { - for (MeasurementScheduleRequest sched : measurementScheduleUpdate) { - if (sched.getInterval() < MeasurementSchedule.MINIMUM_INTERVAL) { - String smallStack = ThrowableUtil.getFilteredStackAsString(new Throwable()); - String msg = "Invalid collection interval [" - + sched - + "] for Resource [" - + resource - + "]. Setting it to 20 minutes until the situation is corrected. Please report to Development: " - + smallStack; - LogFactory.getLog(ResourceContainer.class).error(msg); - sched.setInterval(20L * 60L * 1000L); - } + for (MeasurementScheduleRequest sched : measurementScheduleUpdate) { + if (sched.getInterval() < MeasurementSchedule.MINIMUM_INTERVAL) { + String smallStack = ThrowableUtil.getFilteredStackAsString(new Throwable()); + String msg = "Invalid collection interval [" + sched + "] for Resource [" + resource + + "]. Setting it to 20 minutes until the situation is corrected. Please report to Development: " + + smallStack; + LogFactory.getLog(ResourceContainer.class).error(msg); + sched.setInterval(20L * 60L * 1000L); } } commit ffb8f7812a79e8cf50306c6dc4485306d3f56b4c Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Apr 25 17:23:14 2012 -0400 Changes to get itest working on win diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index b8d26e6..7f1736b 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -634,7 +634,7 @@ we now use the following method. --> </activation> <properties> - <jboss5.home>${java.io.tmpdir}/jboss-as-${as5.version}</jboss5.home> + <jboss5.home>${java.io.tmpdir}jboss-as-${as5.version}</jboss5.home> <jboss.bindAddress>127.0.0.1</jboss.bindAddress> <jboss.portOffset>30000</jboss.portOffset>  @@ -656,7 +656,7 @@ we now use the following method. --> <configuration> <target> <property name="as5.zipfile" - location="${java.io.tmpdir}/jboss-as-${as5.version}.zip"/> + location="${java.io.tmpdir}jboss-as-${as5.version}.zip"/> <get src="${as5.url}" dest="${as5.zipfile}" usetimestamp="true" verbose="true"/> <unzip src="${as5.zipfile}" dest="${java.io.tmpdir}"/> @@ -687,7 +687,7 @@ we now use the following method. --> <configuration> <background>true</background> <backgroundPollingAddress>${jboss.bindAddress}:${jboss.jnpPort}</backgroundPollingAddress> - <executable>${java.home}/bin/java</executable> + <executable>"${java.home}/bin/java"</executable> <arguments> <argument>-server</argument> <argument>-Xms128M</argument> @@ -697,11 +697,11 @@ we now use the following method. --> <argument>-Dsun.rmi.dgc.client.gcInterval=3600000</argument> <argument>-Dsun.rmi.dgc.server.gcInterval=3600000</argument> <argument>-Djava.net.preferIPv4Stack=true</argument> - <argument>-Dlogging.configuration=file://${jboss5.home}/bin/logging.properties</argument> - <argument>-Djava.library.path=${jboss5.home}/bin/native/lib64</argument> - <argument>-Djava.endorsed.dirs=${jboss5.home}/lib/endorsed</argument> + <argument>-Dlogging.configuration="file:///${jboss5.home}/bin/logging.properties"</argument> + <argument>-Djava.library.path="${jboss5.home}/bin/native/lib64"</argument> + <argument>-Djava.endorsed.dirs="${jboss5.home}/lib/endorsed"</argument> <argument>-classpath</argument> - <argument>${jboss5.home}/bin/run.jar:${java.home}/lib/tools.jar</argument> + <argument>"${jboss5.home}/bin/run.jar${path.separator}${java.home}/lib/tools.jar"</argument> <argument>org.jboss.Main</argument> <argument>--configuration=default</argument> <argument>--host=${jboss.bindAddress}</argument> commit cac6dc3175fc0e209cdd605aaf5e7fbf427fa8af Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Apr 26 15:16:27 2012 +0200 BZ 816584 - default-cache-container is gone in ER6 and no longer needed. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 507eabe..ac6f365 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -5004,8 +5004,6 @@ <c:simple-property name="path" readOnly="true" default="subsystem=infinispan"/> </plugin-configuration> - <metric property="default-cache-container" displayType="summary" dataType="trait" defaultInterval="120000"/> - <service name="Cache Container" discovery="SubsystemDiscovery" class="IspnCContainerComponent" commit 348c2cca86960832425307c467c331a08d502d3f Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Apr 26 07:35:16 2012 -0400 add support for EAP 6.0.0.ER6 diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index eaf8f39..0c077e5 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -229,7 +229,7 @@ </activation> <properties> - <as7.url>Please set the as7.url system property to the location of the EAP 6.0.0.Beta1 distribution zipfile.</as7.url> + <as7.url>Please set the as7.url system property to the location of the EAP ${as7.version} distribution zipfile.</as7.url> <jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version> </properties> </profile> @@ -245,7 +245,7 @@ </activation> <properties> - <as7.url>Please set the as7.url system property to the location of the EAP 6.0.0.ER4 distribution zipfile.</as7.url> + <as7.url>Please set the as7.url system property to the location of the EAP ${as7.version} distribution zipfile.</as7.url> <jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version> </properties> </profile> @@ -261,7 +261,23 @@ </activation> <properties> - <as7.url>Please set the as7.url system property to the location of the EAP 6.0.0.ER5 distribution zipfile.</as7.url> + <as7.url>Please set the as7.url system property to the location of the EAP ${as7.version} distribution zipfile.</as7.url> + <jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version> + </properties> + </profile> + + <profile> + <id>eap600ER6.itest.setup</id> + + <activation> + <property> + <name>as7.version</name> + <value>6.0.0.ER6</value> + </property> + </activation> + + <properties> + <as7.url>Please set the as7.url system property to the location of the EAP ${as7.version} distribution zipfile.</as7.url> <jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version> </properties> </profile> diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java index ae2e97d..f47e4dd 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java @@ -60,6 +60,7 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.Beta1", "7.1.0.Final-redhat-1"); EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER4", "7.1.1.Final-redhat-1"); EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER5", "7.1.1.Final-redhat-1"); + EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER6", "7.1.1.Final-redhat-1"); } private static final String RELEASE_VERSION_TRAIT_NAME = "_skm:release-version"; commit 22e05e781aee781c9f38d3c687ef7d71d2a01ccd Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Apr 26 07:02:06 2012 -0400 increase expected type hierarchy depth from 5 to 6 and add a constant for the value diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java index 04de0e9..58b0c91 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java @@ -20,8 +20,6 @@ package org.rhq.modules.plugins.jbossas7.itest; import java.util.Set; -import org.testng.annotations.AfterSuite; - import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.clientapi.agent.discovery.InvalidPluginConfigurationClientException; import org.rhq.core.domain.configuration.Configuration; @@ -52,6 +50,8 @@ public abstract class AbstractJBossAS7PluginTest extends AbstractAgentPluginTest public static final String MANAGEMENT_USERNAME = "test"; public static final String MANAGEMENT_PASSWORD = "test"; + private static final int TYPE_HIERARCHY_DEPTH = 6; + private static boolean createdManagementUsers; /** @@ -116,7 +116,7 @@ public abstract class AbstractJBossAS7PluginTest extends AbstractAgentPluginTest @Override protected int getTypeHierarchyDepth() { - return 5; + return TYPE_HIERARCHY_DEPTH; } protected static Resource getResourceByTypeAndKey(Resource parent, final ResourceType type, String key) { commit 103c02ec1c7cb78180706218b446940fa1a710f6 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Apr 25 19:29:13 2012 -0500 Master host and port can be parametrized like the rest of the configuration values. Add code to find the actual value set at runtime. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 6f6eae0..a6ee7bb 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -193,7 +193,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent setUserAndPasswordPluginConfigProps(serverPluginConfig, hostConfig, baseDir); String key = baseDir.getPath(); - HostPort hostPort = hostConfig.getHostPort(); + HostPort hostPort = hostConfig.getHostPort(commandLine); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String description = buildDefaultResourceDescription(hostPort, productType); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java index 24e2f70..6fa7af4 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java @@ -48,9 +48,11 @@ public class HostConfiguration { public static final int DEFAULT_MGMT_PORT = 9990; private static final String BIND_ADDRESS_MANAGEMENT_SYSPROP = "jboss.bind.address.management"; + private static final String BIND_MASTER_ADDRESS_SYSPROP = "jboss.domain.master.address"; private static final String SOCKET_BINDING_PORT_OFFSET_SYSPROP = "jboss.socket.binding.port-offset"; private CommandLineOption BIND_ADDRESS_MANAGEMENT_OPTION = new CommandLineOption("bmanagement", null); + private CommandLineOption BIND_MASTER_ADDRESS_OPTION = new CommandLineOption(null, "master-address"); private final Log log = LogFactory.getLog(HostConfiguration.class); @@ -179,7 +181,7 @@ public class HostConfiguration { * Try to obtain the domain controller's location from looking at host.xml * @return host and port of the domain controller */ - public HostPort getHostPort() { + public HostPort getHostPort(AS7CommandLine commandLine) { // first check remote, as we can't distinguish between a missing local element or // and empty one which is the default String remoteHost = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@host"); @@ -188,7 +190,8 @@ public class HostConfiguration { HostPort hp; if (!remoteHost.isEmpty() && !portString.isEmpty()) { hp = new HostPort(false); - hp.host = remoteHost; + hp.host = replaceDollarExpression(remoteHost, commandLine, "localhost"); + portString = replaceDollarExpression(portString, commandLine, "9999"); hp.port = Integer.parseInt(portString); } else { hp = new HostPort(true); @@ -278,7 +281,10 @@ public class HostConfiguration { if (expression.equals(BIND_ADDRESS_MANAGEMENT_SYSPROP)) { // special case: mgmt address can be specified via either -bmanagement= or -Djboss.bind.address.management= resolvedValue = commandLine.getClassOption(BIND_ADDRESS_MANAGEMENT_OPTION); + } else if (expression.equals(BIND_MASTER_ADDRESS_SYSPROP)) { + resolvedValue = commandLine.getClassOption(BIND_MASTER_ADDRESS_OPTION); } + if (resolvedValue == null) { resolvedValue = commandLine.getSystemProperties().get(expression); } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java index 480c99b..1bf6fc7 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java @@ -41,18 +41,29 @@ public class XmlFileReadingTest { public void domainController1() throws Exception { URL url = getClass().getClassLoader().getResource("host1.xml"); HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); - HostPort hp = hostConfig.getHostPort(); + HostPort hp = hostConfig.getHostPort(new AS7CommandLine(new String[] { "java", "foo.Main", + "org.jboss.as.host-controller" })); assert hp.isLocal : "DC is not local as expected: " + hp; } public void domainController2() throws Exception { URL url = getClass().getClassLoader().getResource("host2.xml"); HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); - HostPort hp = hostConfig.getHostPort(); + HostPort hp = hostConfig.getHostPort(new AS7CommandLine(new String[] { "java", "foo.Main", + "org.jboss.as.host-controller" })); assert "192.168.100.1".equals(hp.host) : "DC is at " + hp.host; assert hp.port == 9559 : "DC port is at " + hp.port; } + public void domainController3() throws Exception { + URL url = getClass().getClassLoader().getResource("host3.xml"); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); + HostPort hp = hostConfig.getHostPort(new AS7CommandLine(new String[] { "java", "foo.Main", + "org.jboss.as.host-controller", "--master-address=192.168.123.123" })); + assert "192.168.123.123".equals(hp.host) : "DC is at " + hp.host; + assert hp.port == 1234 : "DC port is at " + hp.port; + } + public void testXpath70() throws Exception { URL url = getClass().getClassLoader().getResource("standalone70.xml"); diff --git a/modules/plugins/jboss-as-7/src/test/resources/host3.xml b/modules/plugins/jboss-as-7/src/test/resources/host3.xml new file mode 100644 index 0000000..aa2d705 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/test/resources/host3.xml @@ -0,0 +1,91 @@ + + +<host xmlns="urn:jboss:domain:1.1" + name="master"> + + <management> + <security-realms> + <security-realm name="ManagementRealm"> + <authentication> + <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/> + </authentication> + </security-realm> + </security-realms> + <management-interfaces> + <native-interface security-realm="ManagementRealm"> + <socket interface="management" port="9999"/> + </native-interface> + <http-interface security-realm="ManagementRealm"> + <socket interface="management" port="9990"/> + </http-interface> + </management-interfaces> + </management> + + <domain-controller> +  + <remote host="${jboss.domain.master.address}" port="${jboss.domain.master.port:1234}" /> + </domain-controller> + + <interfaces> + <interface name="management"> + <inet-address value="${jboss.bind.address.management:127.0.0.1}"/> + </interface> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <jvms> + <jvm name="default"> + <heap size="64m" max-size="128m"/> + </jvm> + </jvms> + + <servers> + <server name="server-one" group="main-server-group"> +  + <jvm name="default"> +  + </jvm> + </server> + + <server name="server-two" group="main-server-group" auto-start="true"> +  + <socket-binding-group ref="standard-sockets" port-offset="150"/> + <jvm name="default"> + <heap size="64m" max-size="256m"/> + </jvm> + </server> + + <server name="server-three" group="other-server-group" auto-start="false"> +  + <socket-binding-group ref="ha-sockets" port-offset="250"/> + </server> + </servers> +</host> commit d856c518a5584ea6cba491bc8d188660b555d5ec Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Apr 25 19:26:40 2012 -0400 Reapply logging subsystem cleanup removed by revert. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 3359438..507eabe 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2166,14 +2166,7 @@ </results> </operation> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2224,14 +2217,7 @@ <c:simple-property name="path" readOnly="true" default="console-handler"/> </plugin-configuration> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2271,14 +2257,7 @@ <c:simple-property name="path" readOnly="true" default="custom-handler"/> </plugin-configuration> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2323,14 +2302,7 @@  - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2405,14 +2377,7 @@  - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2510,14 +2475,7 @@  - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> commit 32a4a6180e8f1ee813bc395452e4c0aaf800ab8c Merge: f0e3fe9 a3fcd70 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Apr 25 15:33:55 2012 -0700 Merge branch 'BZ805545' commit a3fcd70ab1ec92d8b258f4c1f928ee32e4f40d2e Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Apr 25 15:28:38 2012 -0700 [BZ 805545] Improve the usability of the Resource Metric Collection Schedule table. Make the collection intervals update properly after in-place edit. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java index a5d932a..9d029ef 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java @@ -23,12 +23,11 @@ import com.smartgwt.client.types.ListGridEditEvent; import com.smartgwt.client.types.RowEndEditAction; import com.smartgwt.client.types.SortDirection; import com.smartgwt.client.widgets.form.fields.CheckboxItem; +import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.MeasurementScheduleCriteria; -import org.rhq.enterprise.gui.coregui.client.components.form.DurationItem; -import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync; @@ -36,7 +35,6 @@ import org.rhq.enterprise.gui.coregui.client.util.Log; import java.util.ArrayList; import java.util.List; -import java.util.TreeSet; /** * A view that displays a non-paginated table of {@link org.rhq.core.domain.measurement.MeasurementSchedule measurement @@ -81,7 +79,6 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { getListGrid().setFields(listGridFields.toArray(new ListGridField[listGridFields.size()])); getListGrid().setCanEdit(true); getListGrid().setModalEditing(true); - //getListGrid().setEditByCell(true); getListGrid().setEditEvent(ListGridEditEvent.CLICK); getListGrid().setAutoSaveEdits(false); getListGrid().setListEndEditAction(RowEndEditAction.DONE); @@ -98,11 +95,7 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { @Override public void onChange(com.smartgwt.client.widgets.form.fields.events.ChangeEvent event) { boolean enabled = Boolean.valueOf(event.getItem().getValue() + ""); - Log.debug("Enabled/Disable Measurement: "+event.getItem().getFieldName()+ Boolean.valueOf(event.getItem().getValue() + "")); - ListGridRecord[] records = getListGrid().getSelectedRecords(); - Log.debug(" * Number of Records selected: "+records.length); - Log.debug(" * Number of Records selected: "+records[0].getAttributeAsString(SchedulesDataSource.ATTR_DISPLAY_NAME)); if(!enabled){ enableSchedules(); }else { @@ -114,14 +107,16 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { ListGridField intervalField = getListGrid().getField(SchedulesDataSource.ATTR_INTERVAL); - TreeSet<TimeUnit> supportedUnits = new TreeSet<TimeUnit>(); - supportedUnits.add(TimeUnit.SECONDS); - supportedUnits.add(TimeUnit.MINUTES); - supportedUnits.add(TimeUnit.HOURS); - supportedUnits.add(TimeUnit.DAYS); - DurationItem durationItem = new DurationItem("duration","Duration", - TimeUnit.MILLISECONDS, supportedUnits, false, false, this); - intervalField.setEditorType(durationItem); + final ScheduleTableCollectionWidget collectionIntervalWidget = new ScheduleTableCollectionWidget("collectionInterval", this); + + collectionIntervalWidget.addChangeHandler(new com.smartgwt.client.widgets.form.fields.events.ChangeHandler() { + @Override + public void onChange(ChangeEvent event) { + Log.debug(" Collection Interval: "+ collectionIntervalWidget.getValue()); + updateSchedules(collectionIntervalWidget.getInterval()); + } + }); + intervalField.setEditorType(collectionIntervalWidget); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/ScheduleTableCollectionWidget.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/ScheduleTableCollectionWidget.java new file mode 100644 index 0000000..6600cf8 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/ScheduleTableCollectionWidget.java @@ -0,0 +1,179 @@ +/* + * 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.coregui.client.inventory.common; + +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.CanvasItem; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.SpinnerItem; +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.ShowValueEvent; +import com.smartgwt.client.widgets.form.fields.events.ShowValueHandler; +import com.smartgwt.client.widgets.form.validator.IntegerRangeValidator; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; + +import java.util.LinkedHashMap; + +/** + * This widget is used inside the ListGrid controls when editing the collection interval + * in place. It shows up inside the grid cell when you click on it to edit the cell. The + * control consists of a collection interval spinner for entering the collection interval + * time period and a unit of measure SelectItem to choose the time measurement units. + * + * @author Mike Thompson + */ +public class ScheduleTableCollectionWidget extends CanvasItem { + private static final Messages MSG = CoreGUI.getMessages(); + + private static final String UNITS_SECONDS = "s"; + private static final String UNITS_MINUTES = "m"; + private static final String UNITS_HOURS = "h"; + + private DynamicForm form; + private SpinnerItem collectionIntervalSpinnerItem = new SpinnerItem(); + private IntegerRangeValidator integerRangeValidator = new IntegerRangeValidator(); + private SelectItem unitsItem = new SelectItem(); + + // Maps values to labels for the units select list. + private static final LinkedHashMap<String, String> VALUE_MAP = new LinkedHashMap<String, String>(); + static { + VALUE_MAP.put(UNITS_SECONDS, MSG.common_unit_seconds()); + VALUE_MAP.put(UNITS_MINUTES, MSG.common_unit_minutes()); + VALUE_MAP.put(UNITS_HOURS, MSG.common_unit_hours()); + } + + private AbstractSchedulesView schedulesView; + + public ScheduleTableCollectionWidget(String locatorId, final AbstractSchedulesView schedulesView) { + super(locatorId); + this.schedulesView = schedulesView; + + form = new LocatableDynamicForm("collectionIntervalForm"); + form.setNumCols(2); + collectionIntervalSpinnerItem.setWidth(50); + collectionIntervalSpinnerItem.setShowTitle(false); + integerRangeValidator.setMin(1); + integerRangeValidator.setMax(10000000); // avoids exceptions if someone enters really large nums; no one needs to go higher anyway + collectionIntervalSpinnerItem.setValidators(integerRangeValidator); + collectionIntervalSpinnerItem.addChangedHandler(new ChangedHandler() { + @Override + public void onChanged(ChangedEvent changedEvent) { + Long collectionInterval = Long.valueOf(changedEvent.getItem().getValue() + ""); + Log.debug("Collection interval value Changed to: " + collectionInterval + " " + unitsItem.getValueAsString()); + schedulesView.updateSchedules(convertToMillis(collectionInterval, unitsItem.getValueAsString())); + } + }); + + // Specify a null title so no label is rendered to the left of the combo box. + unitsItem.setValueMap(VALUE_MAP); + unitsItem.setDefaultValue(UNITS_MINUTES); + unitsItem.setShowTitle(false); + unitsItem.setWidth(100); + unitsItem.addChangedHandler(new ChangedHandler() { + @Override + public void onChanged(ChangedEvent event) { + + Long collectionInterval = Long.valueOf(collectionIntervalSpinnerItem.getValueAsString()); + Log.debug("Collection interval units changed to: " + unitsItem.getValueAsString()); + String value = (String) event.getValue(); + if (value.equals(UNITS_SECONDS)) { + integerRangeValidator.setMin(30); + } else { + integerRangeValidator.setMin(1); + } + schedulesView.updateSchedules(convertToMillis(collectionInterval, unitsItem.getValueAsString())); + } + }); + + addShowValueHandler(new ShowValueHandler() { + @Override + public void onShowValue(ShowValueEvent event) { + Integer rawValue = (Integer) event.getDataValue(); + convertToProperUnits(rawValue); + } + }); + + if (!schedulesView.hasWriteAccess()) { + collectionIntervalSpinnerItem.setDisabled(true); + unitsItem.setDisabled(true); + } + + form.setFields(collectionIntervalSpinnerItem, unitsItem); + setCanvas(form); + } + + private void convertToProperUnits(long milliseconds){ + if (milliseconds > 1000) { + long seconds = milliseconds / 1000; + if (seconds >= 60) { + long minutes = seconds / 60; + seconds = seconds % 60; + if (minutes > 60) { + long hours = minutes / 60; + collectionIntervalSpinnerItem.setValue(hours); + minutes = minutes % 60; + unitsItem.setValue(UNITS_HOURS); + collectionIntervalSpinnerItem.setStep(1); + } + if (minutes != 0) { + collectionIntervalSpinnerItem.setValue(minutes); + unitsItem.setValue(UNITS_MINUTES); + collectionIntervalSpinnerItem.setStep(5); + } + } + if (seconds != 0) { + unitsItem.setValue(UNITS_SECONDS); + collectionIntervalSpinnerItem.setValue(seconds); + collectionIntervalSpinnerItem.setStep(5); + } + } + } + + private long convertToMillis(long collectionInterval, String timeUnitString){ + long millis = 0; + + if(timeUnitString.equals(UNITS_SECONDS)){ + millis = collectionInterval * 1000; + + }else if(timeUnitString.equals(UNITS_MINUTES)){ + millis = collectionInterval * (60 * 1000); + + }else if(timeUnitString.equals(UNITS_HOURS)){ + millis = collectionInterval * (60 * 60 * 1000); + } + return millis; + + } + + + public Long getInterval() { + + if (collectionIntervalSpinnerItem.getValue() == null || !collectionIntervalSpinnerItem.validate()) { + return null; + } + Long intervalValue = Long.valueOf(collectionIntervalSpinnerItem.getValueAsString()); + return convertToMillis(intervalValue, unitsItem.getValueAsString()); + } + +} + commit f0e3fe97ee27a406a396c4f0794c343185a80a08 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Apr 25 17:17:04 2012 -0400 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 diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index f32feb2..4c1edc8 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -45,11 +45,12 @@ public class ServerStartScriptDiscoveryUtility { // Generic OS-level env vars that should be in every process's environment. private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList( - "PATH", - "LD_LIBRARY_PATH" + "PATH", + "LD_LIBRARY_PATH" )); static { if (File.pathSeparatorChar == '\\') { + CORE_ENV_VAR_NAME_INCLUDES.add("OS"); // many batch files use this to figure out if the OS type is NT or 9x CORE_ENV_VAR_NAME_INCLUDES.add("SYSTEMROOT"); // required on Windows to avoid winsock create errors } } diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index 2484718..df9e9a5 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -144,6 +144,12 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom "MAX_FD", // "PROFILER" // )); + + // If OS is Windows, add env vars that are only used by the batch files. + if (File.pathSeparatorChar == '\\') { + START_SCRIPT_ENV_VAR_NAMES.add("ECHO"); + START_SCRIPT_ENV_VAR_NAMES.add("NOPAUSE"); + } } private final Log log = LogFactory.getLog(this.getClass()); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index a2596af..6f6eae0 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -76,21 +76,35 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent private static final String RHQADMIN = "rhqadmin"; private static final String RHQADMIN_ENCRYPTED = "35c160c1f841a889d4cda53f0bfc94b6"; + // The list of environment vars that the AS7 start script will use if they are set. private static final Set<String> START_SCRIPT_ENV_VAR_NAMES = new LinkedHashSet<String>(); static { START_SCRIPT_ENV_VAR_NAMES.addAll(Arrays.asList( // "RUN_CONF", // + "STANDALONE_CONF", // + "DOMAIN_CONF", // "MAX_FD", // "PROFILER", // "JAVA_HOME", // "JAVA", // "JAVA_OPTS", // "PRESERVE_JAVA_OPTS", // + "PROCESS_CONTROLLER_JAVA_OPTS", // + "HOST_CONTROLLER_JAVA_OPTS", // + "JAVAC_JAR", // "JBOSS_HOME", // + "JBOSS_MODULES_SYSTEM_PKGS", // + "JBOSS_MODULEPATH", // "JBOSS_BASE_DIR", // "JBOSS_LOG_DIR", // "JBOSS_CONFIG_DIR" // )); + + // If OS is Windows, add env vars that are only used by the batch files. + if (File.pathSeparatorChar == '\\') { + START_SCRIPT_ENV_VAR_NAMES.add("ECHO"); + START_SCRIPT_ENV_VAR_NAMES.add("NOPAUSE"); + } } // e.g.: -mp /opt/jboss-as-7.1.1.Final/modules diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index ac10e82..98dda57 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -196,8 +196,9 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom } processExecution.setEnvironmentVariables(startScriptEnv); - String homeDir = getHomeDir(); - processExecution.setWorkingDirectory(homeDir); + // When running on Windows 9x, standalone.bat and domain.bat need the cwd to be the AS bin dir in order to find + // standalone.bat.conf and domain.bat.conf respectively. + processExecution.setWorkingDirectory(startScriptFile.getParent()); processExecution.setCaptureOutput(true); processExecution.setWaitForCompletion(15000L); // 15 seconds // TODO: Should we wait longer than 15 seconds? processExecution.setKillOnTimeout(false); @@ -274,16 +275,12 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom startScriptFile = new File(mode.getStartScript()); } if (!startScriptFile.isAbsolute()) { - String homeDir = getHomeDir(); + File homeDir = serverPluginConfig.getHomeDir(); startScriptFile = new File(homeDir, startScriptFile.getPath()); } return startScriptFile; } - private String getHomeDir() { - return pluginConfiguration.getSimpleValue("homeDir", null); - } - private boolean waitForServerToStart() { boolean up = false; int count = 0; commit bdb7941db69414f7f0f104d2f88d623e4da68754 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Apr 25 16:03:12 2012 -0400 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 diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java index 4763be1..1c9e08c 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java @@ -107,11 +107,11 @@ public class JavaCommandLine { public JavaCommandLine(String[] args, boolean includeSystemPropertiesFromClassArguments, Set<OptionValueDelimiter> shortClassOptionValueDelims, Set<OptionValueDelimiter> longClassOptionValueDelims) { if (args == null) { - throw new IllegalArgumentException("'commandLine' parameter is null."); + throw new IllegalArgumentException("'args' parameter is null."); } if (args.length == 0) { - throw new IllegalArgumentException("'commandLine' parameter is an empty array."); + throw new IllegalArgumentException("'args' parameter is an empty array."); } this.includeSystemPropertiesFromClassArguments = includeSystemPropertiesFromClassArguments; @@ -130,15 +130,17 @@ public class JavaCommandLine { throw new IllegalArgumentException("'longClassOptionValueDelims' parameter is an empty set."); } - if (log.isDebugEnabled()) { - log.debug("Parsing " + toString()); - } + // Wrap as list and store as field for use by getArguments() and toString(). + this.arguments = Arrays.asList(args); parseCommandLine(args); } private void parseCommandLine(String[] args) { - this.arguments = Arrays.asList(args); + if (log.isDebugEnabled()) { + log.debug("Parsing " + this + "..."); + } + this.javaExecutable = new File(args[0]); this.classPath = new ArrayList<String>(); this.systemProperties = new LinkedHashMap<String, String>(); @@ -340,10 +342,12 @@ public class JavaCommandLine { */ @Nullable public String getClassOption(CommandLineOption option) { - String optionValue; - if (option.getLongName() != null && this.longClassOptionNameToOptionValueMap.containsKey(option.getLongName())) { + String optionValue = null; + // Note, we never store null values in either of the option value maps. + + if ((option.getLongName() != null) && this.longClassOptionNameToOptionValueMap.containsKey(option.getLongName())) { optionValue = this.longClassOptionNameToOptionValueMap.get(option.getLongName()); - if (optionValue != null && !option.isExpectsValue()) { + if (!optionValue.isEmpty() && !option.isExpectsValue()) { // TODO: Store the delims used for each of the options in another set of maps, so we can handle // things differently here depending on what delim was used. if (this.longClassOptionValueDelims.equals(EnumSet.of(OptionValueDelimiter.EQUALS_SIGN))) { @@ -353,9 +357,11 @@ public class JavaCommandLine { optionValue = ""; } } - } else if (option.getShortName() != null && this.shortClassOptionNameToOptionValueMap.containsKey(option.getShortName())) { + } + + if ((optionValue == null) && (option.getShortName() != null) && this.shortClassOptionNameToOptionValueMap.containsKey(option.getShortName())) { optionValue = this.shortClassOptionNameToOptionValueMap.get(option.getShortName()); - if (optionValue != null && !option.isExpectsValue()) { + if (!optionValue.isEmpty() && !option.isExpectsValue()) { // TODO: Store the delims used for each of the options in another set of maps, so we can handle // things differently here depending on what delim was used. if (this.shortClassOptionValueDelims.equals(EnumSet.of(OptionValueDelimiter.EQUALS_SIGN))) { @@ -365,12 +371,11 @@ public class JavaCommandLine { optionValue = ""; } } - } else { - optionValue = null; - if (option.isExpectsValue()) { - log.warn("Class option [" + option + "] expects a value, but no value was specified on command line [" - + this + "]."); - } + } + + if (optionValue != null && optionValue.isEmpty() && option.isExpectsValue()) { + log.warn("Class option [" + option + "] expects a value, but no value was specified on command line [" + + this + "]."); } return optionValue; @@ -383,10 +388,10 @@ public class JavaCommandLine { @Override public String toString() { - return "JavaCommandLine [arguments=" + Arrays.asList(arguments) // - + ", includeSystemPropertiesFromClassArguments=" + includeSystemPropertiesFromClassArguments // - + ", shortClassOptionFormat=" + Arrays.asList(shortClassOptionValueDelims) // - + ", longClassOptionFormat=" + Arrays.asList(longClassOptionValueDelims) + "]"; + return "JavaCommandLine[arguments=" + this.arguments // + + ", includeSystemPropertiesFromClassArguments=" + this.includeSystemPropertiesFromClassArguments // + + ", shortClassOptionFormat=" + this.shortClassOptionValueDelims // + + ", longClassOptionFormat=" + this.longClassOptionValueDelims + "]"; } } diff --git a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java index e6dc4ae..a8bab91 100644 --- a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java +++ b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java @@ -122,10 +122,15 @@ public class JavaCommandLineTest { Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("x", null, true)), "blah"); Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "novaluelong", false)), ""); Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "novaluelong", true)), ""); - Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "long", false)), "longval"); - Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "long", true)), "longval"); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("l", "long", false)), "longval"); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("l", "long", true)), "longval"); Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("n", null, false)), ""); Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("n", null, true)), ""); + + javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", + "-ea", "-cp", cp, "org.example.Main", "-x", "blah", "--novaluelong", "-l", "longval", "-n"); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("l", "long", false)), ""); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("l", "long", true)), "longval"); } public void testGetAbsentClassOption() throws Exception { @@ -148,4 +153,11 @@ public class JavaCommandLineTest { Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption("n", null, false))); } + public void testToString() throws Exception { + String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; + JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", + "-ea", "-cp", cp, "org.example.Main", "-x", "blah", "--novaluelong", "--long=longval", "-n"); + Assert.assertNotNull(javaCommandLine.toString()); + } + } commit ea33f55739eb3077a2f87b02ab2cdbe72dc0a16c Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Apr 25 21:52:58 2012 +0200 Add a sleep to give the PC more time to start up resource containers. diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java index 248847e..c6cb36a 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java @@ -21,6 +21,7 @@ public class GenericJBossAS7PluginTest extends AbstractJBossAS7PluginTest { @Test(priority = 1) @RunDiscovery public void testAllResourceComponentsStarted() throws Exception { + Thread.sleep(30*1000L); assertAllResourceComponentsStarted(); } commit af75487636b8c7e50b8c366615635cc1783ff08d Author: Denis Krusko <kruskod(a)gmail.com> Date: Wed Apr 25 21:52:27 2012 +0200 Add some Russian translations (sync to version 9b4908a5bb of the translation project) diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties new file mode 100644 index 0000000..f18cd9a --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -0,0 +1,2468 @@ +## +## RHQ GUI i18n Messages - Default (English) +## +## Developers: See the following wiki page for how to work with this file: +## +## http://rhq-project.org/display/RHQ/Working+with+the+Resource+Bundles +## +#################################### +#common_alert_high = High +#common_alert_low = Low +#common_alert_medium = Medium +#common_buildInfo_gwtVersion = ${gwt.version} +#common_button_ack = Acknowledge +#common_button_ack_all = Acknowledge All +#common_button_add = Add +#common_button_advanced = Advanced... +#common_button_apply = Apply +#common_button_cancel = Cancel +#common_button_close = Close +#common_button_compare = Compare +#common_button_create_child = Create Child +#common_button_delete = Delete +#common_button_delete_all = Delete All +#common_button_disable = Disable +#common_button_dump_sysInfo_to_log = Dump system info +#common_button_edit = Edit +#common_button_enable = Enable +#common_button_execute = Execute +#common_button_finish = Finish +#common_button_fixedWidth = Fixed Width +#common_button_import = Import +#common_button_new = New +#common_button_next = Next +#common_button_ok = OK +#common_button_previous = Previous +#common_button_purge = Purge +#common_button_purgeAll = Purge All +#common_button_refresh = Refresh +#common_button_reset = Reset +#common_button_save = Save +#common_button_scaleToFit = Scale To Fit +#common_button_schedule = Schedule +#common_button_search = Search +#common_button_set = Set +#common_button_showDetails = Show Details... +#common_button_uninventory = Uninventory +#common_calendar_april_short = apr +#common_calendar_august_short = aug +#common_calendar_december_short = dec +#common_calendar_february_short = feb +#common_calendar_january_short = jan +#common_calendar_july_short = jul +#common_calendar_june_short = jun +#common_calendar_march_short = mar +#common_calendar_may_short = may +#common_calendar_november_short = nov +#common_calendar_october_short = oct +#common_calendar_september_short = sept +#common_label_ago = {0} ago +#common_label_all = ALL +#common_label_all_resources = all resources +#common_label_day = day +#common_label_error = Error +#common_label_filters = Filters +#common_label_hour = hour +#common_label_item = item +#common_label_items = items +#common_label_month = month +#common_label_none = none +#common_label_none2 = none +#common_label_role = role +#common_label_roles = roles +#common_label_scheduled_operations = scheduled operations +#common_label_selected_resources = selected resources +#common_label_unlimited = unlimited +#common_label_user = user +#common_label_users = users +#common_label_week = week +#common_label_yesterday = Yesterday +#common_msg_areYouSure = Are You Sure? +#common_msg_asyncTimeout = {0}. This occurred because the server is taking a long time to complete this request. Please be aware that the server may still be processing your request and it may complete shortly. You can check the server logs to see if any abnormal errors occurred. +#common_msg_changeAutoDetected = Change auto-detected +#common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}? +#common_msg_emphasizedNotePrefix = NOTE: +#common_msg_loading = Loading... +#common_msg_noItemsToShow = No items to show +#common_msg_notYetImplemented = Not Yet Implemented +#common_msg_see_more = see more... +#common_msg_step_x_of_y = Step {0} of {1} +#common_severity_debug = Debug +#common_severity_error = Error +#common_severity_fatal = Fatal +#common_severity_info = Info +#common_severity_warn = Warn +#common_status_canceled = Canceled +#common_status_deferred = Deferred +#common_status_failed = Failed +#common_status_inprogress = In Progress +#common_status_nochange = No Change +#common_status_partial = Partial +#common_status_success = Success +#common_status_timedOut = Timed Out +#common_status_unknown = Unknown +#common_title_add_column = Add Column +#common_title_add_graph_to_view = Add Graph to Monitor View +#common_title_add_portlet = Add Portlet +#common_title_address = Address +#common_title_alerts = Alerts +#common_title_alerts_range = Alert Range +#common_title_ancestry = Ancestry +#common_title_availability = Availability +#common_title_available_resources = Available Resources +#common_title_average_metrics = Average Metrics per Minute +#common_title_background = Background +#common_title_bundle = Bundle +#common_title_bundles = Bundles +#common_title_category = Category +#common_title_change_refresh_time = Refresh Interval +#common_title_columns = Columns +#common_title_compare_metrics = Compare Metrics +#common_title_compatibleGroups = Compatible Groups +#common_title_compatibleGroups_total = Compatible Group Total +#common_title_component_errors = Component Errors +#common_title_config_update_status = Update Status +#common_title_configuration = Configuration +#common_title_count = Count +#common_title_createTime = Creation Time +#common_title_custom = Custom +#common_title_dashboard_name = Dashboard Name +#common_title_dateCreated = Date Created +#common_title_dateRange = Date Range +#common_title_default = Default +#common_title_definition = Definition +#common_title_definitions = Definitions +#common_title_description = Description +#common_title_details = Details +#common_title_display = Display +#common_title_display_name = Display Name +#common_title_duration = Duration +#common_title_edit = Edit? +#common_title_edit_mode = Edit Mode +#common_title_enabled = Enabled? +#common_title_end = End +#common_title_generalProp = General Properties +#common_title_group = Group +#common_title_group_def_total = Group Definition Total +#common_title_group_member_health = Group Member Health +#common_title_groups = Groups +#common_title_help = Help +#common_title_host = Host +#common_title_id = ID +#common_title_id_parent = Parent ID +#common_title_in_compliance = In Compliance? +#common_title_interval = Interval +#common_title_inventory = Inventory +#common_title_inventorySummary = Inventory Summary +#common_title_kind = Kind +#common_title_lastUpdated = Last Updated +#common_title_lastUpdatedBy = Last Updated By +#common_title_ldapGroups = LDAP Groups +#common_title_mashup = Mashup +#common_title_members_reporting = Members Reporting +#common_title_message = Message +#common_title_metric = Metric +#common_title_metric_chart = Metric Chart +#common_title_mixedGroups = Mixed Groups +#common_title_mixedGroups_total = Mixed Group Total +#common_title_name = Name +#common_title_new_dashboard = New Dashboard +#common_title_numeric_metrics = Numeric Metrics +#common_title_numeric_type = Numeric Type +#common_title_operation = Operation +#common_title_operation_status = Operation Status +#common_title_operations = Operations +#common_title_operations_range = Operation Range +#common_title_over = Over +#common_title_password = Password +#common_title_path = Path +#common_title_permissions = Permissions +#common_title_platform = Platform +#common_title_platform_total = Platform Total +#common_title_plugin = Plugin +#common_title_port = Port +#common_title_providers = Providers +#common_title_recent_alerts = Recent Alerts +#common_title_recent_bundle_deployments = Recent Bundle Deployments +#common_title_recent_configuration_updates = Recent Configuration Updates +#common_title_recent_drifts = Recent Drift +#common_title_recent_event_counts = Recent Event Counts +#common_title_recent_measurements = Recent Measurements +#common_title_recent_oob_metrics = Recent Out of Bound metrics +#common_title_recent_operations = Recent Operations +#common_title_recent_pkg_history = Recent Package History +#common_title_recently_added = Recently Added +#common_title_remove_column = Remove Column +#common_title_repositories = Repositories +#common_title_resource = Resource +#common_title_resourceGroups = Resource Groups +#common_title_resource_group = Resource Group +#common_title_resource_id = Resource ID +#common_title_resource_inventory = Resource Inventory +#common_title_resource_key = Resource Key +#common_title_resource_name = Resource Name +#common_title_resource_type = Resource Type +#common_title_resources = Resources +#common_title_results_count = Results Count +#common_title_results_count_tooltip = Displays this number of results +#common_title_role = Role +#common_title_roles = Roles +#common_title_scheduled_operations = Scheduled Operations +#common_title_search = Search +#common_title_selected_resources = Selected Resources +#common_title_server = Server +#common_title_server_total = Server Total +#common_title_service = Service +#common_title_service_total = Service Total +#common_title_settings = Settings +#common_title_show = Show +#common_title_sort_order = Sort Order +#common_title_sort_order_tooltip = Sets sort order for results. +#common_title_start = Start +#common_title_status = Status +#common_title_stop = Stop +#common_title_summary = Summary +#common_title_tag_cloud = Tag Cloud +#common_title_the = The +#common_title_timestamp = Date/Time +#common_title_total = Total +#common_title_type = Type +#common_title_units = Units +#common_title_user = User +#common_title_users = Users +#common_title_value = Value +#common_title_version = Version +#common_title_view_mode = View Mode +#common_title_web_address = Web Address +#common_title_welcome = Welcome +#common_unit_abbrev_bits = b +#common_unit_abbrev_bytes = B +#common_unit_abbrev_celsius = C +#common_unit_abbrev_days = d +#common_unit_abbrev_fahrenheight = F +#common_unit_abbrev_gigabits = Gb +#common_unit_abbrev_gigabytes = GB +#common_unit_abbrev_hours = h +#common_unit_abbrev_jiffys = j +#common_unit_abbrev_kelvin = K +#common_unit_abbrev_kilobits = Kb +#common_unit_abbrev_kilobytes = KB +#common_unit_abbrev_megabits = Mb +#common_unit_abbrev_megabytes = MB +#common_unit_abbrev_microseconds = us +#common_unit_abbrev_milliseconds = ms +#common_unit_abbrev_minutes = m +#common_unit_abbrev_nanoseconds = ns +#common_unit_abbrev_percentage = % +#common_unit_abbrev_petabits = Pb +#common_unit_abbrev_petabytes = PB +#common_unit_abbrev_seconds = s +#common_unit_abbrev_terabits = Tb +#common_unit_abbrev_terabytes = TB +#common_unit_days = days +#common_unit_days2 = days +#common_unit_hours = hours +#common_unit_milliseconds = milliseconds +#common_unit_minute = minute +#common_unit_minutes = minutes +#common_unit_months = months +#common_unit_seconds = seconds +#common_unit_times = times +#common_unit_weeks = weeks +#common_unit_years = years +#common_val_for = for +#common_val_n1st = {0}st +#common_val_n2nd = {0}nd +#common_val_n3rd = {0}rd +#common_val_na = N/A +#common_val_never = Never +#common_val_no = No +#common_val_no_lower = no +#common_val_none = None +#common_val_nth = {0}th +#common_val_yes = Yes +#common_val_yes_lower = yes +#dataSource_ContentRepoTree_error_load = Error loading repositories +#dataSource_ContentRepoTree_field_parentId = Parent ID +#dataSource_bundle_loadFailed = Failed to load Bundle data +#dataSource_configurationHistory_clickToSeeError = Double click to see error message... +#dataSource_configurationHistory_currentConfig = This is the current configuration +#dataSource_configurationHistory_dateCompleted = Date Completed +#dataSource_configurationHistory_dateSubmitted = Date Submitted +#dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history. +#dataSource_configurationHistory_updateType = Update Type +#dataSource_configurationHistory_updateType_group = Group +#dataSource_configurationHistory_updateType_individual = Individual +#dataSource_definitions_loadFailed = Failed to load metric definitions +#dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information +#dataSource_measurementOob_field_factor = Out of Range Factor (%) +#dataSource_measurementOob_field_formattedBaseband = Band +#dataSource_measurementOob_field_formattedOutlier = Outlier +#dataSource_measurementOob_field_parentName = Parent +#dataSource_measurementOob_field_resourceName = Resource +#dataSource_measurementOob_field_scheduleName = Metric +#dataSource_operationHistory_error_fetchFailure = Failure loading operation histories. +#dataSource_operationHistory_field_createdTime = Created Time +#dataSource_operationHistory_field_operationName = Operation Name +#dataSource_operationHistory_field_startedTime = Started Time +#dataSource_operationHistory_field_subject = Requester +#dataSource_operationSchedule_field_description = Notes +#dataSource_operationSchedule_field_id = Schedule ID +#dataSource_operationSchedule_field_nextFireTime = Next Execution +#dataSource_operationSchedule_field_operationDisplayName = Operation +#dataSource_operationSchedule_field_operationName = Operation +#dataSource_operationSchedule_field_subject = Owner +#dataSource_operationSchedule_field_timeout = Timeout (in seconds) +#dataSource_platforms_field_cpu = CPU +#dataSource_platforms_field_memory = Memory +#dataSource_platforms_field_swap = Swap +#dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability. +#dataSource_problemResources_field_available = Current Availability +#dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. +#dataSource_recentOperations_field_location = Location +#dataSource_recentOperations_field_operation = Operation +#dataSource_recentOperations_field_resource = Resource +#dataSource_recentOperations_field_status = Status +#dataSource_resourceErrors_clickStatusIcon = Click the icon for more details +#dataSource_resourceErrors_deleteFailure = Failed to delete resource errors +#dataSource_resourceErrors_deleteSuccess = You have successfully deleted [{0}] resource error messages. +#dataSource_resourceErrors_error_fetchFailure = Failed to find Resource errors for Resource with id [{0}]. +#dataSource_resourceErrors_field_errorType = Error Type +#dataSource_resourceErrors_field_summary = Summary +#dataSource_resourceErrors_field_timeOccured = Time +#dataSource_resourceGroups_loadFailed = Failed to load Resource Groups +#dataSource_resources_field_discoveryTime = Discovery Time +#dataSource_resources_field_importTime = Import Time +#dataSource_resources_field_key = Key +#dataSource_resources_field_lastModifiedTime = Last Modified Time +#dataSource_resources_field_lastModifier = Last Modifier +#dataSource_resources_field_location = Location +#dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request. +#dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}. +#dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class) +#dataSource_rpc_no = no +#dataSource_rpc_yes = yes +#dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. +#dataSource_scheduledOperations_field_location = Location +#dataSource_scheduledOperations_field_operation = Operation +#dataSource_scheduledOperations_field_resource = Resource +#dataSource_schedules_disableFailure_group = Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}] +#dataSource_schedules_disableFailure_resource = Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}] +#dataSource_schedules_disableSuccessful_concise = You have disabled the collection of [{0}] measurements +#dataSource_schedules_disableSuccessful_full_group = You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}] +#dataSource_schedules_disableSuccessful_full_resource = You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}] +#dataSource_schedules_enableFailure_group = Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}] +#dataSource_schedules_enableFailure_resource = Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}] +#dataSource_schedules_enableSuccessful_concise = You have enabled the collection of [{0}] measurements +#dataSource_schedules_enableSuccessful_full_group = You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}] +#dataSource_schedules_enableSuccessful_full_resource = You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}] +#dataSource_schedules_field_resourceGroupId = Group ID +#dataSource_schedules_loadFailed = Failed to load metric schedules +#dataSource_schedules_loadFailedContext = Failed to load metric schedules for context [{0}] +#dataSource_schedules_loadFailedCriteria = Failed to load metric schedules for criteria [{0}] +#dataSource_schedules_updateFailure_group = Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds. +#dataSource_schedules_updateFailure_resource = Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds. +#dataSource_schedules_updateSuccessful_concise = A new collection interval of [{0}] seconds has been set on [{1}] measurements +#dataSource_schedules_updateSuccessful_full_group = A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}] +#dataSource_schedules_updateSuccessful_full_resource = A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}] +#dataSource_traits_failFetch = Failed to fetch traits for criteria [{0}]. +#dataSource_traits_field_definitionID = Definition ID +#dataSource_traits_field_lastChanged = Last Changed +#dataSource_traits_field_primaryKey = Primary Key +#dataSource_traits_field_trait = Trait +#dataSource_traits_group_field_groupId = Group ID +#dataSource_users_delete = Deleted user [{0}] +#dataSource_users_deleteFailed = Failed to delete user [{0}] +#dataSource_users_field_department = Department +#dataSource_users_field_emailAddress = Email Address +#dataSource_users_field_factive = Login Enabled? +#dataSource_users_field_firstName = First Name +#dataSource_users_field_id = ID +#dataSource_users_field_lastName = Last Name +#dataSource_users_field_ldap = LDAP Login? +#dataSource_users_field_name = User Name +#dataSource_users_field_passwordVerify = Verify Password +#dataSource_users_field_phoneNumber = Phone Number +#dataSource_users_invalidEmailAddress = Invalid email address. +#dataSource_users_passwordsDoNotMatch = Passwords do not match. +#datasource_roles_field_ldapGroups = LDAP Groups +#datasource_roles_field_subjects = Subjects +#datasource_templateSchedules_disabled = Disabled collection of selected metric [{0}]. +#datasource_templateSchedules_disabled_detailed = Disabled collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. +#datasource_templateSchedules_disabled_failed = Failed to disable collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. +#datasource_templateSchedules_enabled = Enabled collection of selected metric [{0}]. +#datasource_templateSchedules_enabled_detailed = Enabled collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. +#datasource_templateSchedules_enabled_failed = Failed to enable collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. +#datasource_templateSchedules_updated = Updated collection intervals of selected metric [{0}]. +#datasource_templateSchedules_updated_detail = Collection interval for metric [{0}] [{1}] by default for ResourceType with id [{2}] set to [{3}] seconds. +#datasource_templateSchedules_updated_failed = Failed to set collection interval to [{0}] seconds for metric [{1}] [{2}] by default for ResourceType with id [{3}]. +#favorites = Favorites +#favorites_groups = Favorite Groups +#favorites_recentlyViewed = Recently Viewed +#favorites_resources = Favorite Resources +#filter_from_date = From +#filter_to_date = To +#group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource +#util_ancestry_parentAncestry = Parent Ancestry for: +#util_errorHandler_nullException = exception was null +#util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. +#util_rpcManager_activeRequests = {0} Active Requests +#util_userPerm_loadFailGlobal = Failed to load your global permissions - none granted. +#util_userPerm_loadFailGroup = Failed to load your permissions for Resource Group with id [{0}] - none granted. +#util_userPerm_loadFailResource = Failed to load your permissions for Resource with id [{0}] - none granted. +#util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subject +#util_userSession_logoutFail = Failed to logout. +#util_widgetsField_unlimited = Unlimited +#view_aboutBox_allRightsReserved = All Rights Reserved. +#view_aboutBox_buildNumber = Build Number: +#view_aboutBox_failedToLoad = Failed to load product information. +#view_aboutBox_homepage = Homepage +#view_aboutBox_jbossByRedHat = JBoss by Red Hat +#view_aboutBox_title = About {0} +#view_aboutBox_version = Version: +#view_adminConfig_agentPlugins = Agent Plugins +#view_adminConfig_alertDefTemplates = Alert Definition Templates +#view_adminConfig_downloads = Downloads +#view_adminConfig_driftDefTemplates = Drift Definition Templates +#view_adminConfig_metricTemplates = Metric Collection Templates +#view_adminConfig_serverPlugins = Server Plugins +#view_adminConfig_systemSettings = System Settings +#view_adminContent_contentSources = Content Sources +#view_adminRoles_assignedGroups = Assigned Resource Groups +#view_adminRoles_assignedSubjects = Assigned Subjects +#view_adminRoles_failLdap = Failed to determine if LDAP configured - assuming no LDAP. +#view_adminRoles_failLdapGroups = Failed to retrieve available LDAP groups - assuming no LDAP groups. +#view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups available for role. +#view_adminRoles_failRoles = Failed to fetch roles. +#view_adminRoles_globalPerms = Global Permissions +#view_adminRoles_ldapGroups = LDAP Groups +#view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only +#view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. +#view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... +#view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... +#view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... +#view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... +#view_adminRoles_permissions_globalPermissions = Global Permissions +#view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +#view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. +#view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. +#view_adminRoles_permissions_isAuthorized = Authorized? +#view_adminRoles_permissions_isRead = Read? +#view_adminRoles_permissions_isWrite = Write? +#view_adminRoles_permissions_permDesc_manageBundles = can create, update, or delete provisioning bundles (viewing is implied for everyone) +#view_adminRoles_permissions_permDesc_manageInventory = has all Resource permissions, as described below, for all Resources; can create, update, and delete groups; and can import auto-discovered or manually discovered Resources +#view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete repositories of any user (everyone can create their own repositories), can associate content sources to repositories. +#view_adminRoles_permissions_permDesc_manageSecurity = can create, update, or delete users and roles - implies all other permissions +#view_adminRoles_permissions_permDesc_manageSettings = can modify the {0} Server configuration and perform any Server-related functionality +#view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception of their assigned roles +#view_adminRoles_permissions_permReadDesc_configure = view Resource configuration and Resource configuration revision history +#view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations and operation execution history +#view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED) view child Resource creation history +#view_adminRoles_permissions_permReadDesc_deleteChildResources = (IMPLIED) view child Resource deletion history +#view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties (name, description, version, etc.), connection settings, and connection settings history +#view_adminRoles_permissions_permReadDesc_manageAlerts = (IMPLIED) view alert definitions and alert history +#view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED) view installed and available packages; view package installation history +#view_adminRoles_permissions_permReadDesc_manageDrift = (IMPLIED) view drift definitions and drift history +#view_adminRoles_permissions_permReadDesc_manageEvents = (IMPLIED) view events +#view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric data and collection schedules +#view_adminRoles_permissions_permWriteDesc_configure = update Resource configuration; delete Resource configuration revision history items +#view_adminRoles_permissions_permWriteDesc_control = execute operations; delete operation execution history items +#view_adminRoles_permissions_permWriteDesc_createChildResources = create new child Resources (for child Resources of types that are creatable) +#view_adminRoles_permissions_permWriteDesc_deleteChildResources = uninventory resources; delete Resources (for Resources of types that are deletable) +#view_adminRoles_permissions_permWriteDesc_inventory = update Resource name, version, description, and connection settings; delete connection settings history items +#view_adminRoles_permissions_permWriteDesc_manageAlerts = create, update, and delete alert definitions; acknowledge and delete alert history items +#view_adminRoles_permissions_permWriteDesc_manageContent = subscribe to content sources; install and uninstall packages +#view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete drift definitions; and manage drift instances +#view_adminRoles_permissions_permWriteDesc_manageEvents = delete events +#view_adminRoles_permissions_permWriteDesc_manageMeasurements = update metric collection schedules +#view_adminRoles_permissions_perm_configure = Configure +#view_adminRoles_permissions_perm_control = Control +#view_adminRoles_permissions_perm_createChildResources = Create Child Resources +#view_adminRoles_permissions_perm_deleteChildResources = Delete Child Resources +#view_adminRoles_permissions_perm_inventory = Inventory +#view_adminRoles_permissions_perm_manageAlerts = Manage Alerts +#view_adminRoles_permissions_perm_manageBundles = Manage Bundles +#view_adminRoles_permissions_perm_manageContent = Manage Content +#view_adminRoles_permissions_perm_manageDrift = Manage Drift +#view_adminRoles_permissions_perm_manageEvents = Manage Events +#view_adminRoles_permissions_perm_manageInventory = Manage Inventory +#view_adminRoles_permissions_perm_manageMeasurements = Manage Measurements +#view_adminRoles_permissions_perm_manageRepositories = Manage Repositories +#view_adminRoles_permissions_perm_manageSecurity = Manage Security +#view_adminRoles_permissions_perm_manageSettings = Manage Settings +#view_adminRoles_permissions_perm_viewUsers = View Users +#view_adminRoles_permissions_read = Read: +#view_adminRoles_permissions_readAccessImplied = Read access for the {0} permission is implied and cannot be disabled. +#view_adminRoles_permissions_resourcePermissions = Resource Permissions +#view_adminRoles_permissions_write = Write: +#view_adminRoles_resourcePerms = Resource Permissions +#view_adminRoles_roleAdded = Role [{0}] added. +#view_adminRoles_roleDeleteFailed = Failed to delete role [{0}]. +#view_adminRoles_roleDeleted = Role [{0}] deleted. +#view_adminRoles_roleUpdateFailed = Failed to update role [{0}]. +#view_adminRoles_roleUpdated = Role [{0}] updated. +#view_adminTemplates_definedBy = Defined By +#view_adminTemplates_disabledTemplates = Disabled Templates +#view_adminTemplates_editAlertTemplate = Edit Alert Template +#view_adminTemplates_editTemplates = Edit Templates +#view_adminTemplates_enabledTemplates = Enabled Templates +#view_adminTemplates_platformServices = Platform Services +#view_adminTemplates_platforms = Platforms +#view_adminTemplates_pluginTemplates = Plugin Templates +#view_adminTemplates_prompt_disabledAlertTemplates = Number of alert templates that are created but disabled on this resource type +#view_adminTemplates_prompt_disabledMetricTemplates = Number of metric schedules that are disabled by default on this resource type +#view_adminTemplates_prompt_enabledAlertTemplates = Number of alert templates that are enabled on this resource type +#view_adminTemplates_prompt_enabledMetricTemplates = Number of metric schedules that are enabled by default on this resource type +#view_adminTemplates_servers = Servers +#view_adminTemplates_userTemplates = User Templates +#view_adminTopology_affinityGroups = Affinity Groups +#view_adminTopology_agents = Agents +#view_adminTopology_partitionEvents = Partition Events +#view_adminTopology_remoteAgentInstall = Remote Agent Install +#view_adminTopology_servers = Servers +#view_adminUsersDetails_dataTypeName = user +#view_admin_administration = Administration +#view_admin_configuration = Configuration +#view_admin_content = Content +#view_admin_downloads_agentDownload = Agent Download +#view_admin_downloads_agent_buildNumber = Agent Build +#view_admin_downloads_agent_help = <p> This is the {0} Agent Update Binary jar file. The purpose of this jar file is to allow you to install a fresh agent on a machine where an agent does not yet exist and to allow you to update an agent that is already installed on a machine. For more details, run this agent download jar with the --help command line option:<br/> <b>java -jar <agent-download.jar> --help</b> </p> <h3>Agent Install</h3> <p> <b>java -jar <agent-download.jar> --install[=<new agent directory>]</b><br/> This command will install a new agent. If you do not specify the new agent directory, the default will be "." </p> <h3>Agent Update</h3> <p> <b>java -jar <agent-download.jar> --update[=<old agent home>]</b><br/> This will update an existing agent that was already installed. If you do not specify the directory where the old, existing agent was installed, it will assumed to be "rhq-agent". </p> +#view_admin_downloads_agent_link_label = Link +#view_admin_downloads_agent_link_value = Download Agent {0} ({1}) +#view_admin_downloads_agent_loadError = Cannot get agent version info +#view_admin_downloads_agent_md5 = Agent MD5 +#view_admin_downloads_agent_version = Agent Version +#view_admin_downloads_bundleDownload = Bundle Deployer Download +#view_admin_downloads_bundle_help = <p> This is the Bundle Deployer tool. It is for use by developers and packagers of {0} bundles. This standalone tool allows you to test your bundles and their recipes from a console. </p> +#view_admin_downloads_bundle_link_label = Link +#view_admin_downloads_bundle_link_value = Download Bundle Deployer {0} +#view_admin_downloads_bundle_loadError = Cannot get bundle deployer info +#view_admin_downloads_cliAlertScriptsDownload = CLI Alert Scripts Download +#view_admin_downloads_cliAlertScripts_help = CLI alert scripts are pre-canned scripts that can be used for creating scripted alert notifications. The scripts will usually require some tweaking before they can be used as a notification on a particular alert definition. +#view_admin_downloads_cliAlertScripts_loadError = Cannot get info on available CLI alert scripts for download +#view_admin_downloads_cliAlertScripts_none = No CLI alert scripts are available for download +#view_admin_downloads_cliDownload = Command Line Client Download +#view_admin_downloads_cli_buildNumber = CLI Build +#view_admin_downloads_cli_help = <p> This is the Command Line Client tool, otherwise known as the CLI. It is a standalone tool that runs from within a console and provides a command line interface to the {0} Server. You can invoke commands via the CLI as well as run scripts to perform automated tasks. See the documentation for more information on how to install and use the CLI. </p> +#view_admin_downloads_cli_link_label = Link +#view_admin_downloads_cli_link_value = Download CLI {0} ({1}) +#view_admin_downloads_cli_loadError = Cannot get CLI version info +#view_admin_downloads_cli_md5 = CLI MD5 +#view_admin_downloads_cli_version = CLI Version +#view_admin_downloads_connectorsDownload = Connectors Download +#view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by {0}. You install connectors into some managed products so {0} agents can talk to them. See the documentation for more information. +#view_admin_downloads_connectors_loadError = Cannot get connectors info +#view_admin_downloads_connectors_none = No connectors are available for download +#view_admin_landing = From this section, the {0} global settings can be administered. This includes configuring security, setting up plugins, and managing {0} Servers and Agents. +#view_admin_measTemplates_updateExisting_title = Update Existing Schedules +#view_admin_measTemplates_updateExisting_tooltip = Check this box to update the collection schedules for the selected metrics on all existing resources of this type. If this is not checked, the template schedules will only be applied to new resources of this type that are added to inventory in the future. +#view_admin_plugins_agent = Agent +#view_admin_plugins_agentDeleteConfirm = <b>Warning!</b><br/>\nThe following agent plugins are about to be deleted:<br/>\n{0}<br/>\nAre you sure you want to delete these? +#view_admin_plugins_agentDisableConfirm = <b>Warning!</b><br/>\nThe following agent plugins are about to be disabled:<br/>\n{0}<br/>\nAre you sure you want to disable these? +#view_admin_plugins_deletedAgentPlugins = Deleted agent plugins: {0} +#view_admin_plugins_deletedAgentPluginsFailure = Failed to delete agent plugins. +#view_admin_plugins_deployed = Deployed? +#view_admin_plugins_disabledAgentPlugins = Disabled agent plugins: {0} +#view_admin_plugins_disabledAgentPluginsFailure = Failed to disable agent plugins. +#view_admin_plugins_disabledServerPlugins = Disabled server plugins: {0} +#view_admin_plugins_disabledServerPluginsFailure = Failed to disable server plugins. +#view_admin_plugins_enabledAgentPlugins = Enabled agent plugins: {0} +#view_admin_plugins_enabledAgentPluginsFailure = Failed to enable agent plugins. +#view_admin_plugins_enabledServerPlugins = Enabled server plugins: {0} +#view_admin_plugins_enabledServerPluginsFailure = Failed to enable server plugins. +#view_admin_plugins_hideDeleted = Hide Deleted +#view_admin_plugins_hideUndeployed = Hide Undeployed +#view_admin_plugins_loadFailure = Failed to load plugin data +#view_admin_plugins_purgedAgentPlugins = Preparing to purge agent plugins {0}. This may take a few minutes since all type definitions from the plugins must first be purged from the system. The plugins will still be visible on this page until they have been purged. Please note that you must not re-install the plugin while the purge is running, otherwise failures will occur. Therefore, please wait before attempting to re-install the plugin into the system until this purge is complete. +#view_admin_plugins_purgedAgentPluginsFailure = Failed to purge agent plugins. +#view_admin_plugins_purgedServerPlugins = Purged server plugins: {0}. +#view_admin_plugins_purgedServerPluginsFailure = Failed to purge server plugins. +#view_admin_plugins_restartMasterPC = Restart Master Plugin Container +#view_admin_plugins_restartMasterPCComplete = Master plugin container has been restarted. +#view_admin_plugins_restartMasterPCFailure = Failed to restart the master plugin container +#view_admin_plugins_restartMasterPCStarted = Restarting the master plugin container... +#view_admin_plugins_scan = Scan For Updates +#view_admin_plugins_scanComplete = Finished scanning for updated plugins +#view_admin_plugins_scanFailure = Failed to scan for updated plugins. +#view_admin_plugins_server = Server +#view_admin_plugins_serverConfig = Plugin Configuration +#view_admin_plugins_serverConfig_badSettings = Please enter valid settings +#view_admin_plugins_serverConfig_saveFailed = Failed to save the settings +#view_admin_plugins_serverConfig_settingsSaved = The settings have been saved. +#view_admin_plugins_serverControls = Controls +#view_admin_plugins_serverControls_badParams = Please enter valid parameters +#view_admin_plugins_serverControls_clickForError = Click for the error message +#view_admin_plugins_serverControls_invokeFailure = Failed to invoke the control +#view_admin_plugins_serverControls_name = Control +#view_admin_plugins_serverControls_parameters = Parameters +#view_admin_plugins_serverControls_results = Results +#view_admin_plugins_serverDisableConfirm = <b>Warning!</b><br/>\nThe following server plugins are about to be disabled:<br/>\n{0}<br/>\nAre you sure you want to disable these? +#view_admin_plugins_serverScheduleJobs = Scheduled Jobs +#view_admin_plugins_serverUndeployConfirm = <b>Warning!</b><br/>\nThe following server plugins are about to be undeployed:<br/>\n{0}<br/>\nAre you sure you want to undeploy these? +#view_admin_plugins_showDeleted = Show Deleted +#view_admin_plugins_showUndeployed = Show Undeployed +#view_admin_plugins_undeploy = Undeploy +#view_admin_plugins_undeployedServerPlugins = Undeployed server plugins: {0} +#view_admin_plugins_undeployedServerPluginsFailure = Failed to undeploy server plugins. +#view_admin_plugins_upload = Upload Plugin +#view_admin_security = Security +#view_admin_systemSettings_ActiveDriftServerPlugin_desc = The drift server plugin that manages the persistence of drift-related entities and content. +#view_admin_systemSettings_ActiveDriftServerPlugin_name = Active Drift Server Plugin +#view_admin_systemSettings_AgentMaxQuietTimeAllowed_desc = If this amount of time passes without hearing from an agent, that quiet agent will be considered down. This value is specified in minutes. +#view_admin_systemSettings_AgentMaxQuietTimeAllowed_name = Agent Max Quiet Time Allowed +#view_admin_systemSettings_AlertPurge_desc = How old alert history items must be before being purged from the database. This is specified in days. +#view_admin_systemSettings_AlertPurge_name = Delete Alerts Older Than +#view_admin_systemSettings_AvailabilityPurge_desc = How old availability data must be before being purged from the database. This is specified in days. +#view_admin_systemSettings_AvailabilityPurge_name = Delete Availability Data Older Than +#view_admin_systemSettings_BaseURL_desc = A URL to the server GUI, used mainly within alert email notifications. +#view_admin_systemSettings_BaseURL_name = GUI Console URL +#view_admin_systemSettings_BaselineDataSet_desc = The amount of past measurement data that is used to determine a baseline. This is specified in days. +#view_admin_systemSettings_BaselineDataSet_name = Baseline Dataset +#view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days. Maximum value is 'Baseline Dataset'. +#view_admin_systemSettings_BaselineFrequency_name = Baseline Calculation Frequency +#view_admin_systemSettings_DataMaintenance_desc = How often database maintenance is performed (for example, vacuuming if using Postgres). This is specified in hours. +#view_admin_systemSettings_DataMaintenance_name = Database Maintenance Period +#view_admin_systemSettings_DataReindex_desc = If enabled, certain database tables will be re-indexed periodically. +#view_admin_systemSettings_DataReindex_name = Reindex Data Tables Nightly +#view_admin_systemSettings_DriftFilePurge_desc = How old unused and orphaned drift files must be before being purged from backend storage. This is specified in days. +#view_admin_systemSettings_DriftFilePurge_name = Delete Unused Drift Files Older Than +#view_admin_systemSettings_EnableAgentAutoUpdate_desc = Determines if the server will allow agents to auto-update themselves. You will not be able to download agent distributions from the server if this is disabled. +#view_admin_systemSettings_EnableAgentAutoUpdate_name = Enable Agent Auto-Updates +#view_admin_systemSettings_EnableDebugMode_desc = If enabled, the server will enter debug mode. +#view_admin_systemSettings_EnableDebugMode_name = Enable Debug Mode +#view_admin_systemSettings_EnableExperimentalFeatures_desc = If enabled, any experimental features that exist in the current product will be available. +#view_admin_systemSettings_EnableExperimentalFeatures_name = Enable Experimental Features +#view_admin_systemSettings_EventPurge_desc = How old event data must be before being purged from the database. This is specified in days. +#view_admin_systemSettings_EventPurge_name = Delete Events Older Than +#view_admin_systemSettings_JAASProvider_desc = Should LDAP be used to determine user identity? +#view_admin_systemSettings_JAASProvider_name = Enable LDAP +#view_admin_systemSettings_LDAPBaseDN_desc = The base of the directory tree to search for usernames and passwords while authenticating users, e.g. ou=People,dc=redhat,dc=com +#view_admin_systemSettings_LDAPBaseDN_name = Search Base +#view_admin_systemSettings_LDAPBindDN_desc = The username to connect to the LDAP server when querying the LDAP user database. This is typically the full LDAP distinguished name (DN) of a manager user, e.g. cn=Manager,dc=redhat,dc=com +#view_admin_systemSettings_LDAPBindDN_name = Username +#view_admin_systemSettings_LDAPBindPW_desc = The credentials of the user used to connect to the LDAP server when querying the LDAP user database. +#view_admin_systemSettings_LDAPBindPW_name = Password +#view_admin_systemSettings_LDAPFilter_desc = Any additional filters to apply when doing the LDAP search. This is useful if the population to authenticate can be identified via a given LDAP property, e.g. RHQUser=true +#view_admin_systemSettings_LDAPFilter_name = Search Filter +#view_admin_systemSettings_LDAPGroupFilter_desc = LDAP search filter that must return all LDAP groups available for authorization. This is used for LDAP group authorization. +#view_admin_systemSettings_LDAPGroupFilter_name = Group Search Filter +#view_admin_systemSettings_LDAPGroupMember_desc = LDAP search filter that is used in conjunction with the group search filter to determine user authorization. This is used for LDAP group authorization. +#view_admin_systemSettings_LDAPGroupMember_name = Group Member Filter +#view_admin_systemSettings_LDAPLoginProperty_desc = The LDAP property that contains the user name. Defaults to "cn". If multiple matches are found, the first entry found is used. +#view_admin_systemSettings_LDAPLoginProperty_name = Login Property +#view_admin_systemSettings_LDAPProtocol_desc = Should communication with the LDAP server be done over SSL? +#view_admin_systemSettings_LDAPProtocol_name = SSL +#view_admin_systemSettings_LDAPUrl_desc = URL to the LDAP Server +#view_admin_systemSettings_LDAPUrl_name = LDAP URL +#view_admin_systemSettings_RtDataPurge_desc = How old response time data must be before being purged from the database. This is specified in days. +#view_admin_systemSettings_RtDataPurge_name = Delete Response Time Data Older Than +#view_admin_systemSettings_TraitPurge_desc = How old measurement trait data must be before being purged from the database. This is specified in days. +#view_admin_systemSettings_TraitPurge_name = Delete Measurement Traits Older Than +#view_admin_systemSettings_cannotLoadServerDetails = Cannot load server details +#view_admin_systemSettings_cannotLoadSettings = Cannot obtain the current system settings +#view_admin_systemSettings_dumpToLogFailed = Writing of system info to server log file failed +#view_admin_systemSettings_dumpedToLog = System info was successfully written to server log file +#view_admin_systemSettings_fixBeforeSaving = Please fix the invalid values before saving +#view_admin_systemSettings_group_baseline = Automatic Baseline Configuration Properties +#view_admin_systemSettings_group_dataMgr = Data Manager Configuration Properties +#view_admin_systemSettings_group_drift = Drift Server Configuration Settings +#view_admin_systemSettings_group_general = General Configuration Properties +#view_admin_systemSettings_group_ldap = LDAP Configuration Properties +#view_admin_systemSettings_saveFailure = Failed to save the system settings +#view_admin_systemSettings_savedSettings = You successfully saved the system properties +#view_admin_systemSettings_serverDetails = Server Details +#view_admin_systemSettings_serverDetails_buildNumber = Build Number +#view_admin_systemSettings_serverDetails_currentTable = Current Measurement Raw Table +#view_admin_systemSettings_serverDetails_dbDriverName = Database Driver Name +#view_admin_systemSettings_serverDetails_dbDriverVersion = Database Driver Version +#view_admin_systemSettings_serverDetails_dbName = Database Product Name +#view_admin_systemSettings_serverDetails_dbUrl = Database Connection URL +#view_admin_systemSettings_serverDetails_dbVersion = Database Product Version +#view_admin_systemSettings_serverDetails_installDir = Server Installation Directory +#view_admin_systemSettings_serverDetails_nextRotation = Next Measurement Table Rotation +#view_admin_systemSettings_serverDetails_time = Server Local Time +#view_admin_systemSettings_serverDetails_tz = Server Time Zone +#view_admin_topology = Topology +#view_alert_common_tab_conditions = Conditions +#view_alert_common_tab_conditions_expression = Fire alert when +#view_alert_common_tab_conditions_expression_tooltip = Determines if ANY or ALL of the conditions must evaluate to true in order for the entire condition set to be considered true. +#view_alert_common_tab_conditions_modal_title = Add Condition +#view_alert_common_tab_conditions_recovery_disabled = This alert caused its alert definition to be disabled +#view_alert_common_tab_conditions_recovery_enabled = Triggered ''{0}'' to be re-enabled +#view_alert_common_tab_conditions_text = Condition +#view_alert_common_tab_conditions_type_availability = Availability Change +#view_alert_common_tab_conditions_type_availability_down = Went down +#view_alert_common_tab_conditions_type_availability_up = Came up +#view_alert_common_tab_conditions_type_drift = Drift Detection +#view_alert_common_tab_conditions_type_drift_configpaths = Drift Detection for files that match "{0}" and for drift definition [{1}] +#view_alert_common_tab_conditions_type_drift_onlyconfig = Drift Detection for drift definition [{0}] +#view_alert_common_tab_conditions_type_drift_onlypaths = Drift Detection for files that match "{0}" +#view_alert_common_tab_conditions_type_event = Event Detection +#view_alert_common_tab_conditions_type_event_matching = with event source matching +#view_alert_common_tab_conditions_type_metric_baseline = Metric Value Baseline +#view_alert_common_tab_conditions_type_metric_baseline_verb = of +#view_alert_common_tab_conditions_type_metric_calltime_change = Call Time Value Changes +#view_alert_common_tab_conditions_type_metric_calltime_change_verb = by at least +#view_alert_common_tab_conditions_type_metric_calltime_delta_grows = Grows +#view_alert_common_tab_conditions_type_metric_calltime_delta_other = Changes +#view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks = Shrinks +#view_alert_common_tab_conditions_type_metric_calltime_destination = with call destination matching +#view_alert_common_tab_conditions_type_metric_calltime_threshold = Call Time Value Threshold +#view_alert_common_tab_conditions_type_metric_change = Metric Value Change +#view_alert_common_tab_conditions_type_metric_range_inside_exclusive = Metric Value Range: [{0}] between [{1}] and [{2}], exclusive +#view_alert_common_tab_conditions_type_metric_range_inside_inclusive = Metric Value Range: [{0}] between [{1}] and [{2}], inclusive +#view_alert_common_tab_conditions_type_metric_range_outside_exclusive = Metric Value Range: [{0}] outside [{1}] and [{2}], exclusive +#view_alert_common_tab_conditions_type_metric_range_outside_inclusive = Metric Value Range: [{0}] outside [{1}] and [{2}], inclusive +#view_alert_common_tab_conditions_type_metric_threshold = Metric Value Threshold +#view_alert_common_tab_conditions_type_metric_trait_change = Trait Change +#view_alert_common_tab_conditions_type_operation = Operation Execution +#view_alert_common_tab_conditions_type_operation_status = with result status +#view_alert_common_tab_conditions_type_resource_configuration = Resource Configuration Change +#view_alert_common_tab_dampening = Dampening +#view_alert_common_tab_dampening_category_consecutive_count = Consecutive +#view_alert_common_tab_dampening_category_consecutive_count_tooltip = An alert is triggered once every X occurrences the condition set is true consecutively. +#view_alert_common_tab_dampening_category_duration_count = Time Period +#view_alert_common_tab_dampening_category_duration_count_tooltip = An alert is triggered once every X occurrences the condition set is true within a given time period. +#view_alert_common_tab_dampening_category_none = None +#view_alert_common_tab_dampening_category_none_tooltip = Dampening is disabled. Every time the condition set is true, an alert will be triggered. +#view_alert_common_tab_dampening_category_partial_count = Last N Evaluations +#view_alert_common_tab_dampening_category_partial_count_tooltip = An alert is triggered once every X occurrences the condition set is true during the last N evaluations of the condition set. +#view_alert_common_tab_dampening_consecutive_occurrences_label = Occurrences +#view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip = The number of times the condition set must be consecutively true before the alert is triggered +#view_alert_common_tab_dampening_duration_occurrences_label = Occurrences +#view_alert_common_tab_dampening_duration_occurrences_label_tooltip = The number of times the condition set must be true during the given time period before the alert is triggered. +#view_alert_common_tab_dampening_duration_period_label = Time Period +#view_alert_common_tab_dampening_duration_period_label_tooltip = The time span in which the condition set will be tested to see if the given number of occurrences are true. +#view_alert_common_tab_dampening_partial_evalatuions_label = Evaluations +#view_alert_common_tab_dampening_partial_evalatuions_label_tooltip = The total number of times the condition set will be tested to see if the given number of occurrences are true. +#view_alert_common_tab_dampening_partial_occurrences_label = Occurrences +#view_alert_common_tab_dampening_partial_occurrences_label_tooltip = The number of times the condition set must be true during the last N evaluations before the alert is triggered. +#view_alert_common_tab_general = General Properties +#view_alert_common_tab_invalid_condition_category = Invalid condition category - please report this as a bug: {0} +#view_alert_common_tab_invalid_dampening_category = Invalid dampening category - please report this as a bug: {0} +#view_alert_common_tab_invalid_time_units = Invalid time units - please report this as a bug: {0} +#view_alert_common_tab_notifications = Notifications +#view_alert_common_tab_notifications_message = Message +#view_alert_common_tab_notifications_sender = Sender +#view_alert_common_tab_notifications_status = Status +#view_alert_common_tab_recovery = Recovery +#view_alert_definition_condition_editor_availabilityDuration = Availability Duration +#view_alert_definition_condition_editor_availabilityDuration_tooltip = Specify the availability state change and the duration that state must persist in order to trigger the condition. The duration is in minutes and should be long enough, several minutes, to give the agent time to detect another availability state change that may correct the problem. +#view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = The number of minutes the resource must be at the given availability before the condition is met. +#view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. +#view_alert_definition_condition_editor_availability_value = Availability +#view_alert_definition_condition_editor_common_avg = Average +#view_alert_definition_condition_editor_common_max = Maximum +#view_alert_definition_condition_editor_common_min = Minimum +#view_alert_definition_condition_editor_delete_confirm = Delete the selected alert condition(s)? +#view_alert_definition_condition_editor_drift_configname_regex = Drift Definition Name +#view_alert_definition_condition_editor_drift_configname_regex_tooltip = If specified, this is the drift definition name that was responsible for the drift that was detected. This can optionally be a regular expression if you wish to match multiple drift definition names. +#view_alert_definition_condition_editor_drift_pathname_regex = Pathname Regular Expression +#view_alert_definition_condition_editor_drift_pathname_regex_tooltip = If specified, this is a regular expression that must match the pathnames of those files that drifted. +#view_alert_definition_condition_editor_drift_tooltip = This condition is triggered when drift has been detected. +#view_alert_definition_condition_editor_event_regex = Regular Expression +#view_alert_definition_condition_editor_event_regex_tooltip = If specified, this is a regular expression that must match a collected event message in order to trigger the condition. +#view_alert_definition_condition_editor_event_severity = Event Severity +#view_alert_definition_condition_editor_event_tooltip = Specify the event severity that an event message must be reported with in order to trigger this condition. If you specify an optional regular expression, the event message must also match that regular expression in order for the condition to trigger. +#view_alert_definition_condition_editor_metric_baseline_percentage = Baseline Percentage +#view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = A collected metric value will trigger this condition when compared to this percentage of the selected baseline value using the selected comparator +#view_alert_definition_condition_editor_metric_baseline_tooltip = Specify the baseline value that must be violated to trigger the condition. The value you specify is a percentage of the given baseline value. +#view_alert_definition_condition_editor_metric_baseline_value = Baseline +#view_alert_definition_condition_editor_metric_calltime_change_percentage = Percentage Change +#view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip = A collected calltime value will trigger this condition when it differs by at least this percentage of the selected calltime limit value +#view_alert_definition_condition_editor_metric_calltime_change_tooltip = Specify the calltime value that, when changed at least a specified amount, triggers the condition. You must specify which calltime limit to check (minimum, maximum or average calltime value) and the percentage of change that must occur. +#view_alert_definition_condition_editor_metric_calltime_common_comparator = Comparator +#view_alert_definition_condition_editor_metric_calltime_common_comparator_changes = Changes +#view_alert_definition_condition_editor_metric_calltime_common_comparator_grows = Grows +#view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks = Shrinks +#view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip = How a collected calltime value should be compared to the given calltime limit +#view_alert_definition_condition_editor_metric_calltime_common_limit = Call Time Limit +#view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip = The calltime limit value that is to be compared with the given value +#view_alert_definition_condition_editor_metric_calltime_common_name = Call Time Metric +#view_alert_definition_condition_editor_metric_calltime_common_regex = Regular Expression +#view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip = If specified, this is a regular expression that must match a call destination in order to trigger the condition. +#view_alert_definition_condition_editor_metric_calltime_threshold_tooltip = Specify the calltime threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. You also must specify which calltime limit to compare the value with (minimum, maximum or average calltime value). +#view_alert_definition_condition_editor_metric_calltime_threshold_value = Call Time Value +#view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip = The threshold value of the metric that will trigger the condition when compared using the selected comparator. +#view_alert_definition_condition_editor_metric_change_tooltip = Specify the metric whose value must change to trigger the condition. +#view_alert_definition_condition_editor_metric_common_definition_not_found = Should have found metric definition - something is wrong +#view_alert_definition_condition_editor_metric_nometrics = When using the ALL conjunction, you cannot use the same metric in multiple conditions and this alert uses all available metrics in currently existing conditions. +#view_alert_definition_condition_editor_metric_range_comparator = Comparator +#view_alert_definition_condition_editor_metric_range_comparator_inside_exclusive = Inside, exclusive +#view_alert_definition_condition_editor_metric_range_comparator_inside_inclusive = Inside, inclusive +#view_alert_definition_condition_editor_metric_range_comparator_outside_exclusive = Outside, exclusive +#view_alert_definition_condition_editor_metric_range_comparator_outside_inclusive = Outside, inclusive +#view_alert_definition_condition_editor_metric_range_comparator_tooltip = Determines if a metric value should trigger this condition when inside the range or outside of it. If inclusive, the value is considered to be in the range if its value equals a low or high threshold value. If exclusive, the value is not considered in the range if it equals the low or high value. +#view_alert_definition_condition_editor_metric_range_hivalue = High Value +#view_alert_definition_condition_editor_metric_range_hivalue_tooltip = The high threshold value of the range. +#view_alert_definition_condition_editor_metric_range_lovalue = Low Value +#view_alert_definition_condition_editor_metric_range_lovalue_tooltip = The low threshold value of the range. +#view_alert_definition_condition_editor_metric_range_tooltip = Compares a metric value to a given low-high value range. +#view_alert_definition_condition_editor_metric_threshold_comparator = Comparator +#view_alert_definition_condition_editor_metric_threshold_comparator_equal = Equal to +#view_alert_definition_condition_editor_metric_threshold_comparator_greater = Greater Than +#view_alert_definition_condition_editor_metric_threshold_comparator_less = Less than +#view_alert_definition_condition_editor_metric_threshold_comparator_tooltip = How a collected metric value should be compared to the given threshold value +#view_alert_definition_condition_editor_metric_threshold_name = Metric +#view_alert_definition_condition_editor_metric_threshold_tooltip = Specify the threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. +#view_alert_definition_condition_editor_metric_threshold_value = Metric Value +#view_alert_definition_condition_editor_metric_threshold_value_tooltip = The threshold value of the metric that will trigger the condition when compared using the selected comparator. +#view_alert_definition_condition_editor_metric_trait_change_tooltip = Specify the trait whose value must change to trigger the condition. +#view_alert_definition_condition_editor_metric_trait_change_value = Trait +#view_alert_definition_condition_editor_metricswarning = You cannot have multiple conditions that use the same metric when using the ALL conjunction. This alert definition has multiple conditions that use the metric [{0}]. +#view_alert_definition_condition_editor_operation_status = Operation Status +#view_alert_definition_condition_editor_operation_tooltip = Specify the result that must occur when the selected operation is executed in order to trigger the condition. +#view_alert_definition_condition_editor_operator_availability_durationDown = Stays Down +#view_alert_definition_condition_editor_operator_availability_durationNotUp = Stays Not Up +#view_alert_definition_condition_editor_operator_availability_goesDisabled = Goes disabled +#view_alert_definition_condition_editor_operator_availability_goesDown = Goes down +#view_alert_definition_condition_editor_operator_availability_goesNotUp = Goes not up +#view_alert_definition_condition_editor_operator_availability_goesUnknown = Goes unknown +#view_alert_definition_condition_editor_operator_availability_goesUp = Goes up +#view_alert_definition_condition_editor_option_availability = Availability Change +#view_alert_definition_condition_editor_option_drift = Drift Detection +#view_alert_definition_condition_editor_option_event = Event Detection +#view_alert_definition_condition_editor_option_label = Condition Type +#view_alert_definition_condition_editor_option_metric_baseline = Measurement Baseline Threshold +#view_alert_definition_condition_editor_option_metric_calltime_change = Call Time Value Change +#view_alert_definition_condition_editor_option_metric_calltime_threshold = Call Time Value Threshold +#view_alert_definition_condition_editor_option_metric_change = Measurement Value Change +#view_alert_definition_condition_editor_option_metric_range = Measurement Value Range +#view_alert_definition_condition_editor_option_metric_threshold = Measurement Absolute Value Threshold +#view_alert_definition_condition_editor_option_metric_trait_change = Trait Value Change +#view_alert_definition_condition_editor_option_operation = Operation Execution +#view_alert_definition_condition_editor_option_resource_configuration = Resource Configuration Change +#view_alert_definition_condition_editor_resource_configuration_tooltip = This condition is triggered when the resource configuration changes. +#view_alert_definition_for_group = View Group Definition +#view_alert_definition_for_type = View Template +#view_alert_definition_notification_cliScript_editor_anotherUser = Another User +#view_alert_definition_notification_cliScript_editor_existingScript = Existing Script +#view_alert_definition_notification_cliScript_editor_loadFailed = Loading the CLI Notification Editor Failed. +#view_alert_definition_notification_cliScript_editor_newScriptVersion = Version +#view_alert_definition_notification_cliScript_editor_repository = Repository +#view_alert_definition_notification_cliScript_editor_script = Script +#view_alert_definition_notification_cliScript_editor_selectRepo = Select the repository where the script should reside +#view_alert_definition_notification_cliScript_editor_selectRepoFirst = Select a repository first. +#view_alert_definition_notification_cliScript_editor_thisUser = Myself +#view_alert_definition_notification_cliScript_editor_uploadNewScript = Upload New Script +#view_alert_definition_notification_cliScript_editor_verifyAuthentication = Verify +#view_alert_definition_notification_cliScript_editor_whichUser = User To Run The Script As +#view_alert_definition_notification_editor_delete_confirm = Are you sure you want to delete the selected alert notifications? +#view_alert_definition_notification_editor_field_configuration = Configuration +#view_alert_definition_notification_editor_field_configuration_loadFailed = Failed to get notification configuration preview +#view_alert_definition_notification_editor_field_configuration_not_loaded = Unknown +#view_alert_definition_notification_editor_field_sender = Sender +#view_alert_definition_notification_editor_loadFailed = Cannot get alert senders +#view_alert_definition_notification_editor_loadFailed_single = Cannot get alert sender configuration definition +#view_alert_definition_notification_editor_none_available = No alert senders available +#view_alert_definition_notification_editor_saveFailed = Cannot save the notification configuration +#view_alert_definition_notification_editor_sender = Notification Sender +#view_alert_definition_notification_editor_title_add = Add Notification +#view_alert_definition_notification_editor_title_edit = Edit Notification +#view_alert_definition_notification_operation_editor_common_operation = Operation +#view_alert_definition_notification_operation_editor_mode_relative = Relative Resource +#view_alert_definition_notification_operation_editor_mode_specific = Specific Resource +#view_alert_definition_notification_operation_editor_mode_this = This Resource +#view_alert_definition_notification_operation_editor_mode_title = Resource Selection Mode +#view_alert_definition_notification_operation_editor_mode_unknown = UNKNOWN OPTION - THIS IS A BUG +#view_alert_definition_notification_operation_editor_operations_loadFailed = Failed to load the list of available operations +#view_alert_definition_notification_operation_editor_operations_no_parameters = This operation does not take any parameters +#view_alert_definition_notification_operation_editor_relative_ancestor = Start Search From +#view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed = Cannot get type ancestry +#view_alert_definition_notification_operation_editor_relative_ancestor_root = Root Ancestor Type +#view_alert_definition_notification_operation_editor_relative_ancestor_tooltip = Select the top of the type hierarchy from which to search its descendant tree for the Filter By type +#view_alert_definition_notification_operation_editor_relative_descendant = Then Filter By +#view_alert_definition_notification_operation_editor_relative_descendant_filter_tooltip = A specific name to uniquely identify a resource when more than one resource of the selected type might exist. This is optional if there will only ever be one resource of the resource type in the selected type hierarchy. +#view_alert_definition_notification_operation_editor_relative_descendant_loadFailed = Cannot get type descendants +#view_alert_definition_notification_operation_editor_relative_descendant_tooltip = The resource type to search for under the root type defined in the Start Search From selection. +#view_alert_definition_notification_operation_editor_specific_pick_button = Pick +#view_alert_definition_notification_operation_editor_specific_pick_error_invalid = Please pick a resource +#view_alert_definition_notification_operation_editor_specific_pick_error_no_operation = Please pick a resource that has one or more operations +#view_alert_definition_notification_operation_editor_specific_pick_text = Pick a resource... +#view_alert_definition_notification_operation_editor_specific_resource = Resource +#view_alert_definition_notification_role_editor_loadFailed = Cannot determine current roles - starting empty +#view_alert_definition_notification_role_editor_restoreFailed = Cannot use current roles - starting empty +#view_alert_definition_notification_role_editor_saveFailed = Cannot save the selected roles +#view_alert_definition_notification_user_editor_loadFailed = Cannot determine current users - starting empty +#view_alert_definition_notification_user_editor_restoreFailed = Cannot use current users - starting empty +#view_alert_definition_notification_user_editor_saveFailed = Cannot save the selected users +#view_alert_definition_recovery_editor_disable_when_fired = Disable When Fired +#view_alert_definition_recovery_editor_disable_when_fired_tooltip = Indicates if this alert will be disabled after it fires. Once disabled, the alert can be manually re-enabled or a recovery alert can be set up to automatically re-enable it. If this alert is a recovery alert itself, this setting cannot be turned on. +#view_alert_definition_recovery_editor_loadFailed = Cannot build recovery menu +#view_alert_definition_recovery_editor_none_available = None +#view_alert_definition_recovery_editor_recovery_alert = Recover Alert +#view_alert_definition_recovery_editor_recovery_alert_tooltip = The target alert that will be recovered (i.e. re-enabled) after this alert triggers. Do not select an alert here if you are not defining a recovery alert. +#view_alert_definitions_create_failure = Alert definition creation failed +#view_alert_definitions_create_success = Alert definition successfully created +#view_alert_definitions_delete_confirm = Delete the selected alert definition(s)? +#view_alert_definitions_delete_failure = Failed to deleted the selected alert definitions +#view_alert_definitions_delete_success = Successfully deleted {0} alert definitions +#view_alert_definitions_disable_confirm = Disable the selected alert definition(s)? +#view_alert_definitions_disable_failure = Failed to disable the selected alert definitions +#view_alert_definitions_disable_success = Successfully disabled {0} alert definitions +#view_alert_definitions_enable_confirm = Enable the selected alert definition(s)? +#view_alert_definitions_enable_failure = Failed to enable the selected alert definitions +#view_alert_definitions_enable_success = Successfully enabled {0} alert definitions +#view_alert_definitions_loadFailed = Failed to fetch alert definition data +#view_alert_definitions_loadFailed_single = Failed to fetch data for alert definition with id {0} +#view_alert_definitions_table_title_group = Group Alert Definitions +#view_alert_definitions_table_title_resource = Resource Alert Definitions +#view_alert_definitions_update_failure = Alert definition update failed +#view_alert_definitions_update_success = Alert definition successfully updated +#view_alert_details_field_ack_at = Acknowledged at +#view_alert_details_field_ack_by = Acknowledged by +#view_alert_details_field_recovery_info = Recovery Info +#view_alert_details_loadFailed = Failed to fetch alert details +#view_alerts_ack_confirm = Acknowledge the selected alert(s)? +#view_alerts_ack_confirm_all = Acknowledge all alerts from this source? +#view_alerts_ack_failure = Failed to acknowledge alerts with id''s: {0} +#view_alerts_ack_failure_all = Failed to acknowledge all alerts from this source +#view_alerts_ack_success = Successfully acknowledged {0} alerts +#view_alerts_delete_confirm = Delete the selected alert(s)? +#view_alerts_delete_confirm_all = Delete all alerts from this source? +#view_alerts_delete_failure = Failed to delete alerts with id''s: {0} +#view_alerts_delete_failure_all = Failed to delete all alerts from this source +#view_alerts_delete_success = Successfully deleted {0} alerts +#view_alerts_field_ack_status = Status +#view_alerts_field_ack_status_ack = Ack ({0}) +#view_alerts_field_ack_status_ackHover = Acknowledged by {0} at {1} +#view_alerts_field_ack_status_noAck = No Ack +#view_alerts_field_ack_status_noAckHover = Not yet Acknowledged +#view_alerts_field_ack_subject = Acknowledge Subject +#view_alerts_field_ack_time = Acknowledge Time +#view_alerts_field_condition_text = Condition Text +#view_alerts_field_condition_text_many = Multiple Conditions +#view_alerts_field_condition_text_none = No Conditions +#view_alerts_field_condition_value = Condition Value +#view_alerts_field_enabled = Enabled +#view_alerts_field_modified_time = Modified Time +#view_alerts_field_parent = Parent +#view_alerts_field_priority = Priority +#view_alerts_field_protected = Protected +#view_alerts_field_protected_tooltip = If true, this definition is protected from being changed by the parent definition. In other words, the parent definition settings will not override this definition. +#view_alerts_loadFailed = Failed to fetch alerts data +#view_alerts_table_filter_priority = Priority Filter +#view_alerts_table_title_group = Group Alert History +#view_alerts_table_title_resource = Resource Alert History +#view_autoDiscoveryQ_committed = Committed +#view_autoDiscoveryQ_confirmSelect = Also select the platform children? +#view_autoDiscoveryQ_confirmSelectAll = Also select the children of each platform? +#view_autoDiscoveryQ_deleted = Deleted +#view_autoDiscoveryQ_deselectAll = Deselect All +#view_autoDiscoveryQ_field_discoveryTime = Discovery Time +#view_autoDiscoveryQ_field_inventoryStatus = Inventory Status +#view_autoDiscoveryQ_field_parentId = Parent ID +#view_autoDiscoveryQ_ignore = Ignore +#view_autoDiscoveryQ_ignoreFailure = Failed to ignore Resources +#view_autoDiscoveryQ_ignoreInProgress = Ignoring the selected Resources... +#view_autoDiscoveryQ_ignoreSuccessful = You have successfully ignored the selected Resources. +#view_autoDiscoveryQ_ignored = Ignored +#view_autoDiscoveryQ_importFailure = Failed to import Resources +#view_autoDiscoveryQ_importInProgress = Importing the selected Resources... +#view_autoDiscoveryQ_importSuccessful = You have successfully imported the selected Resources. +#view_autoDiscoveryQ_loadFailure = Failed to load the inventory discovery queue +#view_autoDiscoveryQ_newAndIgnored = New and Ignored +#view_autoDiscoveryQ_noperm = (You are not authorized to view the auto-discovery queue) +#view_autoDiscoveryQ_selectAll = Select All +#view_autoDiscoveryQ_showStatus = Show +#view_autoDiscoveryQ_title = Autodiscovery Queue +#view_autoDiscoveryQ_unignore = Unignore +#view_autoDiscoveryQ_unignoreFailure = Failed to unignore Resources +#view_autoDiscoveryQ_unignoreInProgress = Unignoring the selected Resources... +#view_autoDiscoveryQ_unignoreSuccessful = You have successfully unignored the selected Resources. +#view_autoDiscoveryQ_uninventoried = Uninventoried +#view_bundleVersion_loadFailure = Failed to load bundle version data +#view_bundle_bundle = Bundle +#view_bundle_bundleDeployment = Bundle Deployment +#view_bundle_bundleDeployments = Bundle Deployments +#view_bundle_bundleDestinations = Bundle Destinations +#view_bundle_bundleFiles = Bundle Files +#view_bundle_bundleType = Bundle Type +#view_bundle_bundleVersion = Bundle Version +#view_bundle_bundleVersions = Bundle Versions +#view_bundle_bundles = Bundles +#view_bundle_createWizard_bundleDistro = Bundle Distribution +#view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist in the database +#view_bundle_createWizard_cancelSuccessful = Canceled the creation of bundle [{0}], version = [{1}] +#view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file +#view_bundle_createWizard_createFailure = Failed to create the bundle +#view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] +#view_bundle_createWizard_enterRecipe = Please supply a valid recipe +#view_bundle_createWizard_enterUrl = Please enter a valid URL where the bundle distribution file can be downloaded from +#view_bundle_createWizard_failedToUploadDistroFile = Failed to upload bundle distribution file +#view_bundle_createWizard_failedToUploadFile = Failed to upload bundle file +#view_bundle_createWizard_loadBundleFileFailure = Cannot obtain bundle file information from server +#view_bundle_createWizard_noAdditionalFilesNeeded = No additional files need to be uploaded for this bundle +#view_bundle_createWizard_noBundleTypesAvail = No bundle types are available +#view_bundle_createWizard_noBundleTypesSupported = No bundle types are supported - you must deploy a valid plugin that supports bundle deployments +#view_bundle_createWizard_provideBundleDistro = Provide a Bundle Distribution +#view_bundle_createWizard_recipeOption = Recipe +#view_bundle_createWizard_title = Create Bundle +#view_bundle_createWizard_uploadInProgress = Upload is in progress... This can take several minutes for large files +#view_bundle_createWizard_uploadOption = Upload +#view_bundle_createWizard_uploadStepName = Upload Bundle Files +#view_bundle_createWizard_urlOption = URL +#view_bundle_createWizard_windowTitle = Bundle Creation Wizard +#view_bundle_createWizard_youMustChooseOne = You must choose one option in order to create a bundle! +#view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions, destinations and deployments for this bundle will also be deleted. However, this will not remove any content from remote machines. +#view_bundle_deploy = Deploy +#view_bundle_deployDir = Deploy Directory +#view_bundle_deployWizard_deployStep = Deploy Bundle to Destination Platforms +#view_bundle_deployWizard_deploying = Deploying... +#view_bundle_deployWizard_deploymentCreated = Created Deployment... +#view_bundle_deployWizard_deploymentCreatedDetail = You have created the deployment [{0}] with the description [{1}] +#view_bundle_deployWizard_deploymentCreatedDetail_concise = You have created the deployment [{0}] +#view_bundle_deployWizard_deploymentScheduled = Bundle Deployment Scheduled! +#view_bundle_deployWizard_deploymentScheduledDetail = You have scheduled the bundle deployment [{0}] to the destination group [{1}] +#view_bundle_deployWizard_deploymentScheduledDetail_concise = You have scheduled the bundle deployment +#view_bundle_deployWizard_destinationCreatedDetail = You have created the destination [{0}] with the description [{1}] +#view_bundle_deployWizard_destinationCreatedDetail_concise = You have created the destination [{0}] +#view_bundle_deployWizard_error_1 = Failed to delete new deployment on Cancel +#view_bundle_deployWizard_error_10 = Failed to create destination, it may already exist. (Note, for an existing destination deploy from the Destination view) +#view_bundle_deployWizard_error_11 = Failed to find defined deployments. +#view_bundle_deployWizard_error_12 = Failed to find defined bundles. +#view_bundle_deployWizard_error_2 = Failed to delete new destination on Cancel +#view_bundle_deployWizard_error_3 = Failed to Schedule Deployment! +#view_bundle_deployWizard_error_4 = Failed to schedule deployment: {0} +#view_bundle_deployWizard_error_5 = Failed to Create Deployment! +#view_bundle_deployWizard_error_6 = Failed to create deployment: {0} +#view_bundle_deployWizard_error_7 = Failed to get deployment name. +#view_bundle_deployWizard_error_8 = You must select a valid resource group from the drop down +#view_bundle_deployWizard_error_9 = Failed to delete new destination in nextPage +#view_bundle_deployWizard_error_noBundleConfig = Failed to obtain bundle target information. Is the group you selected a valid compatible group that can be targeted for bundle deployments? +#view_bundle_deployWizard_getConfigSkip = No configuration needed for this bundle version. +#view_bundle_deployWizard_getConfigStep = Set Deployment Configuration +#view_bundle_deployWizard_getDestStep = New Destination +#view_bundle_deployWizard_getDest_deployDir = Deployment Directory +#view_bundle_deployWizard_getDest_deployDir_help = The directory where the bundle will be deployed. This directory will be the same for all deployments on all resources but it is relative to the destination base directory location. This means that the absolute directory may have a different path on the different target resources depending on where the base location is on all the different target resources. +#view_bundle_deployWizard_getDest_desc = Destination Description +#view_bundle_deployWizard_getDest_destBaseDirName = Base Location +#view_bundle_deployWizard_getDest_group_help = The group whose members will be the destination targets for all bundle deployments. Only compatible groups that contain resources that support bundle deployments are selectable. +#view_bundle_deployWizard_getDest_name = Destination Name +#view_bundle_deployWizard_getDest_name_help = The name of the destination, which will identify a particular group of resources and the destination directory on those resources for a particular bundle. +#view_bundle_deployWizard_getInfoStep = Provide Deployment Information +#view_bundle_deployWizard_getInfo_clean = Clean Deployment? (wipe deploy directory on destination platform) +#view_bundle_deployWizard_getInfo_deploymentDesc = Deployment Description +#view_bundle_deployWizard_getInfo_deploymentName = Deployment Name +#view_bundle_deployWizard_getOptionsStep = Deploy Options +#view_bundle_deployWizard_getOptions_deployLater = Deploy Later +#view_bundle_deployWizard_getOptions_deployNow = Deploy Now +#view_bundle_deployWizard_getOptions_deployTime = Deployment Time +#view_bundle_deployWizard_selectBundleStep = Select Deployment Bundle +#view_bundle_deployWizard_selectBundle_single = Select only a single bundle for deployment. +#view_bundle_deployWizard_selectVersionStep = Select Deployment Bundle Version +#view_bundle_deployWizard_selectVersion_latest = Latest Version [{0}] +#view_bundle_deployWizard_selectVersion_live = Live Version [{0}] +#view_bundle_deployWizard_selectVersion_select = Select Version from List: +#view_bundle_deployWizard_title = Bundle Deployment Wizard +#view_bundle_deploy_action = Action +#view_bundle_deploy_backButton = Back to Destination +#view_bundle_deploy_clickForError = Click the icon for the error message +#view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle deployment? This only deletes it from the database; all bundle content that was deployed on remote machines will remain. +#view_bundle_deploy_deleteFailure = Failed to delete the bundle deployment [{0}] +#view_bundle_deploy_deleteSuccessful = You successfully deleted the bundle deployment [{0}] +#view_bundle_deploy_deployedBy = Deployed By +#view_bundle_deploy_deploymentPlatforms = Deployment Resource +#view_bundle_deploy_installDetails = Install Details +#view_bundle_deploy_loadBundleFailure = Failed to find bundle +#view_bundle_deploy_loadDeployFailure = Failed to load bundle deployments +#view_bundle_deploy_loadFailure = Failed to load bundle deployment +#view_bundle_deploy_name = Deployment Name +#view_bundle_deploy_selectARow = Select a row to show installation details +#view_bundle_deploy_tagUpdateFailure = Failed to update bundle deployment tags +#view_bundle_deploy_tagUpdateSuccessful = You have successfully updated the bundle deployment tags +#view_bundle_deploy_time = Deployment Time +#view_bundle_deployed = Deployed +#view_bundle_deployments = Deployments +#view_bundle_dest_backToBundle = Back to Bundle +#view_bundle_dest_baseDirName = Base Location +#view_bundle_dest_created = Created +#view_bundle_dest_deleteConfirm = Are you sure you want to delete this bundle destination? This only deletes it from the database; all bundle content that was deployed to this destination on remote machines will remain. +#view_bundle_dest_deleteFailure = Failed to delete the bundle destination [{0}] +#view_bundle_dest_deleteSuccessful = You successfully deleted the bundle destination [{0}] +#view_bundle_dest_deployDir = Deploy Directory +#view_bundle_dest_group = Group +#view_bundle_dest_lastDeployedVersion = Last Deployed Version +#view_bundle_dest_lastDeploymentDate = Last Deployment Date +#view_bundle_dest_lastDeploymentStatus = Last Deployment Status +#view_bundle_dest_loadFailure = Failed to load bundle destinations +#view_bundle_dest_loadFailureVersionInfo = Failed to load bundle destination deployed version information +#view_bundle_dest_purgeConfirm = This will purge the bundle content from all remote machines. Are you sure you want to do this? +#view_bundle_dest_purgeFailure = Failed to purge the bundle destination [{0}] from some or all of the remote machines. +#view_bundle_dest_purgeSuccessful = You successfully purged the bundle destination [{0}] from all of the remote machines. +#view_bundle_dest_revertConfirm = This will revert all remote machines back to the previous bundle deployment. Are you sure you want to do this? +#view_bundle_dest_tagUpdateFailure = Failed to update bundle destination tags +#view_bundle_dest_tagUpdateSuccessful = You have successfully updated the bundle destination tags +#view_bundle_destinations = Destinations +#view_bundle_fileListView_fileSize = File Size +#view_bundle_fileListView_loadFailure = Failed to load bundle file data +#view_bundle_fileListView_md5 = MD5 +#view_bundle_fileListView_sha256 = SHA256 +#view_bundle_files = Files +#view_bundle_latestVersion = Latest Version +#view_bundle_list_backToAll = Back to All Bundles +#view_bundle_list_deleteConfirm = Are you sure you want to delete the selected bundles? This will delete all of their versions, destinations and deployments from the database. However, this will not remove any content from remote machines. +#view_bundle_list_deleteFailure = Failed to delete the bundle [{0}] +#view_bundle_list_deleteSuccessful = You successfully deleted the bundle [{0}] +#view_bundle_list_deletesFailure = Failed to delete the bundles +#view_bundle_list_deletesSuccessful = You successfully deleted the bundles +#view_bundle_list_destinationsCount = Destinations Count +#view_bundle_list_error1 = Failed to load bundle to deploy [{0}] +#view_bundle_list_error2 = Failed to get a single bundle to deploy [{0}] +#view_bundle_list_error3 = Failed to load bundle +#view_bundle_list_loadFailure = Failed to load the bundle to be deployed [{0}] +#view_bundle_list_loadWithLatestFailure = Failed to load bundle with the latest version data +#view_bundle_list_singleLoadFailure = Failed to get a single bundle to be deployed [{0}] +#view_bundle_list_tagUpdateFailure = Failed to update bundle tags +#view_bundle_list_tagUpdateSuccessful = You have successfully updated the bundle tags +#view_bundle_list_versionsCount = Versions Count +#view_bundle_purge = Purge +#view_bundle_recipe = Recipe +#view_bundle_resDeployDS_loadFailure = Failed to load bundle resource deployments +#view_bundle_revert = Revert +#view_bundle_revertWizard_confirmStep_confirmation = Reverting Live Deployment to Previous Deployment. Click "Next" to continue... +#view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment = Failed to find live deployment; cannot revert +#view_bundle_revertWizard_confirmStep_liveDeployment = Live Deployment +#view_bundle_revertWizard_confirmStep_name = Revert Deployment Confirmation +#view_bundle_revertWizard_confirmStep_noLiveDeployment = No live deployment was found for the destination [{0}] +#view_bundle_revertWizard_confirmStep_noLiveDeployment_concise = No live deployment was found for the destination +#view_bundle_revertWizard_confirmStep_noPriorDeployment = The live deployment [{0}] cannot be reverted because there is no prior deployment for the destination [{1}] +#view_bundle_revertWizard_confirmStep_noPriorDeployment_concise = The live deployment cannot be reverted because there is no prior deployment +#view_bundle_revertWizard_confirmStep_prevDeployment = Previous Deployment +#view_bundle_revertWizard_getInfoStep_cleanDeploy = Clean Deployment? (this will delete an old, existing deploy directory prior to starting the revert deployment) +#view_bundle_revertWizard_getInfoStep_getNameFailure = Failed to get revert deployment name +#view_bundle_revertWizard_getInfoStep_name = Provide Revert Information +#view_bundle_revertWizard_getInfoStep_revertDeployDesc = Revert Deploy Description +#view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From]\\n{0}\\n\\n[REVERT To]\\n{1} +#view_bundle_revertWizard_getInfoStep_revertDeployName = Revert Deploy Name +#view_bundle_revertWizard_revertStep_name = Deploy Bundle to Destination Platforms +#view_bundle_revertWizard_revertStep_reverting = Reverting... +#view_bundle_revertWizard_revertStep_scheduled = You have successfully scheduled the revert deployment! +#view_bundle_revertWizard_revertStep_scheduledDetails = You have successfully scheduled to revert the bundle deployment [{0}] from resource group [{1}] +#view_bundle_revertWizard_revertStep_scheduledFailure = Failed to schedule revert deployment! +#view_bundle_revertWizard_title = Bundle Revert +#view_bundle_revertWizard_windowTitle = Bundle Revert Wizard +#view_bundle_tree_loadFailure = Failed to load bundle data +#view_bundle_version_backToBundle = Back to Bundle +#view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version tags +#view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated the bundle version tags +#view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle version? This will not remove any content from remote machines. +#view_bundle_version_deleteFailure = Failed to delete the bundle version [{0}] +#view_bundle_version_deleteSuccessful = You successfully deleted the bundle version [{0}] +#view_bundle_version_loadFailure = Failed to load bundle version +#view_bundle_versions = Versions +#view_configCompare_comparingConfigs = Comparing Configurations +#view_configCompare_configCompare = Configuration Comparison +#view_configEdit_addItem = Add Item to List +#view_configEdit_confirm_1 = Are you sure you want to delete the selected properties from the set? +#view_configEdit_confirm_2 = Are you sure you want to delete this row? +#view_configEdit_confirm_3 = Are you sure you want to delete the [{0}] selected [{1}]? +#view_configEdit_editRow = Edit Row +#view_configEdit_enterPropName = Enter the name of the property to be added. +#view_configEdit_error_1 = Configuration is not supported by this Resource. +#view_configEdit_error_2 = Connection settings are not supported by this Resource. +#view_configEdit_error_3 = Cannot add property named [{0}]. The property name is already used in the set. +#view_configEdit_files = Files +#view_configEdit_hideAll = Hide All +#view_configEdit_jumpToSection = Jump to Section +#view_configEdit_msg_1 = Added property [{0}] to the set. +#view_configEdit_msg_2 = Removed properties from the set. +#view_configEdit_msg_3 = [{0} {1}] deleted from list. +#view_configEdit_msg_4 = Item added to list. +#view_configEdit_properties = Properties +#view_configEdit_tooltip_1 = Delete the selected items from the list. +#view_configEdit_tooltip_2 = Add an item to the list. +#view_configEdit_viewRow = View Row +#view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved. +#view_configurationDetails_configNotUpdatedDueToNoChange = Configuration was not updated, since the new configuration is equivalent to the current configuration. +#view_configurationDetails_error_updateFailure = Failed to update configuration. +#view_configurationDetails_messageConcise = Configuration updated - current version is {0}. +#view_configurationDetails_messageDetailed = Configuration updated to version {0} for Resource [{1}]. +#view_configurationDetails_noConfigurationFetched = No configuration was retrieved. This means that either the plugin failed to load the configuration or that configuration collection is merely switched off in the connection settings. +#view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration. +#view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved. +#view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history. +#view_configurationHistoryList_cannotDeleteCurrent = One of the selected history items represents the current configuration - you cannot delete it. +#view_configurationHistoryList_cannotDeleteGroupItems = One or more selected configuration history items are part of a group configuration update. You must purge that parent group history item before you can delete its individual resource history items. +#view_configurationHistoryList_delete_failure = Failed to delete the configuration history items. +#view_configurationHistoryList_delete_success = You successfully deleted the selected configuration history items. +#view_configurationHistoryList_rollback = Rollback +#view_configurationHistoryList_rollback_failure = Failed to rollback the configuration. The original configuration is still in effect. +#view_configurationHistoryList_rollback_success = You successfully rolled back the configuration to the selected past configuration. +#view_configurationHistoryList_table_clickStatusIcon = Click the status icon for full details +#view_configurationHistoryList_table_statusFailure = This configuration update failed +#view_configurationHistoryList_table_statusInprogress = This configuration update is still in progress +#view_configurationHistoryList_table_statusNochange = No changes were made to this configuration +#view_configurationHistoryList_table_statusSuccess = This configuration update was successful +#view_configurationHistoryList_title = Configuration History +#view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved. +#view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings. +#view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings update initiated. +#view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings update initiated for Resource [{0}]. +#view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings. +#view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved. +#view_core_loggedOut = Logged out +#view_core_noRecentAlerts = There are no recent alerts to report +#view_core_recentAlerts = There are [{0}] recent alerts - click to go to the recent alerts report +#view_core_serverUnreachable = The server is unreachable and may be down +#view_core_uncaught = Globally uncaught exception +#view_dashboardManager_deleteFail = Failed to delete dashboard. +#view_dashboardManager_deleted = Successfully deleted dashboard {0} +#view_dashboardManager_error = Failed to save dashboard to server +#view_dashboardManager_saved = Saved dashboard {0} to server +#view_dashboardManager_success = Saved dashboard +#view_dashboard_favorites_error1 = Failed to load favorite Resources. +#view_dashboardsManager_error1 = Failed to add new dashboard +#view_dashboardsManager_message_title_details = <h1>Welcome to {0}</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p> +#view_dashboards_confirm1 = Are you sure you want to delete +#view_dashboards_portlets_refresh_fail1 = Failed to update interval for portlets that auto-refresh +#view_dashboards_portlets_refresh_fail2 = Failed to disable reload for portlets that auto-refresh +#view_dashboards_portlets_refresh_multiple_min = {0} minutes +#view_dashboards_portlets_refresh_none = No Refresh +#view_dashboards_portlets_refresh_one_min = 1 minute +#view_dashboards_portlets_refresh_success1 = Updated interval for portlets that auto-refresh +#view_dashboards_portlets_refresh_success2 = Stopping reload for portlets that auto-refresh +#view_dashboards_title = Dashboard +#view_drift_button_detectNow = Detect Now +#view_drift_button_pinToDef = Pin to Definition +#view_drift_button_pinToDef_confirm = Pinning will set this snapshot as snapshot 0 for the definition. All other existing snapshots will be removed from the definition. The definition will be be marked as pinned and subsequent drift will always be reported against the pinned snapshot. Pin this snapshot to the definition? +#view_drift_button_pinToTemplate = Pin to Template +#view_drift_button_pinToTemplate_confirm = After pinning, this snapshot will be set to the initial snapshot for all definitions created using the template. If pinned to an existing template then the template''s existing definitions will be pinned to the new initial snapshot and their existing snapshots will be removed. Continue to template selection? +#view_drift_carousel_sizeFilterLabel = Snapshot Display Max +#view_drift_carousel_startFilterLabel = Snapshot Start +#view_drift_category_fileAdded = File Added +#view_drift_category_fileChanged = File Changed +#view_drift_category_fileNew = Newly Detected +#view_drift_category_fileRemoved = File Removed +#view_drift_confirm_deleteAllDefs = Delete all drift detection definitions? +#view_drift_confirm_deleteDefs = Delete the selected drift detection definition(s)? +#view_drift_confirm_deleteTemplate = Warning! Deleting this template will also cause all attached drift definitions to be deleted as well. Those attached definitions along with all of their snapshots will be permanently removed from the system. Detached definitions will not be removed. Are you sure you want to continue? +#view_drift_failure_deleteDefs = Failed to delete some or all drift detection definitions. +#view_drift_failure_deleteTemplates = Failed to delete some or all of the drift templates +#view_drift_failure_detectNow = Failed to submit drift detection run request +#view_drift_failure_load = Failed to fetch drift instances +#view_drift_failure_pinToDef = Failed to pin snapshot to definition +#view_drift_success_defUpdated = Drift detection definition updated and will affect the next detection run as applicable. +#view_drift_success_delete = Successfully deleted {0} drift instances +#view_drift_success_deleteDefs = Successfully deleted {0} drift detection definitions +#view_drift_success_deleteTemplate = Successfully deleted {0} drift templates +#view_drift_success_detectNow = Successfully submitted drift detection run request +#view_drift_success_pinToDef = Successfully pinned snapshot {0} to drift definition. +#view_drift_success_templateUpdated = Drift template updated and changes pushed to attached definitions. +#view_drift_table_attached = Attached? +#view_drift_table_baseDir = Base Directory +#view_drift_table_driftHandlingMode = Drift Handling +#view_drift_table_driftHandlingMode_normal = normal +#view_drift_table_driftHandlingMode_plannedChanges = planned changes +#view_drift_table_hover_defNotPinned = The drift definition is not pinned Click to view the initial snapshot. +#view_drift_table_hover_defPinned = The drift definition is pinned to its initial snapshot. Click to view the initial snapshot. +#view_drift_table_hover_edit = Click to view or edit the drift definition or template properties. +#view_drift_table_hover_outOfCompliance_drift = There is drift +#view_drift_table_hover_outOfCompliance_noBaseDir = The base directory does not exist +#view_drift_table_hover_templateNotPinned = The drift template is not pinned to a snapshot. +#view_drift_table_hover_templatePinned = The drift template is pinned to a snapshot. Click to view the pinned snapshot. +#view_drift_table_newFile = New File +#view_drift_table_oldFile = Old File +#view_drift_table_pinned = Pinned? +#view_drift_table_resourceDef = Resource Drift Detection Definition +#view_drift_table_resourceHistory = Resource Drift History +#view_drift_table_snapshot = Snapshot +#view_drift_table_snapshotTime = Snapshot Time +#view_drift_table_template = Template +#view_drift_table_title_initialSnapshot = Initial Snapshot for Definition [{0}] : Pinned = [{1}] +#view_drift_table_title_snapshot = Snapshot [{0}] for Definition [{1}] +#view_drift_table_title_templateSnapshot = Pinned Snapshot for Template [{0}] +#view_drift_wizard_addDef_failure = Failed to add new drift detection definition [{0}] +#view_drift_wizard_addDef_infoStepHelp = Each drift detection definition describes a set of files for which drift monitoring will be performed. The definition can be enabled and disabled, defines the detection run interval, and specifies a base directory and optional file filters. For each resource type offering drift detection there will be one or more predefined templates to use as a starting definition, which can then be edited. +#view_drift_wizard_addDef_infoStepName = Select the Template for the new Drift Detection Definition +#view_drift_wizard_addDef_success = Successfully added new drift detection definition [{0}]. Agent(s) will be updated. +#view_drift_wizard_addDef_templatePrompt = Drift Definition Templates +#view_drift_wizard_addDef_title = Add Drift Detection Definition for Resource of Type [{0}] +#view_drift_wizard_addDef_windowTitle = Add Drift Detection Definition Wizard +#view_drift_wizard_addTemplate_failure = Failed to add new drift template [{0}] +#view_drift_wizard_addTemplate_infoStepHelp = Each drift template is derived from an existing template. This provides a quick way to build new templates that are similar to existing templates, or originate with plugin defined templates. Like a drift definition, the template describes a set of files for which drift monitoring will be performed. Depending on the situation a definition derived from the template may or may not be allowed to alter the file set, or change other settings. Template names must be unique within a resource type. +#view_drift_wizard_addTemplate_infoStepName = Select the Starting Template +#view_drift_wizard_addTemplate_success = Successfully added new drift template [{0}]. +#view_drift_wizard_addTemplate_title = Add Drift Definition Template for Type [{0}] +#view_drift_wizard_addTemplate_windowTitle = Add Drift Definition Template Wizard +#view_drift_wizard_pinTemplate_confirmNotPinned = Once pinned each current and future drift definition for the template will have its initial snapshot set to the template''s pinned snapshot. Existing definitions for this template will be reset to the new initial snapshot, and all exsiting snapshots will be removed. Continue pinning the template to the snapshot? +#view_drift_wizard_pinTemplate_confirmPinned = Warning! This template is already pinned. The template can be re-pinned to this new snapshot. Once re-pinned each current and future drift definition for the template will have its initial snapshot set to the template''s pinned snapshot. Existing definitions for this template will be reset to the new initial snapshot, and all exsiting snapshots will be removed. Continue re-pinning the template with this new snapshot? +#view_drift_wizard_pinTemplate_duplicate_name_error = Template name must be unique +#view_drift_wizard_pinTemplate_failure = Failed to pin snapshot to drift template [{0}] +#view_drift_wizard_pinTemplate_infoStepExistingTemplate = Pin to ExistingTemplate +#view_drift_wizard_pinTemplate_infoStepHelp = Once pinned each current and future drift definition for that template will have its initial snapshot set to the template''s pinned snapshot. And the definition itself will be marked as pinned. This is used to detect drift from an expected file set. Note that existing definitions for this template will be reset to the new initial snapshot, and all exsiting snapshots will be removed. +#view_drift_wizard_pinTemplate_infoStepName = Select the Template to be Pinned +#view_drift_wizard_pinTemplate_infoStepNewTemplate = Pin to New Template (derived from the snapshot''s Drift Definition) +#view_drift_wizard_pinTemplate_infoStepRadioHelp = The snapshot can be pinned to a new or existing drift template. The ''New Template" option allows the user to promote a trusted definition and snapshot, at the resource level, to the type level. The new template can then be applied to members of the type. The new template is initially a copy of the snapshot''s drift definition but can then be edited in the next step. The name should be changed and must be a unique drift template name for the type. The "Existing Template" option allows the user to pin, or re-pin, an existing template with the selected snapshot. To be valid, the existing template must monitor the same directories as the snapshot''s definition. The selection box displays only valid existing templates. If there are no valid existing templates this option can not be selected. +#view_drift_wizard_pinTemplate_infoStepRadioTitle = Template Selection +#view_drift_wizard_pinTemplate_infoStepSelectBlocked = There are no existing templates that monitor the same directories as the snapshot''s definition. Select the "New Template" option to continue. +#view_drift_wizard_pinTemplate_infoStepSelectTitle = Existing Templates +#view_drift_wizard_pinTemplate_success = Successfully pinned the drift template [{0}]. +#view_drift_wizard_pinTemplate_title = Pin Snapshot [{0}] of Definition [{1}] to a Drift Template for type [{2}] +#view_drift_wizard_pinTemplate_windowTitle = Pin Drift Definition Template Wizard +#view_dynagroup_children = DynaGroup Children +#view_dynagroup_compatible = Compatible +#view_dynagroup_definitionAlreadyExists = A group definition already exists with this name +#view_dynagroup_definitionCreated = You have successfully created a group definition named [{0}] +#view_dynagroup_definitionLoadFailure = Failed to load group definitions +#view_dynagroup_definitions = DynaGroup Definitions +#view_dynagroup_deleteFailureSelection = Failed to delete the selected group definitions +#view_dynagroup_deleteSuccessfulSelection = You have successfully deleted [{0}] group definitions +#view_dynagroup_editing = Editing [{0}] +#view_dynagroup_exprBuilder_addExpression = Add Expression +#view_dynagroup_exprBuilder_comparisonType = Comparison Type +#view_dynagroup_exprBuilder_comparisonType_contains = contains +#view_dynagroup_exprBuilder_comparisonType_endsWith = ends with +#view_dynagroup_exprBuilder_comparisonType_equals = equals +#view_dynagroup_exprBuilder_comparisonType_startsWith = starts with +#view_dynagroup_exprBuilder_comparisonType_tooltip = Comparison Type +#view_dynagroup_exprBuilder_definingPlugin = Defining Plugin +#view_dynagroup_exprBuilder_definingPlugin_tooltip = The plugin to search +#view_dynagroup_exprBuilder_expression = Expression +#view_dynagroup_exprBuilder_expressionType = Expression Type +#view_dynagroup_exprBuilder_expressionType_pluginConfig = Plugin Configuration +#view_dynagroup_exprBuilder_expressionType_resource = Resource +#view_dynagroup_exprBuilder_expressionType_resourceCategory = Resource Category +#view_dynagroup_exprBuilder_expressionType_resourceConfig = Resource Configuration +#view_dynagroup_exprBuilder_expressionType_resourceType = Resource Type +#view_dynagroup_exprBuilder_expressionType_tooltip = The type of property this expression switches on:<br/> <b>Resource</b>: A resource property such as its name or version<br/> <b>Resource Type</b>: Search for resources of a specific type<br/> <b>Resource Category</b>: Search for resources by category: platform, server, service<br/> <b>Trait</b>: Resources that have selected values for a monitored trait<br/> <b>Plugin Configuration</b>: Search by the plugin component configuration setting of the component<br/> <b>Resource Configuration</b>: Search by the configuration setting of the managed resource +#view_dynagroup_exprBuilder_expressionType_trait = Trait +#view_dynagroup_exprBuilder_expression_tooltip = This is the full expression that is represented by the selections in the form below. This text will be added to your group definition expression text when you click the "Add Expression" button. +#view_dynagroup_exprBuilder_groupBy = Group by +#view_dynagroup_exprBuilder_groupBy_tooltip = GroupBy will cause the system to pivot on the values from the entered expressions creating a separate group for each value. For example, GroupBy on the cluster name to create a group for each cluster with all cluster members in it. +#view_dynagroup_exprBuilder_noPlugins = --No plugins-- +#view_dynagroup_exprBuilder_noProperties = --No properties-- +#view_dynagroup_exprBuilder_noResourceTypes = --No resource types-- +#view_dynagroup_exprBuilder_pluginLoadFailure = Cannot get the list of plugins +#view_dynagroup_exprBuilder_propLoadFailure = Cannot get list of properties +#view_dynagroup_exprBuilder_propertyName = Property Name +#view_dynagroup_exprBuilder_propertyName_tooltip = The name of the property to query. This is defined by the expression type as well as the resource type. +#view_dynagroup_exprBuilder_resTypeLoadFailure = Cannot get list of resource types for plugin [{0}] +#view_dynagroup_exprBuilder_resource = Resource +#view_dynagroup_exprBuilder_resourceType = Resource Type +#view_dynagroup_exprBuilder_resourceType_tooltip = The type of resource +#view_dynagroup_exprBuilder_resource_child = Child +#view_dynagroup_exprBuilder_resource_grandparent = Grandparent +#view_dynagroup_exprBuilder_resource_greatGrandparent = GreatGrandparent +#view_dynagroup_exprBuilder_resource_greatGreatGrandparent = GreatGreatGrandparent +#view_dynagroup_exprBuilder_resource_parent = Parent +#view_dynagroup_exprBuilder_resource_resource = Resource +#view_dynagroup_exprBuilder_resource_tooltip = Choose the level of the resource you wish to select. For example, select "parent" will find resources whose parent resource matches the rest of the expression. +#view_dynagroup_exprBuilder_savedExpression = Saved Expression +#view_dynagroup_exprBuilder_title = Expression Builder +#view_dynagroup_exprBuilder_unset = Unset +#view_dynagroup_exprBuilder_unset_tooltip = Unset will find all of the values that have a null value in the database. This is not possible using the "=" operator because of how databases store and query data. +#view_dynagroup_exprBuilder_value_tooltip = The string value for the expression to query +#view_dynagroup_expression = Expression +#view_dynagroup_expressionBuilderIconTooltip = Expression Builder... +#view_dynagroup_expressionSet = Expression Set +#view_dynagroup_lastCalculationTime = Last Calculation Time +#view_dynagroup_loadDefinitionFailure = Failed to load group definition [{0}] +#view_dynagroup_loadDefinitionMissing = There is no group definition with the ID of [{0}] +#view_dynagroup_mixed = Mixed +#view_dynagroup_newGroupDefinition = New Group Definition +#view_dynagroup_nextCalculationTime = Next Calculation Time +#view_dynagroup_permDenied = You do not have permission to view group definitions +#view_dynagroup_recalcFailure = Failed to recalculate this group definition +#view_dynagroup_recalcFailureSelection = Failed to recalculate the selected group definitions +#view_dynagroup_recalcSuccessful = You have successfully recalculated this group definition +#view_dynagroup_recalcSuccessfulSelection = You have successfully recalculated [{0}] group definitions +#view_dynagroup_recalculate = Recalculate +#view_dynagroup_recalculationInterval = Recalculation Interval (min) +#view_dynagroup_recursive = Recursive +#view_dynagroup_saveAndRecalculate = Save & Recalculate +#view_dynagroup_saveFailure = Failed to save the group definition named [{0}] +#view_dynagroup_saveSuccessful = You have successfully saved the group definition named [{0}] +#view_dynagroup_singleSaveFailure = An error occurred - there should have been one created, but instead there were [{0}] created +#view_dynagroup_template_customExpression = Custom Expression... +#view_dynagroup_template_downedResources = All resources currently down +#view_dynagroup_template_jbossas4_clusters = JBossAS 4 - Clusters +#view_dynagroup_template_jbossas4_earClusters = JBossAS 4 - Clustered EARs +#view_dynagroup_template_jbossas4_hostingApp = JBossAS 4 - All hosting any version of "my" app +#view_dynagroup_template_jbossas4_nonsecured = JBossAS 4 - All non-secured +#view_dynagroup_template_jbossas4_uniqueVersions = JBossAS 4 - Unique versions +#view_dynagroup_template_jbossas5_clusters = JBossAS 5/6 - Clusters +#view_dynagroup_template_platforms = Platform resources in inventory +#view_dynagroup_template_uniqueResourceTypes = Unique resource types in inventory +#view_groupConfigEdit_member = Member +#view_groupConfigEdit_noListProps = List properties are not currently supported for group configurations. +#view_groupConfigEdit_saveReminder = You changed some settings - do not forget to save those changes or they will be lost.\n +#view_groupConfigEdit_setAll = Set all values to: +#view_groupConfigEdit_tooltip_1 = Member values differ - click icon to edit them. +#view_groupConfigEdit_unset = Unset +#view_groupConfigEdit_valsDiff = member values differ +#view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}] +#view_groupCreateWizard_createFailure = Failed to create the resource group [{0}] : {1} +#view_groupCreateWizard_createStepName = Group Settings +#view_groupCreateWizard_createStep_group_exists = Group with name [{0}] already exists +#view_groupCreateWizard_createStep_recursive = Recursive +#view_groupCreateWizard_createSuccessful_concise = You have created a new resource group with name [{0}]. +#view_groupCreateWizard_createSuccessful_full = You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources +#view_groupCreateWizard_membersStepName = Select Members +#view_groupCreateWizard_title = Create Group +#view_groupCreateWizard_windowTitle = Create Group +#view_groupInventoryMembers_button_updateMembership = Update Membership... +#view_groupInventoryMembers_title_updateMembership = Update Membership +#view_group_detail_failLoad = Failed to load group for group with ID [{0}] +#view_group_detail_failLoadComp = Group with id [{0}] does not exist or is not accessible +#view_group_detail_failRecursiveChange = Failed to update the recursive setting for group [{0}] +#view_group_detail_recursiveChange = You successfully changed the recursive setting for group [{0}] +#view_group_inventory_activity_no_recent_metrics = This group has no recent metrics +#view_group_meas_schedules_title = Group Metric Collection Schedules +#view_group_membership_failFetch = Failed to fetch Resource Group +#view_group_membership_saveFailure = Failed to update membership of group [{0}] +#view_group_membership_saveSuccessful = You have updated the membership of group [{0}] +#view_group_operationScheduleDetails_failedToLoadMembers = Failed to load group member Resources. +#view_group_operationScheduleDetails_field_execute = Execute +#view_group_operationScheduleDetails_field_haltOnFailure = Halt on Failure? +#view_group_operationScheduleDetails_memberResource = Member Resource +#view_group_operationScheduleDetails_value_parallel = in parallel +#view_group_operationScheduleDetails_value_sequential = in the order specified below (drag and drop member Resources to change order) +#view_group_pluginConfig_edit_currentGroupProperties = Current Group Properties +#view_group_pluginConfig_edit_invalid = The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}] +#view_group_pluginConfig_edit_noperm = You do not have permission to edit this group connection settings +#view_group_pluginConfig_edit_saveFailure = Failed to initiate group connection setting update for [{0}] compatible group named [{1}] +#view_group_pluginConfig_edit_saveInitiated_concise = The group connection setting updates have been initiated +#view_group_pluginConfig_edit_saveInitiated_full = The group connection setting updates have been initiated for the [{0}] compatible group named [{1}] +#view_group_pluginConfig_edit_saveTooltip = Update the connection settings of all group members +#view_group_pluginConfig_edit_valid = All connection setting properties have valid values, so the connection settings can now be saved +#view_group_pluginConfig_members_fetchFailure = Failed to get plugin config update history for members of group [{0}] +#view_group_pluginConfig_members_fetchFailureConn = Failed to retrieve member connection settings for [{0}] +#view_group_pluginConfig_members_fetchFailureConnInProgress = A group plugin configuration update is currently in progress. You must wait until the update is finished before you can view the group settings. +#view_group_pluginConfig_members_statusDetails = Status Details +#view_group_pluginConfig_members_statusFailure = This configuration update failed for an unknown reason +#view_group_pluginConfig_members_statusInprogress = This configuration update is still in progress +#view_group_pluginConfig_members_statusNochange = No changes were made to this configuration +#view_group_pluginConfig_members_statusSuccess = This configuration update was successful +#view_group_pluginConfig_members_title = Group Connection Settings Member Histories +#view_group_pluginConfig_table_clickStatusIcon = Click the status icon for full details +#view_group_pluginConfig_table_deleteFailure = Failed to delete group plugin config history +#view_group_pluginConfig_table_deleteSuccessful = You have deleted [{0}] history items +#view_group_pluginConfig_table_failFetch = Failed to get group plugin config history +#view_group_pluginConfig_table_msg1 = View Member History for status of each individual resource +#view_group_pluginConfig_table_statusDetails = Status Details +#view_group_pluginConfig_table_statusFailure = This group configuration update failed +#view_group_pluginConfig_table_statusInprogress = This group configuration update is still in progress +#view_group_pluginConfig_table_statusNochange = No changes were made to this group configuration +#view_group_pluginConfig_table_statusSuccess = This group configuration update was successful +#view_group_pluginConfig_table_title = Group Connection Settings History +#view_group_pluginConfig_table_viewMemberHistory = View Member History +#view_group_pluginConfig_table_viewSettings = View Settings +#view_group_pluginConfig_view_groupProperties = Group Properties +#view_group_pluginConfig_view_noperm = You do not have permissions to see the connection settings +#view_group_resConfig_edit_invalid = The following configuration properties have invalid values and must be corrected before the configuration can be saved: [{0}] +#view_group_resConfig_edit_loadFail = Failed to retrieve member Resource configurations for [{0}] +#view_group_resConfig_edit_noperm = You do not have permission to edit this group configuration +#view_group_resConfig_edit_saveFailure = Failed to initiate group configuration update for [{0}] compatible group named [{1}] +#view_group_resConfig_edit_saveInitiated_concise = The group configuration updates have been initiated +#view_group_resConfig_edit_saveInitiated_full = The group configuration updates have been initiated for the [{0}] compatible group named [{1}] +#view_group_resConfig_edit_saveTooltip = Update the configurations of all group members +#view_group_resConfig_edit_valid = All configuration properties have valid values, so the configuration can now be saved +#view_group_resConfig_members_fetchFailure = Failed to get resource config update history for members of group [{0}] +#view_group_resConfig_members_fetchFailureConfig = Failed to retrieve member resource configuration settings for [{0}] +#view_group_resConfig_members_fetchFailureConfigInProgress = A group resource configuration update is currently in progress. You must wait until the update is finished before you can view the group settings. +#view_group_resConfig_members_statusDetails = Status Details +#view_group_resConfig_members_statusFailure = This configuration update failed for an unknown reason +#view_group_resConfig_members_statusInprogress = This configuration update is still in progress +#view_group_resConfig_members_statusNochange = No changes were made to this configuration +#view_group_resConfig_members_statusSuccess = This configuration update was successful +#view_group_resConfig_members_title = Group Resource Configuration Member Histories +#view_group_resConfig_table_clickStatusIcon = Click the status icon for full details +#view_group_resConfig_table_deleteFailure = Failed to delete group resource config history +#view_group_resConfig_table_deleteSuccessful = You have deleted [{0}] history items +#view_group_resConfig_table_failFetch = Failed to get group resource config history +#view_group_resConfig_table_msg1 = View Member History for status of each individual resource +#view_group_resConfig_table_statusDetails = Status Details +#view_group_resConfig_table_statusFailure = This group configuration update failed +#view_group_resConfig_table_statusInprogress = This group configuration update is still in progress +#view_group_resConfig_table_statusNochange = No changes were made to this group configuration +#view_group_resConfig_table_statusSuccess = This group configuration update was successful +#view_group_resConfig_table_title = Group Resource Configuration History +#view_group_resConfig_table_viewMemberHistory = View Member History +#view_group_resConfig_table_viewSettings = View Settings +#view_group_resConfig_view_groupProperties = Group Properties +#view_group_resConfig_view_noperm = You do not have permissions to see the resource configuration settings +#view_group_summary_compatible = Compatible +#view_group_summary_descUpdateFailure = Failed to change the description of the resource group with ID [{0}] +#view_group_summary_descUpdateSuccessful = You have changed the description of this resource group +#view_group_summary_dynamic = Dynamic +#view_group_summary_dynamicNote = Dynamic group names and descriptions are managed, and therefore are not editable +#view_group_summary_groupDefinition = Group Definition +#view_group_summary_memberCount = Member Count +#view_group_summary_memberType = Member Type +#view_group_summary_mixed = Mixed +#view_group_summary_nameUpdateFailure = Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}] +#view_group_summary_nameUpdateSuccessful = You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}] +#view_group_summary_recursive = Recursive +#view_helpTop_description = This section provides access to documentation, tutorials, version, and other helpful information. +#view_help_section_product = Product +#view_help_section_product_about = About +#view_inventory_adq = Discovery Queue +#view_inventory_allGroups = All Groups +#view_inventory_allResources = All Resources +#view_inventory_collectionInterval = Collection Interval +#view_inventory_dynagroupDefs = Dynagroup Definitions +#view_inventory_eventDetails_loadFailed = An error occurred loading the event details +#view_inventory_eventHistory_deleteFailed = Failed to deleted selected events for [{0}] +#view_inventory_eventHistory_deleteSuccessful = You have successfully deleted [{0}] events for [{1}] +#view_inventory_eventHistory_details = Details +#view_inventory_eventHistory_detailsFilter = Details Filter +#view_inventory_eventHistory_groupEventHistory = Group Event History +#view_inventory_eventHistory_purgeFailed = Failed to purge events for [{0}] +#view_inventory_eventHistory_purgeSuccessful = You have successfully purged [{0}] events for [{1}] +#view_inventory_eventHistory_resourceEventHistory = Resource Event History +#view_inventory_eventHistory_severity = Severity +#view_inventory_eventHistory_severityFilter = Severity Filter +#view_inventory_eventHistory_sourceFilter = Source Filter +#view_inventory_eventHistory_sourceLocation = Source Location +#view_inventory_eventHistory_timestamp = Timestamp +#view_inventory_groups = Groups +#view_inventory_groups_children = Children +#view_inventory_groups_deleteFailed = Failed to delete the selected resource groups +#view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups +#view_inventory_groups_descendants = Descendants +#view_inventory_groups_loadFailed = Failed to load group composite data +#view_inventory_mixed = mixed +#view_inventory_platforms = Platforms +#view_inventory_problemGroups = Problem Groups +#view_inventory_resource_loadFailed = Resource with id [{0}] does not exist or is not accessible +#view_inventory_resources_deleteConfirm = Are you sure you want to delete the selected resources? +#view_inventory_resources_deleteFailed = Failed to delete the selected resources +#view_inventory_resources_deleteSuccessful = A request to perform the resource deletion has been submitted successfully to the agent(s). +#view_inventory_resources_disableConfirm = Are you sure you want to disable the selected resources? While disabled availabilities reported from the agent will be ignored. Disabling can be useful for resources that are expected to be down as part of normal operations or maintenance. +#view_inventory_resources_disableFailed = Failed to disable the selected resources. +#view_inventory_resources_disableSuccessful = You have successfully disabled the selected resources and their children, [{0}] resources. +#view_inventory_resources_enableConfirm = Are you sure you want to enable the selected resources? When enabled the availability will be set to UNKNOWN until the agents next report availability for the resources. The agents will be requested to report the current availabilities at their earliest convenience. +#view_inventory_resources_enableFailed = Failed to enable the selected resources. +#view_inventory_resources_enableSuccessful = You have successfully enabled the selected resources and their children, [{0}] resources. +#view_inventory_resources_loadFailed = Failed to load resource composite data +#view_inventory_resources_members = Member Resources +#view_inventory_resources_uninventoryConfirm = Are you sure you want to uninventory the selected resources? Note that if a selected resource still exists, then it will get rediscovered during its agent''s next discovery scan. +#view_inventory_resources_uninventoryFailed = Failed to uninventory the selected resources +#view_inventory_resources_uninventorySuccessful = You have successfully uninventoried the selected resources +#view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed. +#view_inventory_servers = Servers +#view_inventory_serversTop = Servers - Top Level Imports +#view_inventory_services = Services +#view_inventory_summary_agent_error1 = Failed to locate agent managing resource id +#view_inventory_summary_agent_error2 = Failed to ping agent managing resource id +#view_inventory_summary_agent_error3 = You do not have permission to view details for this Agent. +#view_inventory_summary_agent_fullEnpoint = Full Endpoint +#view_inventory_summary_agent_fullEnpoint_err1 = !No remote endpoint associated with this resource! +#view_inventory_summary_agent_last_title = Last Received Availability Report +#view_inventory_summary_agent_status_title = Agent Communications Status +#view_inventory_summary_agent_title = Agent Managing this Resource +#view_inventory_unavailableServers = Unavailable Servers +#view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid. +#view_login_invalidEmail = Invalid e-mail address +#view_login_login = Login +#view_login_logout = Logout +#view_login_noBackend = The backend datasource is unavailable. +#view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required. +#view_login_noUser = The username or password provided does not match our records. +#view_login_prompt = Please Login +#view_login_registerLater = (Cancel - Complete registration later.) +#view_login_registerLdapSuccess = Successfully registered the new LDAP User. +#view_login_registerUser = Register User +#view_login_welcomeMsg = Welcome to {0}! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK", you will be logged in.<br/><br/> +#view_measureRange_last = Time Range - Previous +#view_measureRange_simple = Simple... +#view_measureRange_start = Time Range - Start +#view_measureTable_chartMetricValues = Chart Selected Metrics +#view_measureTable_getLive = Get Live Value +#view_measureTable_getLive_failure = Cannot get live values for those metrics. Make sure the agent is running and the managed resource is up. +#view_measureTable_live_title = Live Data +#view_measure_nan = --no data available-- +#view_measurementOob_title = Suspect Metrics +#view_menuBar_logout = Logout +#view_messageCenter_clearAllMessages = Clear All Messages +#view_messageCenter_lastNMessages = Last {0} Messages +#view_messageCenter_maxMessages = Max Messages +#view_messageCenter_messageBarShowDetails = Show Details +#view_messageCenter_messageDetail = Detail +#view_messageCenter_messageSeverity = Severity +#view_messageCenter_messageTime = Time +#view_messageCenter_messageTitle = Message Center +#view_messageCenter_noRecentMessages = No Recent Messages +#view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +#view_metric_traits = Traits +#view_metric_viewTraitHistory = Value History for Trait [{0}] +#view_operationHistoryDetails_dateCompleted = Date Completed +#view_operationHistoryDetails_dateSubmitted = Date Submitted +#view_operationHistoryDetails_error_fetchFailure = Failure loading operation history. +#view_operationHistoryDetails_noResults = This operation does not return any results. +#view_operationHistoryDetails_operation = Operation +#view_operationHistoryDetails_parameters = Parameters +#view_operationHistoryDetails_requestor = Requestor +#view_operationHistoryDetails_results = Results +#view_operationHistoryDetails_status = Status +#view_operationHistoryList_button_forceDelete = Force Delete +#view_operationHistoryList_button_runOperation = Run Operation +#view_operationHistoryList_notYetStarted = not yet started +#view_operationHistoryList_title = Operation History +#view_operationScheduleDetails_enterParametersBelow = Enter parameters below... +#view_operationScheduleDetails_fieldDefault_description = Select an operation to see its description. +#view_operationScheduleDetails_fieldDefault_parameters = Select an operation to see its parameters. +#view_operationScheduleDetails_fieldHelp_description = an optional description of this scheduled operation (e.g. nightly maintenance app server restart) +#view_operationScheduleDetails_fieldHelp_timeout = a time duration - if specified, if the duration elapses before a scheduled operation execution has completed, the {0} Server will timeout the operation and consider it to have failed; note, it is usually not possible to abort the underlying managed resource operation if it was already initiated +#view_operationScheduleDetails_field_description = Description +#view_operationScheduleDetails_field_parameters = Parameters +#view_operationScheduleDetails_field_timeout = Timeout +#view_operationScheduleDetails_noParameters = This operation does not take any parameters. +#view_operationScheduleDetails_operationSchedule = Operation Schedule +#view_portlet_autodiscovery_setting_platforms = discovered platforms +#view_portlet_configure_definitionDesc = The configuration settings for the portlet. +#view_portlet_configure_definitionTitle = Portlet Configuration +#view_portlet_configure_needed = Click the Settings button to configure this portlet. +#view_portlet_configure_notNeeded = Configuration is not necessary for this portlet. +#view_portlet_defaultName_autodiscovery = Discovery Queue +#view_portlet_defaultName_favoriteResources = Favorite Resources +#view_portlet_defaultName_groupMetric = Resource Group Metric Graph +#view_portlet_defaultName_group_alerts = Group: Alerts +#view_portlet_defaultName_group_bundles = Group: Bundle Deployments +#view_portlet_defaultName_group_config_updates = Group: Configuration Updates +#view_portlet_defaultName_group_events = Group: Event Counts +#view_portlet_defaultName_group_metrics = Group: Metrics +#view_portlet_defaultName_group_oobs = Group: OOB Conditions +#view_portlet_defaultName_group_operations = Group: Operations +#view_portlet_defaultName_group_pkg_hisory = Group: Package History +#view_portlet_defaultName_inventorySummary = Inventory Summary +#view_portlet_defaultName_mashup = Mashup +#view_portlet_defaultName_message = Message +#view_portlet_defaultName_operations = Recent Operations +#view_portlet_defaultName_platformSummary = Platform Utilization +#view_portlet_defaultName_problemResources = Alerted or Unavailable Resources +#view_portlet_defaultName_recentAlerts = Recent Alerts +#view_portlet_defaultName_recentlyAddedResources = Recently Added Resources +#view_portlet_defaultName_resourceMetric = Resource Metric Graph +#view_portlet_defaultName_resource_alerts = Resource: Alerts +#view_portlet_defaultName_resource_bundles = Resource: Bundle Deployments +#view_portlet_defaultName_resource_config_updates = Resource: Configuration Updates +#view_portlet_defaultName_resource_events = Resource: Event Counts +#view_portlet_defaultName_resource_metrics = Resource: Measurements +#view_portlet_defaultName_resource_oobs = Resource: OOB Metrics +#view_portlet_defaultName_resource_operations = Resource: Operations +#view_portlet_defaultName_resource_pkg_hisory = Resource: Package History +#view_portlet_factory_invalidPortlet = This is an obsolete portlet that is no longer valid. Please delete it. +#view_portlet_graph_configure_metricDefinition_graph = The metric definition id to graph +#view_portlet_graph_configure_resource_graph = The resource to graph +#view_portlet_help_autodiscovery = This portlet allows import or ignore of newly discovered resources. Imported resources are added to inventory for monitoring and management. Ignored resources are not imported and are hidden from view unless explicitly unignored. +#view_portlet_help_bundle_deps = This portlet shows relevant bundle deployments based on display criteria configured. +#view_portlet_help_config_updates = This portlet displays recent configuration changes consistent with configuration settings. +#view_portlet_help_eventcounts = This portlet displays Event counts consistent with display criteria configured. +#view_portlet_help_favoriteResources = This portlet displays the current user''s favorite resources. +#view_portlet_help_graph = This portlet displays the resource metric graph. +#view_portlet_help_inventorySummary = This portlet displays a short summary of the current user''s viewable inventory and metric collection rate. +#view_portlet_help_mashup = This portlet displays the returned content of a remote HTTP request (via an iframe). +#view_portlet_help_message = This portlet displays a static HTML message. The <i>message</i> property must be configured. +#view_portlet_help_metrics = This portlet graphs relevant recent metric data based on display criteria configured. +#view_portlet_help_none = There is no help available for this portlet. +#view_portlet_help_oobs = This portlet displays OOB(Out of Bound) metric conditions. +#view_portlet_help_operations = This portlet displays the most recently executed operations for the current user''s inventory. +#view_portlet_help_operations_criteria = This portlet displays Operations consistent with display criteria configured. +#view_portlet_help_pkg_history = This portlet shows relevant package history based on display criteria configured. +#view_portlet_help_platformSummary = This portlet displays utilization data (such as current CPU and memory usage) for platform resources that are accessible by the current user. +#view_portlet_help_problemResources = This portlet displays the current user''s alerted or unavailable resources. +#view_portlet_help_recentAlerts = This portlet displays alerts recently fired on the current user''s viewable inventory. +#view_portlet_help_recentDrifts = This portlet displays recent file drift on the current user''s viewable inventory. +#view_portlet_help_recentlyAdded = This portlet displays resources that have recently been imported into inventory. +#view_portlet_help_scheduledOperations = This portlet displays the next scheduled operations for the current user''s inventory. +#view_portlet_help_tagCloud = This portlet displays the relative tag counts for the current user''s inventory. +#view_portlet_inventory_error1 = Failed to retrieve inventory summary +#view_portlet_inventory_tooltip_collapse = Click to hide details for this resource. +#view_portlet_inventory_tooltip_expand = Click to show more details for this resource. +#view_portlet_message_title = The message to display. +#view_portlet_operations_config_completed = completed operations +#view_portlet_operations_config_completed_enable = Whether to enable completed operations results grouping for dashboard. +#view_portlet_operations_config_completed_maximum = Maximum number of Completed operations to display. +#view_portlet_operations_config_scheduled_enable = Whether to enable scheduled operations results grouping for dashboard. +#view_portlet_operations_config_scheduled_maximum = Maximum number of Scheduled operations to display. +#view_portlet_operations_config_show_last = show Last +#view_portlet_operations_config_show_next = show Next +#view_portlet_operations_disabled = (Results currently disabled. Change settings to enable results. +#view_portlet_platform_platform_error_1 = Failed to load platform metrics +#view_portlet_platform_type_error_1 = Could not load type data +#view_portlet_problemResources_config_display_maximum = Maximum number of Problem resources to display. +#view_portlet_problemResources_config_display_range = Show problem resources going back this many hours. +#view_portlet_problemResources_config_display_range2 = From {0} to {1} +#view_portlet_problemResources_maxDisplaySetting = maximum resources. +#view_portlet_recentAlerts_config_members = Select Members +#view_portlet_recentAlerts_config_priority_label = priority Alerts, +#view_portlet_recentAlerts_config_when = within the past +#view_portlet_recentAlerts_fail_msg = Failed to load resources assigned for alert filtering. +#view_portlet_recentlyAdded_error1 = Failed to load recently added resources +#view_portlet_recentlyAdded_setting_addedPlatforms = recently added platforms +#view_portlet_results_empty = No results found using specified criteria. +#view_remoteAgentInstall_agentStatus = Agent Status +#view_remoteAgentInstall_agentStatusDefault = -Click Update Status Button- +#view_remoteAgentInstall_buttonFindAgent = Find Agent +#view_remoteAgentInstall_connInfo = Connection Information +#view_remoteAgentInstall_error_1 = Error occurred while trying to find agent install path +#view_remoteAgentInstall_error_2 = Could not find an agent installed when looking in common locations +#view_remoteAgentInstall_error_3 = Could not find an agent installed at or under [{0}] +#view_remoteAgentInstall_error_4 = Failed to install agent +#view_remoteAgentInstall_error_5 = Failed to start agent +#view_remoteAgentInstall_error_6 = Failed to stop agent +#view_remoteAgentInstall_installAgent = Install Agent +#view_remoteAgentInstall_installInfo = Agent Installation Information +#view_remoteAgentInstall_installPath = Agent Install Path +#view_remoteAgentInstall_owner = Owner +#view_remoteAgentInstall_promptHost = The host where the agent is or will be installed +#view_remoteAgentInstall_promptInstallPath = Where the agent is or will be installed. If you aren''t sure where an agent is installed, enter a parent directory and click the ''Find Agent'' button to scan that directory and below. If you enter an empty path, common locations are searched on the host for an agent install. +#view_remoteAgentInstall_promptPassword = The credentials that are used to authenticate the user on the host via SSH +#view_remoteAgentInstall_promptPort = The port the SSH server is listening to. If not specified, the default is 22 +#view_remoteAgentInstall_promptUser = The name of the user whose credentials are passed to the host via SSH +#view_remoteAgentInstall_result = Result +#view_remoteAgentInstall_resultCode = ResultCode +#view_remoteAgentInstall_startAgent = Start Agent +#view_remoteAgentInstall_startAgentResults = Agent start results: [{0}] +#view_remoteAgentInstall_step = Step +#view_remoteAgentInstall_stopAgent = Stop Agent +#view_remoteAgentInstall_stopAgentResults = Agent stop results: [{0}] +#view_remoteAgentInstall_success = Agent installation complete +#view_remoteAgentInstall_updateStatus = Update Status +#view_reportsTop_description = This section provides access to global reports. +#view_reportsTop_title = Reports +#view_reports_alertDefinitions = Alert Definitions +#view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition +#view_reports_alertDefinitions_resTypeLoadError = Cannot get the template resource type - unable to view the alert template. +#view_reports_driftCompliance = Drift Compliance +#view_reports_inventorySummary_failFetch = Failed to get inventory summary +#view_reports_platforms = Platform Utilization +#view_reports_subsystems = Subsystems +#view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups. +#view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups. +#view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. +#view_resource_inventory_activity_changed_by = Changed by +#view_resource_inventory_activity_criteria_no_recent_events = No event counts based off display criteria. +#view_resource_inventory_activity_no_recent_alerts = No recent alerts +#view_resource_inventory_activity_no_recent_bundle_deploy = No recent bundle deployments +#view_resource_inventory_activity_no_recent_config_history = No configuration change history +#view_resource_inventory_activity_no_recent_events = No events in the last 24 hours +#view_resource_inventory_activity_no_recent_metrics = This resource has no recent metrics +#view_resource_inventory_activity_no_recent_oob = No OOB conditions found +#view_resource_inventory_activity_no_recent_operations = No recent operation history +#view_resource_inventory_activity_no_recent_pkg_history = No recent package history +#view_resource_inventory_childhistory_createdChild = Created Child +#view_resource_inventory_childhistory_deletedChild = Deleted Child +#view_resource_inventory_childhistory_filterTitle = Past N Days +#view_resource_inventory_childhistory_status_invalidArtifact = Invalid Artifact +#view_resource_inventory_childhistory_status_invalidConfig = Invalid Configuration +#view_resource_monitor_availability_availability = Availability +#view_resource_monitor_availability_availability_tooltip = Percentage of time the resource has been UP compared to the times it was down and disabled +#view_resource_monitor_availability_currentAsOf = This data is current as of {0} +#view_resource_monitor_availability_currentStatus = Current Status +#view_resource_monitor_availability_currentStatus_value = This resource has been {0} since {1} +#view_resource_monitor_availability_disabled = Disabled +#view_resource_monitor_availability_disabledTime = Disabled Time +#view_resource_monitor_availability_disabledTime_tooltip = The cumulative amount of time the resource has been DISABLED +#view_resource_monitor_availability_disabled_tooltip = Percentage of time the resource has been DISABLED compared to the times it was up and down +#view_resource_monitor_availability_down = Down +#view_resource_monitor_availability_down_tooltip = Percentage of time the resource has been DOWN compared to the times it was up and disabled +#view_resource_monitor_availability_downtime = Downtime +#view_resource_monitor_availability_downtime_tooltip = The cumulative amount of time the resource has been DOWN +#view_resource_monitor_availability_loadFailed = Failed to load availability history +#view_resource_monitor_availability_mtbf = MTBF +#view_resource_monitor_availability_mtbf_tooltip = Mean Time Before Failure - in short, this indicates the average time spent in the UP state prior to going DOWN +#view_resource_monitor_availability_mttr = MTTR +#view_resource_monitor_availability_mttr_tooltip = Mean Time To Recovery - in short, this indicates the average time spent in the DOWN state prior to going UP again +#view_resource_monitor_availability_numDisabled = Number of Times Disabled +#view_resource_monitor_availability_numDisabled_tooltip = The total number of times this resource has entered the DISABLED state +#view_resource_monitor_availability_numFailures = Number of Failures +#view_resource_monitor_availability_numFailures_tooltip = The total number of times this resource has entered the DOWN state +#view_resource_monitor_availability_summaryError = Failed to load resource availability summary +#view_resource_monitor_availability_unknown = This resource was in an unknown state for {0} +#view_resource_monitor_availability_uptime = Uptime +#view_resource_monitor_availability_uptime_tooltip = The cumulative amount of time the resource has been UP +#view_resource_monitor_calltime_average = Average +#view_resource_monitor_calltime_count = Count +#view_resource_monitor_calltime_destination = Call Destination +#view_resource_monitor_calltime_editFailed = Call time data can not be edited +#view_resource_monitor_calltime_loadFailed = Could not load call time data +#view_resource_monitor_calltime_lookupFailed = Could not load resource for call time +#view_resource_monitor_calltime_maximum = Maximum +#view_resource_monitor_calltime_minimum = Minimum +#view_resource_monitor_calltime_title = Call Time Data +#view_resource_monitor_detailed_graph_label = Detailed Graph +#view_resource_monitor_graph_instructions = Point your mouse to a data point on the chart +#view_resource_monitor_graph_live_tooltip = Click for a live graph of current values +#view_resource_monitor_graphs_loadFailed = Failed to load graph data +#view_resource_monitor_graphs_lookupFailed = Failed to find resource for graph +#view_resource_monitor_graphs_noneAvailable = No graphs available +#view_resource_monitor_schedules_title = Resource Metric Collection Schedules +#view_resource_monitor_table_avg = Average +#view_resource_monitor_table_last = Last +#view_resource_monitor_table_max = Maximum +#view_resource_monitor_table_min = Minimum +#view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen. +#view_resource_title_component_errors_tooltip = Shows managed component errors. Click for details +#view_resource_title_tagUpdateFailed = Failed to update resource tags +#view_searchBar_defaultPattern = name your pattern +#view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors +#view_searchBar_instructional_noSuggest = No matches, enter a different pattern +#view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page +#view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}] +#view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}] +#view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}] +#view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}] +#view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}] +#view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}] +#view_searchBar_savedSearch_save = Successfully created saved search [{0}] +#view_searchGUI_loginStatus = Unable to determine login status, check server status +#view_selector_assigned = Assigned {0} +#view_selector_available = Available {0} +#view_subTab_error_disabled = Cannot select disabled subTab [{0}]. +#view_summaryDashboard_resetConfirm = Reset to default summary dashboard (lose local changes)? +#view_summaryOverviewForm_error_descriptionChangeFailure = Failed to change description of Resource with id {0} from [{1}] to [{2}]. +#view_summaryOverviewForm_error_locationChangeFailure = Failed to change location of Resource with id {0} from [{1}] to [{2}]. +#view_summaryOverviewForm_error_nameChangeFailure = Failed to change name of Resource with id {0} from [{1}] to [{2}]. +#view_summaryOverviewForm_error_traitsLoadFailure = Failed to load traits for {0}. +#view_summaryOverviewForm_field_description = Description +#view_summaryOverviewForm_field_location = Location +#view_summaryOverviewForm_field_name = Name +#view_summaryOverviewForm_field_type = Type +#view_summaryOverviewForm_field_version = Version +#view_summaryOverviewForm_header_summary = Summary +#view_summaryOverviewForm_label_plugin = Plugin: +#view_summaryOverviewForm_message_descriptionChangeSuccess = Description of Resource with id {0} was changed from [{1}] to [{2}]. +#view_summaryOverviewForm_message_locationChangeSuccess = Location of Resource with id {0} was changed from [{1}] to [{2}]. +#view_summaryOverviewForm_message_nameChangeSuccess = Name of Resource with id {0} was changed from [{1}] to [{2}]. +#view_summaryOverview_header_detectedErrors = Detected Errors +#view_summaryOverview_title_errorDetailsWindow = Error Details +#view_summaryOverview_tooltip_detectedErrors = Click on the rows to see the error details. +#view_tableSection_backButton = Back to List +#view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug +#view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug. +#view_table_drawFail = Failed to draw Table [{0}]. +#view_table_matchingRows = Matching Rows: {0} (selected: {1}) +#view_table_totalRows = Total Rows: {0} (selected: {1}) +#view_table_totalRowsUnknown = Total Rows: ? +#view_tabs_common_activity = Activity +#view_tabs_common_agent = Agent +#view_tabs_common_availability = Availability +#view_tabs_common_calltime = Calltime +#view_tabs_common_child_history = Child History +#view_tabs_common_child_resources = Child Resources +#view_tabs_common_connectionSettings = Connection Settings +#view_tabs_common_connectionSettingsHistory = Connection Settings History +#view_tabs_common_content = Content +#view_tabs_common_current = Current +#view_tabs_common_dashboard = Dashboard +#view_tabs_common_deployed = Deployed +#view_tabs_common_drift = Drift +#view_tabs_common_events = Events +#view_tabs_common_graphs = Graphs +#view_tabs_common_group_members = Group Members +#view_tabs_common_group_membership = Group Membership +#view_tabs_common_groups = Groups +#view_tabs_common_history = History +#view_tabs_common_inventory = Inventory +#view_tabs_common_members = Members +#view_tabs_common_monitoring = Monitoring +#view_tabs_common_overview = Overview +#view_tabs_common_schedule = Schedule +#view_tabs_common_schedules = Schedules +#view_tabs_common_subscriptions = Subscriptions +#view_tabs_common_tables = Tables +#view_tabs_common_timeline = Timeline +#view_tabs_common_traits = Traits +#view_tabs_invalidSubTab = Invalid subtab: {0} +#view_tabs_invalidTab = Invalid tab: {0} +#view_tagCloud_deleteTag = Delete Tag +#view_tagCloud_deleteTagFailure = Failed to delete the tag [{0}] +#view_tagCloud_deleteTagSuccess = You successfully deleted the tag [{0}] +#view_tagCloud_error_fetchFailure = Failed to load tags. +#view_tagCloud_error_tagUsedCount = Tag used {0} times. +#view_taggedResources_title = Tagged Resources +#view_tags_error_1 = Failed to load Tags +#view_tags_tags = Tags +#view_tags_tooltip_1 = Click to remove this Tag +#view_tags_tooltip_2 = Click to edit Tags +#view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) +#view_testTop_description = This section contains pages for testing various GUI components. +#view_testTop_title = Test +#view_titleBar_common_addedFav = You have added [{0}] as a favorite +#view_titleBar_common_addedFavFailure = Failed to add [{0}] as a favorite +#view_titleBar_common_clickToAddFav = Click to add this as a favorite +#view_titleBar_common_clickToRemoveFav = Click to remove this as a favorite +#view_titleBar_common_loadTagsFailure = Failed to load the tags for [{0}] +#view_titleBar_common_removedFav = You have removed [{0}] as one of your favorites +#view_titleBar_common_removedFavFailure = Failed to remove [{0}] as one of your favorites +#view_titleBar_common_updateTagsFailure = Failed to update the tags for [{0}] +#view_titleBar_common_updateTagsSuccessful = The tags for [{0}] have been updated +#view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}] +#view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group +#view_titleBar_group_summary_expandedTooltip = Click to hide details for this group +#view_tree_common_contextMenu_addChartToDashboard = Add chart to dashboard [{0}] +#view_tree_common_contextMenu_editPluginConfiguration = Edit [{0}] Plugin Configuration +#view_tree_common_contextMenu_editResourceConfiguration = Edit [{0}] Resource Configuration +#view_tree_common_contextMenu_groupGraph = Group Metric Graph +#view_tree_common_contextMenu_loadFail_children = Failed to load platform manual add children +#view_tree_common_contextMenu_loadFail_dashboards = Failed to load user dashboards +#view_tree_common_contextMenu_loadFail_group = Failed to load group for context menu +#view_tree_common_contextMenu_loadFailed_dashboard = Failed to load user dashboards +#view_tree_common_contextMenu_loadFailed_manualAddChildren = Failed to load platform manual add children +#view_tree_common_contextMenu_loadFailed_operations = Failure to start wizard for running operations +#view_tree_common_contextMenu_measurements = Measurements +#view_tree_common_contextMenu_resourceConfiguration = Resource Configuration +#view_tree_common_contextMenu_resourceGraph = Resource Metric Graph +#view_tree_common_contextMenu_saveChartToDashboardFailure = Failed to save the dashboard +#view_tree_common_contextMenu_saveChartToDashboardSuccessful = You have saved dashboard [{0}] +#view_tree_common_contextMenu_type_name_label = Type: {0} +#view_tree_common_createFailed_autoCluster = Failed to create or update autocluster backing group +#view_tree_common_loadFailed_children = Failed to load children for node +#view_tree_common_loadFailed_create = Failed to create view for this node +#view_tree_common_loadFailed_descendants = Failed to load descendants for tree +#view_tree_common_loadFailed_generic = Failed to load data for tree +#view_tree_common_loadFailed_group = Failed to load group with id [{0}] +#view_tree_common_loadFailed_groupTree = Failed to load group tree +#view_tree_common_loadFailed_node = Failed to load data for this node +#view_tree_common_loadFailed_root = Failed to load root for tree +#view_tree_common_loadFailed_selection = Failed to select this node +#view_tree_common_loadFailed_update = Failed to update view for this node +#view_tree_group_error_updateAutoCluster = Failed to create or update autocluster backing group. key: [{0}] +#view_type_parentId = Parent ID +#view_type_resourceTypes = Resource Types +#view_type_typeTreeLoadFailure = Failed to load resource type tree data +#view_upload_alreadyUploaded = File has already been uploaded +#view_upload_bundleDistFile = Distribution File +#view_upload_error_bundleDistFile = Error uploading Bundle Distribution File +#view_upload_error_file = Error uploading file +#view_upload_error_fileName = Error uploading file [{0}] +#view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path. +#view_upload_error_packageVersionFile = Error uploading Package Version File +#view_upload_error_results = Error uploading file, unexpected results: [{0}] +#view_upload_inProgress = Can not submit, upload is currently in progress +#view_upload_prompt_1 = Please select a file to upload [{0}] +#view_upload_prompt_2 = File to Upload +#view_upload_success = File successfully uploaded +#view_upload_tooltip_1a = Select a file to upload, then click Upload or Next +#view_upload_tooltip_1b = Select a file to upload, then click Next +#view_upload_tooltip_2 = File upload had previously failed +#view_upload_upload = Upload +#view_upload_uploadFile = UploadFile +#widget_colorPicker_tooltip = Click to select a new color +#widget_durationItem_inputUnitLessThanTargetUnit = Input unit is less than target unit. +#widget_durationItem_unitTypeNotSupported = Unit type [{0}] is not supported by this DurationItem. +#widget_jobTriggerEditor_fieldHelp_repeatDuration = keep running this operation this many times or until this amount of time has elapsed +#widget_jobTriggerEditor_fieldHelp_repeatInterval = how often the operation should be executed +#widget_jobTriggerEditor_fieldHelp_startDelay = start executing the operation after this amount of time has elapsed +#widget_jobTriggerEditor_field_cronExpression = Cron Expression +#widget_jobTriggerEditor_field_mode = Schedule using +#widget_jobTriggerEditor_field_repeatInterval_later = Repeat every +#widget_jobTriggerEditor_field_repeatInterval_now = Run now and every +#widget_jobTriggerEditor_field_startType = Run +#widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime = End time must be after start time. +#widget_jobTriggerEditor_message_endTimeMustBeInFuture = End time must be in the future. +#widget_jobTriggerEditor_message_startTimeMustBeInFuture = Start time must be in the future. +#widget_jobTriggerEditor_tab_examples = Examples +#widget_jobTriggerEditor_tab_format = Format +#widget_jobTriggerEditor_value_calendar = Calendar +#widget_jobTriggerEditor_value_cronExpression = Cron Expression +#widget_jobTriggerEditor_value_for = For +#widget_jobTriggerEditor_value_in = in +#widget_jobTriggerEditor_value_indefinitely = Indefinitely +#widget_jobTriggerEditor_value_later = Later +#widget_jobTriggerEditor_value_laterAndRepeat = Later & Repeat +#widget_jobTriggerEditor_value_now = Now +#widget_jobTriggerEditor_value_nowAndRepeat = Now & Repeat +#widget_jobTriggerEditor_value_on = on +#widget_jobTriggerEditor_value_until = Until +#widget_recordEditor_error_invalidViewPath = Invalid view path: [{0}] +#widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one. +#widget_recordEditor_error_noRecords = No records were returned - expected exactly one. +#widget_recordEditor_error_operation = Operation failed. An error occurred +#widget_recordEditor_error_operationInvalidValues = Operation failed - one or more fields have invalid values +#widget_recordEditor_error_permissionCreate = You do not have the permissions required to create a new [{0}] +#widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}] +#widget_recordEditor_info_recordCreatedConcise = {0} created. +#widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created. +#widget_recordEditor_info_recordUpdatedConcise = {0} updated. +#widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated. +#widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted. +#widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}. +#widget_recordEditor_title_edit = Edit {0} [{1}] +#widget_recordEditor_title_new = Create New {0} +#widget_recordEditor_title_view = View {0} [{1}] +#widget_recordEditor_warn_validation = One or more fields have invalid values. This [{0}] cannot be saved until these values are corrected +#widget_resourceFactoryWizard_archPrompt = Package Architecture +#widget_resourceFactoryWizard_configTemplatePrompt = Resource Configuration Template +#widget_resourceFactoryWizard_contentTemplatePrompt = Deployment Configuration Template +#widget_resourceFactoryWizard_createSubmit = A request to create a resource with the name of [{0}] has been submitted successfully. +#widget_resourceFactoryWizard_createSubmitType = A request to create a resource of type [{0}] has been submitted successfully. +#widget_resourceFactoryWizard_createWizardTitle = Create New Resource of Type [{0}] +#widget_resourceFactoryWizard_createWizardWindowTitle = Resource Create Wizard +#widget_resourceFactoryWizard_editConfigStepName = Deployment Options +#widget_resourceFactoryWizard_execute1 = Failed to create a new resource - there is no package version +#widget_resourceFactoryWizard_execute2 = Failed to create a new resource +#widget_resourceFactoryWizard_failedToDeleteVersion = Failed to delete package version while canceling a resource create +#widget_resourceFactoryWizard_failedToGetType = Failed to get backing package type for new resource +#widget_resourceFactoryWizard_importFailure = Failed to manually import resource +#widget_resourceFactoryWizard_importSubmitted = A request to import a new resource of type [{0}] has been submitted +#widget_resourceFactoryWizard_importWizardTitle = Import Resource of Type [{0}] +#widget_resourceFactoryWizard_importWizardWindowTitle = Resource Import Wizard +#widget_resourceFactoryWizard_infoStepName = Resource Information +#widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures +#widget_resourceFactoryWizard_namePrompt = New Resource Name +#widget_resourceFactoryWizard_templatePrompt = Connection Settings Template +#widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +#widget_resourceFactoryWizard_uploadFailure = Failed to upload file +#widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File +#widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files. +#widget_resourceFactoryWizard_versionPrompt = Package Version +#widget_resourceSelector_groupCategory = Group Category +#widget_resourceSelector_pleaseSelectMultipleResource = Please select one or more resources +#widget_resourceSelector_pleaseSelectResource = Please select a resource +#widget_resourceSelector_selectMultipleResources = Select Resources +#widget_resourceSelector_selectResource = Select a Resource +#widget_typeCache_loadFail = Failed to load resource type metadata +#widget_typeTree_badTemplateType = Invalid URL. Unknown template type [{0}] +#widget_typeTree_badTypeId = Invalid URL. Bad resource type ID [{0}] +#widget_typeTree_loadFail = Failed to load resource types +common_alert_high=Высокий +common_alert_low=Низкий +common_alert_medium=Средний +common_buildInfo_gwtVersion=${gwt.version} +common_button_ack=Принять +common_button_ack_all=Принять всё +common_button_add=Добавить +common_button_advanced=Дополнительно... +common_button_apply=Принять +common_button_cancel=Отменить +common_button_close=Закрыть +common_button_compare=Сравнить +common_button_create_child=Создать ресурс +common_button_delete=Удалить +common_button_delete_all=Удалить всё +common_button_disable=Отключить +common_button_dump_sysInfo_to_log=Дамп информации о системе +common_button_edit=Изменить +common_button_enable=Включить +common_button_execute=Выполнить +common_button_finish=Готово +common_button_fixedWidth=Фиксированная ширина +common_button_import=Импорт +common_button_new=Новый +common_button_next=Следующий +common_button_ok=OK +common_button_previous=Предыдущий +common_button_purge=Очистить +common_button_purgeAll=Очистить всё +common_button_refresh=Обновить +common_button_reset=Сбросить +common_button_save=Сохранить +common_button_scaleToFit=Масштабировать в соответствии +common_button_schedule=Планировщик +common_button_search=Поиск +common_button_set=Установить +common_button_showDetails=Показать детали... +common_button_uninventory=Убрать из инвентария +common_calendar_april_short=апр +common_calendar_august_short=авг +common_calendar_december_short=дек +common_calendar_february_short=вев +common_calendar_january_short=янв +common_calendar_july_short=июль +common_calendar_june_short=июнь +common_calendar_march_short=март +common_calendar_may_short=май +common_calendar_november_short=нояб +common_calendar_october_short=окт +common_calendar_september_short=сент +common_label_ago={0} тому назад +common_label_all=Всё +common_label_all_resources=Все ресурсы +common_label_day=день +common_label_error=Ошибка +common_label_filters=Фильтры +common_label_hour=час +common_label_item=элемент +common_label_items=элементы +common_label_month=месяц +common_label_none=никого +common_label_none2=ничего +common_label_role=роль +common_label_roles=роли +common_label_scheduled_operations=запланированные операции +common_label_selected_resources=выбранные ресурсы +common_label_unlimited=неограниченный +common_label_user=пользователь +common_label_users=пользователи +common_label_week=неделя +common_label_yesterday=Вчера +common_msg_areYouSure=Вы уверены? +common_msg_asyncTimeout={0}. Это произошло потому, что сервер длительное время выполняет данный запрос. Помните, что сервер все еще может обрабатывать ваш запрос и завершить обработку в ближайшее время. Вы можете проверить логи сервера на наличие аварийных ошибок. +common_msg_changeAutoDetected=Автообнаружение изменений +common_msg_deleteConfirm=Вы уверены, что хотите удалить \# выбранный {0}? +common_msg_emphasizedNotePrefix=Примечание\: +common_msg_loading=Загрузка... +common_msg_noItemsToShow=Отсутствуют элементы для отображения +common_msg_notYetImplemented=Еще не реализовано +common_msg_see_more=подробнее... +common_msg_step_x_of_y=Шаг {0} из {1} +common_severity_debug=Отладка +common_severity_error=Ошибка +common_severity_fatal=Фатальный +common_severity_info=Информация +common_severity_warn=Предупреждение +common_status_canceled=Отменён +common_status_deferred=Отложенный +common_status_failed=Безуспешно +common_status_inprogress=В процессе +common_status_nochange=Без изменений +common_status_partial=Частичный +common_status_success=Успешный +common_status_timedOut=Время вышло +common_status_unknown=Неизвестный +common_title_add_column=Добавить столбец +common_title_add_graph_to_view=Добавить график для просмотра +common_title_add_portlet=Добавить портлет +common_title_address=Адрес +common_title_alerts=Предупреждения +common_title_alerts_range=Предупреждение диапазона +common_title_ancestry=Происхождение +common_title_availability=Доступность +common_title_available_resources=Доступные ресурсы +common_title_average_metrics=Среднее количество метрик в минуту +common_title_background=Фон +common_title_bundle=Пакет +common_title_bundles=Пакеты +common_title_category=Категория +common_title_change_refresh_time=Интервал обновления +common_title_columns=Столбцы +common_title_compare_metrics=Сравнить метрики +common_title_compatibleGroups=Совместимые группы +common_title_compatibleGroups_total=Совместимость всей группы +common_title_component_errors=Ошибки компанента +common_title_config_update_status=Обновить статус +common_title_configuration=Конфигурация +common_title_count=Количество +common_title_createTime=Время создания +common_title_custom=По умолчанию +common_title_dashboard_name=Название панели +common_title_dateCreated=Дата создания +common_title_dateRange=Период +common_title_default=По умолчанию +common_title_definition=Определение +common_title_definitions=Определения +common_title_description=Описание +common_title_details=Детали +common_title_display=Показать +common_title_display_name=Показать название +common_title_duration=Продолжительность +common_title_edit=Изменить? +common_title_edit_mode=Режим редактирования +common_title_enabled=Активировать? +common_title_end=Конец +common_title_favorites=Избранные +common_title_generalProp=Общие свойства +common_title_group=Группа +common_title_group_def_total=Определение количества групп +common_title_group_member_health=Состояние члена группы +common_title_groups=Группы +common_title_help=Помощь +common_title_host=Host +common_title_icon=Иконка +common_title_id=ID +common_title_id_parent=Родительский ID +common_title_interval=Интервал +common_title_inventory=Инвентарь +common_title_inventorySummary=Итог инвентаризации +common_title_lastUpdated=Последнее обновление +common_title_lastUpdatedBy=Последнее обновление от +common_title_ldapGroups=LDAP-группы +common_title_mashup=Mashup +common_title_members_reporting=Количество пользователей отчетности +common_title_message=Сообщение +common_title_metric=Метрика +common_title_metric_chart=Метрическая диаграмма +common_title_mixedGroups=Смешанные группы +common_title_mixedGroups_total=Количество смешанных групп +common_title_name=Наименование +common_title_new_dashboard=Новая панель +common_title_numeric_metrics=Числовые метрики +common_title_numeric_type=Числовой тип +common_title_operation=Операция +common_title_operation_status=Статус операции +common_title_operations=Операции +common_title_operations_range=Рабочий диапазон +common_title_over=Более +common_title_password=Пароль +common_title_path=Путь +common_title_permissions=Права +common_title_platform=Платформа +common_title_platform_total=Количество платформ +common_title_plugin=Плагин +common_title_port=Порт +common_title_providers=Провайдеры +common_title_recent_alerts=Последние предупреждения +common_title_recent_bundle_deployments=Последние развертывания пакета +common_title_recent_configuration_updates=Последние обновления конфигурации +common_title_recent_drifts=Последнее отклонение +common_title_recent_event_counts=Количество новых событий +common_title_recent_measurements=Последние измерения +common_title_recent_oob_metrics=Последние выходы за границы метрик +common_title_recent_operations=Последние операции +common_title_recent_pkg_history=Последние измененные пакеты\ +common_title_recently_added=Недавно добавленные +common_title_remove_column=Удалить столбец +common_title_repositories=Репозитории +common_title_resource=Ресурсы +common_title_resource_group=Группа ресурсов +common_title_resource_id=ID Ресурса +common_title_resource_inventory=Инвентарь ресурсов +common_title_resource_key=Ключ ресурса +common_title_resource_name=Наименование ресурса +common_title_resource_type=Тип реусурса +common_title_resourceGroups=Группы ресурсов +common_title_resources=Ресурсы +common_title_results_count=Количество результатов +common_title_results_count_tooltip=Отображает это количество результатов +common_title_role=Роль +common_title_roles=Роли +common_title_scheduled_operations=Запланированные операции +common_title_search=Поиск +common_title_selected_resources=Выбранные ресурсы +common_title_server=Сервер +common_title_server_total=Количество серверов +common_title_service=Служба +common_title_service_total=Количество служб +common_title_settings=Настройки +common_title_show=Показать +common_title_sort_order=Порядок сортировки +common_title_sort_order_tooltip=Установить порядок сортировки результатов. +common_title_start=Старт +common_title_status=Статус +common_title_stop=Стоп +common_title_summary=Сводка +common_title_tag_cloud=Облако тегов +common_title_timestamp=Дата/Время\ +common_title_total=Итог +common_title_type=Тип +common_title_units=Элементы +common_title_user=Пользователь +common_title_users=Пользователи +common_title_value=Значение +common_title_version=Версия +common_title_view_mode=Режим просмотра +common_title_web_address=Web адрес +common_title_welcome=Добро пожаловать +common_unit_abbrev_bits=b +common_unit_abbrev_bytes=B +common_unit_abbrev_celsius=C +common_unit_abbrev_days=д +common_unit_abbrev_fahrenheight=F +common_unit_abbrev_gigabytes=ГБ +common_unit_abbrev_gigabits=Гб +common_unit_abbrev_hours=ч +common_unit_abbrev_jiffys=j +common_unit_abbrev_kelvin=K +common_unit_abbrev_kilobits=Кб +common_unit_abbrev_kilobytes=КБ +common_unit_abbrev_megabits=Мб +common_unit_abbrev_megabytes=МБ +common_unit_abbrev_microseconds=мкс +common_unit_abbrev_milliseconds=мс +common_unit_abbrev_minutes=м +common_unit_abbrev_nanoseconds=нс +common_unit_abbrev_percentage=% +common_unit_abbrev_petabits=Пб +common_unit_abbrev_petabytes=ПБ +common_unit_abbrev_terabits=Тб +common_unit_abbrev_seconds=с +common_unit_abbrev_terabytes=ТБ +common_unit_days=Дни +common_unit_days2=Дни +common_unit_hours=часы +common_unit_milliseconds=миллисекунды +common_unit_minute=минута +common_unit_minutes=минуты +common_unit_months=месяцы +common_unit_seconds=секунды +common_unit_times=раз +common_unit_weeks=недели +common_unit_years=года +common_val_for=для +common_val_n1st={0}ый +common_val_n2nd={0}ой +common_val_n3rd={0}ий +common_val_na=N/A +common_val_never=Никогда +common_val_no=Нет +common_val_no_lower=нет +common_val_none=Нет +common_val_nth={0}ый +common_val_yes=Да +common_val_yes_lower=да +dataSource_bundle_loadFailed=Ошибка при загрузке данных пакета +dataSource_configurationHistory_clickToSeeError=Дважды щелкните, чтобы увидеть сообщение об ошибке... +dataSource_configurationHistory_currentConfig=Это текущая конфигурация +dataSource_configurationHistory_dateCompleted=Дата завершения +dataSource_configurationHistory_dateSubmitted=Дата подтверждения +dataSource_configurationHistory_error_fetchFailure=Не удалось загрузить историю конфигурации +dataSource_configurationHistory_field_createdTime=Вложенный +dataSource_configurationHistory_field_id=ID +dataSource_configurationHistory_field_resource=Ресурс +dataSource_configurationHistory_field_status=Статус +dataSource_configurationHistory_field_subject=Пользователь +dataSource_configurationHistory_updateType=Тип обновления +dataSource_configurationHistory_updateType_group=Группа +dataSource_configurationHistory_updateType_individual=Индивидуальный +dataSource_ContentRepoTree_error_load=Ошибка загрузки репозиториев +dataSource_ContentRepoTree_field_parentId=Родительский ID +dataSource_definitions_loadFailed=Ошибка загрузки определений метрик +dataSource_measurementOob_error_fetchFailure=Не удалось загрузить информацию о выбросах +dataSource_measurementOob_field_factor=Вне зоны действия фактора (%) +dataSource_measurementOob_field_formattedBaseband=Лента +dataSource_measurementOob_field_formattedOutlier=Выброс +dataSource_measurementOob_field_parentName=Родительский ресурс +dataSource_measurementOob_field_resourceName=Ресурс +dataSource_measurementOob_field_scheduleName=Метрика +dataSource_operationHistory_error_fetchFailure=Ошибка загрузки истории операций. +dataSource_operationHistory_field_createdTime=Время создания +dataSource_operationHistory_field_operationName=Наименование операции +dataSource_operationHistory_field_startedTime=Время начала +dataSource_operationHistory_field_subject=Заявитель +dataSource_operationSchedule_field_description=Примечание +dataSource_operationSchedule_field_id=Идентификатор расписания +dataSource_operationSchedule_field_nextFireTime=Следующий запуск +dataSource_operationSchedule_field_operationDisplayName=Операция +dataSource_operationSchedule_field_operationName=Операция +dataSource_operationSchedule_field_subject=Владелец +dataSource_operationSchedule_field_timeout=Таймаут (в секундах) +dataSource_platforms_field_cpu=CPU +dataSource_platforms_field_memory=Memory +dataSource_platforms_field_swap=Swap +dataSource_problemResources_error_fetchFailure=Не удалось загрузить ресурсы с предпреждениями/отсутствуют. +dataSource_problemResources_field_available=Доступные в настоящий момент +dataSource_recentOperations_error_fetchFailure=Не удалось загрузить последние выполненные операции. +dataSource_recentOperations_field_location=Местоположение +dataSource_recentOperations_field_operation=Операция +dataSource_recentOperations_field_resource=Ресурс +dataSource_recentOperations_field_status=Статус +dataSource_resourceErrors_clickStatusIcon=Щелкните по иконке для получения детальной информации +dataSource_resourceErrors_deleteFailure=Не удалось удалить ошибки ресурса +dataSource_resourceErrors_deleteSuccess=Успешно удалены сообщения об ошибках ресурса\: [{0}]. +dataSource_resourceErrors_error_fetchFailure=Не удалось найти ошибки ресурса с id [{0}]. +dataSource_resourceErrors_field_errorType=Тип ошибки +dataSource_resourceErrors_field_summary=Сводка +dataSource_resourceErrors_field_timeOccured=Время +dataSource_resourceGroups_loadFailed=Не удалось загрузить группы ресурсов +dataSource_resources_field_discoveryTime=Время развертывания +dataSource_resources_field_importTime=Время импорта +dataSource_resources_field_key=Ключ +dataSource_resources_field_lastModifiedTime=Время последней модификации +dataSource_resources_field_lastModifier=Последний модификатор +dataSource_resources_field_location=Местоположение +datasource_roles_field_ldapGroups=Группы LDAP +datasource_roles_field_subjects=Субъекты +dataSource_rpc_error_transformRequestFailure=Ошибка в источнике данных при обработке запроса {0}. +dataSource_rpc_error_unsupportedArrayFilterType=Отсутствует поддержка передачи типа {0} поля-фильтры. Пожалуйста, сообщите об ошибке. +dataSource_rpc_error_unsupportedEnumType=Пожалуйста добавьте подходящий код в enum {0} RPCDataSource.getEnumArray(Class) +dataSource_rpc_no=нет +dataSource_rpc_yes=да +dataSource_scheduledOperations_error_fetchFailure=Не удалось загрузить запланированные операции. +dataSource_scheduledOperations_field_location=Местоположение +dataSource_scheduledOperations_field_operation=Операция +dataSource_scheduledOperations_field_resource=Ресурс +dataSource_schedules_disableFailure_group=Не удалось отключить сбор метрик [{0}] для группы ресурсов с ID [{1}]. Метрики\: [{2}] +dataSource_schedules_disableFailure_resource=Не удалось отключить сбор метрик [{0}] для ресурса с ID [{1}]. Метрики\: [{2}] +dataSource_schedules_disableSuccessful_concise=Вы отключили сбор измерений [{0}] +dataSource_schedules_disableSuccessful_full_group=Вы отключили сбор измерений [{0}] для группы ресурсов с ID [{1}]. Октлюченные измерения\: [{2}] +dataSource_schedules_disableSuccessful_full_resource=Вы отключили сбор измерений [{0}] для ресурса с ID [{1}]. Октлюченные измерения\: [{2}] +dataSource_schedules_enableFailure_group=Не удалось включить сбор метрик [{0}] для группы с ID [{1}]. Метрики\: [{2}] +dataSource_schedules_enableFailure_resource=Не удалось включить сбор метрик [{0}] для ресурса с ID [{1}]. Метрики\: [{2}] +dataSource_schedules_enableSuccessful_concise=Включен сбор измерений [{0}] +dataSource_schedules_enableSuccessful_full_group=Включен сбор измерений [{0}] для группы ресурсов с ID [{1}]. Включены измерения\: [{2}] +dataSource_schedules_enableSuccessful_full_resource=Включен сбор измерений [{0}] для ресурса с ID [{1}]. Включены измерения\: [{2}] +dataSource_schedules_field_resourceGroupId=ID группы +dataSource_schedules_loadFailed=Не удалось загрузчить график сбора метрик +dataSource_schedules_loadFailedContext=Не удалось загрузчить график сбора метрик для контекста [{0}] +dataSource_schedules_loadFailedCriteria=Не удалось загрузчить график сбора метрик для критерия [{0}] +dataSource_schedules_updateFailure_group=Не удалось установить интервал сбора показателей [{0}] для группы ресурсов с ID [{1}]. Метрики\: [{2}]. Интервал сбора должен был быть [{3}] секунды. +dataSource_schedules_updateFailure_resource=Не удалось установить интервал сбора показателей [{0}] для ресурса с ID [{1}]. Метрики\: [{2}]. Интервал сбора должен был быть [{3}] секунды. +dataSource_schedules_updateSuccessful_concise=Новый интервал сбора измерений [{0}] был установлен для [{1}] +dataSource_schedules_updateSuccessful_full_group=Новый интервал сбора [{0}] был установлен для измерений [{1}] группы ресурсов с ID [{2}]. Обновлены измерения\: [{3}] +dataSource_schedules_updateSuccessful_full_resource=Новый интервал сбора [{0}] был установлен для измерений [{1}] ресурса с ID [{2}]. Обновлены измерения\: [{3}] +datasource_templateSchedules_disabled=Выключен сбор выбранных метрик [{0}]. +datasource_templateSchedules_disabled_detailed=Выключен сбор метрик [{0}] [{1}] по умолчанию для Типа ресурсов с ID [{2}]. +datasource_templateSchedules_disabled_failed=Не удалось отключить сбор метрик [{0}] [{1}] по умолчанию для Типа ресурсов с ID [{2}]. +datasource_templateSchedules_enabled=Включен сбор выбранных метрик [{0}]. +datasource_templateSchedules_enabled_detailed=Включен сбор метрик [{0}] [{1}] по умолчанию для типов ресурсов с id [{2}]. +datasource_templateSchedules_enabled_failed=Не удалось включить сбор метрик [{0}] [{1}] по умолчанию для типов ресурсов с ID [{2}]. +datasource_templateSchedules_updated=Обновлен интервал сбора выбранных метрик [{0}]. +datasource_templateSchedules_updated_detail=Интервал сбора метрик [{0}] [{1}] по умолчанию для типов ресурсов с ID [{2}] установлен в [{3}] секунд. +datasource_templateSchedules_updated_failed=Не удалось установить интервал сбора метрик [{0}] секунд для метрик [{1}] [{2}] по умолчанию для типов ресурсов с ID [{3}]. +dataSource_traits_failFetch=Не удалось получить признаки для критерия [{0}]. +dataSource_traits_field_definitionID=Определение ID +dataSource_traits_field_lastChanged=Последнее изменение +dataSource_traits_field_primaryKey=Первичный ключ +dataSource_traits_field_trait=Признак +dataSource_traits_group_field_groupId=ID группы +dataSource_users_delete=Удален пользователь [{0}] +dataSource_users_deleteFailed=Не удалось удалить пользователя [{0}] +dataSource_users_field_department=Отдел +dataSource_users_field_emailAddress=E-mail адрес +dataSource_users_field_factive=Вход разрешен? +dataSource_users_field_firstName=Имя +dataSource_users_field_id=ID +dataSource_users_field_lastName=Фамилия +dataSource_users_field_ldap=LDAP логин? +dataSource_users_field_name=Имя пользователя +dataSource_users_field_passwordVerify=Подтверждение пароля +dataSource_users_field_phoneNumber=Телефонный номер +dataSource_users_invalidEmailAddress=Неверный email адрес. +dataSource_users_passwordsDoNotMatch=Пароли не совпадают. +favorites=Избранное +favorites_groups=Избранные группы +favorites_recentlyViewed=Недавно просмотренные +favorites_resources=Избранные ресурсы +filter_from_date=От +filter_to_date=До +group_tree_partialClusterTooltip={0} из {1} членов группы имеют ресурс ''{2}'' +util_ancestry_parentAncestry=Происхождение родителя для\: +util_disambiguationReportDecorator_pluginSuffix=({0} Плагин) +util_errorHandler_nullException=Возникло null исключение +util_monitoringRequestCallback_error_checkServerStatusFailure=Не удается определить статус авторизации - проверьте состояние сервера. +util_rpcManager_activeRequests={0} активных запросов +util_userPerm_loadFailGlobal=Не удается загрузить ваши глобальные полномочия - не предоставлены. +util_userPerm_loadFailGroup=Не удается загрузить ваши полномочия для группы ресурсов с id [{0}] - не предоставлены. +util_userPerm_loadFailResource=Не удается загрузить ваши полномочия для ресурса с id [{0}] - не предоставлены. +util_userSession_loadFailSubject=UserSessionManager\: не удалось загрузить 'Субъект' пользователя +util_userSession_logoutFail=Не удалось выйти из системы. +util_widgetsField_unlimited=Неограниченный +view_aboutBox_allRightsReserved=Все права защищены. +view_aboutBox_buildNumber=Номер сборки\: +view_aboutBox_failedToLoad=Не удалось загрузить информацию о продукте. +view_aboutBox_homepage=Домашняя страница +view_aboutBox_jbossByRedHat=JBoss by Red Hat +view_aboutBox_title=О {0} +view_aboutBox_version=Версия\: +view_admin_administration=Администрация +view_admin_configuration=Конфигурация +view_admin_content=Контент +view_admin_downloads_agent_buildNumber=Номер сборки агента +view_admin_downloads_agent_help=<p> Это бинарный файл обноавления агента {0}. С помощью это jar файла вы можете установить свежую версию агента на машину, на которой агент еще не установлен, и обновить уже установленного агента на машине. Для более детальной информации запустите загруженный jar в командной строке с опцией --help\: <br/><b>java -jar <agent-download.jar> --help</b> </p> <h3>Установка агента</h3> <p> <b>java -jar <agent-download.jar> --install[\=<новый каталог агента>]</b><br/>Эта команда установит нового агента. Если вы не определите новый каталог агента, по умолчанию будет установлен в "."</p> <h3> Обновление агента</h3> <p> <b>java -jar <agent-download.jar> --update[\=<существующий каталог агента>]</b><br/> Будет произведено обновление существующего агента, который уже установлен. Если вы не определили каталог с уже установленным агентом, им будет считаться "rhq-agent". </p> +view_admin_downloads_agent_link_label=Ссылка +view_admin_downloads_agent_link_value=Загрузить агента {0} ({1}) +view_admin_downloads_agent_loadError=Не возможно получить информацию о версии агента +view_admin_downloads_agent_md5=MD5 сумма агента +view_admin_downloads_agent_version=Версия агента +view_admin_downloads_agentDownload=Загрузить агента +view_admin_downloads_bundle_help=<p> Это инструмент развертывания пакета. Он предназначен для использования разработчиками и упаковщиков {0} пакетов. Этот отдельный инструмент позволяет проверить ваши пакеты и их средства из консоли.</p> +view_admin_downloads_bundle_link_label=Связь +view_admin_downloads_bundle_link_value=Загрузить инструмент развертывания пакета {0} +view_admin_downloads_bundle_loadError=Не удалось получить информацию об инструменте развертывания пакета +view_admin_downloads_bundleDownload=Загрузить инструмент развертывания пакетов +view_admin_downloads_cli_buildNumber=Консольная сборка +view_admin_downloads_cli_help=<p> Это клиент командной строки инструмент, известный как CLI. Это отдельный инструмент, который работает из консоли и обеспечивает интерфейс командной строки к {0} серверу. Вы можете вызывать команды с помощью интерфейса командной строки, а также запускать скрипты для выполнения автоматизированных задач. Обратитесь к документации для получения дополнительной информации о том, как установить и использовать интерфейс командной строки. </p> +view_admin_downloads_cli_link_value=Загрузить CLI {0} ({1}) +view_admin_downloads_cli_link_label=Ссылка +view_admin_downloads_cli_loadError=Не удалось получить версию CLI +view_admin_downloads_cli_md5=CLI MD5 +view_admin_downloads_cli_version=Версия CLI +view_admin_downloads_cliAlertScripts_help=CLI предупреждения - это заранее подготовленные сценарии, которые могут быть использованы для уведомлений. Сценарии, как правило, требуют некоторой настройки, прежде чем они могут быть использованы в качестве уведомлений, в частности, необходимо определить текст уведомления. +view_admin_downloads_cliAlertScripts_loadError=Не удается получить доступные CLI скрипты уведомлений для загрузки +view_admin_downloads_cliAlertScripts_none=Отсутствуют CLI сценарии уведомлений, доступные для загрузки +view_admin_downloads_cliAlertScriptsDownload=Загрузить CLI сценарии уведомлений +view_admin_downloads_cliDownload=Загрузить клиент командной строки \ No newline at end of file commit 9e97250c921f48ce368bc359580c4c572490fa63 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Apr 25 14:53:58 2012 -0400 [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) refactor so ASConnection is always obtained directly from the server ResourceComponent; add a ServerPluginConfiguration class and use that for accessing the server plugin config props in a strongly typed way diff --git a/modules/helpers/rtfilter/src/main/java/org/rhq/helpers/rtfilter/filter/RtFilter.java b/modules/helpers/rtfilter/src/main/java/org/rhq/helpers/rtfilter/filter/RtFilter.java index 576e71f..fbac47f 100644 --- a/modules/helpers/rtfilter/src/main/java/org/rhq/helpers/rtfilter/filter/RtFilter.java +++ b/modules/helpers/rtfilter/src/main/java/org/rhq/helpers/rtfilter/filter/RtFilter.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -54,11 +54,12 @@ import org.rhq.helpers.rtfilter.util.ServletUtility; * @author Ian Springer */ public class RtFilter implements Filter { - private static final String JAVA_IO_TMPDIR_SYSPROP = "java.io.tmpdir"; - private static final String JBOSSAS_SERVER_HOME_DIR_SYSPROP = "jboss.server.home.dir"; - private static final String TOMCAT_SERVER_HOME_DIR_SYSPROP = "catalina.home"; - private static final String JBOSSAS_SERVER_LOG_SUBDIR = "log"; + private static final String JAVA_IO_TMPDIR_SYSPROP = "java.io.tmpdir"; + private static final String JBOSS_HOME_DIR_SYSPROP = "jboss.home.dir"; + private static final String JBOSS_SERVER_LOG_DIR_SYSPROP = "jboss.server.log.dir"; + private static final String JBOSS_DOMAIN_LOG_DIR_SYSPROP = "jboss.domain.log.dir"; + private static final String CATALINA_HOME_SYSPROP = "catalina.home"; private static final String TOMCAT_SERVER_LOG_SUBDIR = "logs"; private static final String DEFAULT_LOG_FILE_PREFIX = ""; @@ -187,7 +188,7 @@ public class RtFilter implements Filter { found = true; } - // try to see if the user provided a mapping for this server name + // see if the user provided a mapping for this server name if (!found && vhostMappings.containsKey(serverName)) { found = true; vhost = vhostMappings.getProperty(serverName); @@ -199,7 +200,7 @@ public class RtFilter implements Filter { log.debug("Vhost determined from mapping >" + vhost + "<"); } - // check server name against hostname and hostname.fqdn an see if they match + // check server name against hostname and hostname.fqdn and see if they match if (!found && vhostMappings.containsKey(HOST_TOKEN)) { vhost = vhostMappings.getProperty(HOST_TOKEN); if (myHostName.startsWith(serverName) || myCHostName.startsWith(serverName)) { @@ -359,26 +360,34 @@ public class RtFilter implements Filter { * If, for some reason, neither property is set, fall back to "${java.io.tmpdir}/rhq/rt". */ File serverLogDir = null; - String serverHomeDirPath = System.getProperty(JBOSSAS_SERVER_HOME_DIR_SYSPROP); - if (null != serverHomeDirPath) { - serverLogDir = new File(serverHomeDirPath, JBOSSAS_SERVER_LOG_SUBDIR); + String jbossHomeDir = System.getProperty(JBOSS_HOME_DIR_SYSPROP); + if (jbossHomeDir != null) { + // JBoss AS + log.debug(JBOSS_HOME_DIR_SYSPROP + " sysprop is set - assuming we are running inside JBoss AS."); + String serverLogDirString = System.getProperty(JBOSS_SERVER_LOG_DIR_SYSPROP); + if (serverLogDirString == null) { + serverLogDirString = System.getProperty(JBOSS_DOMAIN_LOG_DIR_SYSPROP); + } + if (serverLogDirString != null) { + serverLogDir = new File(serverLogDirString); + } } else { - serverHomeDirPath = System.getProperty(TOMCAT_SERVER_HOME_DIR_SYSPROP); - if (serverHomeDirPath != null) { - serverLogDir = new File(serverHomeDirPath, TOMCAT_SERVER_LOG_SUBDIR); + String catalinaHome = System.getProperty(CATALINA_HOME_SYSPROP); + if (catalinaHome != null) { + // Tomcat + log.debug(CATALINA_HOME_SYSPROP + " sysprop is set - assuming we are running inside Tomcat."); + serverLogDir = new File(catalinaHome, TOMCAT_SERVER_LOG_SUBDIR); } } - if (null != serverLogDir) { + if (serverLogDir != null) { this.logDirectory = new File(serverLogDir, "rt"); } else { this.logDirectory = new File(System.getProperty(JAVA_IO_TMPDIR_SYSPROP), "rhq/rt"); log .warn("The 'logDirectory' filter init param was not set. Also, the standard system properties were not set (" - + JBOSSAS_SERVER_HOME_DIR_SYSPROP - + ", " - + TOMCAT_SERVER_HOME_DIR_SYSPROP + + JBOSS_SERVER_LOG_DIR_SYSPROP + ", " + JBOSS_DOMAIN_LOG_DIR_SYSPROP + ", " + CATALINA_HOME_SYSPROP + "); defaulting RT log directory to '" + this.logDirectory + "'."); } } @@ -585,4 +594,5 @@ public class RtFilter implements Filter { public static final String MAX_LOG_FILE_SIZE = "maxLogFileSize"; public static final String VHOST_MAPPING_FILE = "vHostMappingFile"; } + } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index 7ee440d..6d6e38f 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -53,7 +53,6 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.content.ContentContext; import org.rhq.core.pluginapi.content.ContentServices; -import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; import org.rhq.core.pluginapi.inventory.CreateResourceReport; import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; @@ -63,6 +62,7 @@ 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.modules.plugins.jbossas7.helper.ServerPluginConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -78,37 +78,21 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone private static final String INTERNAL = "_internal:"; private static final int INTERNAL_SIZE = INTERNAL.length(); - private static final String LOCALHOST = "localhost"; - private static final String DEFAULT_HTTP_MANAGEMENT_PORT = "9990"; public static final String MANAGED_SERVER = "Managed Server"; + final Log log = LogFactory.getLog(this.getClass()); ResourceContext<T> context; Configuration pluginConfiguration; String myServerName; - ASConnection connection; + String path; Address address; String key; - String host; - int port; - private boolean verbose = ASConnection.verbose; - String managementUser; - String managementPassword; - - private LogFileEventResourceComponentHelper logFileEventDelegate; - - /** - * Return availability of this resource - * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability() - */ - public AvailabilityType getAvailability() { - - ReadResource op = new ReadResource(address); - Result res = connection.execute(op); - return (res != null && res.isSuccess()) ? AvailabilityType.UP : AvailabilityType.DOWN; - } + private boolean verbose = ASConnection.verbose; + private BaseServerComponent serverComponent; + protected ASConnection testConnection; /** * Start the resource connection @@ -117,36 +101,38 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone public void start(ResourceContext<T> context) throws InvalidPluginConfigurationException, Exception { this.context = context; pluginConfiguration = context.getPluginConfiguration(); - - if (!(context.getParentResourceComponent() instanceof BaseComponent)) { - host = pluginConfiguration.getSimpleValue("hostname", LOCALHOST); - String portString = pluginConfiguration.getSimpleValue("port", DEFAULT_HTTP_MANAGEMENT_PORT); - port = Integer.parseInt(portString); - managementUser = pluginConfiguration.getSimpleValue("user", "-unset-"); - managementPassword = pluginConfiguration.getSimpleValue("password", "-unset-"); - connection = new ASConnection(host, port, managementUser, managementPassword); - logFileEventDelegate = new LogFileEventResourceComponentHelper(context); - logFileEventDelegate.startLogFileEventPollers(); - } else { - connection = ((BaseComponent) context.getParentResourceComponent()).getASConnection(); - } - - path = pluginConfiguration.getSimpleValue("path", null); + serverComponent = findServerComponent(); + path = pluginConfiguration.getSimpleValue("path"); address = new Address(path); key = context.getResourceKey(); - myServerName = context.getResourceKey().substring(context.getResourceKey().lastIndexOf("/") + 1); + } + @Override + public void stop() { + return; } /** - * Tear down the resource connection - * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop() + * Return availability of this resource + * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability() */ - public void stop() { - if (!(context.getParentResourceComponent() instanceof BaseComponent)) { - logFileEventDelegate.stopLogFileEventPollers(); + public AvailabilityType getAvailability() { + ReadResource op = new ReadResource(address); + Result res = getASConnection().execute(op); + return (res != null && res.isSuccess()) ? AvailabilityType.UP : AvailabilityType.DOWN; + } + + private BaseServerComponent findServerComponent() { + BaseComponent<?> component = this; + while ((component != null) && !(component instanceof BaseServerComponent)) { + component = (BaseComponent<?>) component.context.getParentResourceComponent(); } + return (BaseServerComponent)component; + } + + public BaseServerComponent getServerComponent() { + return serverComponent; } /** @@ -173,7 +159,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone op = new ReadAttribute(address, reqName); // TODO batching } - Result res = connection.execute(op); + Result res = getASConnection().execute(op); if (!res.isSuccess()) { log.warn("Getting metric [" + req.getName() + "] at [ " + address + "] failed: " + res.getFailureDescription()); @@ -258,7 +244,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone } public ASConnection getASConnection() { - return connection; + return (this.testConnection != null) ? this.testConnection : getServerComponent().getASConnection(); } public String getPath() { @@ -268,14 +254,14 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone public Configuration loadResourceConfiguration() throws Exception { ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); - ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(configDef, connection, address); + ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(configDef, getASConnection(), address); return delegate.loadResourceConfiguration(); } public void updateResourceConfiguration(ConfigurationUpdateReport report) { ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); - ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, connection, address); + ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, getASConnection(), address); delegate.updateResourceConfiguration(report); } @@ -293,7 +279,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone } } Operation op = new Remove(address); - Result res = connection.execute(op); + Result res = getASConnection().execute(op); if (!res.isSuccess()) throw new IllegalArgumentException("Delete for [" + path + "] failed: " + res.getFailureDescription()); if (path.contains("server-group")) { @@ -318,6 +304,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone if (report.getPackageDetails() != null) { // Content deployment return deployContent(report); } else { + ASConnection connection = getASConnection(); ConfigurationDefinition configDef = report.getResourceType().getResourceConfigurationDefinition(); // Check for the Highlander principle @@ -358,21 +345,13 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone protected CreateResourceReport deployContent(CreateResourceReport report) { ContentContext cctx = context.getContentContext(); ResourcePackageDetails details = report.getPackageDetails(); - Configuration deploymentTimeConfiguration = report.getPackageDetails().getDeploymentTimeConfiguration(); - - // check if the user has provided a timeout and set it. Otherwise use the default - int timeout = 120; // 120s default - PropertySimple timeoutProp = deploymentTimeConfiguration.getSimple("userProvidedTimeoutMillis"); - if (timeoutProp != null && timeoutProp.getStringValue() != null) { - int tmp = timeoutProp.getIntegerValue(); // value is in millis, we need seconds - timeout = tmp / 1000; - } ContentServices contentServices = cctx.getContentServices(); String resourceTypeName = report.getResourceType().getName(); - ASUploadConnection uploadConnection = new ASUploadConnection(host, port, managementUser, managementPassword); - uploadConnection.setTimeout(timeout); // seconds + ServerPluginConfiguration serverPluginConfig = getServerComponent().getServerPluginConfiguration(); + ASUploadConnection uploadConnection = new ASUploadConnection(serverPluginConfig.getHostname(), + serverPluginConfig.getPort(), serverPluginConfig.getUser(), serverPluginConfig.getPassword()); OutputStream out = uploadConnection.getOutputStream(details.getFileName()); contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out); @@ -392,13 +371,10 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone if (fileName.startsWith("C:\\fakepath\\")) { // TODO this is a hack as the server adds the fake path somehow fileName = fileName.substring("C:\\fakepath\\".length()); } - String runtimeName = fileName; - PropertySimple rtNameProp = report.getPackageDetails().getDeploymentTimeConfiguration() - .getSimple("runtimeName"); - if (rtNameProp != null) { - String rtn = rtNameProp.getStringValue(); - if (rtn != null && !rtn.isEmpty()) - runtimeName = rtn; + + String runtimeName = report.getPackageDetails().getDeploymentTimeConfiguration().getSimpleValue("runtimeName"); + if (runtimeName == null || runtimeName.isEmpty()) { + runtimeName = fileName; } JsonNode resultNode = uploadResult.get("result"); @@ -588,7 +564,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone } OperationResult operationResult = new OperationResult(); - Result result = connection.execute(operation); + Result result = getASConnection().execute(operation); if (result == null) { operationResult.setErrorMessage("Connection was null - is the server running?"); @@ -709,9 +685,10 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone } } - ///// Those two are used to 'inject' the connection and the path from tests. + ///// These two are used to 'inject' the connection and the path from tests. + // TODO: Refactor this - we should be able to mock the ResourceContext passed to start() instead. public void setConnection(ASConnection connection) { - this.connection = connection; + this.testConnection = connection; } public void setPath(String path) { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 924c780..a2596af 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -57,6 +57,7 @@ import org.rhq.core.pluginapi.util.StartScriptConfiguration; import org.rhq.core.system.ProcessInfo; import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; import org.rhq.modules.plugins.jbossas7.helper.HostPort; +import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.ReadAttribute; import org.rhq.modules.plugins.jbossas7.json.Result; @@ -140,15 +141,16 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent ProcessInfo process, AS7CommandLine commandLine) throws Exception { Configuration pluginConfig = discoveryContext.getDefaultPluginConfiguration(); + ServerPluginConfiguration serverPluginConfig = new ServerPluginConfiguration(pluginConfig); File homeDir = getHomeDir(process, commandLine); - - pluginConfig.put(new PropertySimple("homeDir", homeDir)); + serverPluginConfig.setHomeDir(homeDir); File baseDir = getBaseDir(process, commandLine, homeDir); - pluginConfig.put(new PropertySimple("baseDir", baseDir)); + serverPluginConfig.setBaseDir(baseDir); + File configDir = getConfigDir(process, commandLine, baseDir); - pluginConfig.put(new PropertySimple("configDir", configDir)); + serverPluginConfig.setConfigDir(configDir); File hostXmlFile = getHostXmlFile(commandLine, configDir); if (!hostXmlFile.exists()) { @@ -158,21 +160,23 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent HostConfiguration hostConfig = loadHostConfiguration(hostXmlFile); String domainHost = findHost(hostXmlFile); - pluginConfig.put(new PropertySimple("domainHost", domainHost)); + pluginConfig.setSimpleValue("domainHost", domainHost); + + File logDir = getLogDir(process, commandLine, baseDir); - File logFile = getLogFile(getLogDir(process, commandLine, baseDir)); + File logFile = getLogFile(logDir); initLogEventSourcesConfigProp(logFile.getPath(), pluginConfig); HostPort managementHostPort = hostConfig.getManagementHostPort(commandLine, getMode()); - pluginConfig.put(new PropertySimple("hostname", managementHostPort.host)); - pluginConfig.put(new PropertySimple("port", managementHostPort.port)); - pluginConfig.put(new PropertySimple("realm", hostConfig.getManagementSecurityRealm())); + serverPluginConfig.setHostname(managementHostPort.host); + serverPluginConfig.setPort(managementHostPort.port); + pluginConfig.setSimpleValue("realm", hostConfig.getManagementSecurityRealm()); JBossProductType productType = JBossProductType.determineJBossProductType(homeDir); - pluginConfig.put(new PropertySimple("productType", productType.name())); - pluginConfig.put(new PropertySimple("hostXmlFileName", getHostXmlFileName(commandLine))); + serverPluginConfig.setProductType(productType); + pluginConfig.setSimpleValue("hostXmlFileName", getHostXmlFileName(commandLine)); setStartScriptPluginConfigProps(process, commandLine, pluginConfig); - setUserAndPasswordPluginConfigProps(pluginConfig, hostConfig, baseDir); + setUserAndPasswordPluginConfigProps(serverPluginConfig, hostConfig, baseDir); String key = baseDir.getPath(); HostPort hostPort = hostConfig.getHostPort(); @@ -184,8 +188,8 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent if (productType == JBossProductType.AS) { version = versionFromHomeDir; } else { - ProductInfo productInfo = new ProductInfo(managementHostPort.host, pluginConfig.getSimpleValue("user", null), - pluginConfig.getSimpleValue("password", null), managementHostPort.port); + ProductInfo productInfo = new ProductInfo(managementHostPort.host, serverPluginConfig.getUser(), + serverPluginConfig.getPassword(), managementHostPort.port); productInfo = productInfo.getFromRemote(); String productVersion = (productInfo.fromRemote) ? productInfo.productVersion : versionFromHomeDir; // TODO: Grab the product version from the product info properties file, so we aren't relying on connecting @@ -251,7 +255,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent startScriptConfig.setStartScriptArgs(startScriptArgs); } - private void setUserAndPasswordPluginConfigProps(Configuration pluginConfig, HostConfiguration hostConfig, + private void setUserAndPasswordPluginConfigProps(ServerPluginConfiguration serverPluginConfig, HostConfiguration hostConfig, File baseDir) { Properties mgmtUsers = getManagementUsers(hostConfig, getMode(), baseDir); String user; @@ -280,8 +284,8 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent user = RHQADMIN; password = RHQADMIN; } - pluginConfig.put(new PropertySimple("user", user)); - pluginConfig.put(new PropertySimple("password", password)); + serverPluginConfig.setUser(user); + serverPluginConfig.setPassword(password); } protected File getBaseDir(ProcessInfo process, JavaCommandLine javaCommandLine, File homeDir) { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index f88b3d3..ac10e82 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -39,6 +39,7 @@ import org.rhq.core.domain.configuration.PropertySimple; 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.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; @@ -51,6 +52,7 @@ import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; +import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.ComplexResult; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -69,13 +71,41 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom final Log log = LogFactory.getLog(BaseServerComponent.class); + private ASConnection connection; + private LogFileEventResourceComponentHelper logFileEventDelegate; private StartScriptConfiguration startScriptConfig; + private ServerPluginConfiguration serverPluginConfig; @Override - public void start(ResourceContext<T> tResourceContext) throws InvalidPluginConfigurationException, Exception { - super.start(tResourceContext); + public void start(ResourceContext<T> resourceContext) throws InvalidPluginConfigurationException, Exception { + super.start(resourceContext); + + serverPluginConfig = new ServerPluginConfiguration(pluginConfiguration); + connection = new ASConnection(serverPluginConfig.getHostname(), serverPluginConfig.getPort(), + serverPluginConfig.getUser(), serverPluginConfig.getPassword()); + logFileEventDelegate = new LogFileEventResourceComponentHelper(context); + logFileEventDelegate.startLogFileEventPollers(); + startScriptConfig = new StartScriptConfiguration(pluginConfiguration); + } + + @Override + public void stop() { + logFileEventDelegate.stopLogFileEventPollers(); + } + + public ServerPluginConfiguration getServerPluginConfiguration() { + return serverPluginConfig; + } + + @Override + public ASConnection getASConnection() { + return connection; + } - this.startScriptConfig = new StartScriptConfiguration(pluginConfiguration); + // TODO: Refactor this - we should be able to mock the ResourceContext passed to start() instead. + @Override + public void setConnection(ASConnection connection) { + this.connection = connection; } /** @@ -349,28 +379,30 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom return result; } - String baseDirString = pluginConfig.getSimpleValue("baseDir", ""); - if (baseDirString.isEmpty()) { - result.setErrorMessage("No baseDir found - cannot continue."); + File baseDir = serverPluginConfig.getBaseDir(); + if (baseDir == null) { + result.setErrorMessage("'baseDir' plugin config prop is not set."); + return result; + } + + File configDir = serverPluginConfig.getConfigDir(); + if (configDir == null) { + result.setErrorMessage("'configDir' plugin config prop is not set."); return result; } - File baseDir = new File(baseDirString); String configFileName; - BaseProcessDiscovery processDiscovery; - String configDir = pluginConfig.getSimpleValue("configDir",null); switch (mode) { case STANDALONE: configFileName = pluginConfig.getSimpleValue("config", null); - processDiscovery = new StandaloneASDiscovery(); break; case HOST: configFileName = pluginConfig.getSimpleValue("hostConfig", null); - processDiscovery = new HostControllerDiscovery(); break; default: throw new IllegalArgumentException("Unsupported mode: " + mode); } + File configFile = new File(configDir, configFileName); HostConfiguration hostConfig; try { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java index af452cc..82fdfef 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java @@ -1,7 +1,6 @@ package org.rhq.modules.plugins.jbossas7; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -91,7 +90,7 @@ public class DomainDeploymentComponent extends DeploymentComponent implements Op @SuppressWarnings("unchecked") private Collection<String> getServerGroups() { Operation op = new ReadChildrenNames(new Address(), "server-group"); - Result res = connection.execute(op); + Result res = getASConnection().execute(op); return (Collection<String>) res.getResult(); } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/IspnComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/IspnComponent.java index 701962f..bf809cf 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/IspnComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/IspnComponent.java @@ -1,12 +1,5 @@ package org.rhq.modules.plugins.jbossas7; -import java.util.HashSet; -import java.util.Set; - -import org.rhq.core.domain.measurement.MeasurementDataTrait; -import org.rhq.core.domain.measurement.MeasurementReport; -import org.rhq.core.domain.measurement.MeasurementScheduleRequest; - /** * Component class for Infinispan * @author Heiko W. Rupp diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java index aa870fb..716ea39 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java @@ -6,9 +6,7 @@ import java.util.Set; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; -import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; /** diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java index 9afd82a..945682c 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java @@ -30,6 +30,9 @@ import org.rhq.core.domain.measurement.AvailabilityType; 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.event.log.LogFileEventResourceComponentHelper; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.ComplexResult; @@ -39,12 +42,32 @@ import org.rhq.modules.plugins.jbossas7.json.ReadResource; import org.rhq.modules.plugins.jbossas7.json.Result; /** - * Common stuff for the Domain + * A component for a "Managed Server" Resource. + * * @author Heiko W. Rupp */ @SuppressWarnings("unused") public class ManagedASComponent extends BaseComponent<HostControllerComponent<?>> { + private static final String MANAGED_SERVER_TYPE_NAME = "Managed Server"; + private LogFileEventResourceComponentHelper logFileEventDelegate; + + @Override + public void start(ResourceContext<HostControllerComponent<?>> hostControllerComponentResourceContext) + throws InvalidPluginConfigurationException, Exception { + super.start(hostControllerComponentResourceContext); + + logFileEventDelegate = new LogFileEventResourceComponentHelper(context); + logFileEventDelegate.startLogFileEventPollers(); + } + + @Override + public void stop() { + super.stop(); + + logFileEventDelegate.stopLogFileEventPollers(); + } + /** * Get the availability of the managed AS server. We can't just check if * a connection succeeds, as the check runs against the API/HostController @@ -53,15 +76,15 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?> */ @Override public AvailabilityType getAvailability() { - if (context.getResourceType().getName().equals("Managed Server")) { + if (context.getResourceType().getName().equals(MANAGED_SERVER_TYPE_NAME)) { Address theAddress = new Address(); String host = pluginConfiguration.getSimpleValue("domainHost", "local"); - theAddress.add("host",host); + theAddress.add("host", host); theAddress.add("server-config", myServerName); Operation getStatus = new ReadAttribute(theAddress, "status"); Result result; try { - result = connection.execute(getStatus); + result = getASConnection().execute(getStatus); } catch (Exception e) { log.warn(e.getMessage()); return AvailabilityType.DOWN; @@ -157,7 +180,7 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?> } catch (RuntimeException e) { throw new Exception("Failed to extract hostname from server path [" + serverPath + "].", e); } - configuration.put(new PropertySimple("hostname",serverPath)); + configuration.put(new PropertySimple("hostname", serverPath)); Operation op = new ReadResource(getAddress()); ComplexResult res = getASConnection().executeComplex(op); @@ -227,4 +250,5 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?> return opRes; } + } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java index 94c17cf..d7a8521 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java @@ -161,7 +161,7 @@ public class ModClusterComponent extends BaseComponent implements OperationFacet ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); //default address is not right. Update it Address modClusterConfigAddress = new Address(key + CONFIG_ADDRESS); - ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(configDef, connection, + ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(configDef, getASConnection(), modClusterConfigAddress); Configuration config = delegate.loadResourceConfiguration(); @@ -174,7 +174,7 @@ public class ModClusterComponent extends BaseComponent implements OperationFacet ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); //default address is not right. Update it Address modClusterConfigAddress = new Address(key + CONFIG_ADDRESS); - ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, connection, + ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, getASConnection(), modClusterConfigAddress); delegate.updateResourceConfiguration(report); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java index 139fdff..8d5c64e 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java @@ -44,6 +44,7 @@ import org.rhq.core.pluginapi.content.ContentServices; import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -97,7 +98,9 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, for (ResourcePackageDetails details : packages) { - ASUploadConnection uploadConnection = new ASUploadConnection(host,port, super.managementUser, super.managementPassword); + ServerPluginConfiguration serverPluginConfig = getServerComponent().getServerPluginConfiguration(); + ASUploadConnection uploadConnection = new ASUploadConnection(serverPluginConfig.getHostname(), + serverPluginConfig.getPort(), serverPluginConfig.getUser(), serverPluginConfig.getPassword()); String fileName = details.getFileName(); OutputStream out = uploadConnection.getOutputStream(fileName); contentServices.downloadPackageBits(cctx, details.getKey(), out, false); @@ -162,9 +165,8 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, @Override public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) { - Operation op = new ReadChildrenNames(address,"deployment"); // TODO read full packages not only names - Result node = connection.execute(op); + Result node = getASConnection().execute(op); if (!node.isSuccess()) return null; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java index a42d6a1..00d28ca 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java @@ -1,7 +1,5 @@ package org.rhq.modules.plugins.jbossas7; -import java.util.Map; - import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadPoolComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadPoolComponent.java index d83de68..7fd478c 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadPoolComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadPoolComponent.java @@ -37,7 +37,7 @@ public class ThreadPoolComponent extends BaseComponent<ResourceComponent<?>> { ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); //type is a fake property, do not attempt to load it from the managed server configDef.getPropertyDefinitions().remove("type"); - ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(configDef, connection, address); + ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(configDef, getASConnection(), address); Configuration configuration = delegate.loadResourceConfiguration(); //manually load type based on the resource path @@ -54,7 +54,7 @@ public class ThreadPoolComponent extends BaseComponent<ResourceComponent<?>> { ConfigurationDefinition configDef = context.getResourceType().getResourceConfigurationDefinition(); //type is a fake property, do not attempt to save it. configDef.getPropertyDefinitions().remove("type"); - ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, connection, address); + ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(configDef, getASConnection(), address); //type is a fake property, do not attempt to save it. report.getConfiguration().remove("type"); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadsComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadsComponent.java index ffb94cd..a215398 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadsComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadsComponent.java @@ -40,7 +40,7 @@ public class ThreadsComponent extends BaseComponent<ResourceComponent<?>> { //2) Update path to the selected thread pool type. ConfigurationDefinition configDef = report.getResourceType().getResourceConfigurationDefinition(); configDef.getPropertyDefinitions().remove("type"); - CreateResourceDelegate delegate = new CreateResourceDelegate(configDef, connection, address); + CreateResourceDelegate delegate = new CreateResourceDelegate(configDef, getASConnection(), address); Configuration configuration = report.getResourceConfiguration(); PropertySimple threadPoolType = (PropertySimple) configuration.get("type"); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java new file mode 100644 index 0000000..66539e0 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java @@ -0,0 +1,103 @@ +package org.rhq.modules.plugins.jbossas7; + +import java.io.File; +import java.util.Iterator; +import java.util.Set; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.measurement.MeasurementReport; +import org.rhq.core.domain.measurement.MeasurementScheduleRequest; +import org.rhq.core.domain.measurement.calltime.CallTimeData; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.util.ResponseTimeConfiguration; +import org.rhq.core.pluginapi.util.ResponseTimeLogParser; +import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; +import org.rhq.modules.plugins.jbossas7.json.ReadAttribute; +import org.rhq.modules.plugins.jbossas7.json.Result; + +/** + * The ResourceComponent for a "Web Runtime" Resource. + * + * @author Ian Springer + */ +public class WebRuntimeComponent extends BaseComponent<BaseComponent<?>> { + + private static final String RESPONSE_TIME_METRIC = "responseTime"; + + private ResponseTimeLogParser responseTimeLogParser; + + @Override + public void start(ResourceContext<BaseComponent<?>> resourceContext) throws InvalidPluginConfigurationException, Exception { + super.start(resourceContext); + + Configuration pluginConfig = resourceContext.getPluginConfiguration(); + ResponseTimeConfiguration responseTimeConfig = new ResponseTimeConfiguration(pluginConfig); + File logFile = responseTimeConfig.getLogFile(); + if (logFile == null) { + logFile = findLogFile(); + } + + if (logFile != null) { + this.responseTimeLogParser = new ResponseTimeLogParser(logFile); + this.responseTimeLogParser.setExcludes(responseTimeConfig.getExcludes()); + this.responseTimeLogParser.setTransforms(responseTimeConfig.getTransforms()); + } + } + + @Override + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception { + for (Iterator<MeasurementScheduleRequest> iterator = requests.iterator(); iterator.hasNext(); ) { + MeasurementScheduleRequest request = iterator.next(); + if (request.getName().equals(RESPONSE_TIME_METRIC)) { + iterator.remove(); + if (this.responseTimeLogParser != null) { + try { + CallTimeData callTimeData = new CallTimeData(request); + this.responseTimeLogParser.parseLog(callTimeData); + report.addData(callTimeData); + } catch (Exception e) { + log.error("Failed to retrieve call-time metric '" + RESPONSE_TIME_METRIC + "' for " + + context.getResourceType() + " Resource with key [" + context.getResourceKey() + "].", + e); + } + } else { + log.error("The '" + RESPONSE_TIME_METRIC + "' metric is enabled for " + context.getResourceType() + + " Resource with key [" + context.getResourceKey() + "], but no value is defined for the '" + + ResponseTimeConfiguration.RESPONSE_TIME_LOG_FILE_CONFIG_PROP + "' connection property."); + // TODO: Communicate this error back to the server for display in the GUI. + } + break; + } + } + + super.getValues(report, requests); + } + + private File findLogFile() { + File logFile = null; + ServerPluginConfiguration serverPluginConfig = getServerComponent().getServerPluginConfiguration(); + File logDir = serverPluginConfig.getLogDir(); + if (logDir != null && logDir.isDirectory()) { + String virtualHost = readAttribute("virtual-host"); + if (virtualHost != null) { + String contextRoot = readAttribute("context-root"); + if (contextRoot != null) { + // e.g. "192.168.1.100_foo_rt.log" for foo.war deployed to 192.168.1.100 vhost + String logFileName = String.format("%s_%s_rt.log", virtualHost, contextRoot); + logFile = new File(logDir, logFileName); + } + } + } + return logFile; + } + + // TODO: Make this more robust and move it up to BaseComponent. + private String readAttribute(String attributeName) { + ASConnection connection = getASConnection(); + ReadAttribute op = new ReadAttribute(address, attributeName); + Result result = connection.execute(op); + return result.toString(); + } + +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java new file mode 100644 index 0000000..73b84ca --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java @@ -0,0 +1,110 @@ +package org.rhq.modules.plugins.jbossas7.helper; + +import java.io.File; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.modules.plugins.jbossas7.JBossProductType; + +/** + * A wrapper for the plugin configuration of an AS7 Server Resource, which provides strongly typed accessors for each of + * the configuration properties. + */ +public class ServerPluginConfiguration { + + public abstract class Property { + public static final String HOSTNAME = "hostname"; + public static final String PORT = "port"; + public static final String USER = "user"; + public static final String PASSWORD = "password"; + public static final String HOME_DIR = "homeDir"; + public static final String BASE_DIR = "baseDir"; + public static final String CONFIG_DIR = "configDir"; + public static final String LOG_DIR = "logDir"; + public static final String PRODUCT_TYPE = "productType"; + } + + private Configuration pluginConfig; + + public ServerPluginConfiguration(Configuration pluginConfig) { + this.pluginConfig = pluginConfig; + } + + public String getHostname() { + return this.pluginConfig.getSimpleValue(Property.HOSTNAME); + } + + public void setHostname(String hostname) { + this.pluginConfig.setSimpleValue(Property.HOSTNAME, hostname); + } + + public Integer getPort() { + String stringValue = this.pluginConfig.getSimpleValue(Property.PORT); + return Integer.valueOf(stringValue); + } + + public void setPort(int port) { + this.pluginConfig.setSimpleValue(Property.PORT, String.valueOf(port)); + } + + public String getUser() { + return this.pluginConfig.getSimpleValue(Property.USER); + } + + public void setUser(String user) { + this.pluginConfig.setSimpleValue(Property.USER, user); + } + + public String getPassword() { + return this.pluginConfig.getSimpleValue(Property.PASSWORD); + } + + public void setPassword(String password) { + this.pluginConfig.setSimpleValue(Property.PASSWORD, password); + } + + public File getHomeDir() { + String stringValue = this.pluginConfig.getSimpleValue(Property.HOME_DIR); + return (stringValue != null && !stringValue.isEmpty()) ? new File(stringValue) : null; + } + + public void setHomeDir(File homeDir) { + this.pluginConfig.setSimpleValue(Property.HOME_DIR, (homeDir != null) ? homeDir.toString() : null); + } + + public File getBaseDir() { + String stringValue = this.pluginConfig.getSimpleValue(Property.BASE_DIR); + return (stringValue != null && !stringValue.isEmpty()) ? new File(stringValue) : null; + } + + public void setBaseDir(File homeDir) { + this.pluginConfig.setSimpleValue(Property.BASE_DIR, (homeDir != null) ? homeDir.toString() : null); + } + + public File getConfigDir() { + String stringValue = this.pluginConfig.getSimpleValue(Property.CONFIG_DIR); + return (stringValue != null && !stringValue.isEmpty()) ? new File(stringValue) : null; + } + + public void setConfigDir(File configDir) { + this.pluginConfig.setSimpleValue(Property.CONFIG_DIR, (configDir != null) ? configDir.toString() : null); + } + + public File getLogDir() { + String stringValue = this.pluginConfig.getSimpleValue(Property.LOG_DIR); + return (stringValue != null && !stringValue.isEmpty()) ? new File(stringValue) : null; + } + + public void setLogDir(File logDir) { + this.pluginConfig.setSimpleValue(Property.LOG_DIR, (logDir != null) ? logDir.toString() : null); + } + + public JBossProductType getProductType() { + String stringValue = this.pluginConfig.getSimpleValue(Property.PRODUCT_TYPE); + return (stringValue != null && !stringValue.isEmpty()) ? JBossProductType.valueOf(stringValue) : null; + } + + public void setProductType(JBossProductType productType) { + this.pluginConfig.setSimpleValue(Property.PRODUCT_TYPE, (productType != null) ? productType.name() : null); + } + +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/PROPERTY_VALUE.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/PROPERTY_VALUE.java index efe389b..c9c9ac9 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/PROPERTY_VALUE.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/PROPERTY_VALUE.java @@ -20,8 +20,6 @@ package org.rhq.modules.plugins.jbossas7.json; import java.io.Serializable; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonValue; import org.codehaus.jackson.map.annotate.JsonDeserialize; import org.codehaus.jackson.map.annotate.JsonSerialize; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadChildrenResources.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadChildrenResources.java index fbb8187..8a7f9b4 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadChildrenResources.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadChildrenResources.java @@ -18,8 +18,6 @@ */ package org.rhq.modules.plugins.jbossas7.json; -import java.util.List; - /** * Operation that reads children of a given type from an address * @author Heiko W. Rupp diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadResource.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadResource.java index 4bc1fd3..1eece34 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadResource.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadResource.java @@ -18,8 +18,6 @@ */ package org.rhq.modules.plugins.jbossas7.json; -import java.util.List; - /** * Reads data for one AS 7 resource * @author Heiko W. Rupp diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/serializer/PropertyValueDeserializer.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/serializer/PropertyValueDeserializer.java index 11e6ae3..c49f8a2 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/serializer/PropertyValueDeserializer.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/serializer/PropertyValueDeserializer.java @@ -19,7 +19,6 @@ package org.rhq.modules.plugins.jbossas7.json.serializer; import java.io.IOException; -import java.lang.ref.PhantomReference; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonProcessingException; diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 3bc6095..3359438 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -276,6 +276,7 @@ <c:simple-property name="homeDir" type="file" description="Root directory of the server installation" displayName="Home Directory" readOnly="true" required="false"/> <c:simple-property name="baseDir" type="file" description="Base directory for server content" displayName="Base Directory" readOnly="true" required="false"/> <c:simple-property name="configDir" type="file" description="Base configuration directory" displayName="Configuration Directory" readOnly="true" required="false"/> + <c:simple-property name="logDir" type="file" description="the directory where log files will be written for this host controller" displayName="Log Directory" readOnly="true" required="false"/> <c:simple-property name="domainHost" type="string" readOnly="true" required="false" description="Host name within the AS7 domain"/> <c:simple-property name="productType" type="string" readOnly="true" required="false" description="Server product type (e.g. AS or EAP)"/> @@ -532,8 +533,6 @@ createDeletePolicy="both" > <plugin-configuration> - <c:simple-property name="hostname" default="localhost" displayName="Management host" required="true"/> - <c:simple-property name="port" default="9990" type="integer" displayName="Management port" required="true"/> <c:simple-property name="path" readOnly="true"/> &logSources; @@ -695,6 +694,7 @@ <c:simple-property name="homeDir" type="file" description="Root directory of the server installation" displayName="Home Directory" readOnly="true" required="false"/> <c:simple-property name="baseDir" type="file" description="Base directory for server content" displayName="Base Directory" readOnly="true" required="false"/> <c:simple-property name="configDir" type="file" description="Base configuration directory" displayName="Configuration Directory" readOnly="true" required="false"/> + <c:simple-property name="logDir" type="file" description="the directory where log files will be written for this server" displayName="Log Directory" readOnly="true" required="false"/> <c:simple-property name="deployDir" type="file" description="Deploy directory for standalone servers" displayName="Deployment directory" readOnly="true" required="false"/> <c:simple-property name="productType" type="string" readOnly="true" required="false" description="Server product type (e.g. AS or EAP)"/> @@ -3081,7 +3081,7 @@ <service name="Web Runtime" - class="BaseComponent" + class="WebRuntimeComponent" discovery="SubsystemDiscovery" description="Runtime resources exposed by web components in the deployment." singleton="true"> @@ -3093,10 +3093,22 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=web" readOnly="true"/> + + <c:group name="responseTime"> + <c:simple-property name="responseTimeLogFile" required="false" + description="the full path to the log file containing response-time stats for this webapp"/> + <c:simple-property name="responseTimeUrlExcludes" required="false" + description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/> + <c:simple-property name="responseTimeUrlTransforms" required="false" + description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/> + </c:group> </plugin-configuration> - <metric property="virtual-host" dataType="trait" description="Virtual Host"/> - <metric property="context-root" dataType="trait" description="Context Root"/> + <metric property="virtual-host" dataType="trait" displayName="Virtual Host" description="the virtual host this webapp is deployed to"/> + <metric property="context-root" dataType="trait" displayName="Context Root" description="the context root of this webapp"/> + <metric property="responseTime" + dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL" + description="the minimum, maximum, and average response times for requests serviced by this webapp"/> </service> diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/UploadAndDeployTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/UploadAndDeployTest.java index 0ee0bae..a58561c 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/UploadAndDeployTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/UploadAndDeployTest.java @@ -38,6 +38,7 @@ import org.rhq.core.pluginapi.inventory.CreateResourceReport; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.modules.plugins.jbossas7.ASConnection; import org.rhq.modules.plugins.jbossas7.BaseComponent; +import org.rhq.modules.plugins.jbossas7.BaseServerComponent; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -342,7 +343,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest { rt.setName("Deployment"); Resource resource = new Resource("deployment="+TEST_WAR_FILE_NAME, TEST_WAR_FILE_NAME, rt); // TODO resource key? resource.setUuid(UUID.randomUUID().toString()); - BaseComponent parentComponent = new BaseComponent(); + BaseServerComponent parentComponent = new BaseServerComponent(); parentComponent.setConnection(getASConnection()); ResourceContext context = new ResourceContext(resource,parentComponent,null,null,null,null,null,null,null,null,null,null,null); bc.start(context); @@ -376,7 +377,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest { rt.setName("Deployment"); Resource resource = new Resource("server-group=main-server-group",TEST_WAR_FILE_NAME,rt); resource.setUuid(UUID.randomUUID().toString()); - BaseComponent parentComponent = new BaseComponent(); + BaseServerComponent parentComponent = new BaseServerComponent(); parentComponent.setConnection(getASConnection()); ResourceContext context = new ResourceContext(resource,parentComponent,null,null,null,null,null,null,null,null,null,null,null); bc.start(context); commit a43d48857c262605944b6082e8fd21c78653e760 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 25 12:03:13 2012 -0400 be able to have eclipse easily build gwt client for FF, Chrome and IE8 diff --git a/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,Chrome,IE8).launch b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,Chrome,IE8).launch new file mode 100644 index 0000000..cf0a117 --- /dev/null +++ b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,Chrome,IE8).launch @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> +<stringAttribute key="bad_container_name" value="\rhq\etc\eclipse-tools\maven"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> +</listAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-o -Dgwt.userAgent=gecko1_8,safari,ie8 -Dmaven.test.skip=true -Pdev gwt:clean install"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/rhq/modules/enterprise/gui/coregui}"/> +</launchConfiguration> diff --git a/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,IE8).launch b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,IE8).launch index 53e2c87..658bf24 100644 --- a/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,IE8).launch +++ b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Web UI Only (GWT) (FF,IE8).launch @@ -6,6 +6,6 @@ <listEntry value="org.eclipse.ui.externaltools.launchGroup"/> </listAttribute> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-o -Dgwt.userAgent=gecko1_8,ie6,ie8 -Dmaven.test.skip=true -Pdev gwt:clean install"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-o -Dgwt.userAgent=gecko1_8,ie8 -Dmaven.test.skip=true -Pdev gwt:clean install"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/rhq/modules/enterprise/gui/coregui}"/> </launchConfiguration> commit 697228f9914c661d4e92a5d8c9c11281e0731a97 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Apr 25 17:33:37 2012 +0200 Add test for adding a system property and retrieving it. Lets see if it blends diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index e0bd0cb..57e381e 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -25,6 +25,13 @@ import java.util.List; import org.testng.annotations.AfterSuite; import org.testng.annotations.Test; +import org.rhq.core.clientapi.agent.configuration.ConfigurationUpdateRequest; +import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; @@ -112,6 +119,40 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { assertEquals(avail, AvailabilityType.UP); } + @Test(priority = 6, enabled = true) + public void testSystemPropertiesSettings() throws Exception { + + Configuration config = loadResourceConfiguration(getServerResource()); + PropertyList starList = (PropertyList) config.get("*2"); + PropertyMap newProp = new PropertyMap("*:name"); + newProp.put(new PropertySimple("name", "Hulla")); + newProp.put(new PropertySimple("value", "Hopp")); + starList.add(newProp); + + ConfigurationUpdateRequest request = new ConfigurationUpdateRequest(1, config, getServerResource().getId()); + ConfigurationUpdateResponse response = pluginContainer.getConfigurationManager() + .executeUpdateResourceConfigurationImmediately(request); + assert response != null; + assert response.getErrorMessage() == null : "Adding a property resulted in this error: " + + response.getErrorMessage(); + + config = loadResourceConfiguration(getServerResource()); + starList = (PropertyList) config.get("*2"); + List<Property> propertyList = starList.getList(); + for (Property prop : propertyList) { + assert prop instanceof PropertyMap; + PropertyMap map = (PropertyMap) prop; + PropertySimple key = map.getSimple("name"); + assert key != null; + if ("Hulla".equals(key.getStringValue())) { + PropertySimple val = map.getSimple("value"); + assert val != null; + assert "Hopp".equals(val.getStringValue()); + } + } + + } + protected String getExpectedStartScriptFileName() { return (File.separatorChar == '/') ? "standalone.sh" : "standalone.bat"; } commit e82b20df68f9592d485c2b32b3315693aa834b9c Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Apr 25 10:12:48 2012 -0400 hard-code a core set of generic OS-level env vars in ServerStartScriptDiscoveryUtility, which all processes will require diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index b3a362a..f32feb2 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -24,6 +24,8 @@ package org.rhq.core.pluginapi.util; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -34,10 +36,25 @@ import org.hyperic.sigar.ProcExe; import org.rhq.core.system.ProcessInfo; /** + * A set of utility methods for initializing the three plugin configuration properties used by a plugin for starting the + * managed server - "startScript", "startScriptEnv", and "startScriptArgs". See also {@link StartScriptConfiguration}. + * * @author Ian Springer */ public class ServerStartScriptDiscoveryUtility { + // Generic OS-level env vars that should be in every process's environment. + private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList( + "PATH", + "LD_LIBRARY_PATH" + )); + static { + if (File.pathSeparatorChar == '\\') { + CORE_ENV_VAR_NAME_INCLUDES.add("SYSTEMROOT"); // required on Windows to avoid winsock create errors + } + } + + private ServerStartScriptDiscoveryUtility() { } @@ -131,14 +148,21 @@ public class ServerStartScriptDiscoveryUtility { public static Map<String, String> getStartScriptEnv(ProcessInfo serverProcess, ProcessInfo serverParentProcess, Set<String> envVarNameIncludes) { - Map<String, String> startScriptEnv = new LinkedHashMap<String, String>(); Map<String, String> processEnvVars; if (getStartScript(serverParentProcess) != null) { processEnvVars = serverParentProcess.getEnvironmentVariables(); } else { processEnvVars = serverProcess.getEnvironmentVariables(); } - for (String envVarName : envVarNameIncludes) { + + List<String> fullEnvVarNameIncludes = new ArrayList<String>(envVarNameIncludes); + // Add the core includes at the end of the list, since end users will probably be more interested in the + // app-specific env vars. + fullEnvVarNameIncludes.addAll(CORE_ENV_VAR_NAME_INCLUDES); + + // Use a linked hashmap to maintain the order of the includes list. + Map<String, String> startScriptEnv = new LinkedHashMap<String, String>(); + for (String envVarName : fullEnvVarNameIncludes) { String envVarValue = processEnvVars.get(envVarName); if (envVarValue != null) { startScriptEnv.put(envVarName, envVarValue); diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index 440b363..2484718 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Properties; @@ -124,7 +125,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom // The set of env vars that are actually relevant to AS5. Include only these to reduce the amount // of noise in the property value and to potentially avoid stale values. - private static final Set<String> START_SCRIPT_ENV_VAR_NAMES = new HashSet<String>(); + private static final Set<String> START_SCRIPT_ENV_VAR_NAMES = new LinkedHashSet<String>(); // Script options that are set by the script itself and that we don't want. Currently none. private static final Set<CommandLineOption> START_SCRIPT_OPTION_EXCLUDES = new HashSet<CommandLineOption>(); @@ -141,10 +142,8 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom "JBOSS_CONFIG_DIR", // "RUN_CONF", // "MAX_FD", // - "PROFILER", // - "PATH", // - "LD_LIBRARY_PATH", // - "SYSTEMROOT")); // required on Windows or you can get winsock create errors + "PROFILER" // + )); } private final Log log = LogFactory.getLog(this.getClass()); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index d7f8866..924c780 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Properties; @@ -74,11 +75,21 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent private static final String RHQADMIN = "rhqadmin"; private static final String RHQADMIN_ENCRYPTED = "35c160c1f841a889d4cda53f0bfc94b6"; - private static final Set<String> START_SCRIPT_ENV_VAR_NAMES = new HashSet<String>(); + private static final Set<String> START_SCRIPT_ENV_VAR_NAMES = new LinkedHashSet<String>(); static { - START_SCRIPT_ENV_VAR_NAMES.addAll(Arrays.asList( - "PATH", "LD_LIBRARY_PATH", "RUN_CONF", "JBOSS_HOME", "MAX_FD", "PROFILER", "JAVA_HOME", "JAVA", - "PRESERVE_JAVA_OPTS", "JAVA_OPTS", "JBOSS_BASE_DIR", "JBOSS_LOG_DIR", "JBOSS_CONFIG_DIR")); + START_SCRIPT_ENV_VAR_NAMES.addAll(Arrays.asList( // + "RUN_CONF", // + "MAX_FD", // + "PROFILER", // + "JAVA_HOME", // + "JAVA", // + "JAVA_OPTS", // + "PRESERVE_JAVA_OPTS", // + "JBOSS_HOME", // + "JBOSS_BASE_DIR", // + "JBOSS_LOG_DIR", // + "JBOSS_CONFIG_DIR" // + )); } // e.g.: -mp /opt/jboss-as-7.1.1.Final/modules commit bf1db4544f926f8d1e1a7701bb06aa7fe74fe54d Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Apr 25 10:12:45 2012 -0400 [BZ 815956] fix the event icon hover string diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java index 9720e39..a1aca43 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java @@ -100,10 +100,11 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even severityField.setShowHover(true); severityField.setHoverCustomizer(new HoverCustomizer() { public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - if (value == null) { + String sevEnumName = record.getAttribute("severity"); + if (sevEnumName == null) { return null; } - EventSeverity severity = EventSeverity.valueOf((String) value); + EventSeverity severity = EventSeverity.valueOf(sevEnumName); switch (severity) { case DEBUG: return MSG.common_severity_debug(); commit c17fb148c043b4c262b0273907ef1c1edf5740a3 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Apr 25 15:18:44 2012 +0200 BZ 708332: Revert " -support reads of name-value property maps", as - this case was covered by :collapsed maps already - causes havoc for e.g. system-properties This reverts commit 828678db639d68ad404a8b8741b2087335e643e3. Conflicts: modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java index a0e01c1..7b2d9bd 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java @@ -21,7 +21,6 @@ package org.rhq.modules.plugins.jbossas7; import java.io.IOException; import java.util.Collection; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -338,78 +337,46 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet { return propertyMap; } - if ((valueObject instanceof LinkedHashMap) && (isNameValuePropertyMap(propDefs))) {//handle name,value pair mappings - LinkedHashMap<String, String> objects = (LinkedHashMap<String, String>) valueObject; - for (String key : objects.keySet()) { - Property name = null; - name = new PropertySimple("name", key); - propertyMap.put(name); - Property value = null; - value = new PropertySimple("value", objects.get(key)); - propertyMap.put(value); + Map<String, Object> objects = (Map<String, Object>) valueObject; + for (PropertyDefinition propDef : propDefs) { + String key = propDef.getName(); + if (key.equals(specialNameProp)) // Skip over specialName prop, as we have processed that already. + continue; + + // special case: if the key is "*", we just pick the first element + Object o; + if (key.equals("*")) { + o = objects.entrySet().iterator().next().getValue(); + } else if (key.endsWith(":expr")) { + // TODO we need to check te + String tmp = key.substring(0, key.indexOf(":")); + o = objects.get(tmp); + } else { + o = objects.get(key); } - } else { - Map<String, Object> objects = (Map<String, Object>) valueObject; - for (PropertyDefinition propDef : propDefs) { - String key = propDef.getName(); - if (key.equals(specialNameProp)) // Skip over specialName prop, as we have processed that already. - continue; - - // special case: if the key is "*", we just pick the first element - Object o; - if (key.equals("*")) { - o = objects.entrySet().iterator().next().getValue(); - } else if (key.endsWith(":expr")) { - // TODO we need to check te - String tmp = key.substring(0, key.indexOf(":")); - o = objects.get(tmp); - } else { - o = objects.get(key); - } - Property property; - if (propDef instanceof PropertyDefinitionSimple) - property = loadHandlePropertySimple((PropertyDefinitionSimple) propDef, o); - else if (propDef instanceof PropertyDefinitionList) - property = loadHandlePropertyList((PropertyDefinitionList) propDef, o); - else if (propDef instanceof PropertyDefinitionMap) - property = loadHandlePropertyMap((PropertyDefinitionMap) propDef, o, null); - else - throw new IllegalArgumentException("Unknown property type in map property [" + propDefName + "]"); - - if (property != null) - propertyMap.put(property); - else { - if (log.isDebugEnabled()) - log.debug("Property " + key + " was null"); - } + Property property; + if (propDef instanceof PropertyDefinitionSimple) + property = loadHandlePropertySimple((PropertyDefinitionSimple) propDef, o); + else if (propDef instanceof PropertyDefinitionList) + property = loadHandlePropertyList((PropertyDefinitionList) propDef, o); + else if (propDef instanceof PropertyDefinitionMap) + property = loadHandlePropertyMap((PropertyDefinitionMap) propDef, o, null); + else + throw new IllegalArgumentException("Unknown property type in map property [" + propDefName + "]"); + + if (property != null) + propertyMap.put(property); + else { + if (log.isDebugEnabled()) + log.debug("Property " + key + " was null"); } + } return propertyMap; } - /**Determine if the property definition is for name=value property mapping. - * - * @param propDefs - * @return - */ - private boolean isNameValuePropertyMap(List<PropertyDefinition> propDefs) { - boolean isNameValuePropertyMap = false; - if (propDefs != null) { - int found = 0; - for (PropertyDefinition property : propDefs) { - String name = property.getName(); - if (name.equals("name") || name.equals("value")) { - found++; - } - } - if (found == 2) - isNameValuePropertyMap = true; - } - return isNameValuePropertyMap; - } - /** * Handle a List of ... * @param propDef Definition of this list diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index bb58541..3bc6095 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2166,7 +2166,14 @@ </results> </operation> -  + <operation name="change-log-level" description="Change the logging level for a handler."> + <parameters> + &logLevel; + </parameters> + <results> + <c:simple-property name="operationResult" description="Change the logging level for a handler." /> + </results> + </operation> <operation name="disable" description="Disable a logging handler."> <results> @@ -2217,7 +2224,14 @@ <c:simple-property name="path" readOnly="true" default="console-handler"/> </plugin-configuration> -  + <operation name="change-log-level" description="Change the logging level for a handler."> + <parameters> + &logLevel; + </parameters> + <results> + <c:simple-property name="operationResult" description="Change the logging level for a handler." /> + </results> + </operation> <operation name="disable" description="Disable a logging handler."> <results> @@ -2257,7 +2271,14 @@ <c:simple-property name="path" readOnly="true" default="custom-handler"/> </plugin-configuration> -  + <operation name="change-log-level" description="Change the logging level for a handler."> + <parameters> + &logLevel; + </parameters> + <results> + <c:simple-property name="operationResult" description="Change the logging level for a handler." /> + </results> + </operation> <operation name="disable" description="Disable a logging handler."> <results> @@ -2302,7 +2323,14 @@  -  + <operation name="change-log-level" description="Change the logging level for a handler."> + <parameters> + &logLevel; + </parameters> + <results> + <c:simple-property name="operationResult" description="Change the logging level for a handler." /> + </results> + </operation> <operation name="disable" description="Disable a logging handler."> <results> @@ -2342,7 +2370,14 @@  -  + <operation name="change-log-level" description="Change the logging level for a logger category."> + <parameters> + <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this logger. Message levels lower than this value will be discarded."/> + </parameters> + <results> + <c:simple-property name="operationResult" description="Change the logging level for a logger category." /> + </results> + </operation>  @@ -2370,7 +2405,14 @@  -  + <operation name="change-log-level" description="Change the logging level for a handler."> + <parameters> + &logLevel; + </parameters> + <results> + <c:simple-property name="operationResult" description="Change the logging level for a handler." /> + </results> + </operation> <operation name="disable" description="Disable a logging handler."> <results> @@ -2468,7 +2510,14 @@  -  + <operation name="change-log-level" description="Change the logging level for a handler."> + <parameters> + &logLevel; + </parameters> + <results> + <c:simple-property name="operationResult" description="Change the logging level for a handler." /> + </results> + </operation> <operation name="disable" description="Disable a logging handler."> <results> @@ -2490,6 +2539,7 @@ <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> &logFile; &logFilter; + <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; commit 38935c28615dd84c3eb01db73fcc486858616a96 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Apr 25 10:59:01 2012 +0200 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. This value is then passed as upload timeout (assuming that the connect is quick). diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java index 214e46a..b612c5e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java @@ -46,6 +46,7 @@ import org.rhq.core.clientapi.agent.inventory.ResourceFactoryAgentService; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.content.InstalledPackage; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; @@ -582,6 +583,13 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, Agent agent = parentResource.getAgent(); + // add the timeout to the deploymentTimeConfiguration + if (deploymentTimeConfiguration != null) { + if (timeout != null) { + deploymentTimeConfiguration.put(new PropertySimple("userProvidedTimeoutMillis", timeout)); + } + } + // Persist in separate transaction so it is committed immediately, before the request is sent to the agent CreateResourceHistory persistedHistory = resourceFactoryManager.persistCreateHistory(subject, parentResource .getId(), newResourceType.getId(), newResourceName, packageVersion, deploymentTimeConfiguration); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java index c225406..a7fe82d 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java @@ -62,6 +62,8 @@ public class ASUploadConnection { private HttpURLConnection connection; private String host; private int port; + private int timeout; + private static final int DEFAULT_TIMEOUT = 60; // 60sec public ASUploadConnection(String dcHost, int port, String user, String password) { if (dcHost == null) { @@ -76,20 +78,23 @@ public class ASUploadConnection { passwordAuthenticator = new AS7Authenticator(user,password); Authenticator.setDefault(passwordAuthenticator); } + timeout = DEFAULT_TIMEOUT; } public ASUploadConnection(ASConnection asConnection) { this.host=asConnection.getHost(); this.port=asConnection.getPort(); + this.timeout = DEFAULT_TIMEOUT; } + public OutputStream getOutputStream(String fileName) { String url = "http://" + host + ":" + port + UPLOAD_URL_PATH; try { // Create the HTTP connection to the upload URL connection = (HttpURLConnection) new URL(url).openConnection(); - connection.setConnectTimeout(10 * 1000); // 10s - connection.setReadTimeout(60 * 1000); // 60s + connection.setConnectTimeout(30 * 1000); // 30s + connection.setReadTimeout(timeout * 1000); // default 60s connection.setDoInput(true); connection.setDoOutput(true); connection.setRequestMethod(POST_REQUEST_METHOD); @@ -226,4 +231,20 @@ public class ASUploadConnection { } } } + + /** + * Get the currently active upload timeout + * @return timeout in seconds + */ + public int getTimeout() { + return timeout; + } + + /** + * Set upload timeout in seconds. + * @param timeout upload timeout in seconds + */ + public void setTimeout(int timeout) { + this.timeout = timeout; + } } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index 923e3c8..7ee440d 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -358,11 +358,21 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone protected CreateResourceReport deployContent(CreateResourceReport report) { ContentContext cctx = context.getContentContext(); ResourcePackageDetails details = report.getPackageDetails(); + Configuration deploymentTimeConfiguration = report.getPackageDetails().getDeploymentTimeConfiguration(); + + // check if the user has provided a timeout and set it. Otherwise use the default + int timeout = 120; // 120s default + PropertySimple timeoutProp = deploymentTimeConfiguration.getSimple("userProvidedTimeoutMillis"); + if (timeoutProp != null && timeoutProp.getStringValue() != null) { + int tmp = timeoutProp.getIntegerValue(); // value is in millis, we need seconds + timeout = tmp / 1000; + } ContentServices contentServices = cctx.getContentServices(); String resourceTypeName = report.getResourceType().getName(); ASUploadConnection uploadConnection = new ASUploadConnection(host, port, managementUser, managementPassword); + uploadConnection.setTimeout(timeout); // seconds OutputStream out = uploadConnection.getOutputStream(details.getFileName()); contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out); commit c87d039318917302b386003a51d9e8f843135f4b Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Apr 24 17:01:57 2012 -0500 [BZ 812765] Add restart operation of deployment web subsystem as a composite of disable+enable. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java index ba048af..f8d48ec 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java @@ -61,15 +61,24 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet public OperationResult invokeOperation(String name, Configuration parameters) throws InterruptedException, Exception { - String action; if (name.equals("enable")) { - action = "deploy"; + return invokeSimpleOperation("deploy"); } else if (name.equals("disable")) { - action = "undeploy"; + return invokeSimpleOperation("undeploy"); + } else if (name.equals("restart")) { + OperationResult result = invokeSimpleOperation("undeploy"); + + if(result.getErrorMessage() == null){ + result = invokeSimpleOperation("deploy"); + } + + return result; } else { return super.invokeOperation(name, parameters); } + } + private OperationResult invokeSimpleOperation(String action) { Operation op = new Operation(action,getAddress()); Result res = getASConnection().execute(op); OperationResult result = new OperationResult(); diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index d9008f8..bb58541 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2978,6 +2978,11 @@ <c:simple-property name="operationResult"/> </results> </operation> + <operation name="restart"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> <metric property="status" dataType="trait" description="The current runtime status of a deployment. Possible status modes are OK, FAILED, and STOPPED. FAILED indicates a dependency is missing or a service could not start. STOPPED indicates that the deployment was manually stopped."/> commit d7c39945cce4f3f25ac8fcd175c7d2ec0a29e6d2 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Apr 24 15:00:25 2012 -0500 [BZ 812765] Added two missing metrics from the web runtime subsystem. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index b611cc2..d9008f8 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -3039,6 +3039,10 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=web" readOnly="true"/> </plugin-configuration> + + <metric property="virtual-host" dataType="trait" description="Virtual Host"/> + <metric property="context-root" dataType="trait" description="Context Root"/> + </service> commit 47d34c0754b7150847b5f6ad8f64ea68d1c868e6 Merge: a0f5661 53658d5 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Apr 24 14:36:57 2012 -0700 Merge branch 'master' into BZ805545 commit eca0a3965152c123b878f957a53b3eb224d7518b Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Apr 23 15:14:10 2012 -0400 [BZ 814839] all oracle tables should use LOGGING except for those where we use +APPEND hint diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Table.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Table.java index 9455aea..ca855ce 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Table.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Table.java @@ -40,7 +40,7 @@ class Table { private String m_strName; private boolean m_indexOrganized = false; // Index Organized Table private boolean m_parallel = false; // Parallel processing - private boolean m_logging = false; + private boolean m_logging = true; private boolean m_cache = false; private String m_tableSpace; private String m_storage; @@ -290,6 +290,10 @@ class Table { return ""; } + /** + * This is actually the syntax for NO logging. If logging is set to false, + * this returns a string to correspond to syntax that turns off logging. + */ protected String getLoggingSyntax() { return ""; } diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml index 0cc3736..6e617d6 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml @@ -67,7 +67,7 @@ </table> <table name="RHQ_ALERT" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" - storage-options="freelists 5" cache="true" logging="false"> + storage-options="freelists 5" cache="true"> <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/> <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/> @@ -86,7 +86,7 @@ </table> <table name="RHQ_ALERT_NOTIF_LOG" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" - storage-options="freelists 5" cache="true" logging="false"> + storage-options="freelists 5" cache="true"> <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/> <column name="ALERT_ID" required="true" type="INTEGER" references="RHQ_ALERT(ID)"/> @@ -99,7 +99,7 @@ </table> <table name="RHQ_ALERT_CONDITION_LOG" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" - storage-options="freelists 5" cache="true" logging="false"> + storage-options="freelists 5" cache="true"> <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/> <column name="CTIME" required="true" type="LONG"/> diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml index fecb046..90bd30f 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml @@ -77,7 +77,7 @@ </table> - <table name="RHQ_MEASUREMENT_DATA_NUM_1H" logging="false" cache="true" + <table name="RHQ_MEASUREMENT_DATA_NUM_1H" cache="true" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" storage-options="freelists 20"> <column name="TIME_STAMP" required="true" type="LONG"/> @@ -99,7 +99,7 @@ </table> - <table name="RHQ_MEASUREMENT_DATA_NUM_6H" logging="false" cache="true" + <table name="RHQ_MEASUREMENT_DATA_NUM_6H" cache="true" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" storage-options="freelists 20"> <column name="TIME_STAMP" required="true" type="LONG"/> @@ -121,7 +121,7 @@ </table> - <table name="RHQ_MEASUREMENT_DATA_NUM_1D" logging="false" cache="true" + <table name="RHQ_MEASUREMENT_DATA_NUM_1D" cache="true" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" storage-options="freelists 20"> <column name="TIME_STAMP" required="true" type="LONG"/> @@ -167,7 +167,7 @@ </table> - <table name="RHQ_CALLTIME_DATA_VALUE"> + <table name="RHQ_CALLTIME_DATA_VALUE" logging="false"> <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/> <column name="KEY_ID" type="INTEGER" references="RHQ_CALLTIME_DATA_KEY" required="true"/> <column name="BEGIN_TIME" type="LONG" required="true"/> @@ -235,7 +235,7 @@ </table> - <table name="RHQ_MEAS_DATA_NUM_R00"> + <table name="RHQ_MEAS_DATA_NUM_R00" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -249,7 +249,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R01"> + <table name="RHQ_MEAS_DATA_NUM_R01" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -263,7 +263,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R02"> + <table name="RHQ_MEAS_DATA_NUM_R02" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -277,7 +277,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R03"> + <table name="RHQ_MEAS_DATA_NUM_R03" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -291,7 +291,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R04"> + <table name="RHQ_MEAS_DATA_NUM_R04" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -305,7 +305,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R05"> + <table name="RHQ_MEAS_DATA_NUM_R05" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -319,7 +319,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R06"> + <table name="RHQ_MEAS_DATA_NUM_R06" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -333,7 +333,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R07"> + <table name="RHQ_MEAS_DATA_NUM_R07" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -347,7 +347,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R08"> + <table name="RHQ_MEAS_DATA_NUM_R08" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -361,7 +361,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R09"> + <table name="RHQ_MEAS_DATA_NUM_R09" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -375,7 +375,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R10"> + <table name="RHQ_MEAS_DATA_NUM_R10" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -389,7 +389,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R11"> + <table name="RHQ_MEAS_DATA_NUM_R11" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -403,7 +403,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R12"> + <table name="RHQ_MEAS_DATA_NUM_R12" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -417,7 +417,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R13"> + <table name="RHQ_MEAS_DATA_NUM_R13" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> @@ -431,7 +431,7 @@ </primaryKey> </constraint> </table> - <table name="RHQ_MEAS_DATA_NUM_R14"> + <table name="RHQ_MEAS_DATA_NUM_R14" logging="false"> <column name="TIME_STAMP" type="LONG"/> <column name="SCHEDULE_ID" type="INTEGER"/> <column name="VALUE" type="DOUBLE"/> commit 53658d5106effaa6929f04fe65285cb749219395 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Apr 24 17:20:30 2012 -0400 [Bug 772223 - [as5 plugin] JAVA_OPTS and EAP server command line arguments] Integrate the new startScriptEnv and startScriptArgs prop values into Start operation. diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index 4da2937..440b363 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -143,7 +143,8 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom "MAX_FD", // "PROFILER", // "PATH", // - "LD_LIBRARY_PATH")); + "LD_LIBRARY_PATH", // + "SYSTEMROOT")); // required on Windows or you can get winsock create errors } private final Log log = LogFactory.getLog(this.getClass()); @@ -252,7 +253,6 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom if (log.isDebugEnabled()) log.debug("Discovered JBoss AS process: " + processInfo); - JBossInstanceInfo jbossInstanceInfo; try { jbossInstanceInfo = new JBossInstanceInfo(processInfo); diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java index f58051e..b189069 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java @@ -24,6 +24,7 @@ package org.rhq.plugins.jbossas5; import java.io.File; import java.util.List; +import java.util.Map; import java.util.StringTokenizer; import org.apache.commons.logging.Log; @@ -41,6 +42,7 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.pluginapi.util.ProcessExecutionUtility; +import org.rhq.core.pluginapi.util.StartScriptConfiguration; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; @@ -144,7 +146,9 @@ public class ApplicationServerOperationsDelegate { // Private -------------------------------------------- /** - * Starts the underlying AS server. + * Starts the underlying AS server. Uses the StartScript connection properties, if set, or defaults to + * using the minimal required settings, which may not start or restart the app server in the same way + * it was initially started. * * @return success message if no errors are encountered * @throws InterruptedException @@ -159,7 +163,8 @@ public class ApplicationServerOperationsDelegate { return result; } Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); - File startScriptFile = getStartScriptPath(); + StartScriptConfiguration startScriptConfig = new StartScriptConfiguration(pluginConfig); + File startScriptFile = getStartScriptPath(startScriptConfig); validateScriptFile(startScriptFile, ApplicationServerPluginConfigurationProperties.START_SCRIPT_CONFIG_PROP); // The optional command prefix (e.g. sudo or nohup). @@ -170,23 +175,16 @@ public class ApplicationServerOperationsDelegate { null); ProcessExecution processExecution; + if (prefix == null || prefix.replaceAll("\\s", "").equals("")) { // Prefix is either null or contains ONLY whitespace characters. - processExecution = ProcessExecutionUtility.createProcessExecution(startScriptFile); - processExecution.getArguments().add("-c"); - processExecution.getArguments().add(configName); + addProcessExecutionArguments(processExecution, startScriptFile, startScriptConfig, false); - if (bindAddress != null) { - processExecution.getArguments().add("-b"); - processExecution.getArguments().add(bindAddress); - } } else { - // The process execution should be tied to the process represented - // as the prefix. If there are any other - // tokens in the prefix, consider them arguments to the prefix - // process. + // The process execution should be tied to the process represented as the prefix. If there are any other + // tokens in the prefix, consider them arguments to the prefix process. StringTokenizer prefixTokenizer = new StringTokenizer(prefix); String processName = prefixTokenizer.nextToken(); File prefixProcess = new File(processName); @@ -198,15 +196,23 @@ public class ApplicationServerOperationsDelegate { processExecution.getArguments().add(prefixArgument); } - // Add the AS start script and its options as a single argument to the prefix command. - String startScriptArgument = startScriptFile.getAbsolutePath(); - startScriptArgument += " -c " + configName; - if (bindAddress != null) { - startScriptArgument += " -b " + bindAddress; + addProcessExecutionArguments(processExecution, startScriptFile, startScriptConfig, false); + } + + // processExecution is initialized to the current process' env. This isn't really right, it's the + // rhq agent env. Override this if the startScriptEnv propert has been set. + Map<String, String> startScriptEnv = startScriptConfig.getStartScriptEnv(); + if (!startScriptEnv.isEmpty()) { + for (String envVarName : startScriptEnv.keySet()) { + String envVarValue = startScriptEnv.get(envVarName); + // TODO: If we migrate the AS7 util to a general util then hook it up + // envVarValue = replacePropertyPatterns(envVarValue); + startScriptEnv.put(envVarName, envVarValue); } - processExecution.getArguments().add(startScriptArgument); + processExecution.setEnvironmentVariables(startScriptEnv); } + // perform any init common for start and shutdown scripts initProcessExecution(processExecution, startScriptFile); long start = System.currentTimeMillis(); @@ -220,8 +226,9 @@ public class ApplicationServerOperationsDelegate { if (results.getError() == null) { avail = waitForServerToStart(start); } else { - log.error("Error from process execution while starting the AS instance. Exit code [" - + results.getExitCode() + "]", results.getError()); + log.error( + "Error from process execution while starting the AS instance. Exit code [" + results.getExitCode() + + "]", results.getError()); avail = this.serverComponent.getAvailability(); } @@ -236,6 +243,43 @@ public class ApplicationServerOperationsDelegate { return result; } + private void addProcessExecutionArguments(ProcessExecution processExecution, File startScriptFile, + StartScriptConfiguration startScriptConfig, boolean asSingleArg) { + + List<String> startScriptArgs = startScriptConfig.getStartScriptArgs(); + // If the scriptArgs property is unset fall back to using just the other props we have + if (startScriptArgs.isEmpty()) { + startScriptArgs.add("-c"); + startScriptArgs.add(getConfigurationSet()); + + String bindAddress = startScriptConfig.getPluginConfig().getSimpleValue( + ApplicationServerPluginConfigurationProperties.BIND_ADDRESS, null); + if (bindAddress != null) { + startScriptArgs.add("-b"); + startScriptArgs.add(bindAddress); + } + } + + if (asSingleArg) { + // typically, the sudo case + StringBuilder sb = new StringBuilder(startScriptFile.getAbsolutePath()); + for (String startScriptArg : startScriptArgs) { + sb.append(" "); + // TODO: If we migrate the AS7 util to a general util then hook it up + //startScriptArg = replacePropertyPatterns(startScriptArg); + sb.append(startScriptArg); + } + processExecution.getArguments().add(sb.toString()); + + } else { + for (String startScriptArg : startScriptArgs) { + // TODO: If we migrate the AS7 util to a general util then hook it up + //startScriptArg = replacePropertyPatterns(startScriptArg); + processExecution.getArguments().add(startScriptArg); + } + } + } + private String getConfigurationSet() { Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); configPath = resolvePathRelativeToHomeDir(getRequiredPropertyValue(pluginConfig, @@ -244,8 +288,8 @@ public class ApplicationServerOperationsDelegate { if (!configPath.exists()) { throw new InvalidPluginConfigurationException("Configuration path '" + configPath + "' does not exist."); } - return pluginConfig.getSimpleValue(ApplicationServerPluginConfigurationProperties.SERVER_NAME, configPath - .getName()); + return pluginConfig.getSimpleValue(ApplicationServerPluginConfigurationProperties.SERVER_NAME, + configPath.getName()); } private void initProcessExecution(ProcessExecution processExecution, File scriptFile) { @@ -254,7 +298,8 @@ public class ApplicationServerOperationsDelegate { // (e.g. ${JBOSS_HOME}/bin) for the script to work. processExecution.setWorkingDirectory(scriptFile.getParent()); - // Both scripts require the JAVA_HOME env var to be set. + // Both scripts require the JAVA_HOME env var to be set. Set it to the plugin config in case it's + // a different version than that of the agent's env. File javaHomeDir = getJavaHomePath(); if (javaHomeDir == null) { throw new IllegalStateException( @@ -508,11 +553,12 @@ public class ApplicationServerOperationsDelegate { * "C:\opt\jboss-5.1.0.GA\bin\run.sh") */ @NotNull - public File getStartScriptPath() { - Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); - String startScript = pluginConfig.getSimpleValue( - ApplicationServerPluginConfigurationProperties.START_SCRIPT_CONFIG_PROP, DEFAULT_START_SCRIPT); - File startScriptFile = resolvePathRelativeToHomeDir(startScript); + public File getStartScriptPath(StartScriptConfiguration startScriptConfig) { + File startScriptFile = startScriptConfig.getStartScript(); + if (null == startScriptFile) { + startScriptFile = resolvePathRelativeToHomeDir(DEFAULT_START_SCRIPT); + } + return startScriptFile; } @@ -603,3 +649,4 @@ public class ApplicationServerOperationsDelegate { } } } + commit 47966d513450fd9b5251db434c24bbb2b25ad5cd Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Apr 24 17:18:03 2012 -0400 Update ArgsPropertySimpleWrapper to have a getValue that allows space-delimited options to have the value on the same line or the following line. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java index 52c2505..bd5f6fe 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java @@ -84,7 +84,7 @@ public class StartScriptConfiguration { @NotNull public List<String> getStartScriptArgs() { PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ARGS_CONFIG_PROP); - List<String> list = (prop != null) ? new ListPropertySimpleWrapper(prop).getValue() : new ArrayList<String>(); + List<String> list = (prop != null) ? new ArgsPropertySimpleWrapper(prop).getValue() : new ArrayList<String>(); return list; } @@ -96,12 +96,22 @@ public class StartScriptConfiguration { new ArgsPropertySimpleWrapper(prop).setValue(startScriptArgs); } + public Configuration getPluginConfig() { + return pluginConfig; + } + private static class ArgsPropertySimpleWrapper extends ListPropertySimpleWrapper { public ArgsPropertySimpleWrapper(PropertySimple prop) { super(prop); } + // For better readability, put space delimited option values on same line. For example: + // -x some value + // as opposed to: + // -x + // some value + // @Override public void setValue(List list) { String stringValue; @@ -118,6 +128,46 @@ public class StartScriptConfiguration { } this.prop.setStringValue(stringValue); } + + // Ensure one arg per List entry, split up space delimited options with value on same line. This + // protects users that hand enter in this fashion, and also values entered with the above setter. + @Override + public List<String> getValue() { + List<String> list = new ArrayList<String>(); + + String stringValue = this.prop.getStringValue(); + if (stringValue != null) { + String[] lines = stringValue.split("\n+"); + for (String line : lines) { + String element = line.trim(); + //element = replacePropertyPatterns(element); // TODO + // separate an option and its value if on one line + if (element.startsWith("-")) { + boolean added = false; + for (int i = 1, len = element.length(); (i < len); ++i) { + char ch = element.charAt(i); + if (ch == ' ' || ch == '\t') { + String option = element.substring(0, i); + String value = element.substring(i).trim(); + list.add(option); + if (!value.isEmpty()) { + list.add(value); + } + added = true; + break; + } + } + if (!added) { + list.add(element); + } + } else { + list.add(element); + } + } + } + + return list; + } } } \ No newline at end of file commit 0f1354ea754206e64b46f6ec4bb382aaee323237 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Apr 24 11:00:21 2012 -0400 Improve start script discovery on Windows by better parsing away cmd.exe and its options. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index ee7f333..b3a362a 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -43,10 +43,21 @@ public class ServerStartScriptDiscoveryUtility { public static File getStartScript(ProcessInfo serverParentProcess) { // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" - // Windows: "standalone.bat --server-config=standalone-full.xml" - int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; + // Windows: "cmd.exe [options] standalone.bat --server-config=standalone-full.xml" + int startScriptIndex = 1; String[] serverParentProcessCommandLine = serverParentProcess.getCommandLine(); - String startScript = (serverParentProcessCommandLine.length > startScriptIndex) ? serverParentProcessCommandLine[startScriptIndex] : null; + + // advance past cmd.exe options. options start with '/' + if (File.separatorChar == '\\') { + for (; (startScriptIndex < serverParentProcessCommandLine.length); ++startScriptIndex) { + if (!serverParentProcessCommandLine[startScriptIndex].startsWith("/")) { + break; + } + } + } + + String startScript = (serverParentProcessCommandLine.length > startScriptIndex) ? serverParentProcessCommandLine[startScriptIndex] + : null; File startScriptFile; @@ -73,12 +84,13 @@ public class ServerStartScriptDiscoveryUtility { } public static List<String> getStartScriptArgs(ProcessInfo serverParentProcess, List<String> serverArgs, - Set<CommandLineOption> optionExcludes) { + Set<CommandLineOption> optionExcludes) { // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" // Windows: "standalone.bat --server-config=standalone-full.xml" int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; String[] startScriptCommandLine = serverParentProcess.getCommandLine(); - String startScript = (startScriptCommandLine.length > startScriptIndex) ? startScriptCommandLine[startScriptIndex] : null; + String startScript = (startScriptCommandLine.length > startScriptIndex) ? startScriptCommandLine[startScriptIndex] + : null; List<String> startScriptArgs = new ArrayList<String>(); if (isScript(startScript)) { @@ -92,20 +104,20 @@ public class ServerStartScriptDiscoveryUtility { // Skip any options that the start script will take care of specifying. CommandLineOption option = null; for (CommandLineOption optionExclude : optionExcludes) { - if ((optionExclude.getShortName() != null && - (serverArg.equals('-' + optionExclude.getShortName()) || - serverArg.startsWith('-' + optionExclude.getShortName() + "="))) || - ((optionExclude.getLongName() != null) && - (serverArg.equals("--" + optionExclude.getLongName()) || - serverArg.startsWith("--" + optionExclude.getLongName() + "=")))) { + if ((optionExclude.getShortName() != null && (serverArg.equals('-' + optionExclude.getShortName()) || serverArg + .startsWith('-' + optionExclude.getShortName() + "="))) + || ((optionExclude.getLongName() != null) && (serverArg.equals("--" + + optionExclude.getLongName()) || serverArg.startsWith("--" + optionExclude.getLongName() + + "=")))) { option = optionExclude; break; } } if (option != null) { - if (option.isExpectsValue() && ((i + 1) < serverArgsSize) && - (((option.getShortName() != null) && serverArg.equals('-' + option.getShortName())) || - (option.getLongName() != null) && serverArg.equals("--" + option.getLongName()))) { + if (option.isExpectsValue() + && ((i + 1) < serverArgsSize) + && (((option.getShortName() != null) && serverArg.equals('-' + option.getShortName())) || (option + .getLongName() != null) && serverArg.equals("--" + option.getLongName()))) { // If the option expects a value and the delimiter is a space, skip the next argument too. i++; } @@ -118,7 +130,7 @@ public class ServerStartScriptDiscoveryUtility { } public static Map<String, String> getStartScriptEnv(ProcessInfo serverProcess, ProcessInfo serverParentProcess, - Set<String> envVarNameIncludes) { + Set<String> envVarNameIncludes) { Map<String, String> startScriptEnv = new LinkedHashMap<String, String>(); Map<String, String> processEnvVars; if (getStartScript(serverParentProcess) != null) { commit ec5247079bb047ec3ae87e233bdb6afb2a831555 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Apr 24 14:12:48 2012 -0700 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. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index e5ca8f1..078034d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -6,6 +6,8 @@ <inherits name='com.google.gwt.user.User'/> <inherits name='com.google.gwt.i18n.I18N'/> <inherits name="com.google.gwt.logging.Logging"/> + <inherits name='com.google.gwt.core.EmulateJsStack'/> + <inherits name='org.rhq.core.RHQDomain'/> <inherits name='com.smartgwt.SmartGwt' /> @@ -33,6 +35,14 @@ <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" /> +  + <set-property name="compiler.stackMode" value="emulated" /> + <set-configuration-property name="compiler.emulatedStack.recordLineNumbers" value="true" /> + <set-configuration-property name="compiler.emulatedStack.recordFileNames" value="true" /> + <replace-with class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"> <when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/> commit 0ea5517803362a642eccf78fbf26fd5ae922e7b0 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Apr 24 22:02:42 2012 +0200 BZ 802467 - check for at least one jndi-name and the connector name being present diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java index d07ebeb..6ffa409 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java @@ -1,23 +1,31 @@ -package org.rhq.modules.plugins.jbossas7; +/* + * 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. + */ -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package org.rhq.modules.plugins.jbossas7; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.resource.CreateResourceStatus; +import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.inventory.CreateResourceReport; -import org.rhq.modules.plugins.jbossas7.json.Address; -import org.rhq.modules.plugins.jbossas7.json.ComplexResult; -import org.rhq.modules.plugins.jbossas7.json.Operation; -import org.rhq.modules.plugins.jbossas7.json.Result; /** * Component class for HornetQ related stuff @@ -28,222 +36,30 @@ public class HornetQComponent extends BaseComponent { @Override public CreateResourceReport createResource(CreateResourceReport report) { - String targetTypeName = report.getResourceType().getName(); - String resourceName = report.getUserSpecifiedResourceName(); - Configuration rc = report.getResourceConfiguration(); - Address targetAddress = new Address(getPath()); - - CreationType targetType = CreationType.getForName(targetTypeName); - if (targetType==null) - throw new IllegalArgumentException("Type " + targetTypeName + " not yet supported"); - - targetAddress.add(targetType.as7name,resourceName); - List<String> entries; - - Result res; - Operation op = new Operation("read-operation-description",targetAddress); - op.addAdditionalProperty("name","add"); - ComplexResult cres = getASConnection().executeComplex(op); - Map<String,Map<String,Object>> definitions; - if (cres.isSuccess()) { - definitions = (Map<String, Map<String, Object>>) cres.getResult().get("request-properties"); - } - else { - definitions = Collections.emptyMap(); - } - - op = new Operation("add",targetAddress); - switch (targetType) { - case JMS_QUEUE: - entries = getEntriesPropertyFromConfig(rc); - op.addAdditionalProperty("entries",entries); - - processSimpleProperties(op,rc, definitions); - -/* - String durableProp = rc.getSimpleValue("durable","false"); - op.addAdditionalProperty("durable",Boolean.valueOf(durableProp)); - - PropertySimple selectorProp = (PropertySimple) rc.get("selector"); - if (selectorProp!=null && selectorProp.getStringValue()!=null && !selectorProp.getStringValue().isEmpty()) - op.addAdditionalProperty("selector",selectorProp.getStringValue()); -*/ - - break; - case JMS_TOPIC: - entries = getEntriesPropertyFromConfig(rc); - op.addAdditionalProperty("entries",entries); - - break; - - case CONNECTION_FACTORY: - entries = getEntriesPropertyFromConfig(rc); - op.addAdditionalProperty("entries",entries); - - processSimpleProperties(op,rc,definitions); - - // now handle the connector - PropertyMap connectorMap = (PropertyMap) rc.get("connector:collapsed"); - Map<String,String> map = new HashMap<String, String>(1); - String key = connectorMap.getSimpleValue("name:0", null); - String value = connectorMap.getSimpleValue("backup:1", null); - if (key==null) { - report.setErrorMessage("No connector name given"); - report.setStatus(CreateResourceStatus.FAILURE); - return report; - } - map.put(key, value); - op.addAdditionalProperty("connector",map); - - break; - } - - - res = getASConnection().execute(op); - if (res.isSuccess()) { - report.setResourceKey(targetAddress.getPath()); - report.setResourceName(resourceName); - report.setStatus(CreateResourceStatus.SUCCESS); - } else { - report.setErrorMessage(res.getFailureDescription()); + Configuration resourceConfiguration = report.getResourceConfiguration(); + PropertyList entries = resourceConfiguration.getList("entries"); + if (entries == null || entries.getList().isEmpty()) { + report.setErrorMessage("You need to provide at least one JNDI name"); report.setStatus(CreateResourceStatus.FAILURE); - report.setException(res.getRhqThrowable()); + return report; } - return report; - } - - /** - * Add the data from the simple properties as additional properties to the passed operation - * @param op Operation - * @param rc configuration with the properties to use - * @param definitions AS7 metadata - */ - private void processSimpleProperties(Operation op, Configuration rc, Map<String, Map<String, Object>> definitions) { - Map<String,PropertySimple> properties = rc.getSimpleProperties(); - for (PropertySimple ps : properties.values()) { - - Map<String,Object> def = definitions.get(ps.getName()); - String value = ps.getStringValue(); - - if (value!=null) { - Object o = getValueAndType(value,def); - op.addAdditionalProperty(ps.getName(),o); + ResourceType resourceType = report.getResourceType(); + if (resourceType.getName().equals("Connection-Factory")) { + // we need to check that a connector is given + PropertyMap connector = resourceConfiguration.getMap("connector:collapsed"); + if (connector == null) { + throw new IllegalStateException("No connector entry found"); } - } - } - - private Object getValueAndType(String value, Map<String, Object> def) { - - Object ret; - DataType dt = getTypeFromProps(def); - switch (dt) { - case BOOLEAN: - ret = Boolean.valueOf(value); - break; - case INT: - ret = Integer.valueOf(value); - break; - case LONG: - ret = Long.valueOf(value); - break; - case BIG_DECIMAL: - ret = Double.valueOf(value); - break; - case DOUBLE: - ret = Double.valueOf(value); - break; - - default: - ret = value; - } - - return ret; - } - - private DataType getTypeFromProps(Map<String, Object> props) { - Map<String,String> tMap = (Map<String, String>) props.get("type"); - if (tMap==null) - return DataType.OBJECT; - - String type = tMap.get("TYPE_MODEL_VALUE"); - DataType ret = DataType.valueOf(type); - - return ret; - } - - /** - * Get the JNDI entries - * @param rc Configuration parameters - * @return List of string entries - */ - private List<String> getEntriesPropertyFromConfig(Configuration rc) { - PropertyList entriesListProp = (PropertyList) rc.get("entries"); - List<Property> psl = entriesListProp.getList(); - List<String> entries = new ArrayList<String>(psl.size()); - for (Property p :psl) { - PropertySimple ps = (PropertySimple) p; - entries.add(ps.getStringValue()); - } - return entries; - } - - /** - * Supported types for resource creation - */ - enum CreationType { - JMS_QUEUE("JMS Queue","jms-queue"), - JMS_TOPIC("JMS Topic","jms-topic"), - CONNECTION_FACTORY("Connection-Factory","connection-factory") - ; - - private String descriptorName; - private String as7name; - - /** - * Create a Type - * @param descriptorName type name as it is listed in the plugin descriptor - * @param as7name the type by which as7 knows it. - */ - CreationType(String descriptorName, String as7name) { - - this.descriptorName = descriptorName; - this.as7name = as7name; - } - - public static CreationType getForName(String targetTypeName) { - EnumSet<CreationType> set = EnumSet.allOf(CreationType.class); - for (CreationType t : set) { - if (t.descriptorName.equals(targetTypeName)) - return t; + PropertySimple name = connector.getSimple("name:0"); + if (name == null || name.getStringValue() == null || name.getStringValue().isEmpty()) { + report.setErrorMessage("You need to provide a connector name"); + report.setStatus(CreateResourceStatus.FAILURE); + return report; } - return null; - } - } - - public enum DataType { - - STRING(false,"string"), - INT(true,"integer"), - BOOLEAN(false,"boolean"), - LONG(true,"long"), - BIG_DECIMAL(true,"long"), - OBJECT(false,"-object-"), - LIST(false,"-list-"), - DOUBLE(true,"long") - ; - - private boolean numeric; - private String rhqName; - - private DataType(boolean numeric, String rhqName) { - this.numeric = numeric; - this.rhqName = rhqName; } - public boolean isNumeric() { - return numeric; - } + report = super.createResource(report); + return report; } - } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java index 678362f..9a8122c 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java @@ -18,25 +18,10 @@ */ package org.rhq.modules.plugins.jbossas7; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertyList; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.configuration.definition.PropertyDefinitionList; -import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; -import org.rhq.core.domain.resource.CreateResourceStatus; -import org.rhq.core.pluginapi.inventory.CreateResourceReport; -import org.rhq.modules.plugins.jbossas7.json.Address; -import org.rhq.modules.plugins.jbossas7.json.ComplexResult; -import org.rhq.modules.plugins.jbossas7.json.Operation; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; /** * Component class for the JMS subsystem @@ -44,61 +29,17 @@ import org.rhq.modules.plugins.jbossas7.json.Operation; */ public class JmsComponent extends BaseComponent { - private final Log log = LogFactory.getLog(JmsComponent.class); - @Override - public CreateResourceReport createResource(CreateResourceReport report) { - - - Configuration pConf = report.getPluginConfiguration(); - Configuration resConf = report.getResourceConfiguration(); - ConfigurationDefinition resConfDef = report.getResourceType().getResourceConfigurationDefinition(); - - String type = pConf.getSimpleValue("path", ""); - - Address theAddress = new Address(address); - theAddress.add(type, report.getUserSpecifiedResourceName()); - Operation op = new Operation("add",theAddress); - - // Loop over the properties from the config and add them as properties to the op TODO make generally available ? - for (Map.Entry<String, Property> entry: resConf.getAllProperties().entrySet()) { - Property value = entry.getValue(); - if (value !=null) { - String name = entry.getKey(); - - - if (value instanceof PropertySimple) { - PropertyDefinitionSimple propDef = (PropertyDefinitionSimple) resConfDef.get(name); - PropertySimple ps = (PropertySimple) value; - op.addAdditionalProperty(name, getObjectForProperty(ps,propDef)); - } else if (value instanceof PropertyList) { - PropertyList propertyList = (PropertyList) value; - List<Object> list = new ArrayList<Object>(); - PropertyDefinitionList pd = resConfDef.getPropertyDefinitionList(name); - PropertyDefinitionSimple propDef = (PropertyDefinitionSimple) pd.getMemberDefinition(); - for (Property p : propertyList.getList()) { - - Object o = getObjectForProperty((PropertySimple) p, propDef); - list.add(o); - } - op.addAdditionalProperty(name,list); - } - } + public void updateResourceConfiguration(ConfigurationUpdateReport report) { + + Configuration resourceConfiguration = report.getConfiguration(); + PropertyList entries = resourceConfiguration.getList("entries"); + if (entries == null || entries.getList().isEmpty()) { + report.setErrorMessage("You need to provide at least one JNDI name"); + report.setStatus(ConfigurationUpdateStatus.FAILURE); + return; } - ComplexResult res = (ComplexResult) getASConnection().executeComplex(op); - - // TODO Currently this reports a failure even if it succeeds for jms - if (res == null || !res.isSuccess()) { - report.setStatus(CreateResourceStatus.FAILURE); - } else { - report.setStatus(CreateResourceStatus.SUCCESS); - report.setResourceKey(theAddress.toString()); - report.setResourceName(report.getUserSpecifiedResourceName()); - } - - log.info(report); - return report; + super.updateResourceConfiguration(report); } - } diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 186d98a..b611cc2 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -343,7 +343,7 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" + <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" required="false" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> @@ -466,7 +466,7 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" + <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" required="false" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> @@ -499,7 +499,7 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" + <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" required="false" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> @@ -597,7 +597,8 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> + <c:simple-property name="boot-time" defaultValue="true" default="true" required="false" + description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> <c:option value="false"/> @@ -1262,7 +1263,7 @@ <c:map-property name="connector:collapsed" required="true" readOnly="false" displayName="Connector" description="Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector."> <c:simple-property name="name:0" displayName="Name" description="Connector name" required="true"/> - <c:simple-property name="backup:1" displayName="Backup" description="Backup connector name"/> + <c:simple-property name="backup:1" displayName="Backup" description="Backup connector name" required="false"/> </c:map-property> <c:simple-property name="auto-group" required="false" type="boolean" readOnly="false" description="Whether or not message grouping is automatically used"/> <c:simple-property name="block-on-acknowledge" required="false" type="boolean" readOnly="false" description="True to set block on acknowledge."/> commit 629b2256eb71805ce4276bb30d55252fa49ac3ef Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Apr 24 13:13:23 2012 -0400 minor: turn down an INFO log message to DEBUG, but log at WARN if it takes unusually long diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java index 9c505e8..153144a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java @@ -93,7 +93,7 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { long elapsed = (System.currentTimeMillis() - start); if (elapsed > 30000L) { - log.info("Performance: inventory merge (" + elapsed + ")ms"); + log.warn("Performance: inventory merge (" + elapsed + ")ms"); } else { if (log.isDebugEnabled()) { log.debug("Performance: inventory merge (" + elapsed + ")ms"); @@ -114,14 +114,13 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { long start = System.currentTimeMillis(); AvailabilityManagerLocal availabilityManager = LookupUtil.getAvailabilityManager(); boolean ok = availabilityManager.mergeAvailabilityReport(availabilityReport); - long elapsed = (System.currentTimeMillis() - start); - // log at INFO level if we are going to ask for a full report, its a full report or it took a long time, DEBUG otherwise - if (!ok || !availabilityReport.isChangesOnlyReport() || (elapsed > 20000L)) { - log.info("Processed " + reportToString + " - need full=[" + !ok + "] in (" + elapsed + ")ms"); + long elapsed = (System.currentTimeMillis() - start); + if (elapsed > 20000L) { + log.warn("Performance: processed " + reportToString + " - needFull=[" + !ok + "] in (" + elapsed + ")ms"); } else { if (log.isDebugEnabled()) { - log.debug("Processed " + reportToString + " - need full=[" + !ok + "] in (" + elapsed + ")ms"); + log.debug("Performance: processed " + reportToString + " - needFull=[" + !ok + "] in (" + elapsed + ")ms"); } } commit 557fe75a731ebe2dcbf42fa2a89b8ca08d9e33fc Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Apr 24 11:39:42 2012 -0400 minor: improve display name of startScript prop; remove unneeded default="" attributes on start script props diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index bb16aa6..186d98a 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -4,9 +4,9 @@ <!ENTITY startScriptPluginConfigGroup ' <c:group name="startScript"> - <c:simple-property name="startScript" type="file" default="" description="Path to the script that the Start and Restart operations should use to start the server. If the path is not absolute, it is relative to the server home directory." required="false" /> - <c:simple-property name="startScriptEnv" type="longString" default="" description="The variables that the Start and Restart operations will add to the environment of the server start script. Each name=value pair should be on a new line." displayName="Start Script Environment Variables" required="false" /> - <c:simple-property name="startScriptArgs" type="longString" default="" description="The arguments that the Start and Restart operations will pass to the server start script. Each argument should be on a new line." displayName="Start Script Arguments" required="false" /> + <c:simple-property name="startScript" type="file" description="Path to the script that the Start and Restart operations should use to start the server. If the path is not absolute, it is resolved relative to the server home directory." displayName="Start Script Path" required="false" /> + <c:simple-property name="startScriptEnv" type="longString" description="The variables that the Start and Restart operations will add to the environment of the server start script. Each name=value pair should be on a new line." displayName="Start Script Environment Variables" required="false" /> + <c:simple-property name="startScriptArgs" type="longString" description="The arguments that the Start and Restart operations will pass to the server start script. Each argument should be on a new line." displayName="Start Script Arguments" required="false" /> </c:group> '> commit f05212d82a11ad7c80c4ac46576d812e5b958684 Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Apr 24 11:33:51 2012 -0400 minor: remove some obsolete TODO's diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java index c2c9f8d..68c0c6d 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java @@ -59,7 +59,6 @@ public class ListPropertySimpleWrapper { String[] lines = stringValue.split("\n+"); for (String line : lines) { String element = line.trim(); - //element = replacePropertyPatterns(element); // TODO list.add(element); } } diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java index 6d306fa..863279a 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java @@ -66,7 +66,6 @@ public class MapPropertySimpleWrapper { } String key = entry.substring(0, equalsIndex); String value = entry.substring(equalsIndex + 1); - //value = replacePropertyPatterns(value); // TODO map.put(key, value); } } commit f4dfe38e98d3794fded4fa4cfb2c786569cdc62b Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Apr 24 16:36:35 2012 +0200 BZ 815447 - expose node name as part of the server resource config object. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java index e60f285..a0e01c1 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java @@ -137,10 +137,17 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet { if (subPath.contains(":")) { subPath = subPath.substring(0,subPath.indexOf(':')); } + boolean includeRuntime=false; + if (subPath.endsWith("*")) { + subPath = subPath.substring(0,subPath.length()-1); + includeRuntime=true; + } Address address1 = new Address(address); address1.addSegment(subPath); operation = new ReadResource(address1); + if (includeRuntime) + ((ReadResource)operation).includeRuntime(true); } else {//no special handling of <c:groups> details required. //Just assume normal group operations aggregation semantics. return; @@ -383,7 +390,7 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet { } /**Determine if the property definition is for name=value property mapping. - * + * * @param propDefs * @return */ diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 18b7c6e..bb16aa6 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -343,7 +343,7 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" type="boolean" + <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> @@ -466,7 +466,7 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" type="boolean" + <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> @@ -499,7 +499,7 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" type="boolean" + <c:simple-property name="boot-time" defaultValue="true" default="true" type="boolean" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> @@ -785,6 +785,47 @@ </c:map-property> </c:list-property> </c:group> + + <c:group name="child:core-service=server-environment*" displayName="Server environment" hiddenByDefault="true"> + <c:simple-property name="base-dir" required="true" type="string" readOnly="true" + description="The base directory for JBoss Application Server."/> + <c:simple-property name="config-dir" required="true" type="string" readOnly="true" + description="The directory where the configurations are stored."/> + <c:simple-property name="config-file" required="true" type="string" readOnly="true" + description="The configuration file used to launch JBoss Application Server."/> + <c:simple-property name="content-dir" required="true" type="string" readOnly="true" + description="The directory where user content (e.g. deployments) that is managed by the server is stored."/> + <c:simple-property name="data-dir" required="true" type="string" readOnly="true" + description="The data directory."/> + <c:simple-property name="deploy-dir" required="true" type="string" readOnly="true" + description="Deprecated variant of 'content-dir'."/> + <c:simple-property name="ext-dirs" required="true" type="string" readOnly="true" + description="A list of ext directories."/> + <c:simple-property name="home-dir" required="true" type="string" readOnly="true" + description="The home directory for JBoss Application Server."/> + <c:simple-property name="host-name" required="true" type="string" readOnly="true" description="The host name."/> + <c:simple-property name="initial-running-mode" required="true" type="string" readOnly="true" + description="The current running mode of the server. Either LIVE (normal operations) or ADMIN_ONLY. An ADMIN_ONLY server will start any configured management interfaces and accept management requests, but will not start services used for handling end user requests."> + <c:property-options> + <c:option value="ADMIN_ONLY" name="ADMIN_ONLY"/> + <c:option value="NORMAL" name="NORMAL"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="launch-type" required="true" type="string" readOnly="true" + description="The type of the running server."/> + <c:simple-property name="log-dir" required="true" type="string" readOnly="true" + description="The directory where log files are sent."/> + <c:simple-property name="modules-dir" required="true" type="string" readOnly="true" + description="The directory where modules are found."/> + <c:simple-property name="node-name" required="true" type="string" readOnly="true" + description="The name of the server node."/> + <c:simple-property name="qualified-host-name" required="true" type="string" readOnly="true" + description="The qualified host name."/> + <c:simple-property name="server-name" required="true" type="string" readOnly="true" + description="The name of the server."/> + <c:simple-property name="temp-dir" required="true" type="string" readOnly="true" + description="The temporary directory."/> + </c:group> </resource-configuration> <drift-definition commit e2d8a8c505910a8b7ac5939546166ea7d371000f Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Apr 24 14:37:11 2012 +0200 Set properties on custom-handlers diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 7d2afe6..18b7c6e 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2239,12 +2239,12 @@ description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; <c:simple-property name="module" required="true" type="string" readOnly="true" description="The module that the logging handler depends on."/> - <c:list-property name="properties"> - <c:map-property name="properties"> - <c:simple-property name="name" required="true" description="The name of the configuration property." /> - <c:simple-property name="value" required="true" description="The value of the configuration property." /> - </c:map-property> - </c:list-property> + <c:list-property name="properties"> + <c:map-property name="properties:collapsed" displayName="Properties"> + <c:simple-property name="name:0" displayName="Name" required="true" description="The name of the configuration property."/> + <c:simple-property name="value:1" displayName="Value" required="true" description="The value of the configuration property."/> + </c:map-property> + </c:list-property> </resource-configuration> </service> commit 073ef70413b10fe0d042e3bc2d00b82b6e6964bd Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Apr 23 16:35:54 2012 +0200 Comment out mime-mapping section, as this is currently broken in AS7. See AS7-4592 diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 94a87d3..7d2afe6 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -1389,12 +1389,14 @@ <c:simple-property name="x-powered-by" required="false" type="boolean" readOnly="false" defaultValue="true" description="Enable advertising the JSP engine in x-powered-by. The default value is true."/> </c:group> <c:group name="child:configuration=container" displayName="Container"> + <c:list-property name="welcome-file" required="false" description="A welcome file declaration." > <c:simple-property name="welcome-file" type="string"/> </c:list-property> commit 58dd8873d898abe1955b014447d175ccb3d94968 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Apr 23 15:05:04 2012 +0200 BZ 708332 'boot-time' flag is not available for standalone servers. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 75a0a11..94a87d3 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -230,7 +230,7 @@ <!ENTITY logFile ' <c:map-property name="file" required="true" readOnly="false" description="The file description consisting of the path and optional relative to path."> <c:simple-property name="path" required="true" readOnly="false" description="The filesystem path."/> - <c:simple-property name="relative-to" required="false" readOnly="false" description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute. The standard paths provided by the system include:<ul><li>jboss.home - the root directory of the JBoss AS distribution</li><li>user.home - user's home directory</li><li>user.dir - user's current working directory</li><li>java.home - java installation directory</li><li>jboss.server.base.dir - root directory for an individual server instance</li><li>jboss.server.data.dir - directory the server will use for persistent data file storage</li><li>jboss.server.log.dir - directory the server will use for log file storage</li><li>jboss.server.tmp.dir - directory the server will use for temporary file storage</li><li>jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances</li></ul>"> + <c:simple-property name="relative-to" required="false" readOnly="false" description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute. The standard paths provided by the system include:<ul><li>jboss.home - the root directory of the JBoss AS distribution</li><li>user.home - user's home directory</li><li>user.dir - user's current working directory</li><li>java.home - java installation directory</li><li>jboss.server.base.dir - root directory for an individual server instance</li><li>jboss.server.data.dir - directory the server will use for persistent data file storage</li><li>jboss.server.log.dir - directory the server will use for log file storage</li><li>jboss.server.tmp.dir - directory the server will use for temporary file storage</li><li>jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances</li></ul>"> <c:property-options> <c:option value="java.home" /> <c:option value="jboss.domain.servers.dir" /> @@ -343,7 +343,8 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> + <c:simple-property name="boot-time" defaultValue="true" type="boolean" + description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> <c:option value="false"/> @@ -465,7 +466,8 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> + <c:simple-property name="boot-time" defaultValue="true" type="boolean" + description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> <c:property-options> <c:option value="true"/> <c:option value="false"/> @@ -497,6 +499,13 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> + <c:simple-property name="boot-time" defaultValue="true" type="boolean" + description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> + <c:property-options> + <c:option value="true"/> + <c:option value="false"/> + </c:property-options> + </c:simple-property> </c:map-property> </c:list-property> </c:group> @@ -750,12 +759,6 @@ <c:map-property name="*:name" displayName="Name" readOnly="true"> <c:simple-property name="name" displayName="Property-Name" readOnly="true"/> <c:simple-property name="value" displayName="Value"/> - <c:simple-property name="boot-time" defaultValue="true" description="If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence."> - <c:property-options> - <c:option value="true"/> - <c:option value="false"/> - </c:property-options> - </c:simple-property> </c:map-property> </c:list-property> </c:group> commit 5ffafd23eb5463d7a97344d6d5209377566f5048 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Apr 23 17:29:49 2012 -0400 AS5 start script work - Add discovery code for start script props - Tweak plugin-api to keep space-delimited args on the same line in the list prop diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java index 3f4b64e..c2c9f8d 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java @@ -28,7 +28,7 @@ import org.rhq.core.domain.configuration.PropertySimple; */ public class ListPropertySimpleWrapper { - private PropertySimple prop; + protected PropertySimple prop; public ListPropertySimpleWrapper(PropertySimple prop) { if (prop == null) { diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java index 11f5248..52c2505 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java @@ -68,8 +68,8 @@ public class StartScriptConfiguration { @NotNull public Map<String, String> getStartScriptEnv() { PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ENV_CONFIG_PROP); - Map<String, String> map = (prop != null) ? - new MapPropertySimpleWrapper(prop).getValue() : new HashMap<String, String>(); + Map<String, String> map = (prop != null) ? new MapPropertySimpleWrapper(prop).getValue() + : new HashMap<String, String>(); return map; } @@ -84,17 +84,40 @@ public class StartScriptConfiguration { @NotNull public List<String> getStartScriptArgs() { PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ARGS_CONFIG_PROP); - List<String> list = (prop != null) ? - new ListPropertySimpleWrapper(prop).getValue() : new ArrayList<String>(); + List<String> list = (prop != null) ? new ListPropertySimpleWrapper(prop).getValue() : new ArrayList<String>(); return list; } - public void setStartScriptArgs(List startScriptArgs) { + public void setStartScriptArgs(List<String> startScriptArgs) { PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ARGS_CONFIG_PROP); if (prop == null) { prop = new PropertySimple(START_SCRIPT_ARGS_CONFIG_PROP, null); } - new ListPropertySimpleWrapper(prop).setValue(startScriptArgs); + new ArgsPropertySimpleWrapper(prop).setValue(startScriptArgs); + } + + private static class ArgsPropertySimpleWrapper extends ListPropertySimpleWrapper { + + public ArgsPropertySimpleWrapper(PropertySimple prop) { + super(prop); + } + + @Override + public void setValue(List list) { + String stringValue; + if (list != null && !list.isEmpty()) { + StringBuilder buffer = new StringBuilder(list.get(0).toString()); + for (int i = 1; i < list.size(); ++i) { + String arg = list.get(i).toString(); + // put options on new line, keep space delimited options on same line + buffer.append(arg.startsWith("-") ? '\n' : ' ').append(arg); + } + stringValue = buffer.toString(); + } else { + stringValue = null; + } + this.prop.setStringValue(stringValue); + } } } \ No newline at end of file diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index 42f5ecc..4da2937 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -61,7 +61,11 @@ import org.rhq.core.pluginapi.inventory.ManualAddFacet; import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.core.pluginapi.util.FileUtils; +import org.rhq.core.pluginapi.util.JavaCommandLine; +import org.rhq.core.pluginapi.util.ServerStartScriptDiscoveryUtility; +import org.rhq.core.pluginapi.util.StartScriptConfiguration; import org.rhq.core.system.ProcessInfo; import org.rhq.plugins.jbossas5.helper.JBossInstallationInfo; import org.rhq.plugins.jbossas5.helper.JBossInstanceInfo; @@ -118,6 +122,30 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom "%libUrl%/jboss-profileservice-spi.jar" // }; + // The set of env vars that are actually relevant to AS5. Include only these to reduce the amount + // of noise in the property value and to potentially avoid stale values. + private static final Set<String> START_SCRIPT_ENV_VAR_NAMES = new HashSet<String>(); + + // Script options that are set by the script itself and that we don't want. Currently none. + private static final Set<CommandLineOption> START_SCRIPT_OPTION_EXCLUDES = new HashSet<CommandLineOption>(); + + static { + START_SCRIPT_ENV_VAR_NAMES.addAll(Arrays.asList( // + "JAVA_OPTS", // + "JAVA_HOME", // + "JAVA", // + "JAVAC_JAR", // + "JBOSS_HOME", // + "JBOSS_BASE_DIR", // + "JBOSS_LOG_DIR", // + "JBOSS_CONFIG_DIR", // + "RUN_CONF", // + "MAX_FD", // + "PROFILER", // + "PATH", // + "LD_LIBRARY_PATH")); + } + private final Log log = LogFactory.getLog(this.getClass()); public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext discoveryContext) { @@ -224,22 +252,24 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom if (log.isDebugEnabled()) log.debug("Discovered JBoss AS process: " + processInfo); - JBossInstanceInfo cmdLine; + + JBossInstanceInfo jbossInstanceInfo; try { - cmdLine = new JBossInstanceInfo(processInfo); + jbossInstanceInfo = new JBossInstanceInfo(processInfo); } catch (Exception e) { log.error("Failed to process JBoss AS command line: " + Arrays.asList(processInfo.getCommandLine()), e); continue; } // Skip it if it's an AS/EAP/SOA-P version we don't support. - JBossInstallationInfo installInfo = cmdLine.getInstallInfo(); + JBossInstallationInfo installInfo = jbossInstanceInfo.getInstallInfo(); if (!isSupportedProduct(installInfo)) { continue; } - File installHome = new File(cmdLine.getSystemProperties().getProperty(JBossProperties.HOME_DIR)); - File configDir = new File(cmdLine.getSystemProperties().getProperty(JBossProperties.SERVER_HOME_DIR)); + File installHome = new File(jbossInstanceInfo.getSystemProperties().getProperty(JBossProperties.HOME_DIR)); + File configDir = new File(jbossInstanceInfo.getSystemProperties().getProperty( + JBossProperties.SERVER_HOME_DIR)); // The config dir might be a symlink - call getCanonicalFile() to resolve it if so, before // calling isDirectory() (isDirectory() returns false for a symlink, even if it points at @@ -261,9 +291,9 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom // TODO? Set the connection type - local or remote // Set the required props... - String jnpURL = getJnpURL(cmdLine, installHome, configDir); - PropertySimple namingUrlProp = new PropertySimple(ApplicationServerPluginConfigurationProperties.NAMING_URL, - jnpURL); + String jnpURL = getJnpURL(jbossInstanceInfo, installHome, configDir); + PropertySimple namingUrlProp = new PropertySimple( + ApplicationServerPluginConfigurationProperties.NAMING_URL, jnpURL); if (jnpURL == null) { namingUrlProp.setErrorMessage("RHQ failed to discover the naming provider URL."); } @@ -275,9 +305,9 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom // Set the optional props... pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.SERVER_NAME, - cmdLine.getSystemProperties().getProperty(JBossProperties.SERVER_NAME))); + jbossInstanceInfo.getSystemProperties().getProperty(JBossProperties.SERVER_NAME))); pluginConfiguration.put(new PropertySimple(ApplicationServerPluginConfigurationProperties.BIND_ADDRESS, - cmdLine.getSystemProperties().getProperty(JBossProperties.BIND_ADDRESS))); + jbossInstanceInfo.getSystemProperties().getProperty(JBossProperties.BIND_ADDRESS))); JBossASDiscoveryUtils.UserInfo userInfo = JBossASDiscoveryUtils.getJmxInvokerUserInfo(configDir); if (userInfo != null) { @@ -317,6 +347,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom private DiscoveredResourceDetails createResourceDetails(ResourceDiscoveryContext discoveryContext, Configuration pluginConfig, @Nullable ProcessInfo processInfo, JBossInstallationInfo installInfo) { + String serverHomeDir = pluginConfig.getSimple(ApplicationServerPluginConfigurationProperties.SERVER_HOME_DIR) .getStringValue(); File absoluteConfigPath = resolvePathRelativeToHomeDir(pluginConfig, serverHomeDir); @@ -359,10 +390,55 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom + formatServerName(bindAddress, namingPort, discoveryContext.getSystemInformation().getHostname(), absoluteConfigPath.getName(), isRhqServer); + // If we are discovering plugin config via processInfo, then in addition to everything we discover above, + // we'll now see if we can determine more robust startup environment information to be used for start/restart + // operations if possible. If this information is not discovered, and left unset by the user or a remote client + // update, then the start script will fall back to the minimal information captured above. + if (processInfo != null) { + setStartScriptPluginConfigProps(processInfo, new JavaCommandLine(processInfo.getCommandLine()), + pluginConfig); + } + return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, PRODUCT_PREFIX + installInfo.getVersion(), description, pluginConfig, processInfo); } + private void setStartScriptPluginConfigProps(ProcessInfo process, JavaCommandLine commandLine, + Configuration pluginConfig) { + StartScriptConfiguration startScriptConfig = new StartScriptConfiguration(pluginConfig); + ProcessInfo parentProcess = process.getParentProcess(); + + File startScript = ServerStartScriptDiscoveryUtility.getStartScript(parentProcess); + // if we don't discover the start script then leave it empty and the operation code + // will determine the OS-specific default when needed. + if (startScript != null) { + boolean exists = startScript.exists(); + + if (!exists && !startScript.isAbsolute()) { + File homeDir = new File( + pluginConfig.getSimpleValue(ApplicationServerPluginConfigurationProperties.HOME_DIR)); + File startScriptAbsolute = new File(homeDir, startScript.getPath()); + exists = startScriptAbsolute.exists(); + } + if (!exists) { + log.warn("Discovered startScriptFile [" + + startScript + + "] but failed to find it on disk. The start script may not be correct. The command line used for discovery is [" + + commandLine + "]"); + + } + startScriptConfig.setStartScript(startScript); + } + + Map<String, String> startScriptEnv = ServerStartScriptDiscoveryUtility.getStartScriptEnv(process, + parentProcess, START_SCRIPT_ENV_VAR_NAMES); + startScriptConfig.setStartScriptEnv(startScriptEnv); + + List<String> startScriptArgs = ServerStartScriptDiscoveryUtility.getStartScriptArgs(parentProcess, + commandLine.getClassArguments(), START_SCRIPT_OPTION_EXCLUDES); + startScriptConfig.setStartScriptArgs(startScriptArgs); + } + public String formatServerName(String bindingAddress, String jnpPort, String hostname, String configurationName, boolean isRhq) { @@ -445,13 +521,11 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom // Above did not work, so fall back to our previous scheme JnpConfig jnpConfig = getJnpConfig(installHome, configDir, cmdLine.getSystemProperties()); - - String jnpAddress = (jnpConfig.getJnpAddress() != null) ? jnpConfig.getJnpAddress() : null; Integer jnpPort = (jnpConfig.getJnpPort() != null) ? jnpConfig.getJnpPort() : null; if (jnpAddress == null || jnpPort == null) { - log.warn("Failed to discover JNP URL for JBoss instance with configuration directory [" + configDir + "]."); + log.warn("Failed to discover JNP URL for JBoss instance with configuration directory [" + configDir + "]."); return null; } commit 9f566843033418d301fc52bcf81050e599bafab5 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Apr 23 17:20:05 2012 -0400 Add some debug logging and enhance toString() diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java index f7956ba..4763be1 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java @@ -53,7 +53,6 @@ import org.jetbrains.annotations.NotNull; * @author Ian Springer */ public class JavaCommandLine { - /** * When parsing command line options, specifies the valid option value delimiter(s). * @@ -131,6 +130,10 @@ public class JavaCommandLine { throw new IllegalArgumentException("'longClassOptionValueDelims' parameter is an empty set."); } + if (log.isDebugEnabled()) { + log.debug("Parsing " + toString()); + } + parseCommandLine(args); } @@ -380,11 +383,10 @@ public class JavaCommandLine { @Override public String toString() { - StringBuilder buffer = new StringBuilder(this.arguments.get(0)); - for (int i = 1, argumentsSize = this.arguments.size(); i < argumentsSize; i++) { - buffer.append(' ').append(this.arguments.get(i)); - } - return buffer.toString(); + return "JavaCommandLine [arguments=" + Arrays.asList(arguments) // + + ", includeSystemPropertiesFromClassArguments=" + includeSystemPropertiesFromClassArguments // + + ", shortClassOptionFormat=" + Arrays.asList(shortClassOptionValueDelims) // + + ", longClassOptionFormat=" + Arrays.asList(longClassOptionValueDelims) + "]"; } } commit a0f5661578404b47511e05145e1648eeffc30cdb Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Apr 23 13:40:50 2012 -0700 [BZ 805545] Improved the usability of the Resource Metric Collection Schedule table. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java index f5e4dbb..a5d932a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java @@ -18,20 +18,25 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common; -import java.util.ArrayList; -import java.util.List; - import com.smartgwt.client.data.SortSpecifier; +import com.smartgwt.client.types.ListGridEditEvent; +import com.smartgwt.client.types.RowEndEditAction; import com.smartgwt.client.types.SortDirection; +import com.smartgwt.client.widgets.form.fields.CheckboxItem; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; - import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.MeasurementScheduleCriteria; +import org.rhq.enterprise.gui.coregui.client.components.form.DurationItem; +import org.rhq.enterprise.gui.coregui.client.components.form.TimeUnit; import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.util.Log; + +import java.util.ArrayList; +import java.util.List; +import java.util.TreeSet; /** * A view that displays a non-paginated table of {@link org.rhq.core.domain.measurement.MeasurementSchedule measurement @@ -74,32 +79,50 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> { protected void configureTable() { ArrayList<ListGridField> listGridFields = getDataSource().getListGridFields(); getListGrid().setFields(listGridFields.toArray(new ListGridField[listGridFields.size()])); - setupTableInteractions(this.hasWriteAccess); + getListGrid().setCanEdit(true); + getListGrid().setModalEditing(true); + //getListGrid().setEditByCell(true); + getListGrid().setEditEvent(ListGridEditEvent.CLICK); + getListGrid().setAutoSaveEdits(false); + getListGrid().setListEndEditAction(RowEndEditAction.DONE); + setupTableInteractions(this.hasWriteAccess); super.configureTable(); - } + } protected void setupTableInteractions(final boolean hasWriteAccess) { - addTableAction(extendLocatorId("Enable"), MSG.common_button_enable(), null, new TableAction() { - public boolean isEnabled(ListGridRecord[] selection) { - return ((selection.length >= 1) && hasWriteAccess); - } - - public void executeAction(ListGridRecord[] selection, Object actionValue) { - enableSchedules(); + ListGridField enabledField = getListGrid().getField(SchedulesDataSource.ATTR_ENABLED); + CheckboxItem enabledCheckboxItem = new CheckboxItem(); + enabledCheckboxItem.addChangeHandler(new com.smartgwt.client.widgets.form.fields.events.ChangeHandler() { + @Override + public void onChange(com.smartgwt.client.widgets.form.fields.events.ChangeEvent event) { + boolean enabled = Boolean.valueOf(event.getItem().getValue() + ""); + Log.debug("Enabled/Disable Measurement: "+event.getItem().getFieldName()+ Boolean.valueOf(event.getItem().getValue() + "")); + + ListGridRecord[] records = getListGrid().getSelectedRecords(); + Log.debug(" * Number of Records selected: "+records.length); + Log.debug(" * Number of Records selected: "+records[0].getAttributeAsString(SchedulesDataSource.ATTR_DISPLAY_NAME)); + if(!enabled){ + enableSchedules(); + }else { + disableSchedules(); + } } }); - addTableAction(extendLocatorId("Disable"), MSG.common_button_disable(), null, new TableAction() { - public boolean isEnabled(ListGridRecord[] selection) { - return ((selection.length >= 1) && hasWriteAccess); - } + enabledField.setEditorType(enabledCheckboxItem); + + ListGridField intervalField = getListGrid().getField(SchedulesDataSource.ATTR_INTERVAL); + + TreeSet<TimeUnit> supportedUnits = new TreeSet<TimeUnit>(); + supportedUnits.add(TimeUnit.SECONDS); + supportedUnits.add(TimeUnit.MINUTES); + supportedUnits.add(TimeUnit.HOURS); + supportedUnits.add(TimeUnit.DAYS); + DurationItem durationItem = new DurationItem("duration","Duration", + TimeUnit.MILLISECONDS, supportedUnits, false, false, this); + intervalField.setEditorType(durationItem); - public void executeAction(ListGridRecord[] selection, Object actionValue) { - disableSchedules(); - } - }); - addExtraWidget(new UpdateCollectionIntervalWidget(this.getLocatorId(), this), true); } protected abstract void enableSchedules(int[] measurementDefinitionIds, diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java index e73cb66..92292d1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java @@ -18,8 +18,6 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common; -import java.util.ArrayList; - import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; @@ -28,7 +26,6 @@ import com.smartgwt.client.rpc.RPCResponse; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; - import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.Criteria; import org.rhq.core.domain.criteria.MeasurementScheduleCriteria; @@ -41,6 +38,9 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import java.util.ArrayList; + + /** * A server-side SmartGWT DataSource for reading and updating {@link MeasurementScheduleComposite}s. * @@ -97,8 +97,11 @@ public class SchedulesDataSource extends RPCDataSource<MeasurementScheduleCompos fields.add(intervalField); displayNameField.setWidth("20%"); + displayNameField.setCanEdit(false); descriptionField.setWidth("40%"); + descriptionField.setCanEdit(false); typeField.setWidth("10%"); + typeField.setCanEdit(false); enabledField.setWidth("10%"); intervalField.setWidth("*"); commit 7666cba06eaa173cbb7b159b4f2ce78ab5876d36 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Apr 23 15:24:11 2012 -0400 fix some itests that were failing in jenkins diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java index 1355522..ae2e97d 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java @@ -36,6 +36,7 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.inventory.InventoryManager; import org.rhq.core.pc.inventory.ResourceContainer; +import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; import org.rhq.core.pluginapi.configuration.MapPropertySimpleWrapper; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.StartScriptConfiguration; @@ -102,10 +103,34 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin Integer expectedPort = portOffset + 9990; assertEquals(port, expectedPort, "Plugin config prop [port]."); + // "startScript" prop + String startScript = pluginConfig.getSimpleValue("startScript"); + Assert.assertNotNull(startScript); + + File startScriptFile = new File(startScript); + String expectedStartScriptFileName = getExpectedStartScriptFileName(); + Assert.assertEquals(startScriptFile.getName(), expectedStartScriptFileName); + + if (!startScriptFile.isAbsolute()) { + // If it's relative, e.g. "bin/standalone.sh", it will be resolved relative to the AS home dir. + startScriptFile = new File(JBOSS_HOME, startScript); + } + Assert.assertTrue(startScriptFile.exists(), "Start script [" + startScriptFile + "] does not exist."); + // "startScriptEnv" prop PropertySimple startScriptEnvProp = pluginConfig.getSimple("startScriptEnv"); MapPropertySimpleWrapper startScriptEnvPropWrapper = new MapPropertySimpleWrapper(startScriptEnvProp); Map<String,String> env = startScriptEnvPropWrapper.getValue(); + validateStartScriptEnv(env); + + // "startScriptArgs" prop + PropertySimple startScriptArgsProp = pluginConfig.getSimple("startScriptArgs"); + ListPropertySimpleWrapper startScriptArgsPropWrapper = new ListPropertySimpleWrapper(startScriptArgsProp); + List<String> args = startScriptArgsPropWrapper.getValue(); + Assert.assertEquals(args, getExpectedStartScriptArgs(), "Plugin config prop [startScriptArgs]"); + } + + protected void validateStartScriptEnv(Map<String, String> env) { Assert.assertTrue(env.size() <= 4, env.toString()); String javaHome = env.get("JAVA_HOME"); @@ -123,12 +148,6 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin String[] ldLibraryPathElements = ldLibraryPath.split(File.pathSeparator); Assert.assertTrue(ldLibraryPathElements.length >= 1); Assert.assertTrue(new File(ldLibraryPathElements[0]).isDirectory()); - - // Only domain sets JBOSS_HOME. TODO: move this into DomainServerComponentTest subclass - String jbossHome = env.get("JBOSS_HOME"); - if (jbossHome != null) { - Assert.assertTrue(new File(jbossHome).isDirectory()); - } } protected abstract String getBindAddressSystemPropertyName(); @@ -199,6 +218,10 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin assertTrue(processArgs.contains("-Dfoo=bar"), processArgs.toString()); } + protected abstract String getExpectedStartScriptFileName(); + + protected abstract List<String> getExpectedStartScriptArgs(); + public void killServerProcesses() { List<ProcessInfo> processes = getServerProcesses(); System.out.println("\n=== Killing " + processes.size() + " " + getServerResourceType() + " processes..."); diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java index b1de5b9..16c99c7 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java @@ -19,17 +19,16 @@ package org.rhq.modules.plugins.jbossas7.itest.domain; import java.io.File; +import java.util.Arrays; import java.util.List; +import java.util.Map; import org.testng.Assert; import org.testng.annotations.AfterSuite; import org.testng.annotations.Test; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; import org.rhq.modules.plugins.jbossas7.itest.AbstractServerComponentTest; import org.rhq.test.arquillian.RunDiscovery; @@ -72,32 +71,6 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { super.testAutoDiscovery(); } - @Override - protected void validatePluginConfiguration(Configuration pluginConfig) { - super.validatePluginConfiguration(pluginConfig); - - // "startScript" prop - String startScript = pluginConfig.getSimpleValue("startScript"); - String expectedStartScriptFileName = (File.separatorChar == '/') ? "domain.sh" : "domain.bat"; - String expectedStartScript = new File("bin", expectedStartScriptFileName).getPath(); - Assert.assertEquals(startScript, expectedStartScript); - - // "startScriptArgs" prop - PropertySimple startScriptArgsProp = pluginConfig.getSimple("startScriptArgs"); - ListPropertySimpleWrapper startScriptArgsPropWrapper = new ListPropertySimpleWrapper(startScriptArgsProp); - List<String> args = startScriptArgsPropWrapper.getValue(); - - Assert.assertEquals(args.size(), 7, args.toString()); - - Assert.assertEquals(args.get(0), "-Djboss.bind.address.management=127.0.0.1"); - Assert.assertEquals(args.get(1), "-Djboss.bind.address=127.0.0.1"); - Assert.assertEquals(args.get(2), "-Djboss.bind.address.unsecure=127.0.0.1"); - Assert.assertEquals(args.get(3), "-Djboss.socket.binding.port-offset=50000"); - Assert.assertEquals(args.get(4), "-Djboss.management.native.port=59999"); - Assert.assertEquals(args.get(5), "-Djboss.management.http.port=59990"); - Assert.assertEquals(args.get(6), "-Djboss.management.https.port=59943"); - } - // ******************************* METRICS ******************************* // @Override @Test(priority = 1002, enabled = true) @@ -111,6 +84,10 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { super.testShutdownAndStartOperations(); } + protected String getExpectedStartScriptFileName() { + return (File.separatorChar == '/') ? "domain.sh" : "domain.bat"; + } + @AfterSuite public void killServerProcesses() { super.killServerProcesses(); @@ -121,4 +98,29 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { return 50000; } + @Override + protected List<String> getExpectedStartScriptArgs() { + String [] args = new String[] { + "-Djboss.bind.address.management=127.0.0.1", + "-Djboss.bind.address=127.0.0.1", + "-Djboss.bind.address.unsecure=127.0.0.1", + "-Djboss.socket.binding.port-offset=50000", + "-Djboss.management.native.port=59999", + "-Djboss.management.http.port=59990", + "-Djboss.management.https.port=59943" + }; + return Arrays.asList(args); + } + + @Override + protected void validateStartScriptEnv(Map<String, String> env) { + super.validateStartScriptEnv(env); + + // Only domain sets JBOSS_HOME, when not started via start script. + String jbossHome = env.get("JBOSS_HOME"); + if (jbossHome != null) { + Assert.assertTrue(new File(jbossHome).isDirectory()); + } + } + } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index 18f43b9..e0bd0cb 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -19,22 +19,19 @@ package org.rhq.modules.plugins.jbossas7.itest.standalone; import java.io.File; +import java.util.Arrays; import java.util.List; -import org.testng.Assert; import org.testng.annotations.AfterSuite; import org.testng.annotations.Test; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; import org.rhq.modules.plugins.jbossas7.itest.AbstractServerComponentTest; import org.rhq.test.arquillian.RunDiscovery; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; /** * Test discovery and facets of the "JBossAS7 Standalone Server" Resource type. @@ -78,30 +75,6 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { super.testAutoDiscovery(); } - @Override - protected void validatePluginConfiguration(Configuration pluginConfig) { - super.validatePluginConfiguration(pluginConfig); - - // "startScript" prop - String startScript = pluginConfig.getSimpleValue("startScript"); - String expectedStartScriptFileName = (File.separatorChar == '/') ? "standalone.sh" : "standalone.bat"; - String expectedStartScript = new File("bin", expectedStartScriptFileName).getPath(); - Assert.assertEquals(startScript, expectedStartScript); - - // "startScriptArgs" prop - PropertySimple startScriptArgsProp = pluginConfig.getSimple("startScriptArgs"); - ListPropertySimpleWrapper startScriptArgsPropWrapper = new ListPropertySimpleWrapper(startScriptArgsProp); - List<String> args = startScriptArgsPropWrapper.getValue(); - - Assert.assertEquals(args.size(), 5, args.toString()); - - Assert.assertEquals(args.get(0), "--server-config=standalone-full.xml"); - Assert.assertEquals(args.get(1), "-Djboss.bind.address.management=127.0.0.1"); - Assert.assertEquals(args.get(2), "-Djboss.bind.address=127.0.0.1"); - Assert.assertEquals(args.get(3), "-Djboss.bind.address.unsecure=127.0.0.1"); - Assert.assertEquals(args.get(4), "-Djboss.socket.binding.port-offset=40000"); - } - @Test(priority = 2) public void testStandaloneServerPluginConfiguration() throws Exception { return; @@ -139,6 +112,20 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { assertEquals(avail, AvailabilityType.UP); } + protected String getExpectedStartScriptFileName() { + return (File.separatorChar == '/') ? "standalone.sh" : "standalone.bat"; + } + + protected List<String> getExpectedStartScriptArgs() { + String [] args = new String[] { + "--server-config=standalone-full.xml", + "-Djboss.bind.address.management=127.0.0.1", + "-Djboss.bind.address=127.0.0.1", + "-Djboss.bind.address.unsecure=127.0.0.1", + "-Djboss.socket.binding.port-offset=40000" }; + return Arrays.asList(args); + } + @AfterSuite public void killServerProcesses() { super.killServerProcesses(); commit a6b524fcc45a963899a1c9da3b8c03e47fdd2db6 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Apr 23 10:07:46 2012 -0400 fix a test failure diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java index 4483eca..1355522 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java @@ -19,7 +19,6 @@ package org.rhq.modules.plugins.jbossas7.itest; import java.io.File; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -107,7 +106,7 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin PropertySimple startScriptEnvProp = pluginConfig.getSimple("startScriptEnv"); MapPropertySimpleWrapper startScriptEnvPropWrapper = new MapPropertySimpleWrapper(startScriptEnvProp); Map<String,String> env = startScriptEnvPropWrapper.getValue(); - Assert.assertEquals(env.size(), 3, env.toString()); + Assert.assertTrue(env.size() <= 4, env.toString()); String javaHome = env.get("JAVA_HOME"); Assert.assertNotNull(javaHome); @@ -124,6 +123,12 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin String[] ldLibraryPathElements = ldLibraryPath.split(File.pathSeparator); Assert.assertTrue(ldLibraryPathElements.length >= 1); Assert.assertTrue(new File(ldLibraryPathElements[0]).isDirectory()); + + // Only domain sets JBOSS_HOME. TODO: move this into DomainServerComponentTest subclass + String jbossHome = env.get("JBOSS_HOME"); + if (jbossHome != null) { + Assert.assertTrue(new File(jbossHome).isDirectory()); + } } protected abstract String getBindAddressSystemPropertyName(); @@ -196,17 +201,21 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin public void killServerProcesses() { List<ProcessInfo> processes = getServerProcesses(); + System.out.println("\n=== Killing " + processes.size() + " " + getServerResourceType() + " processes..."); Sigar sigar = new Sigar(); for (ProcessInfo process : processes) { - System.out.println("\n=== Killing process with pid [" + process.getPid() + "] and command line [" + System.out.println("====== Killing process with pid [" + process.getPid() + "] and command line [" + Arrays.toString(process.getCommandLine()) + "]..."); try { sigar.kill(process.getPid(), "KILL"); } catch (SigarException e) { - System.err.println("Failed to kill " + process); + System.err.println("Failed to kill " + process + ": " + e); } } sigar.close(); + processes = getServerProcesses(); + Assert.assertEquals(processes.size(), 0, + "Failed to kill " + processes.size() + " " + getServerResourceType() + " processes: " + processes); } protected abstract int getPortOffset(); @@ -217,14 +226,6 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin + getPortOffset()); } - private static List<List<String>> getCommandLines(List<ProcessInfo> processes) { - List<List<String>> commandLines = new ArrayList<List<String>>(); - for (ProcessInfo process : processes) { - commandLines.add(Arrays.asList(process.getCommandLine())); - } - return commandLines; - } - } commit f7b0063fe01e1cfc8a03ef99b7c9c27ddb90de7a Author: John Sanda <jsanda(a)redhat.com> Date: Mon Apr 23 11:33:51 2012 -0400 [BZ 805987] removing debug code that was inadvertedly included in previous commit diff --git a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml index ef6a09e..cfaa40b 100644 --- a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml @@ -217,7 +217,6 @@ displayName="Operating System Platforms" package="org.rhq.plugins.platform" description="Management and monitoring of operating system level functions" - version="6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration"> commit 3614f6ea557eb2b6292499d96c3de68d2a7d8a42 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Apr 23 11:28:03 2012 -0400 [BZ 805987] Get rid of warnning from plugin descriptor parser diff --git a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml index 799669a..ef6a09e 100644 --- a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml @@ -217,9 +217,10 @@ displayName="Operating System Platforms" package="org.rhq.plugins.platform" description="Management and monitoring of operating system level functions" + version="6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin" - xmlns:c="urn:xmlns:rhq-configuration" xsi:schemaLocation="urn:xmlns:rhq-plugin "> + xmlns:c="urn:xmlns:rhq-configuration"> <platform name="Windows" commit 434342233f64e6f82e655cd46ed946c88ed8a3c3 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Apr 23 10:17:21 2012 -0400 Disabling Logging Handler filter usage pending [BZ 815378]. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 21b9285..75a0a11 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -185,6 +185,7 @@ '> <!ENTITY logFilter ' +  '> <!ENTITY jvmDefinitionResourceConfigProperties ' commit b8e274ea10d8d00da62441553dc989bf6c75548d Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Apr 23 07:49:05 2012 -0400 fix several bugs in command line parsing and start script plugin config init code; enable the start/stop operation itests diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/CommandLineOption.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/CommandLineOption.java new file mode 100644 index 0000000..cba7cb1 --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/CommandLineOption.java @@ -0,0 +1,97 @@ +/* + * RHQ Management Platform + * Copyright (C) 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.pluginapi.util; + +/** + * The name(s) and other metadata associated with a command line option. + * + * @author Ian Springer + */ +public class CommandLineOption { + + private String shortName; + private String longName; + private boolean expectsValue; + + /** + * Same as <code>JavaCommandLineOption(shortName, longName, true)</code> + */ + public CommandLineOption(char shortName, String longName) { + this(new String(new char[] { shortName }), longName, true); + } + + public CommandLineOption(char shortName, String longName, boolean expectsValue) { + this(new String(new char[] { shortName }), longName, expectsValue); + } + + /** + * Same as <code>JavaCommandLineOption(shortName, longName, true)</code> + */ + public CommandLineOption(String shortName, String longName) { + this(shortName, longName, true); + } + + public CommandLineOption(String shortName, String longName, boolean expectsValue) { + if ((shortName == null) && (longName == null)) { + throw new IllegalArgumentException("ShortName and longName cannot both be null."); + } + + this.shortName = shortName; + this.longName = longName; + this.expectsValue = expectsValue; + } + + public String getShortName() { + return shortName; + } + + public String getLongName() { + return longName; + } + + public boolean isExpectsValue() { + return expectsValue; + } + + @Override + public String toString() { + StringBuilder buffer = new StringBuilder(); + if (this.shortName != null) { + buffer.append('-').append(this.shortName); + if (this.expectsValue) { + buffer.append("=VALUE"); + } + if (this.longName != null) { + buffer.append('|'); + } + } + if (this.longName != null) { + buffer.append("--").append(this.longName); + if (this.expectsValue) { + buffer.append("=VALUE"); + } + } + return buffer.toString(); + } + +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java index 5a5ec96..f7956ba 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java @@ -26,12 +26,17 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.EnumSet; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import com.sun.istack.Nullable; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull; /** @@ -50,15 +55,27 @@ import org.jetbrains.annotations.NotNull; public class JavaCommandLine { /** - * When parsing command line options, determines the valid format. - * <p>POSIX for short command line options is equivalent to SPACE_ONLY.</P> - * <p>POSIX for long command line options is equivalent to EQUALS_ONLY.</P> * - * - * @see JavaCommandLine#getClassOption(JavaCommandLineOption) + * When parsing command line options, specifies the valid option value delimiter(s). + * + * @see JavaCommandLine#getClassOption(CommandLineOption) */ - public enum OptionFormat { - POSIX, SPACE_OR_EQUALS - }; + public enum OptionValueDelimiter { + /** + * The option value is separated from the option name by whitespace (hence it is actually a separate command + * line argument, e.g. "-f FILE" or "--file FILE". + */ + WHITESPACE, + + /** + * The option value is separated from the option name by an equals sign, e.g. "-f=FILE" or "--file=FILE". + */ + EQUALS_SIGN + } + + private static final String SHORT_OPTION_PREFIX = "-"; + private static final String LONG_OPTION_PREFIX = "--"; + + private final Log log = LogFactory.getLog(JavaCommandLine.class); private List<String> arguments; private File javaExecutable; @@ -69,32 +86,27 @@ public class JavaCommandLine { private File executableJarFile; private List<String> classArguments; private boolean includeSystemPropertiesFromClassArguments; - private OptionFormat shortClassOptionFormat; - private OptionFormat longClassOptionFormat; + private Set<OptionValueDelimiter> shortClassOptionValueDelims; + private Set<OptionValueDelimiter> longClassOptionValueDelims; + private Map<String, String> shortClassOptionNameToOptionValueMap; + private Map<String, String> longClassOptionNameToOptionValueMap; /** * Same as <code>JavaCommandLine(args, false, OptionFormat.POSIX, OptionFormat.POSIX)</code> */ public JavaCommandLine(String... args) { - this(args, false, OptionFormat.POSIX, OptionFormat.POSIX); - } - - /** - * Same as <code>JavaCommandLine(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX)</code> - */ - public JavaCommandLine(boolean includeSystemPropertiesFromClassArguments, String... args) { - this(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX); + this(args, false); } /** * Same as <code>JavaCommandLine(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX)</code> */ public JavaCommandLine(String[] args, boolean includeSystemPropertiesFromClassArguments) { - this(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX); + this(args, includeSystemPropertiesFromClassArguments, null, null); } public JavaCommandLine(String[] args, boolean includeSystemPropertiesFromClassArguments, - OptionFormat shortClassOptionFormat, OptionFormat longClassOptionFormat) { + Set<OptionValueDelimiter> shortClassOptionValueDelims, Set<OptionValueDelimiter> longClassOptionValueDelims) { if (args == null) { throw new IllegalArgumentException("'commandLine' parameter is null."); } @@ -104,8 +116,20 @@ public class JavaCommandLine { } this.includeSystemPropertiesFromClassArguments = includeSystemPropertiesFromClassArguments; - this.shortClassOptionFormat = (shortClassOptionFormat == null) ? OptionFormat.POSIX : shortClassOptionFormat; - this.longClassOptionFormat = (longClassOptionFormat == null) ? OptionFormat.POSIX : longClassOptionFormat; + + // Default to GNU-style short options (e.g. "-f FILE"). + this.shortClassOptionValueDelims = (shortClassOptionValueDelims != null) ? shortClassOptionValueDelims : + EnumSet.of(OptionValueDelimiter.WHITESPACE); + if (this.shortClassOptionValueDelims.isEmpty()) { + throw new IllegalArgumentException("'shortClassOptionValueDelims' parameter is an empty set."); + } + + // Default to GNU-style long options (e.g. "--file=FILE"). + this.longClassOptionValueDelims = (longClassOptionValueDelims != null) ? longClassOptionValueDelims : + EnumSet.of(OptionValueDelimiter.EQUALS_SIGN); + if (this.longClassOptionValueDelims.isEmpty()) { + throw new IllegalArgumentException("'longClassOptionValueDelims' parameter is an empty set."); + } parseCommandLine(args); } @@ -155,6 +179,8 @@ public class JavaCommandLine { this.javaOptions = Collections.unmodifiableList(this.javaOptions); this.classArguments = Collections.unmodifiableList(this.classArguments); this.systemProperties = Collections.unmodifiableMap(this.systemProperties); + + parseClassOptions(); } private void parseClassArguments(String[] args, int beginIndex) { @@ -167,6 +193,87 @@ public class JavaCommandLine { } } + private void parseClassOptions() { + this.shortClassOptionNameToOptionValueMap = new HashMap<String, String>(); + this.longClassOptionNameToOptionValueMap = new HashMap<String, String>(); + + if (!this.classArguments.isEmpty()) { + for (int i = 0, classArgumentsSize = this.classArguments.size(); i < classArgumentsSize; i++) { + String classArg = this.classArguments.get(i); + + String optionString; // the option with the prefix stripped off + Set<OptionValueDelimiter> optionValueDelims; + Map<String, String> optionValueMap; + // We must check if the arg starts with long prefix before short prefix, since the former is a subset of + // the latter. + if (classArg.startsWith(LONG_OPTION_PREFIX)) { + // long opt + if (classArg.length() == LONG_OPTION_PREFIX.length()) { + // arg is "--", which means to stop processing options + // TODO: make this configurable? + break; + } + optionString = classArg.substring(LONG_OPTION_PREFIX.length()); + optionValueDelims = this.longClassOptionValueDelims; + optionValueMap = this.longClassOptionNameToOptionValueMap; + } else if (classArg.startsWith(SHORT_OPTION_PREFIX)) { + // short opt + optionString = classArg.substring(SHORT_OPTION_PREFIX.length()); + optionValueDelims = this.shortClassOptionValueDelims; + optionValueMap = this.shortClassOptionNameToOptionValueMap; + } else { + // not an option + continue; + } + + String optionName = null; + String optionValue = null; + if (optionValueDelims.contains(OptionValueDelimiter.WHITESPACE)) { + int equalsIndex = optionString.indexOf('='); + if (equalsIndex >= 1) { + if (optionValueDelims.contains(OptionValueDelimiter.EQUALS_SIGN)) { + optionName = optionString.substring(0, equalsIndex); + optionValue = (equalsIndex == (optionString.length() - 1)) ? + "" : optionString.substring(equalsIndex + 1); + } else { + log.warn("Option [" + classArg + + "] contains an equals sign, which is not a valid class option value delimiter for this command line."); + } + } else { + optionName = optionString; + if (((i + 1) < classArgumentsSize) && !this.classArguments.get(i + 1).startsWith("-")) { + // there is a next argument and it's not an option - assume it's an argument to this option + // and advance our loop index. + optionValue = this.classArguments.get(++i); + } else { + // the option has no argument - store an empty string as its value to indicate the option + // was present on the command line. + optionValue = ""; + } + } + } else if (optionValueDelims.contains(OptionValueDelimiter.EQUALS_SIGN)) { + int equalsIndex = optionString.indexOf('='); + if (equalsIndex == -1) { + // the option has no argument - store an empty string as its value to indicate the option + // was present on the command line. + optionName = optionString; + optionValue = ""; + } else if (equalsIndex >= 1) { + optionName = optionString.substring(0, equalsIndex); + optionValue = (equalsIndex == (optionString.length() - 1)) ? + "" : optionString.substring(equalsIndex + 1); + } else { + log.warn("Ignoring malformed option [" + classArg + "] on command line [" + this + "]..."); + } + } + + if (optionName != null) { + optionValueMap.put(optionName, optionValue); + } + } + } + } + private void parseSystemPropertyArgument(String arg) { String argValue = arg.substring(2); int equalsSignIndex = argValue.indexOf('='); @@ -223,78 +330,52 @@ public class JavaCommandLine { } /** - * @param option - * @return null if the option is not on the command line, "" if it is on the command line and - * either has no value or expects no value, otherwise the non-empty value. + * @param option the class option to look for + * + * @return null if the class option is not on the command line, "" if it is on the command line and + * either has no value or expects no value, and otherwise the non-empty value. */ @Nullable - public String getClassOption(JavaCommandLineOption option) { - String shortOption = null; - String shortOptionEquals = null; - if (option.getShortName() != null) { - shortOption = "-" + option.getShortName(); - shortOptionEquals = shortOption + "="; - } - - String longOption = null; - String longOptionEquals = null; - if (option.getLongName() != null) { - longOption = "--" + option.getLongName(); - longOptionEquals = longOption + "="; - } - - for (int i = 0, classArgsLength = getClassArguments().size(); i < classArgsLength; i++) { - String classArg = getClassArguments().get(i); - - // If we hit a "stop processing options" option then don't look further, the rest of the - // options are actually deferred to a subsequent command. - // TODO: This behavior may need to be configurable. - if ("--".equals(classArg)) { - break; - } - - if (option.getShortName() != null && classArg.startsWith(shortOption)) { - if (!option.isExpectsValue()) { - return ""; - - } else { - switch (shortClassOptionFormat) { - case POSIX: - return (i != (classArgsLength - 1)) ? getClassArguments().get(i + 1) : ""; - - case SPACE_OR_EQUALS: - default: - int len = shortOptionEquals.length(); - if (classArg.startsWith(shortOptionEquals)) { - return (len < classArg.length()) ? (classArg.substring(len).trim()) : ""; - } - break; - } + public String getClassOption(CommandLineOption option) { + String optionValue; + if (option.getLongName() != null && this.longClassOptionNameToOptionValueMap.containsKey(option.getLongName())) { + optionValue = this.longClassOptionNameToOptionValueMap.get(option.getLongName()); + if (optionValue != null && !option.isExpectsValue()) { + // TODO: Store the delims used for each of the options in another set of maps, so we can handle + // things differently here depending on what delim was used. + if (this.longClassOptionValueDelims.equals(EnumSet.of(OptionValueDelimiter.EQUALS_SIGN))) { + log.warn("Class option [" + option + "] does not expect a value, but a value was specified on command line [" + + this + "]."); + } else if (this.longClassOptionValueDelims.equals(EnumSet.of(OptionValueDelimiter.WHITESPACE))) { + optionValue = ""; } - - } else if (option.getLongName() != null && classArg.startsWith(longOption)) { - if (!option.isExpectsValue()) { - return ""; - - } else { - switch (longClassOptionFormat) { - case POSIX: - int len = longOptionEquals.length(); - if (classArg.startsWith(longOptionEquals)) { - return (len < classArg.length()) ? (classArg.substring(len).trim()) : ""; - } - break; - - case SPACE_OR_EQUALS: - default: - return (i != (classArgsLength - 1)) ? getClassArguments().get(i + 1) : ""; - } + } + } else if (option.getShortName() != null && this.shortClassOptionNameToOptionValueMap.containsKey(option.getShortName())) { + optionValue = this.shortClassOptionNameToOptionValueMap.get(option.getShortName()); + if (optionValue != null && !option.isExpectsValue()) { + // TODO: Store the delims used for each of the options in another set of maps, so we can handle + // things differently here depending on what delim was used. + if (this.shortClassOptionValueDelims.equals(EnumSet.of(OptionValueDelimiter.EQUALS_SIGN))) { + log.warn("Class option [" + option + "] does not expect a value, but a value was specified on command line [" + + this + "]."); + } else if (this.shortClassOptionValueDelims.equals(EnumSet.of(OptionValueDelimiter.WHITESPACE))) { + optionValue = ""; } } + } else { + optionValue = null; + if (option.isExpectsValue()) { + log.warn("Class option [" + option + "] expects a value, but no value was specified on command line [" + + this + "]."); + } } - // If we reached here, the option wasn't on the command line. - return null; + return optionValue; + } + + public boolean isClassOptionPresent(CommandLineOption option) { + String optionValue = getClassOption(option); + return (optionValue != null); } @Override diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLineOption.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLineOption.java deleted file mode 100644 index b7bf674..0000000 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLineOption.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 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, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * 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 and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.rhq.core.pluginapi.util; - -/** - * The name(s) associated with a java command line option. - * - * @author Ian Springer - */ -public class JavaCommandLineOption { - - private String shortName; - private String longName; - private boolean expectsValue; - - /** - * Same as <code>JavaCommandLineOption(shortName, longName, true)</code> - */ - public JavaCommandLineOption(char shortName, String longName) { - this(new String(new char[] { shortName }), longName, true); - } - - public JavaCommandLineOption(char shortName, String longName, boolean expectsValue) { - this(new String(new char[] { shortName }), longName, expectsValue); - } - - /** - * Same as <code>JavaCommandLineOption(shortName, longName, true)</code> - */ - public JavaCommandLineOption(String shortName, String longName) { - this(shortName, longName, true); - } - - public JavaCommandLineOption(String shortName, String longName, boolean expectsValue) { - if ((shortName == null) && (longName == null)) { - throw new IllegalArgumentException("ShortName and longName cannot both be null."); - } - - this.shortName = shortName; - this.longName = longName; - this.expectsValue = expectsValue; - } - - public String getShortName() { - return shortName; - } - - public String getLongName() { - return longName; - } - - public boolean isExpectsValue() { - return expectsValue; - } - - @Override - public String toString() { - return "JavaCommandLineOption [shortName=" + shortName + ", longName=" + longName + ", expectsValue=" - + expectsValue + "]"; - } -} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index bc81ed8..ee7f333 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -73,7 +73,7 @@ public class ServerStartScriptDiscoveryUtility { } public static List<String> getStartScriptArgs(ProcessInfo serverParentProcess, List<String> serverArgs, - Set<JavaCommandLineOption> optionExcludes) { + Set<CommandLineOption> optionExcludes) { // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" // Windows: "standalone.bat --server-config=standalone-full.xml" int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; @@ -90,8 +90,8 @@ public class ServerStartScriptDiscoveryUtility { for (int i = 0, serverArgsSize = serverArgs.size(); i < serverArgsSize; i++) { String serverArg = serverArgs.get(i); // Skip any options that the start script will take care of specifying. - JavaCommandLineOption option = null; - for (JavaCommandLineOption optionExclude : optionExcludes) { + CommandLineOption option = null; + for (CommandLineOption optionExclude : optionExcludes) { if ((optionExclude.getShortName() != null && (serverArg.equals('-' + optionExclude.getShortName()) || serverArg.startsWith('-' + optionExclude.getShortName() + "="))) || @@ -103,8 +103,10 @@ public class ServerStartScriptDiscoveryUtility { } } if (option != null) { - if (option.isExpectsValue() && ((i + 1) < serverArgsSize)) { - // Skip the option's argument too. + if (option.isExpectsValue() && ((i + 1) < serverArgsSize) && + (((option.getShortName() != null) && serverArg.equals('-' + option.getShortName())) || + (option.getLongName() != null) && serverArg.equals("--" + option.getLongName()))) { + // If the option expects a value and the delimiter is a space, skip the next argument too. i++; } } else { diff --git a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java index 72b6201..e6dc4ae 100644 --- a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java +++ b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java @@ -114,24 +114,38 @@ public class JavaCommandLineTest { Assert.assertEquals(sysprops.get("prop4"), "boo"); } - public void testGetClassOption() throws Exception { + public void testGetPresentClassOption() throws Exception { String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", "-ea", "-cp", cp, "org.example.Main", "-x", "blah", "--novaluelong", "--long=longval", "-n"); - Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption("b", "bogus"))); - Assert.assertEquals("blah", javaCommandLine.getClassOption(new JavaCommandLineOption("x", null))); - Assert.assertEquals("", javaCommandLine.getClassOption(new JavaCommandLineOption(null, "novaluelong", false))); - Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption(null, "novaluelong"))); - Assert.assertEquals("longval", javaCommandLine.getClassOption(new JavaCommandLineOption(null, "long"))); - Assert.assertEquals("", javaCommandLine.getClassOption(new JavaCommandLineOption("n", null, false))); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("x", null, false)), ""); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("x", null, true)), "blah"); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "novaluelong", false)), ""); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "novaluelong", true)), ""); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "long", false)), "longval"); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption(null, "long", true)), "longval"); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("n", null, false)), ""); + Assert.assertEquals(javaCommandLine.getClassOption(new CommandLineOption("n", null, true)), ""); + } + + public void testGetAbsentClassOption() throws Exception { + String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; + JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", + "-ea", "-cp", cp, "org.example.Main", "-x", "blah", "--novaluelong", "--long=longval", "-n"); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption("b", null, false))); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption("b", null, true))); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption(null, "bogus", false))); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption(null, "bogus", true))); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption("b", "bogus", false))); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption("b", "bogus", true))); } public void testGetClassOptionStopProcessing() throws Exception { String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", "-ea", "-cp", cp, "org.example.Main", "-x", "blah", "--novaluelong", "--long=longval", "--", "-n"); - Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption("b", "bogus"))); - Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption("n", null, false))); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption("b", "bogus"))); + Assert.assertNull(javaCommandLine.getClassOption(new CommandLineOption("n", null, false))); } } diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 167d4a9..eaf8f39 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -320,6 +320,10 @@ <move file="${java.io.tmpdir}/jboss-eap-6.0" tofile="${java.io.tmpdir}/jboss-as-${as7.version}" failonerror="false" overwrite="false"/> + + <chmod perm="u+rx"> + <fileset dir="${jboss7.home}/bin" includes="*.sh"/> + </chmod> <replace dir="${jboss7.home}" includes="standalone/configuration/standalone.xml, domain/configuration/host.xml" token="<inet-address " value="<loopback-address "/> diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java index bd2ccaa..fed8973 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java @@ -23,6 +23,7 @@ package org.rhq.modules.plugins.jbossas7; import java.util.Collections; +import java.util.EnumSet; import java.util.List; import org.jetbrains.annotations.NotNull; @@ -36,21 +37,27 @@ import org.rhq.core.pluginapi.util.JavaCommandLine; */ public class AS7CommandLine extends JavaCommandLine { + private static final String APP_SERVER_MODULE_NAME_PREFIX = "org.jboss.as"; + private String appServerModuleName; private List<String> appServerArgs; public AS7CommandLine(String[] args) { - super(args, true, OptionFormat.SPACE_OR_EQUALS, OptionFormat.SPACE_OR_EQUALS); + // Note, we don't use EnumSet.allOf() just in case some other option delimiter is added to the enum in the future. + super(args, true, EnumSet.of(OptionValueDelimiter.WHITESPACE, OptionValueDelimiter.EQUALS_SIGN), + EnumSet.of(OptionValueDelimiter.WHITESPACE, OptionValueDelimiter.EQUALS_SIGN)); + // In the case of AS7, the class arguments are actually the arguments to the jboss-modules.jar main class. We + // want to split out the arguments to the app server module (i.e. "org.jboss.as.standalone" or + // "org.jboss.as.host-controller"). e.g. For the class arguments + // "-mp /home/ips/Applications/jboss-as-7.1.1.Final/modules -jaxpmodule javax.xml.jaxp-provider + // org.jboss.as.standalone -Djboss.home.dir=/opt/jboss-as-7.1.1.Final --server-config=standalone-full.xml", + // this.appServerModuleName would get set to "org.jboss.as.standalone" and this.appServerArgs would get set to + // "-Djboss.home.dir=/opt/jboss-as-7.1.1.Final --server-config=standalone-full.xml" List<String> classArgs = super.getClassArguments(); - // The class arguments are actually the arguments to the jboss-modules.jar main class. We want to get to the - // arguments to the app server module (i.e. "org.jboss.as.standalone" or "org.jboss.as.host-controller"). - // e.g. "-mp /home/ips/Applications/jboss-as-7.1.1.Final/modules -jaxpmodule javax.xml.jaxp-provider - // org.jboss.as.standalone -Djboss.home.dir=/opt/jboss-as-7.1.1.Final --server-config=standalone-full.xml" - // In for (int i = 0, classArgsSize = classArgs.size(); i < classArgsSize; i++) { String classArg = classArgs.get(i); - if (classArg.startsWith("org.jboss.as")) { + if (classArg.startsWith(APP_SERVER_MODULE_NAME_PREFIX)) { this.appServerModuleName = classArg; if ((i + 1) < classArgsSize) { this.appServerArgs = Collections.unmodifiableList(classArgs.subList(i + 1, classArgsSize)); @@ -61,7 +68,8 @@ public class AS7CommandLine extends JavaCommandLine { } } if (this.appServerModuleName == null) { - throw new IllegalArgumentException("Class arguments do not contain an argument starting with \"org.jboss.as\"."); + throw new IllegalArgumentException("Class arguments do not contain an argument starting with \"" + + APP_SERVER_MODULE_NAME_PREFIX + "\"."); } } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java index b9e5e92..1d8841a 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java @@ -19,7 +19,7 @@ package org.rhq.modules.plugins.jbossas7; /** - * Various definitions for the operation modes of AS7 (HOST is strictly no mode, but fits here nicely) + * Various definitions for the operation modes of AS7 (HOST is strictly not a mode, but fits here nicely) * @author Heiko W. Rupp */ public enum AS7Mode { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 6597dd9..d7f8866 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -48,9 +48,9 @@ import org.rhq.core.pluginapi.inventory.ManualAddFacet; import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.JavaCommandLine; -import org.rhq.core.pluginapi.util.JavaCommandLineOption; import org.rhq.core.pluginapi.util.ServerStartScriptDiscoveryUtility; import org.rhq.core.pluginapi.util.StartScriptConfiguration; import org.rhq.core.system.ProcessInfo; @@ -86,13 +86,13 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent // --pc-port 52624 // -default-jvm /usr/java/jdk1.6.0_30/jre/bin/java // -Djboss.home.dir=/opt/jboss-as-7.1.1.Final - private static final Set<JavaCommandLineOption> START_SCRIPT_OPTION_EXCLUDES = new HashSet<JavaCommandLineOption>(); + private static final Set<CommandLineOption> START_SCRIPT_OPTION_EXCLUDES = new HashSet<CommandLineOption>(); static { - START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption("mp", null)); - START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption(null, "pc-address")); - START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption(null, "pc-port")); - START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption("default-jvm", null)); - START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption("Djboss.home.dir", null, false)); + START_SCRIPT_OPTION_EXCLUDES.add(new CommandLineOption("mp", null)); + START_SCRIPT_OPTION_EXCLUDES.add(new CommandLineOption(null, "pc-address")); + START_SCRIPT_OPTION_EXCLUDES.add(new CommandLineOption(null, "pc-port")); + START_SCRIPT_OPTION_EXCLUDES.add(new CommandLineOption("default-jvm", null)); + START_SCRIPT_OPTION_EXCLUDES.add(new CommandLineOption("Djboss.home.dir", null)); } private final Log log = LogFactory.getLog(this.getClass()); @@ -216,6 +216,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent File startScript = ServerStartScriptDiscoveryUtility.getStartScript(parentProcess); if (startScript == null) { + // The parent process is not a script - fallback to the default value (e.g. "bin/standalone.sh"). startScript = new File(getMode().getStartScript()); } if (!startScript.exists()) { @@ -342,7 +343,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent // Returns the name of the host config xml file (domain controller) or server config xml file (standalone server), // e.g. "standalone.xml" or "host.xml". protected String getHostXmlFileName(AS7CommandLine commandLine) { - JavaCommandLineOption hostXmlFileNameOption = getHostXmlFileNameOption(); + CommandLineOption hostXmlFileNameOption = getHostXmlFileNameOption(); String optionValue = commandLine.getClassOption(hostXmlFileNameOption); return (optionValue != null) ? optionValue : getDefaultHostXmlFileName(); } @@ -374,7 +375,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent protected abstract String getDefaultBaseDirName(); - protected abstract JavaCommandLineOption getHostXmlFileNameOption(); + protected abstract CommandLineOption getHostXmlFileNameOption(); protected abstract String getDefaultHostXmlFileName(); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index cf97f7b..f88b3d3 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -23,11 +23,9 @@ import java.net.ConnectException; import java.util.ArrayList; import java.util.Date; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -41,12 +39,16 @@ import org.rhq.core.domain.configuration.PropertySimple; 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.inventory.InvalidPluginConfigurationException; 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.OperationResult; import org.rhq.core.pluginapi.util.ProcessExecutionUtility; +import org.rhq.core.pluginapi.util.StartScriptConfiguration; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; +import org.rhq.core.system.SystemInfo; import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; @@ -64,8 +66,18 @@ import org.rhq.modules.plugins.jbossas7.json.Result; public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseComponent<T> implements MeasurementFacet { private static final String SEPARATOR = "\n-----------------------\n"; + final Log log = LogFactory.getLog(BaseServerComponent.class); + private StartScriptConfiguration startScriptConfig; + + @Override + public void start(ResourceContext<T> tResourceContext) throws InvalidPluginConfigurationException, Exception { + super.start(tResourceContext); + + this.startScriptConfig = new StartScriptConfiguration(pluginConfiguration); + } + /** * Restart the server by first executing a 'shutdown' operation via its API, and then calling * the {@link #startServer(AS7Mode)} method to start it again. @@ -140,17 +152,19 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom processExecution.setArguments(arguments); } - // 'startScriptArgs' is a longString with the args delimited by newlines. - String startScriptArgs = pluginConfiguration.getSimpleValue("startScriptArgs", ""); - if (!startScriptArgs.isEmpty()) { - for (String arg : startScriptArgs.split("\n+")) { - arg = arg.trim(); - replacePropertyPatterns(arg); - arguments.add(arg); - } + List<String> startScriptArgs = startScriptConfig.getStartScriptArgs(); + for (String startScriptArg : startScriptArgs) { + startScriptArg = replacePropertyPatterns(startScriptArg); + arguments.add(startScriptArg); } - setEnvironmentVariables(processExecution); + Map<String, String> startScriptEnv = startScriptConfig.getStartScriptEnv(); + for (String envVarName : startScriptEnv.keySet()) { + String envVarValue = startScriptEnv.get(envVarName); + envVarValue = replacePropertyPatterns(envVarValue); + startScriptEnv.put(envVarName, envVarValue); + } + processExecution.setEnvironmentVariables(startScriptEnv); String homeDir = getHomeDir(); processExecution.setWorkingDirectory(homeDir); @@ -161,7 +175,8 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom if (log.isDebugEnabled()) { log.debug("About to execute the following process: [" + processExecution + "]"); } - ProcessExecutionResults results = context.getSystemInformation().executeProcess(processExecution); + SystemInfo systemInfo = context.getSystemInformation(); + ProcessExecutionResults results = systemInfo.executeProcess(processExecution); logExecutionResults(results); if (results.getError() != null) { operationResult.setErrorMessage(results.getError().getMessage()); @@ -179,7 +194,6 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom // context.getAvailabilityContext().requestAvailabilityCheck(); return operationResult; - } private void setErrorMessage(OperationResult operationResult, List<String> errors) { @@ -214,8 +228,8 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom } } - String envVars = pluginConfiguration.getSimpleValue("startScriptEnv", ""); - if (envVars.isEmpty()) { + Map<String, String> startScriptEnv = startScriptConfig.getStartScriptEnv(); + if (startScriptEnv.isEmpty()) { errors.add("No start script environment variables are set. At a minimum, PATH should be set " + "(on UNIX, it should contain at least /bin and /usr/bin). It is recommended that " + "JAVA_HOME also be set, otherwise the PATH will be used to find java."); @@ -225,11 +239,13 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom } private File getStartScriptFile(AS7Mode mode) { - String startScript = pluginConfiguration.getSimpleValue("startScript", mode.getStartScript()); - File startScriptFile = new File(startScript); + File startScriptFile = startScriptConfig.getStartScript(); + if (startScriptFile == null) { + startScriptFile = new File(mode.getStartScript()); + } if (!startScriptFile.isAbsolute()) { String homeDir = getHomeDir(); - startScriptFile = new File(homeDir, startScript); + startScriptFile = new File(homeDir, startScriptFile.getPath()); } return startScriptFile; } @@ -242,7 +258,7 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom boolean up = false; int count = 0; while (!up) { - Operation op = new ReadAttribute(new Address(),"release-version"); + Operation op = new ReadAttribute(new Address(), "release-version"); Result res = getASConnection().execute(op); if (res.isSuccess()) { // If op succeeds, server is not down up = true; @@ -466,44 +482,15 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom super.getValues(report, leftovers); } - private void setEnvironmentVariables(ProcessExecution processExecution) { - Configuration pluginConfig = context.getPluginConfiguration(); - - // 'startScriptEnv' is a longString with "name=value" strings delimited by newlines. - String envVars = pluginConfig.getSimpleValue("startScriptEnv", null); - - Map<String, String> processExecutionEnvironmentVariables = createEnvironmentVariableMap(envVars); - processExecution.setEnvironmentVariables(processExecutionEnvironmentVariables); - } - - private Map<String, String> createEnvironmentVariableMap(String envVarsString) { - StringTokenizer tokenizer = new StringTokenizer(envVarsString, "\n"); - Map<String, String> envVars = new LinkedHashMap<String, String>(tokenizer.countTokens()); - while (tokenizer.hasMoreTokens()) { - String var = tokenizer.nextToken().trim(); - int equalsIndex = var.indexOf('='); - if (equalsIndex == -1) { - throw new IllegalStateException("Malformed environment entry: " + var); - } - - String varName = var.substring(0, equalsIndex); - String varValue = var.substring(equalsIndex + 1); - varValue = replacePropertyPatterns(varValue); - envVars.put(varName, varValue); - } - - return envVars; - } - // Replace any "%xxx%" substrings with the values of plugin config props "xxx". private String replacePropertyPatterns(String value) { Pattern pattern = Pattern.compile("(%([^%]*)%)"); Matcher matcher = pattern.matcher(value); - Configuration parentPluginConfig = context.getPluginConfiguration(); + Configuration pluginConfig = context.getPluginConfiguration(); StringBuffer buffer = new StringBuffer(); while (matcher.find()) { String propName = matcher.group(2); - PropertySimple prop = parentPluginConfig.getSimple(propName); + PropertySimple prop = pluginConfig.getSimple(propName); String propValue = ((prop != null) && (prop.getStringValue() != null)) ? prop.getStringValue() : ""; String propPattern = matcher.group(1); String replacement = (prop != null) ? propValue : propPattern; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java index 2374a91..7886190 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java @@ -22,7 +22,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.pluginapi.util.JavaCommandLineOption; +import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.core.system.ProcessInfo; import org.rhq.modules.plugins.jbossas7.helper.HostPort; @@ -40,8 +40,8 @@ public class HostControllerDiscovery extends BaseProcessDiscovery { private static final String DEFAULT_DOMAIN_CONFIG_FILE_NAME = "domain.xml"; private static final String DEFAULT_HOST_CONFIG_FILE_NAME = "host.xml"; - private JavaCommandLineOption DOMAIN_CONFIG_OPTION = new JavaCommandLineOption("c", "domain-config"); - private JavaCommandLineOption HOST_CONFIG_OPTION = new JavaCommandLineOption(null, "host-config"); + private CommandLineOption DOMAIN_CONFIG_OPTION = new CommandLineOption("c", "domain-config"); + private CommandLineOption HOST_CONFIG_OPTION = new CommandLineOption(null, "host-config"); @Override protected AS7Mode getMode() { @@ -69,7 +69,7 @@ public class HostControllerDiscovery extends BaseProcessDiscovery { } @Override - protected JavaCommandLineOption getHostXmlFileNameOption() { + protected CommandLineOption getHostXmlFileNameOption() { return HOST_CONFIG_OPTION; } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java index 301be99..136a0af 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java @@ -24,7 +24,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.pluginapi.util.JavaCommandLineOption; +import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.core.system.ProcessInfo; import org.rhq.modules.plugins.jbossas7.helper.HostPort; @@ -41,7 +41,7 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { private static final String DEFAULT_SERVER_CONFIG_FILE_NAME = "standalone.xml"; - private JavaCommandLineOption SERVER_CONFIG_OPTION = new JavaCommandLineOption('c', "server-config"); + private CommandLineOption SERVER_CONFIG_OPTION = new CommandLineOption('c', "server-config"); @Override protected AS7Mode getMode() { @@ -69,7 +69,7 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { } @Override - protected JavaCommandLineOption getHostXmlFileNameOption() { + protected CommandLineOption getHostXmlFileNameOption() { return SERVER_CONFIG_OPTION; } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java index 13560e6..24e2f70 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; -import org.rhq.core.pluginapi.util.JavaCommandLineOption; +import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.modules.plugins.jbossas7.AS7CommandLine; import org.rhq.modules.plugins.jbossas7.AS7Mode; @@ -50,7 +50,7 @@ public class HostConfiguration { private static final String BIND_ADDRESS_MANAGEMENT_SYSPROP = "jboss.bind.address.management"; private static final String SOCKET_BINDING_PORT_OFFSET_SYSPROP = "jboss.socket.binding.port-offset"; - private JavaCommandLineOption BIND_ADDRESS_MANAGEMENT_OPTION = new JavaCommandLineOption("bmanagement", null); + private CommandLineOption BIND_ADDRESS_MANAGEMENT_OPTION = new CommandLineOption("bmanagement", null); private final Log log = LogFactory.getLog(HostConfiguration.class); diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java index 3040b16..04de0e9 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java @@ -20,6 +20,8 @@ package org.rhq.modules.plugins.jbossas7.itest; import java.util.Set; +import org.testng.annotations.AfterSuite; + import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.clientapi.agent.discovery.InvalidPluginConfigurationClientException; import org.rhq.core.domain.configuration.Configuration; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java index 0b83684..4483eca 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java @@ -19,9 +19,14 @@ package org.rhq.modules.plugins.jbossas7.itest; import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; import org.testng.Assert; import org.rhq.core.domain.configuration.Configuration; @@ -30,7 +35,14 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.inventory.InventoryManager; +import org.rhq.core.pc.inventory.ResourceContainer; import org.rhq.core.pluginapi.configuration.MapPropertySimpleWrapper; +import org.rhq.core.pluginapi.util.FileUtils; +import org.rhq.core.pluginapi.util.StartScriptConfiguration; +import org.rhq.core.system.ProcessInfo; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; import static org.testng.Assert.*; @@ -41,6 +53,8 @@ import static org.testng.Assert.*; */ public abstract class AbstractServerComponentTest extends AbstractJBossAS7PluginTest { + public static final File JBOSS_HOME = new File(FileUtils.getCanonicalPath(System.getProperty("jboss7.home"))); + private static final Map<String, String> EAP6_VERSION_TO_AS7_VERSION_MAP = new HashMap<String, String>(); static { EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.Beta1", "7.1.0.Final-redhat-1"); @@ -135,15 +149,82 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin } public void testShutdownAndStartOperations() throws Exception { + // First make sure the server is up. AvailabilityType avail = getAvailability(getServerResource()); assertEquals(avail, AvailabilityType.UP); + + // Now shut it down using the Shutdown op and make sure it has gone down. invokeOperationAndAssertSuccess(getServerResource(), SHUTDOWN_OPERATION_NAME, null); avail = getAvailability(getServerResource()); assertEquals(avail, AvailabilityType.DOWN); - // Restart the server, so the rest of the tests don't fail. + + // Before restarting it, add some stuff to the 'startScriptEnv' and 'startScriptArgs' props so we can verify + // they are used correctly by the Start op. + Configuration pluginConfig = getServerResource().getPluginConfiguration(); + StartScriptConfiguration startScriptConfig = new StartScriptConfiguration(pluginConfig); + + // Add a var to the start script env. + Map<String, String> env = startScriptConfig.getStartScriptEnv(); + env.put("foo", "bar"); + startScriptConfig.setStartScriptEnv(env); + + // Add an arg to the start script args. + List<String> args = startScriptConfig.getStartScriptArgs(); + args.add("-Dfoo=bar"); + startScriptConfig.setStartScriptArgs(args); + + // Restart the server ResourceComponent so it picks up the changes we just made to the plugin config. + InventoryManager inventoryManager = this.pluginContainer.getInventoryManager(); + inventoryManager.deactivateResource(getServerResource()); + ResourceContainer serverContainer = inventoryManager.getResourceContainer(getServerResource()); + inventoryManager.activateResource(getServerResource(), serverContainer, true); + + // Finally restart it using the Start op and make sure it has come back up. invokeOperationAndAssertSuccess(getServerResource(), START_OPERATION_NAME, null); avail = getAvailability(getServerResource()); assertEquals(avail, AvailabilityType.UP); + + List<ProcessInfo> processes = getServerProcesses(); + //Assert.assertEquals(processes.size(), 1, getCommandLines(processes).toString()); + ProcessInfo serverProcess = processes.get(0); + Map<String, String> processEnv = serverProcess.getEnvironmentVariables(); + assertEquals(processEnv.get("foo"), "bar", processEnv.toString()); + + List<String> processArgs = Arrays.asList(serverProcess.getCommandLine()); + assertTrue(processArgs.contains("-Dfoo=bar"), processArgs.toString()); + } + + public void killServerProcesses() { + List<ProcessInfo> processes = getServerProcesses(); + Sigar sigar = new Sigar(); + for (ProcessInfo process : processes) { + System.out.println("\n=== Killing process with pid [" + process.getPid() + "] and command line [" + + Arrays.toString(process.getCommandLine()) + "]..."); + try { + sigar.kill(process.getPid(), "KILL"); + } catch (SigarException e) { + System.err.println("Failed to kill " + process); + } + } + sigar.close(); + } + + protected abstract int getPortOffset(); + + private List<ProcessInfo> getServerProcesses() { + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + return systemInfo.getProcesses("arg|*|match=org\\.jboss\\.as\\..+,arg|-Djboss.socket.binding.port-offset|match=" + + getPortOffset()); + } + + private static List<List<String>> getCommandLines(List<ProcessInfo> processes) { + List<List<String>> commandLines = new ArrayList<List<String>>(); + for (ProcessInfo process : processes) { + commandLines.add(Arrays.asList(process.getCommandLine())); + } + return commandLines; } } + + diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java index 5847d00..b1de5b9 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.List; import org.testng.Assert; +import org.testng.annotations.AfterSuite; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; @@ -29,7 +30,6 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; -import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.modules.plugins.jbossas7.itest.AbstractServerComponentTest; import org.rhq.test.arquillian.RunDiscovery; @@ -41,8 +41,10 @@ import org.rhq.test.arquillian.RunDiscovery; @Test(groups = {"integration", "pc", "domain"}, singleThreaded = true) public class DomainServerComponentTest extends AbstractServerComponentTest { - public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, ResourceCategory.SERVER, null); - public static final String RESOURCE_KEY = FileUtils.getCanonicalPath(System.getProperty("jboss7.home") + "/domain"); + public static final ResourceType RESOURCE_TYPE = + new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, ResourceCategory.SERVER, null); + // The key is the server's base dir. + public static final String RESOURCE_KEY = new File(JBOSS_HOME, "domain").getPath(); @Override protected ResourceType getServerResourceType() { @@ -75,8 +77,9 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { super.validatePluginConfiguration(pluginConfig); // "startScript" prop - String startScript = pluginConfig.getSimpleValue("startScript", null); - String expectedStartScript = (File.separatorChar == '/') ? "bin/domain.sh" : "bin\\domain.bat"; + String startScript = pluginConfig.getSimpleValue("startScript"); + String expectedStartScriptFileName = (File.separatorChar == '/') ? "domain.sh" : "domain.bat"; + String expectedStartScript = new File("bin", expectedStartScriptFileName).getPath(); Assert.assertEquals(startScript, expectedStartScript); // "startScriptArgs" prop @@ -103,10 +106,19 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { } // ******************************* OPERATIONS ******************************* // - // TODO: Re-enable this once "shutdown" operation has been fixed. - @Test(priority = 1003, enabled = false) + @Test(priority = 1003, enabled = true) public void testDomainServerShutdownAndStartOperations() throws Exception { super.testShutdownAndStartOperations(); } + @AfterSuite + public void killServerProcesses() { + super.killServerProcesses(); + } + + @Override + protected int getPortOffset() { + return 50000; + } + } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index 946ffce..18f43b9 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.List; import org.testng.Assert; +import org.testng.annotations.AfterSuite; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; @@ -30,7 +31,6 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; -import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.modules.plugins.jbossas7.itest.AbstractServerComponentTest; import org.rhq.test.arquillian.RunDiscovery; @@ -44,9 +44,10 @@ import static org.testng.Assert.*; @Test(groups = {"integration", "pc", "standalone"}, singleThreaded = true) public class StandaloneServerComponentTest extends AbstractServerComponentTest { - public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Standalone Server", PLUGIN_NAME, ResourceCategory.SERVER, null); - // The key of an AS7 Standalone Server Resource is its JBOSS_HOME dir. - public static final String RESOURCE_KEY = FileUtils.getCanonicalPath(System.getProperty("jboss7.home") + "/standalone"); + public static final ResourceType RESOURCE_TYPE = + new ResourceType("JBossAS7 Standalone Server", PLUGIN_NAME, ResourceCategory.SERVER, null); + // The key is the server's base dir. + public static final String RESOURCE_KEY = new File(JBOSS_HOME, "standalone").getPath(); private static final String RELOAD_OPERATION_NAME = "reload"; private static final String RESTART_OPERATION_NAME = "restart"; @@ -82,8 +83,9 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { super.validatePluginConfiguration(pluginConfig); // "startScript" prop - String startScript = pluginConfig.getSimpleValue("startScript", null); - String expectedStartScript = (File.separatorChar == '/') ? "bin/standalone.sh" : "bin\\standalone.bat"; + String startScript = pluginConfig.getSimpleValue("startScript"); + String expectedStartScriptFileName = (File.separatorChar == '/') ? "standalone.sh" : "standalone.bat"; + String expectedStartScript = new File("bin", expectedStartScriptFileName).getPath(); Assert.assertEquals(startScript, expectedStartScript); // "startScriptArgs" prop @@ -118,8 +120,7 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { invokeOperationAndAssertSuccess(getServerResource(), RELOAD_OPERATION_NAME, null); } - // TODO: Re-enable this once "shutdown" operation has been fixed. - @Test(priority = 5, enabled = false) + @Test(priority = 5, enabled = true) public void testStandaloneServerShutdownAndStartOperations() throws Exception { super.testShutdownAndStartOperations(); } @@ -127,11 +128,25 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { // TODO: Re-enable once fixed. @Test(priority = 5, dependsOnMethods = "testStandaloneServerShutdownAndStartOperations", enabled = false) public void testRestartOperation() throws Exception { + // First make sure the server is up. AvailabilityType avail = getAvailability(getServerResource()); assertEquals(avail, AvailabilityType.UP); + + // Make sure the server is back up. + // TODO (ips): Check that the server is a different process now. invokeOperationAndAssertSuccess(getServerResource(), RESTART_OPERATION_NAME, null); avail = getAvailability(getServerResource()); assertEquals(avail, AvailabilityType.UP); } + @AfterSuite + public void killServerProcesses() { + super.killServerProcesses(); + } + + @Override + protected int getPortOffset() { + return 40000; + } + } commit 6bcc92d742da0d7e9eb4481dbeeb9785278bdbb9 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Apr 23 07:47:47 2012 -0400 add new API method - setSimpleValue() diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index 5f77d55..3d0513a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -365,6 +365,21 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM return ((property != null) && (property.getStringValue() != null)) ? property.getStringValue() : defaultValue; } + public void setSimpleValue(String name, String value) { + PropertySimple property = getSimple(name); + if (value == null) { + if (property != null) { + remove(name); + } + } else { + if (property == null) { + put(new PropertySimple(name, value)); + } else { + property.setStringValue(value); + } + } + } + /** * Same as {@link #get(String)} except that it returns the object as a {@link PropertyList}. * commit e5973a6178ac9c3c3f2a4a2782bd258901be98c1 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Apr 23 05:00:55 2012 -0400 Root logger operations fix and more cleanup of redundant operations. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 515ce85..21b9285 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2088,6 +2088,18 @@ <c:simple-property name="path" readOnly="true" default="subsystem=logging"/> </plugin-configuration> + <resource-configuration> + <c:group name="child:root-logger=ROOT" displayName="Root logger"> + &logFilter; + &logLevel; + &logLevel; + <c:list-property name="handlers" required="true" readOnly="false" + description="The Handlers associated with this Logger."> + <c:simple-property name="handler" type="string" description="The Handlers associated with this Logger."/> + </c:list-property> + </c:group> + </resource-configuration> + <service name="Async Handler" discovery="SubsystemDiscovery" createDeletePolicy="both" @@ -2240,14 +2252,7 @@ <c:simple-property name="path" readOnly="true" default="file-handler"/> </plugin-configuration> - <operation name="change-file" description="Change the file for a handler."> - <parameters> - &logFile; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the file for a handler." /> - </results> - </operation> +   @@ -2287,28 +2292,14 @@ <c:simple-property name="path" readOnly="true" default="logger"/> </plugin-configuration> - <operation name="assign-handler" description="Assign a Handler to a Logger."> - <parameters> - <c:simple-property name="name" required="true" type="string" readOnly="false" description="The handler's name."/> - </parameters> - <results> - <c:simple-property name="operationResult" description="Assign a Handler to a Logger." /> - </results> - </operation> +   - <operation name="unassign-handler" description="Unassign a Handler from a Logger."> - <parameters> - <c:simple-property name="name" required="true" type="string" readOnly="false" description="The handler's name."/> - </parameters> - <results> - <c:simple-property name="operationResult" description="Unassign a Handler from a Logger." /> - </results> - </operation> +  <resource-configuration> - <c:simple-property name="category" required="true" type="string" readOnly="true" description="Specifies the category for the logger."/> +  &logFilter; <c:list-property name="handlers" required="false" description="The Handlers associated with this Logger." > <c:simple-property name="handlers" /> @@ -2329,14 +2320,7 @@ <c:simple-property name="path" readOnly="true" default="periodic-rotating-file-handler"/> </plugin-configuration> - <operation name="change-file" description="Change the file for a handler."> - <parameters> - &logFile; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the file for a handler." /> - </results> - </operation> +   @@ -2368,7 +2352,7 @@ </service> - <service name="Root Logger" + + </service> --> <service name="Size Rotating File Handler" discovery="SubsystemDiscovery" @@ -2434,14 +2418,7 @@ <c:simple-property name="path" readOnly="true" default="size-rotating-file-handler"/> </plugin-configuration> - <operation name="change-file" description="Change the file for a handler."> - <parameters> - &logFile; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the file for a handler." /> - </results> - </operation> +   commit 828678db639d68ad404a8b8741b2087335e643e3 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Apr 23 03:00:58 2012 -0400 -support reads of name-value property maps -remove redundant change-log-level method as handled by config. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java index cc4528c..e60f285 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java @@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7; import java.io.IOException; import java.util.Collection; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -330,46 +331,78 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet { return propertyMap; } - Map<String, Object> objects = (Map<String, Object>) valueObject; - for (PropertyDefinition propDef : propDefs) { - String key = propDef.getName(); - if (key.equals(specialNameProp)) // Skip over specialName prop, as we have processed that already. - continue; - - // special case: if the key is "*", we just pick the first element - Object o; - if (key.equals("*")) { - o = objects.entrySet().iterator().next().getValue(); - } else if (key.endsWith(":expr")) { - // TODO we need to check te - String tmp = key.substring(0, key.indexOf(":")); - o = objects.get(tmp); - } else { - o = objects.get(key); + if ((valueObject instanceof LinkedHashMap) && (isNameValuePropertyMap(propDefs))) {//handle name,value pair mappings + LinkedHashMap<String, String> objects = (LinkedHashMap<String, String>) valueObject; + for (String key : objects.keySet()) { + Property name = null; + name = new PropertySimple("name", key); + propertyMap.put(name); + Property value = null; + value = new PropertySimple("value", objects.get(key)); + propertyMap.put(value); } + } else { + Map<String, Object> objects = (Map<String, Object>) valueObject; + for (PropertyDefinition propDef : propDefs) { + String key = propDef.getName(); + if (key.equals(specialNameProp)) // Skip over specialName prop, as we have processed that already. + continue; + + // special case: if the key is "*", we just pick the first element + Object o; + if (key.equals("*")) { + o = objects.entrySet().iterator().next().getValue(); + } else if (key.endsWith(":expr")) { + // TODO we need to check te + String tmp = key.substring(0, key.indexOf(":")); + o = objects.get(tmp); + } else { + o = objects.get(key); + } - Property property; - if (propDef instanceof PropertyDefinitionSimple) - property = loadHandlePropertySimple((PropertyDefinitionSimple) propDef, o); - else if (propDef instanceof PropertyDefinitionList) - property = loadHandlePropertyList((PropertyDefinitionList) propDef, o); - else if (propDef instanceof PropertyDefinitionMap) - property = loadHandlePropertyMap((PropertyDefinitionMap) propDef, o, null); - else - throw new IllegalArgumentException("Unknown property type in map property [" + propDefName + "]"); - - if (property != null) - propertyMap.put(property); - else { - if (log.isDebugEnabled()) - log.debug("Property " + key + " was null"); - } + Property property; + if (propDef instanceof PropertyDefinitionSimple) + property = loadHandlePropertySimple((PropertyDefinitionSimple) propDef, o); + else if (propDef instanceof PropertyDefinitionList) + property = loadHandlePropertyList((PropertyDefinitionList) propDef, o); + else if (propDef instanceof PropertyDefinitionMap) + property = loadHandlePropertyMap((PropertyDefinitionMap) propDef, o, null); + else + throw new IllegalArgumentException("Unknown property type in map property [" + propDefName + "]"); + if (property != null) + propertyMap.put(property); + else { + if (log.isDebugEnabled()) + log.debug("Property " + key + " was null"); + } + } } return propertyMap; } + /**Determine if the property definition is for name=value property mapping. + * + * @param propDefs + * @return + */ + private boolean isNameValuePropertyMap(List<PropertyDefinition> propDefs) { + boolean isNameValuePropertyMap = false; + if (propDefs != null) { + int found = 0; + for (PropertyDefinition property : propDefs) { + String name = property.getName(); + if (name.equals("name") || name.equals("value")) { + found++; + } + } + if (found == 2) + isNameValuePropertyMap = true; + } + return isNameValuePropertyMap; + } + /** * Handle a List of ... * @param propDef Definition of this list diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index f81b1ec..515ce85 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2106,14 +2106,7 @@ </results> </operation> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2164,14 +2157,7 @@ <c:simple-property name="path" readOnly="true" default="console-handler"/> </plugin-configuration> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2211,14 +2197,7 @@ <c:simple-property name="path" readOnly="true" default="custom-handler"/> </plugin-configuration> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2242,9 +2221,12 @@ description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; <c:simple-property name="module" required="true" type="string" readOnly="true" description="The module that the logging handler depends on."/> - <c:list-property name="properties" required="false" description="Defines the properties used for the logging handler. All properties must be accessible via a setter method." > - <c:simple-property name="properties" /> - </c:list-property> + <c:list-property name="properties"> + <c:map-property name="properties"> + <c:simple-property name="name" required="true" description="The name of the configuration property." /> + <c:simple-property name="value" required="true" description="The value of the configuration property." /> + </c:map-property> + </c:list-property> </resource-configuration> </service> @@ -2267,14 +2249,7 @@ </results> </operation> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2321,14 +2296,7 @@ </results> </operation> - <operation name="change-log-level" description="Change the logging level for a logger category."> - <parameters> - <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this logger. Message levels lower than this value will be discarded."/> - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a logger category." /> - </results> - </operation> +  <operation name="unassign-handler" description="Unassign a Handler from a Logger."> <parameters> @@ -2370,14 +2338,7 @@ </results> </operation> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2482,14 +2443,7 @@ </results> </operation> - <operation name="change-log-level" description="Change the logging level for a handler."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult" description="Change the logging level for a handler." /> - </results> - </operation> +  <operation name="disable" description="Disable a logging handler."> <results> @@ -2511,7 +2465,6 @@ <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> &logFile; &logFilter; - <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; commit f57dcfb57a6883afea6210fc01d045242126fc03 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Apr 20 16:47:15 2012 -0400 Define only allowed values and update parameter when changing log level. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index fde475f..f81b1ec 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2108,7 +2108,7 @@ <operation name="change-log-level" description="Change the logging level for a handler."> <parameters> - <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this logger. Message levels lower than this value will be discarded."/> + &logLevel; </parameters> <results> <c:simple-property name="operationResult" description="Change the logging level for a handler." /> @@ -2141,7 +2141,12 @@ <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; - <c:simple-property name="overflow-action" required="true" type="string" readOnly="false" defaultValue="BLOCK" description="Specify what action to take when the overflowing. The valid options are 'block' and 'discard'. The default value is BLOCK."/> + <c:simple-property name="overflow-action" required="true" type="string" readOnly="false" defaultValue="BLOCK" description="Specify what action to take when the overflowing. The valid options are 'block' and 'discard'. The default value is BLOCK."> + <c:property-options> + <c:option value="BLOCK"/> + <c:option value="DISCARD"/> + </c:property-options> + </c:simple-property> <c:simple-property name="queue-length" required="true" type="integer" readOnly="false" description="The queue length to use before flushing writing"/> <c:list-property name="subhandlers" required="false" description="The Handlers associated with this async handler." > <c:simple-property name="subhandlers" /> @@ -2208,7 +2213,7 @@ <operation name="change-log-level" description="Change the logging level for a handler."> <parameters> - <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this logger. Message levels lower than this value will be discarded."/> + &logLevel; </parameters> <results> <c:simple-property name="operationResult" description="Change the logging level for a handler." /> @@ -2264,7 +2269,7 @@ <operation name="change-log-level" description="Change the logging level for a handler."> <parameters> - <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this logger. Message levels lower than this value will be discarded."/> + &logLevel; </parameters> <results> <c:simple-property name="operationResult" description="Change the logging level for a handler." /> @@ -2367,7 +2372,7 @@ <operation name="change-log-level" description="Change the logging level for a handler."> <parameters> - <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this logger. Message levels lower than this value will be discarded."/> + &logLevel; </parameters> <results> <c:simple-property name="operationResult" description="Change the logging level for a handler." /> @@ -2479,7 +2484,7 @@ <operation name="change-log-level" description="Change the logging level for a handler."> <parameters> - <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this logger. Message levels lower than this value will be discarded."/> + &logLevel; </parameters> <results> <c:simple-property name="operationResult" description="Change the logging level for a handler." /> commit 6c51823767d8eca2fc66956b1b38cef5acec2c01 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Apr 20 14:07:18 2012 -0400 Couple of more fixes to the logging subsystem -removed 'update-properties' as supported by 'resource-configuration' instead -fix several properties that should have been required but were not because of incorrect detection of 'nillable' types by d2d. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 494e91f..fde475f 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2136,27 +2136,13 @@ </results> </operation> - <operation name="update-properties" description="Update the properties of an existing ASYNC handler."> - <parameters> - &logLevel; - &logFilter; - <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> - <c:simple-property name="queue-length" required="true" type="integer" readOnly="false" description="The queue length to use before flushing writing"/> - <c:simple-property name="overflow-action" required="true" type="string" readOnly="false" description="Specify what action to take when the overflowing. The valid options are 'block' and 'discard'"/> - <c:simple-property name="subhandlers" required="false" type="string" readOnly="false" description="The Handlers associated with this async handler."/> - </parameters> - <results> - <c:simple-property name="operationResult" description="Update the properties of an existing ASYNC handler." /> - </results> - </operation> - <resource-configuration> &logFilter; <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; - <c:simple-property name="overflow-action" required="false" type="string" readOnly="false" defaultValue="BLOCK" description="Specify what action to take when the overflowing. The valid options are 'block' and 'discard'. The default value is BLOCK."/> - <c:simple-property name="queue-length" required="false" type="integer" readOnly="false" description="The queue length to use before flushing writing"/> + <c:simple-property name="overflow-action" required="true" type="string" readOnly="false" defaultValue="BLOCK" description="Specify what action to take when the overflowing. The valid options are 'block' and 'discard'. The default value is BLOCK."/> + <c:simple-property name="queue-length" required="true" type="integer" readOnly="false" description="The queue length to use before flushing writing"/> <c:list-property name="subhandlers" required="false" description="The Handlers associated with this async handler." > <c:simple-property name="subhandlers" /> </c:list-property> @@ -2194,25 +2180,6 @@ </results> </operation> - <operation name="update-properties" description="Update the properties of an existing console handler."> - <parameters> - <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - &logLevel; - &logFilter; - <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> - <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" description="Automatically flush after each write."/> - <c:simple-property name="target" required="false" type="string" readOnly="false" defaultValue="System.out" description="Defines the target of the console handler. The value can either be SYSTEM_OUT or SYSTEM_ERR. The default value is System.out."> - <c:property-options> - <c:option value="System.err" name="System.err"/> - <c:option value="System.out" name="System.out"/> - </c:property-options> - </c:simple-property> - </parameters> - <results> - <c:simple-property name="operationResult" description="Update the properties of an existing console handler." /> - </results> - </operation> - <resource-configuration> <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" defaultValue="true" description="Automatically flush after each write. The default value is true."/> <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> @@ -2260,27 +2227,16 @@ </results> </operation> - <operation name="update-properties" description="Update the properties of an existing custom logging handler."> - <parameters> - <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - &logLevel; - &logFilter; - <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> - <c:simple-property name="properties" required="false" type="string" readOnly="false" description="Defines the properties used for the logging handler. All properties must be accessible via a setter method."/> - </parameters> - <results> - <c:simple-property name="operationResult" description="Update the properties of an existing custom logging handler." /> - </results> - </operation> +  <resource-configuration> - <c:simple-property name="class" required="false" type="string" readOnly="true" description="The logging handler class to be used."/> + <c:simple-property name="class" required="true" type="string" readOnly="true" description="The logging handler class to be used."/> <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> &logFilter; <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; - <c:simple-property name="module" required="false" type="string" readOnly="true" description="The module that the logging handler depends on."/> + <c:simple-property name="module" required="true" type="string" readOnly="true" description="The module that the logging handler depends on."/> <c:list-property name="properties" required="false" description="Defines the properties used for the logging handler. All properties must be accessible via a setter method." > <c:simple-property name="properties" /> </c:list-property> @@ -2327,20 +2283,7 @@ </results> </operation> - <operation name="update-properties" description="Update the properties of an existing file handler."> - <parameters> - <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - &logLevel; - &logFilter; - <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> - <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" description="Automatically flush after each write."/> - <c:simple-property name="append" required="false" type="boolean" readOnly="false" description="Specify whether to append to the target file."/> - &logFile; - </parameters> - <results> - <c:simple-property name="operationResult" description="Update the properties of an existing file handler." /> - </results> - </operation> +  <resource-configuration> <c:simple-property name="append" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specify whether to append to the target file. The default value is true."/> @@ -2392,9 +2335,8 @@ </operation> <resource-configuration> - <c:simple-property name="category" required="false" type="string" readOnly="true" description="Specifies the category for the logger."/> + <c:simple-property name="category" required="true" type="string" readOnly="true" description="Specifies the category for the logger."/> &logFilter; - <c:list-property name="handlers" required="false" description="The Handlers associated with this Logger." > <c:simple-property name="handlers" /> </c:list-property> @@ -2444,21 +2386,7 @@ </results> </operation> - <operation name="update-properties" description="Update the properties of an existing periodic rotating file handler."> - <parameters> - <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - &logLevel; - &logFilter; - <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> - <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" description="Automatically flush after each write."/> - <c:simple-property name="append" required="false" type="boolean" readOnly="false" description="Specify whether to append to the target file."/> - &logFile; - <c:simple-property name="suffix" required="true" type="string" readOnly="false" description="Set the suffix string. The string is in a format which can be understood by java.text.SimpleDateFormat. The period of the rotation is automatically calculated based on the suffix."/> - </parameters> - <results> - <c:simple-property name="operationResult" description="Update the properties of an existing periodic rotating file handler." /> - </results> - </operation> +  <resource-configuration> <c:simple-property name="append" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specify whether to append to the target file. The default value is true."/> @@ -2469,7 +2397,7 @@ <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; - <c:simple-property name="suffix" required="false" type="string" readOnly="false" description="Set the suffix string. The string is in a format which can be understood by java.text.SimpleDateFormat. The period of the rotation is automatically calculated based on the suffix."/> + <c:simple-property name="suffix" required="true" type="string" readOnly="false" description="Set the suffix string. The string is in a format which can be understood by java.text.SimpleDateFormat. The period of the rotation is automatically calculated based on the suffix."/> </resource-configuration> </service> @@ -2570,22 +2498,7 @@ </results> </operation> - <operation name="update-properties" description="Update the properties of an existing size rotating file handler."> - <parameters> - <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - &logLevel; - &logFilter; - <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> - <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" description="Automatically flush after each write."/> - <c:simple-property name="append" required="false" type="boolean" readOnly="false" description="Specify whether to append to the target file."/> - &logFile; - <c:simple-property name="rotate-size" required="true" type="string" readOnly="false" description="The size at which to rotate the log file."/> - <c:simple-property name="max-backup-index" required="true" type="integer" readOnly="false" description="The maximum number of backups to keep."/> - </parameters> - <results> - <c:simple-property name="operationResult" description="Update the properties of an existing size rotating file handler." /> - </results> - </operation> +  <resource-configuration> <c:simple-property name="append" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specify whether to append to the target file. The default value is true."/> @@ -2597,8 +2510,8 @@ <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; - <c:simple-property name="max-backup-index" required="false" type="integer" readOnly="false" defaultValue="1" description="The maximum number of backups to keep. The default value is 1."/> - <c:simple-property name="rotate-size" required="false" type="string" readOnly="false" defaultValue="2m" description="The size at which to rotate the log file. The default value is 2m."/> + <c:simple-property name="max-backup-index" required="true" type="integer" readOnly="false" defaultValue="1" description="The maximum number of backups to keep. The default value is 1."/> + <c:simple-property name="rotate-size" required="true" type="string" readOnly="false" defaultValue="2m" description="The size at which to rotate the log file. The default value is 2m."/> </resource-configuration> </service> commit 6d8eb43747824bd3139f62ff7a7b7fc51af2bc8a Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Apr 20 13:39:11 2012 -0400 Modify d2d to show when properties required and to detect 'nillable' for required object types. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java index 1fe630d..4a64d1f 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java @@ -193,8 +193,8 @@ public class Domain2Descriptor { } } } else if (mode == D2DMode.RECURSIVE) {// list the child nodes and properties - String legend = "Key: - property, -M metric, + operation, [] child node."; - StringBuilder tree = new StringBuilder(path + " ->\t\t\t" + legend + " \n"); + String legend = "Key: - property, -M metric,* req'd, + operation, [] child node."; + StringBuilder tree = new StringBuilder(path + " ->\t" + legend + " \n"); if (!descriptorSegment) { System.out.print(tree); listPropertiesAndChildren(3, resMap); @@ -311,7 +311,11 @@ public class Domain2Descriptor { return excluded; } - /** Assume parent metadata type passed in with i)description ii)attributes iii)operations iv)children + /** Assume parent metadata type passed in with + * i)description + * ii)attributes + * iii)operations + * iv)children * * @param indent * @param childMap @@ -323,7 +327,7 @@ public class Domain2Descriptor { //retrieve the operations for the node. Map<String, Object> cOperationMap = (Map<String, Object>) metaDataNode.get("operations"); - if (!descriptorSegment) { + if (!descriptorSegment) {//if we're attempting to generate a descriptor if (cOperationMap != null) { //retrieve keys and sort. String[] ckeys = cOperationMap.keySet().toArray(new String[cOperationMap.size()]); @@ -332,7 +336,7 @@ public class Domain2Descriptor { if (!isExcludedOperation(ckey)) { StringBuilder sbc = new StringBuilder(); doIndent(indent + 2, sbc); - sbc.append("+ " + ckey + "{*}"); + sbc.append("+ " + ckey + "{..}"); System.out.println(sbc); } } @@ -359,7 +363,7 @@ public class Domain2Descriptor { //retrieve the attributes for the node. Map<String, Object> cAttributeMap = (Map<String, Object>) metaDataNode.get("attributes"); - if (!descriptorSegment) { + if (!descriptorSegment) {//if we're attempting to generate a descriptor if (cAttributeMap != null) { //retrieve keys and sort. String[] ckeys = cAttributeMap.keySet().toArray(new String[cAttributeMap.size()]); @@ -369,10 +373,19 @@ public class Domain2Descriptor { doIndent(indent + 2, sbc); Object attribute = cAttributeMap.get(ckey); String accessType = (String) ((Map<String, Object>) attribute).get("access-type"); + boolean required = isRequired(attribute); + String pre = null; if (accessType.equalsIgnoreCase("metric")) { - sbc.append("-M " + ckey); + pre = "-M "; + if (required) + pre = "-*M"; + sbc.append(pre + ckey); } else { - sbc.append("- " + ckey); + pre = "- "; + if (required) + pre = "-* "; + + sbc.append(pre + ckey); } System.out.println(sbc); } @@ -424,6 +437,17 @@ public class Domain2Descriptor { } } + private boolean isRequired(Object attribute) { + if ((attribute == null) && attribute instanceof Map) { + throw new IllegalArgumentException("Attribute object passed in cannot be null and must be of type Map."); + } + Object isRequired = ((Map<String, Object>) attribute).get("required"); + Object nillable = ((Map<String, Object>) attribute).get("nillable"); + boolean required = ((isRequired != null) && ("" + isRequired).equals("true")) + || ((nillable != null) && ("" + nillable).equals("false")); + return required; + } + private Map<String, Object> locateMetaDataNodeFromMap(Map<String, Object> child) { Map<String, Object> retrieved = null; if (child != null) { @@ -458,8 +482,8 @@ public class Domain2Descriptor { Type ptype = getTypeFromProps(props); if (ptype == Type.OBJECT && mode != D2DMode.METRICS) { StringBuilder requiredStatus = new StringBuilder(); - Object required = props.get("required"); - if (required != null && (Boolean) required) { + boolean required = isRequired(props); + if (required) { requiredStatus.append(" required=\"true\""); } else { requiredStatus.append(" required=\"false\""); @@ -528,13 +552,14 @@ public class Domain2Descriptor { sb.append(key); sb.append("\""); //include required status on plugin entry - Object required = props.get("required"); - if (required != null && (Boolean) required) { + boolean required = isRequired(props); + if (required) { sb.append(" required=\"true\""); } else { sb.append(" required=\"false\""); } + String description = (String) props.get("description"); appendDescription(sb, description, null); @@ -795,8 +820,8 @@ public class Domain2Descriptor { } sb.append('"'); - Object required = props.get("required"); - if (required != null && (Boolean) required) { + boolean required = isRequired(props); + if (required) { sb.append(" required=\"true\""); } else { sb.append(" required=\"false\""); @@ -846,7 +871,8 @@ public class Domain2Descriptor { mb.append("<c:map-property name=\""); mb.append(entryName); mb.append('"'); - if (required != null && (Boolean) required) { + + if (required) { mb.append(" required=\"true\""); } else { mb.append(" required=\"false\""); commit c760e4253f460ac9dd8bf9a7d121e0f5e392bd32 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Apr 20 09:19:08 2012 -0400 Moving root logger configuration into it's own sub node and updating available operations. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index c33017c..494e91f 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2088,44 +2088,6 @@ <c:simple-property name="path" readOnly="true" default="subsystem=logging"/> </plugin-configuration> - <operation name="change-root-log-level" description="Change the root logger level."> - <parameters> - &logLevel; - </parameters> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="remove-root-logger" description="Remove the root logger."> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <operation name="set-root-logger" description="Set the root logger."> - <parameters> - &logLevel; - <c:list-property name="handlers" required="true" readOnly="false" - description="The Handlers associated with this Logger."> - <c:simple-property name="handler" type="string"/> - </c:list-property> - </parameters> - <results> - <c:simple-property name="operationResult"/> - </results> - </operation> - - <resource-configuration> - <c:group name="child:root-logger=ROOT" displayName="Root logger"> - &logFilter; - &logLevel; - <c:list-property name="handlers" readOnly="true"> - <c:simple-property name="handler" readOnly="true" description="The Handlers associated with this Logger."/> - </c:list-property> - </c:group> - </resource-configuration> - <service name="Async Handler" discovery="SubsystemDiscovery" createDeletePolicy="both" @@ -2512,6 +2474,63 @@ </service> + <service name="Root Logger" + discovery="SubsystemDiscovery" + createDeletePolicy="both" + class="BaseComponent"> + + <plugin-configuration> + <c:simple-property name="path" readOnly="true" default="root-logger=ROOT"/> + </plugin-configuration> + + <operation name="change-root-log-level" description="Change the root logger level."> + <parameters> + &logLevel; + </parameters> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="remove-root-logger" description="Remove the root logger."> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="root-logger-assign-handler" description="Assign a Handler to the root logger."> + <parameters> + <c:simple-property name="name" required="true" type="string" readOnly="false" description="The handler's name."/> + </parameters> + <results> + <c:simple-property name="operationResult" description="Assign a Handler to the root logger." /> + </results> + </operation> + + <operation name="set-root-logger" description="Set the root logger."> + <parameters> + &logLevel; + <c:list-property name="handlers" required="true" readOnly="false" + description="The Handlers associated with this Logger."> + <c:simple-property name="handler" type="string"/> + </c:list-property> + </parameters> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <resource-configuration> + <c:group name="Root logger" displayName="Root logger"> + &logFilter; + <c:list-property name="handlers" required="false" description="The Handlers associated with this Logger." > + <c:simple-property name="handlers" /> + </c:list-property> + &logLevel; + </c:group> + </resource-configuration> + </service> + <service name="Size Rotating File Handler" discovery="SubsystemDiscovery" createDeletePolicy="both" commit c9934363667ed9ad79c5c511d0fbc3cf386ef0a7 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Apr 20 09:18:22 2012 -0400 Initial changes to convert as7Json to more standard json. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java index 6a7736e..1fe630d 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java @@ -954,6 +954,26 @@ public class Domain2Descriptor { return optionList.toString(); } + public static String convertAs7JsonToValidJson(String forConversion) { + //-String top line off + //-replace all ' => ' with ':' + forConversion = forConversion.replaceAll(" => ", ":"); + //-replace all 'STRING' with '"STRING"' + forConversion = forConversion.replaceAll("STRING", "\"STRING\""); + //-replace all 'LIST' with '"LIST"' + forConversion = forConversion.replaceAll("LIST", "\"LIST\""); + //-replace all 'OBJECT' with '"OBJECT"' + forConversion = forConversion.replaceAll("OBJECT", "\"OBJECT\""); + //-replace all 'BOOLEAN' with '"BOOLEAN"' + forConversion = forConversion.replaceAll("BOOLEAN", "\"BOOLEAN\""); + //-replace all 'INT' with '"INT"' + forConversion = forConversion.replaceAll("INT", "\"INT\""); + //-replace all 'L,' with ',' + forConversion = forConversion.replaceAll("L,", ","); + //-- case by case as above not regex. L not terminal with , + return forConversion; + } + private void doIndent(int indent, StringBuilder sb) { for (int i = 0; i < indent; i++) { sb.append(' '); commit 28e565cf5f0647ff8418610744943ea7d5a22303 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Apr 20 18:07:05 2012 -0400 fix schema - had to move it back one diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 32947b0..312da82 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -4003,7 +4003,7 @@ </schemaSpec> - <schemaSpec version="2.122"> + <schemaSpec version="2.121"> <schema-javaTask className="ContentSourceConfigurationObfuscationUpgradeTask" /> </schemaSpec> </dbupgrade> commit 8eef654812f3fd06f4deb8b76560c57d7743282f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Apr 20 15:56:57 2012 -0500 Long options are the same as short options (with space or equals between argument and argument value). diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java index d234432..bd2ccaa 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java @@ -40,7 +40,7 @@ public class AS7CommandLine extends JavaCommandLine { private List<String> appServerArgs; public AS7CommandLine(String[] args) { - super(args, true, OptionFormat.SPACE_OR_EQUALS, OptionFormat.POSIX); + super(args, true, OptionFormat.SPACE_OR_EQUALS, OptionFormat.SPACE_OR_EQUALS); List<String> classArgs = super.getClassArguments(); // The class arguments are actually the arguments to the jboss-modules.jar main class. We want to get to the commit 6ef74e9998cd1d8353323ff9e3b616fad6719cc8 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Apr 20 16:08:32 2012 -0400 [BZ 797325][BZ 814839] revert the LOGGING enablement on the alert table diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index a0dfc7e..378c069 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -15,7 +15,7 @@ <description>Database schema setup, upgrade and other utilities</description> <properties> - <db.schema.version>2.122</db.schema.version> + <db.schema.version>2.121</db.schema.version> <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name> <rhq.ds.connection-url>${rhq.test.ds.connection-url}</rhq.ds.connection-url> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 8bf4830..32947b0 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -4003,14 +4003,6 @@ </schemaSpec> - <schemaSpec version="2.121"> - <schema-directSQL> - <statement targetDBVendor="oracle"> - ALTER TABLE RHQ_ALERT_NOTIFICATION LOGGING - </statement> - </schema-directSQL> - </schemaSpec> - <schemaSpec version="2.122"> <schema-javaTask className="ContentSourceConfigurationObfuscationUpgradeTask" /> </schemaSpec> commit f01a945ab7f5a357efcb68db11c7800903c95aac Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 20 13:01:21 2012 -0400 [BZ 813434] further improvements to logging and error handling (https://bugzilla.redhat.com/show_bug.cgi?id=813434) diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java index 8c47173..ab4cc57 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java @@ -21,6 +21,7 @@ package org.rhq.plugins.www.util; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.ProtocolException; import java.net.SocketTimeoutException; @@ -53,10 +54,11 @@ public class WWWUtils { } /** - * Sends a HEAD request for the passed URL and returns true if the URL was reachable. + * Sends a HEAD request to the passed URL and returns true if the URL was reachable. * * @param httpURL a http or https URL to check * @param timeout timeout, in milliseconds + * * @return true if connecting to the URL succeeds, or false otherwise */ public static boolean isAvailable(URL httpURL, int timeout) { @@ -90,7 +92,7 @@ public class WWWUtils { } connection.setConnectTimeout(timeout); - // Hold off on setting the read timeout. + // Hold off on setting the read timeout until after we connect. if (connection instanceof HttpsURLConnection) { disableCertificateVerification((HttpsURLConnection) connection); @@ -98,28 +100,31 @@ public class WWWUtils { // First just connect to the HTTP server. long connectStartTime = System.currentTimeMillis(); - if (LOG.isDebugEnabled()) { - LOG.debug("Connecting to [" + httpURL + "]..."); - } + LOG.debug("Connecting to [" + httpURL + "]..."); try { connection.connect(); } catch (IOException e) { - if (e instanceof SocketTimeoutException) { + if (e instanceof ConnectException) { + // This most likely just means the server is down. + LOG.debug("Failed to connect to [" + httpURL + "]."); + } else if (e instanceof SocketTimeoutException) { + // This probably means the server is up but not properly accepting connection requests. long connectDuration = System.currentTimeMillis() - connectStartTime; LOG.debug("Attempt to connect to [" + httpURL + "] timed out after " + connectDuration + " milliseconds."); } else { - LOG.error("An error occurred while attempting to connect to [" + httpURL + "].", e); + // Log all other IOExceptions as warnings, since they may likely provide useful details to users. + logWarnWithStackTraceOnlyIfDebugEnabled("An error occurred while attempting to connect to [" + httpURL + + "].", e); } return false; } int connectDuration = (int) (System.currentTimeMillis() - connectStartTime); - if (LOG.isDebugEnabled()) { - LOG.debug("Connected to [" + httpURL + "] in " + connectDuration + " milliseconds."); - } + LOG.debug("Connected to [" + httpURL + "] in " + connectDuration + " milliseconds."); if ((timeout > 0) && (connectDuration >= timeout)) { LOG.debug("Attempt to ping [" + httpURL + "] timed out after " + connectDuration + " milliseconds."); + return false; } try { @@ -132,16 +137,15 @@ public class WWWUtils { // Now actually send the request and read the response. long readStartTime = System.currentTimeMillis(); - if (LOG.isDebugEnabled()) { - LOG.debug("Sending " + connection.getRequestMethod() + " request to [" + httpURL + "]..."); - } + LOG.debug("Sending " + connection.getRequestMethod() + " request to [" + httpURL + "]..."); try { + // Calling getResponseCode() will cause the request to be sent. int responseCode = connection.getResponseCode(); if (responseCode == -1) { - LOG.error("Ping request to [" + httpURL + "] returned an invalid response: " + LOG.warn("Ping request to [" + httpURL + "] returned an invalid response: " + getResponseBody(connection)); } else if (responseCode >= 500) { - LOG.error("Ping request to [" + httpURL + "] returned a response with server error " + responseCode + LOG.warn("Ping request to [" + httpURL + "] returned a response with server error " + responseCode + " (" + connection.getResponseMessage() + "): " + getResponseBody(connection)); } else if (responseCode >= 400) { LOG.warn("Ping request to [" + httpURL + "] returned a response with client error " + responseCode @@ -154,19 +158,17 @@ public class WWWUtils { + " request to [" + httpURL + "] timed out after " + readDuration + " milliseconds."); } else { - LOG.error("An error occurred while attempting to read response from " + connection.getRequestMethod() - + " to [" + httpURL + "].", e); + logWarnWithStackTraceOnlyIfDebugEnabled("An error occurred while attempting to read response from " + + connection.getRequestMethod() + " to [" + httpURL + "].", e); } return false; } long readDuration = System.currentTimeMillis() - readStartTime; - if (LOG.isDebugEnabled()) { - LOG.debug("Read response from " + connection.getRequestMethod() + " request to [" + httpURL - + "] in " + readDuration + " milliseconds."); - } + LOG.debug("Read response from " + connection.getRequestMethod() + " request to [" + httpURL + + "] in " + readDuration + " milliseconds."); } finally { - // We don't care about keeping the connection around. We're only going to be pinging the server once every - // few minutes. + // We don't care about keeping the connection around. We're only going to be pinging each server once every + // minute. connection.disconnect(); } @@ -177,6 +179,7 @@ public class WWWUtils { * Get the content of the 'Server' header. * * @param httpURL a http or https URL to get the header from + * * @return the contents of the header or null if anything went wrong or the field was not present. */ public static String getServerHeader(URL httpURL) { @@ -189,7 +192,7 @@ public class WWWUtils { connection.setReadTimeout(1000); connection.connect(); - // get the response code to actually trigger sending the Request. + // Get the response code to actually trigger sending the request. connection.getResponseCode(); ret = connection.getHeaderField("Server"); } catch (IOException e) { @@ -218,7 +221,7 @@ public class WWWUtils { private static HostnameVerifier NO_OP_HOSTNAME_VERIFIER = new HostnameVerifier() { @Override public boolean verify(String s, SSLSession sslSession) { - return true; + return true; } }; @@ -230,12 +233,16 @@ public class WWWUtils { connection.setSSLSocketFactory(sslContext.getSocketFactory()); connection.setHostnameVerifier(NO_OP_HOSTNAME_VERIFIER); } catch (Exception e) { - if (LOG.isDebugEnabled()) { - LOG.debug("Failed to disable certificate and hostname validation.", e); - } else { - LOG.warn("Failed to disable certificate and hostname validation (enable DEBUG logging to see stack trace): " - + e); - } + logWarnWithStackTraceOnlyIfDebugEnabled("Failed to disable certificate and hostname validation on URLConnection for [" + + connection.getURL() + "].", e); + } + } + + private static void logWarnWithStackTraceOnlyIfDebugEnabled(String message, Exception e) { + if (LOG.isDebugEnabled()) { + LOG.warn(message, e); + } else { + LOG.warn(message + " (enable DEBUG logging to see stack trace): " + e); } } commit 56eb5ef724b8e09a3d1aae8c483bfb771f0e10ad Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Apr 20 11:00:13 2012 -0400 [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. diff --git a/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java index 5c5d9ba..64c9369 100644 --- a/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java +++ b/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java @@ -48,7 +48,7 @@ public class ComparableVersionTest { JON_VERSIONS.add("2.4.1.GA"); JON_VERSIONS.add("4.2.0.JON300.GA"); JON_VERSIONS.add("4.2.0.JON.3.0.1.GA"); - JON_VERSIONS.add("4.2.0.JON302.GA"); + JON_VERSIONS.add("4.2.0.JON302GA"); JON_VERSIONS.add("4.4.0.JON310GA"); JON_VERSIONS.add("4.4.1.JON311GA"); } commit 32137ba4965ff492c8b32e167a6f189bd24255e5 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Apr 20 10:50:02 2012 -0400 [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. This commit also adds a set of unit tests that check version-by-version past, current and next few future version strings. diff --git a/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 2d86cac..5e16ac6 100644 --- a/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -325,8 +325,8 @@ public class ComparableVersion public final void parseVersion( String version ) { // a complete hack to fix BZ 813967 - if (version.equals("4.2.0.JON300.GA")) { - version = "4.2.0.JON3.0.0.GA"; + if (version.equals("4.2.0.JON.3.0.1.GA")) { + version = "4.2.0.JON301GA"; } this.value = version; diff --git a/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java index 8482306..5c5d9ba 100644 --- a/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java +++ b/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java @@ -18,10 +18,81 @@ */ package org.apache.maven.artifact.versioning; +import java.util.ArrayList; +import java.util.List; + import org.testng.annotations.Test; @Test public class ComparableVersionTest { + + private static List<String> RHQ_VERSIONS = new ArrayList<String>(); + static { + RHQ_VERSIONS.add("4.0.0.GA"); + RHQ_VERSIONS.add("4.1.0.GA"); + RHQ_VERSIONS.add("4.2.0.GA"); + RHQ_VERSIONS.add("4.2.1.GA"); + RHQ_VERSIONS.add("4.3.0.GA"); + RHQ_VERSIONS.add("4.3.1.RC1"); + RHQ_VERSIONS.add("4.3.1.RC2"); + RHQ_VERSIONS.add("4.3.1.GA"); + RHQ_VERSIONS.add("4.4.0.RC1"); + RHQ_VERSIONS.add("4.4.0.RC2"); + RHQ_VERSIONS.add("4.4.0.GA"); + RHQ_VERSIONS.add("4.4.1.GA"); + } + + private static List<String> JON_VERSIONS = new ArrayList<String>(); + static { + JON_VERSIONS.add("2.4.0.GA"); + JON_VERSIONS.add("2.4.1.GA"); + JON_VERSIONS.add("4.2.0.JON300.GA"); + JON_VERSIONS.add("4.2.0.JON.3.0.1.GA"); + JON_VERSIONS.add("4.2.0.JON302.GA"); + JON_VERSIONS.add("4.4.0.JON310GA"); + JON_VERSIONS.add("4.4.1.JON311GA"); + } + + public void testRHQVersions() { + testListOfVersionsStepByStep(RHQ_VERSIONS); + testListOfVersionsSkippingVersions(RHQ_VERSIONS); + } + + public void testJONVersions() { + testListOfVersionsStepByStep(JON_VERSIONS); + testListOfVersionsSkippingVersions(JON_VERSIONS); + } + + private void testListOfVersionsStepByStep(List<String> versions) { + String oldVer = null; + String newVer = null; + for (String ver : versions) { + if (newVer != null) { + oldVer = newVer; + newVer = ver; + compareVersions(oldVer, newVer); + } else { + newVer = ver; + } + } + } + + private void testListOfVersionsSkippingVersions(List<String> versions) { + // Start with the oldest, and test all versions after it making sure they are all newer. + // After testing the oldest, go to the next oldest and do it again. + // This tests a person skipping one or more versions when upgrading (say, upgrading from 2.0 to 4.0, skipping 3.0) + if (versions.size() <= 1) { + return; + } + + String oldest = versions.get(0); + for (int i = 1; i < versions.size(); i++) { + compareVersions(oldest, versions.get(i)); + } + + testListOfVersionsSkippingVersions(versions.subList(1, versions.size())); + } + public void testBZ_813967() { compareVersions("4.2.0.JON300.GA", "4.2.0.JON.3.0.1.GA"); } @@ -58,6 +129,8 @@ public class ComparableVersionTest { } private void compareVersions(String ver1String, String ver2String) { + //System.out.println("Testing: " + ver1String + "\t" + ver2String); + ComparableVersion ver1 = new ComparableVersion(ver1String); ComparableVersion ver2 = new ComparableVersion(ver2String); commit 5b27a0f6093e01e7e3516349036d83d1fc27a0e0 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 20 10:05:14 2012 -0400 refactor discovery code to use the new util classes in plugin-api for initializing the start script path, env, and args plugin config props diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java index 6227fae..d234432 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java @@ -22,6 +22,11 @@ */ package org.rhq.modules.plugins.jbossas7; +import java.util.Collections; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + import org.rhq.core.pluginapi.util.JavaCommandLine; /** @@ -31,8 +36,43 @@ import org.rhq.core.pluginapi.util.JavaCommandLine; */ public class AS7CommandLine extends JavaCommandLine { + private String appServerModuleName; + private List<String> appServerArgs; + public AS7CommandLine(String[] args) { super(args, true, OptionFormat.SPACE_OR_EQUALS, OptionFormat.POSIX); + + List<String> classArgs = super.getClassArguments(); + // The class arguments are actually the arguments to the jboss-modules.jar main class. We want to get to the + // arguments to the app server module (i.e. "org.jboss.as.standalone" or "org.jboss.as.host-controller"). + // e.g. "-mp /home/ips/Applications/jboss-as-7.1.1.Final/modules -jaxpmodule javax.xml.jaxp-provider + // org.jboss.as.standalone -Djboss.home.dir=/opt/jboss-as-7.1.1.Final --server-config=standalone-full.xml" + // In + for (int i = 0, classArgsSize = classArgs.size(); i < classArgsSize; i++) { + String classArg = classArgs.get(i); + if (classArg.startsWith("org.jboss.as")) { + this.appServerModuleName = classArg; + if ((i + 1) < classArgsSize) { + this.appServerArgs = Collections.unmodifiableList(classArgs.subList(i + 1, classArgsSize)); + } else { + this.appServerArgs = Collections.emptyList(); + } + break; + } + } + if (this.appServerModuleName == null) { + throw new IllegalArgumentException("Class arguments do not contain an argument starting with \"org.jboss.as\"."); + } + } + + @NotNull + public String getAppServerModuleName() { + return this.appServerModuleName; + } + + @NotNull + public List<String> getAppServerArguments() { + return this.appServerArgs; } } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index a39b615..6597dd9 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -23,7 +23,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -36,7 +35,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hyperic.sigar.ProcExe; import org.w3c.dom.Document; import org.rhq.core.domain.configuration.Configuration; @@ -53,8 +51,9 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.JavaCommandLine; import org.rhq.core.pluginapi.util.JavaCommandLineOption; +import org.rhq.core.pluginapi.util.ServerStartScriptDiscoveryUtility; +import org.rhq.core.pluginapi.util.StartScriptConfiguration; import org.rhq.core.system.ProcessInfo; -import org.rhq.core.system.SystemInfo; import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; import org.rhq.modules.plugins.jbossas7.helper.HostPort; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -76,12 +75,26 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent private static final String RHQADMIN_ENCRYPTED = "35c160c1f841a889d4cda53f0bfc94b6"; private static final Set<String> START_SCRIPT_ENV_VAR_NAMES = new HashSet<String>(); - static { START_SCRIPT_ENV_VAR_NAMES.addAll(Arrays.asList( "PATH", "LD_LIBRARY_PATH", "RUN_CONF", "JBOSS_HOME", "MAX_FD", "PROFILER", "JAVA_HOME", "JAVA", "PRESERVE_JAVA_OPTS", "JAVA_OPTS", "JBOSS_BASE_DIR", "JBOSS_LOG_DIR", "JBOSS_CONFIG_DIR")); } + + // e.g.: -mp /opt/jboss-as-7.1.1.Final/modules + // --pc-address 127.0.0.1 + // --pc-port 52624 + // -default-jvm /usr/java/jdk1.6.0_30/jre/bin/java + // -Djboss.home.dir=/opt/jboss-as-7.1.1.Final + private static final Set<JavaCommandLineOption> START_SCRIPT_OPTION_EXCLUDES = new HashSet<JavaCommandLineOption>(); + static { + START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption("mp", null)); + START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption(null, "pc-address")); + START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption(null, "pc-port")); + START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption("default-jvm", null)); + START_SCRIPT_OPTION_EXCLUDES.add(new JavaCommandLineOption("Djboss.home.dir", null, false)); + } + private final Log log = LogFactory.getLog(this.getClass()); // Auto-discover running AS7 instances. @@ -147,7 +160,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent pluginConfig.put(new PropertySimple("productType", productType.name())); pluginConfig.put(new PropertySimple("hostXmlFileName", getHostXmlFileName(commandLine))); - setStartScriptPluginConfigProps(discoveryContext.getSystemInformation(), process, commandLine, pluginConfig); + setStartScriptPluginConfigProps(process, commandLine, pluginConfig); setUserAndPasswordPluginConfigProps(pluginConfig, hostConfig, baseDir); String key = baseDir.getPath(); @@ -196,69 +209,34 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent return new File(FileUtils.getCanonicalPath(homeDir.getPath())); } - private void setStartScriptPluginConfigProps(SystemInfo systemInfo, ProcessInfo process, - AS7CommandLine commandLine, Configuration pluginConfig) { - ProcessInfo parentProcess = getParentProcess(systemInfo, process); - - // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" - // Windows: "standalone.bat --server-config=standalone-full.xml" - int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; - String[] startScriptCommandLine = parentProcess.getCommandLine(); - String startScript = (startScriptCommandLine.length > startScriptIndex) ? startScriptCommandLine[startScriptIndex] : null; - - Map<String, String> startScriptEnvMap; - List<String> startScriptArgsList = new ArrayList<String>(); - - File startScriptFile; - // TODO: What if CygWin was used to start AS7 on Windows via a shell script? - if (startScript != null && (startScript.endsWith(".sh") || startScript.endsWith(".bat"))) { - // The parent process is a script - assume it's standalone.sh, domain.sh, or some custom start script. - - startScriptFile = new File(startScript); - if (!startScriptFile.isAbsolute()) { - ProcExe parentProcessExe = parentProcess.getExecutable(); - if (parentProcessExe == null) { - startScriptFile = new File("bin", startScriptFile.getName()); - } else { - String cwd = parentProcessExe.getCwd(); - startScriptFile = new File(cwd, startScriptFile.getPath()); - startScriptFile = new File(FileUtils.getCanonicalPath(startScriptFile.getPath())); - } - } - startScriptEnvMap = parentProcess.getEnvironmentVariables(); - - // Skip past the script to get the arguments that were passed to the script. - for (int i = (startScriptIndex + 1); i < startScriptCommandLine.length; i++) { - startScriptArgsList.add(startScriptCommandLine[i]); - } - } else { - // The parent process is not a script - the user may have started AS7 via some other mechanism. + private void setStartScriptPluginConfigProps(ProcessInfo process, AS7CommandLine commandLine, + Configuration pluginConfig) { + StartScriptConfiguration startScriptConfig = new StartScriptConfiguration(pluginConfig); + ProcessInfo parentProcess = process.getParentProcess(); - AS7Mode mode = getMode(); - startScriptFile = new File(mode.getStartScript()); - startScriptEnvMap = process.getEnvironmentVariables(); - startScriptArgsList = commandLine.getClassArguments(); + File startScript = ServerStartScriptDiscoveryUtility.getStartScript(parentProcess); + if (startScript == null) { + startScript = new File(getMode().getStartScript()); } - - if (!startScriptFile.exists()) { - log.warn("Start script [" + startScriptFile + "] does not exist."); + if (!startScript.exists()) { + if (!startScript.isAbsolute()) { + File homeDir = new File(pluginConfig.getSimpleValue("homeDir")); + File startScriptAbsolute = new File(homeDir, startScript.getPath()); + if (!startScriptAbsolute.exists()) { + log.warn("Failed to find start script file for AS7 server with command line [" + commandLine + + "] - defaulting 'startScripFile' plugin config prop to [" + startScript + "]."); + } + } } - pluginConfig.put(new PropertySimple("startScript", startScriptFile)); + startScriptConfig.setStartScript(startScript); - StringBuilder startScriptArgs = new StringBuilder(); - for (String startScriptArg : startScriptArgsList) { - startScriptArgs.append(startScriptArg).append('\n'); - } - pluginConfig.put(new PropertySimple("startScriptArgs", startScriptArgs)); + Map<String, String> startScriptEnv = ServerStartScriptDiscoveryUtility.getStartScriptEnv(process, parentProcess, + START_SCRIPT_ENV_VAR_NAMES); + startScriptConfig.setStartScriptEnv(startScriptEnv); - StringBuilder startScriptEnv = new StringBuilder(); - for (String varName : START_SCRIPT_ENV_VAR_NAMES) { - if (startScriptEnvMap.containsKey(varName)) { - String varValue = startScriptEnvMap.get(varName); - startScriptEnv.append(varName).append('=').append(varValue).append('\n'); - } - } - pluginConfig.put(new PropertySimple("startScriptEnv", startScriptEnv)); + List<String> startScriptArgs = ServerStartScriptDiscoveryUtility.getStartScriptArgs(parentProcess, + commandLine.getAppServerArguments(), START_SCRIPT_OPTION_EXCLUDES); + startScriptConfig.setStartScriptArgs(startScriptArgs); } private void setUserAndPasswordPluginConfigProps(Configuration pluginConfig, HostConfiguration hostConfig, @@ -294,16 +272,6 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent pluginConfig.put(new PropertySimple("password", password)); } - private static ProcessInfo getParentProcess(SystemInfo systemInfo, ProcessInfo process) { - long parentPid = process.getParentPid(); - List<ProcessInfo> processes = systemInfo.getProcesses("process|pid|match=" - + parentPid); - if (processes.size() != 1) { - throw new IllegalStateException("Failed to obtain parent process of " + process + "."); - } - return processes.get(0); - } - protected File getBaseDir(ProcessInfo process, JavaCommandLine javaCommandLine, File homeDir) { String baseDirString = javaCommandLine.getSystemProperties().get(getBaseDirSystemPropertyName()); File baseDir; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java index 4f5d713..480c99b 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java @@ -20,7 +20,8 @@ public class XmlFileReadingTest { public void hostPort70() throws Exception { URL url = getClass().getClassLoader().getResource("standalone70.xml"); HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); - HostPort hp = hostConfig.getManagementHostPort(new AS7CommandLine(new String [] {"java"}), AS7Mode.STANDALONE); + HostPort hp = hostConfig.getManagementHostPort( + new AS7CommandLine(new String [] {"java", "foo.Main", "org.jboss.as.standalone"}), AS7Mode.STANDALONE); System.out.println(hp); assert hp.host.equals("127.0.0.70") : "Host is " + hp.host; assert hp.port==19990 : "Port is " + hp.port; @@ -29,7 +30,8 @@ public class XmlFileReadingTest { public void hostPort71() throws Exception { URL url = getClass().getClassLoader().getResource("standalone71.xml"); HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); - HostPort hp = hostConfig.getManagementHostPort(new AS7CommandLine(new String[] {"java"}), AS7Mode.STANDALONE); + HostPort hp = hostConfig.getManagementHostPort( + new AS7CommandLine(new String[] {"java", "foo.Main", "org.jboss.as.standalone"}), AS7Mode.STANDALONE); System.out.println(hp); // hp : HostPort{host='localhost', port=9990, isLocal=true} assert hp.host.equals("127.0.0.71") : "Host is " + hp.host; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java index bc28689..0b83684 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java @@ -18,14 +18,19 @@ */ package org.rhq.modules.plugins.jbossas7.itest; +import java.io.File; import java.util.HashMap; import java.util.Map; +import org.testng.Assert; + import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.configuration.MapPropertySimpleWrapper; import static org.testng.Assert.*; @@ -64,23 +69,47 @@ public abstract class AbstractServerComponentTest extends AbstractJBossAS7Plugin assertNotNull(getServerResource(), getServerResourceType() + " Resource with key [" + getServerResourceKey() + "] was not discovered."); - System.out.println("===== Discovered: " + getServerResource()); + System.out.println("\n===== Discovered: " + getServerResource()); Configuration pluginConfig = getServerResource().getPluginConfiguration(); System.out.println("---------- " + pluginConfig.toString(true)); validatePluginConfiguration(pluginConfig); } - private void validatePluginConfiguration(Configuration pluginConfig) { + protected void validatePluginConfiguration(Configuration pluginConfig) { + // "hostname" prop String hostname = pluginConfig.getSimpleValue("hostname", null); String expectedHostname = System.getProperty(getBindAddressSystemPropertyName()); assertEquals(hostname, expectedHostname, "Plugin config prop [hostname]."); + // "port" prop String portString = pluginConfig.getSimpleValue("port", null); Integer port = (portString != null) ? Integer.valueOf(portString) : null; String portOffsetString = System.getProperty(getPortOffsetSystemPropertyName()); int portOffset = (portOffsetString != null) ? Integer.valueOf(portOffsetString) : 0; Integer expectedPort = portOffset + 9990; assertEquals(port, expectedPort, "Plugin config prop [port]."); + + // "startScriptEnv" prop + PropertySimple startScriptEnvProp = pluginConfig.getSimple("startScriptEnv"); + MapPropertySimpleWrapper startScriptEnvPropWrapper = new MapPropertySimpleWrapper(startScriptEnvProp); + Map<String,String> env = startScriptEnvPropWrapper.getValue(); + Assert.assertEquals(env.size(), 3, env.toString()); + + String javaHome = env.get("JAVA_HOME"); + Assert.assertNotNull(javaHome); + Assert.assertTrue(new File(javaHome).isDirectory()); + + String path = env.get("PATH"); + Assert.assertNotNull(path); + String[] pathElements = path.split(File.pathSeparator); + Assert.assertTrue(pathElements.length >= 1); + Assert.assertTrue(new File(pathElements[0]).isDirectory()); + + String ldLibraryPath = env.get("LD_LIBRARY_PATH"); + Assert.assertNotNull(ldLibraryPath); + String[] ldLibraryPathElements = ldLibraryPath.split(File.pathSeparator); + Assert.assertTrue(ldLibraryPathElements.length >= 1); + Assert.assertTrue(new File(ldLibraryPathElements[0]).isDirectory()); } protected abstract String getBindAddressSystemPropertyName(); diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java index 3014022..5847d00 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java @@ -18,10 +18,17 @@ */ package org.rhq.modules.plugins.jbossas7.itest.domain; +import java.io.File; +import java.util.List; + +import org.testng.Assert; import org.testng.annotations.Test; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.modules.plugins.jbossas7.itest.AbstractServerComponentTest; import org.rhq.test.arquillian.RunDiscovery; @@ -63,6 +70,31 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { super.testAutoDiscovery(); } + @Override + protected void validatePluginConfiguration(Configuration pluginConfig) { + super.validatePluginConfiguration(pluginConfig); + + // "startScript" prop + String startScript = pluginConfig.getSimpleValue("startScript", null); + String expectedStartScript = (File.separatorChar == '/') ? "bin/domain.sh" : "bin\\domain.bat"; + Assert.assertEquals(startScript, expectedStartScript); + + // "startScriptArgs" prop + PropertySimple startScriptArgsProp = pluginConfig.getSimple("startScriptArgs"); + ListPropertySimpleWrapper startScriptArgsPropWrapper = new ListPropertySimpleWrapper(startScriptArgsProp); + List<String> args = startScriptArgsPropWrapper.getValue(); + + Assert.assertEquals(args.size(), 7, args.toString()); + + Assert.assertEquals(args.get(0), "-Djboss.bind.address.management=127.0.0.1"); + Assert.assertEquals(args.get(1), "-Djboss.bind.address=127.0.0.1"); + Assert.assertEquals(args.get(2), "-Djboss.bind.address.unsecure=127.0.0.1"); + Assert.assertEquals(args.get(3), "-Djboss.socket.binding.port-offset=50000"); + Assert.assertEquals(args.get(4), "-Djboss.management.native.port=59999"); + Assert.assertEquals(args.get(5), "-Djboss.management.http.port=59990"); + Assert.assertEquals(args.get(6), "-Djboss.management.https.port=59943"); + } + // ******************************* METRICS ******************************* // @Override @Test(priority = 1002, enabled = true) diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index d1d2de6..946ffce 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -18,11 +18,18 @@ */ package org.rhq.modules.plugins.jbossas7.itest.standalone; +import java.io.File; +import java.util.List; + +import org.testng.Assert; import org.testng.annotations.Test; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.modules.plugins.jbossas7.itest.AbstractServerComponentTest; import org.rhq.test.arquillian.RunDiscovery; @@ -70,6 +77,34 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { super.testAutoDiscovery(); } + @Override + protected void validatePluginConfiguration(Configuration pluginConfig) { + super.validatePluginConfiguration(pluginConfig); + + // "startScript" prop + String startScript = pluginConfig.getSimpleValue("startScript", null); + String expectedStartScript = (File.separatorChar == '/') ? "bin/standalone.sh" : "bin\\standalone.bat"; + Assert.assertEquals(startScript, expectedStartScript); + + // "startScriptArgs" prop + PropertySimple startScriptArgsProp = pluginConfig.getSimple("startScriptArgs"); + ListPropertySimpleWrapper startScriptArgsPropWrapper = new ListPropertySimpleWrapper(startScriptArgsProp); + List<String> args = startScriptArgsPropWrapper.getValue(); + + Assert.assertEquals(args.size(), 5, args.toString()); + + Assert.assertEquals(args.get(0), "--server-config=standalone-full.xml"); + Assert.assertEquals(args.get(1), "-Djboss.bind.address.management=127.0.0.1"); + Assert.assertEquals(args.get(2), "-Djboss.bind.address=127.0.0.1"); + Assert.assertEquals(args.get(3), "-Djboss.bind.address.unsecure=127.0.0.1"); + Assert.assertEquals(args.get(4), "-Djboss.socket.binding.port-offset=40000"); + } + + @Test(priority = 2) + public void testStandaloneServerPluginConfiguration() throws Exception { + return; + } + // ******************************* METRICS ******************************* // @Override @Test(priority = 3, enabled = true) commit 5bc68a45f285d49f6bd0c9756c7b598fce5f9067 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 20 10:04:18 2012 -0400 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 diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 5fcc1fb..167d4a9 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -455,6 +455,7 @@ <argument>javax.xml.jaxp-provider</argument> <argument>org.jboss.as.standalone</argument> <argument>-Djboss.home.dir=${jboss7.home}</argument> + <argument>--server-config=standalone-full.xml</argument> <argument>-Djboss.bind.address.management=${jboss.standalone.bindAddress}</argument> <argument>-Djboss.bind.address=${jboss.standalone.bindAddress}</argument> <argument>-Djboss.bind.address.unsecure=${jboss.standalone.bindAddress}</argument> @@ -523,6 +524,13 @@ <argument>-Djboss.host.default.config=host.xml</argument> <argument>-Dorg.jboss.boot.log.file=${jboss7.home}/domain/log/host-controller.log</argument> <argument>-Dlogging.configuration=file:${jboss7.home}/domain/configuration/logging.properties</argument> + <argument>--</argument> + +  +  + <argument>-default-jvm</argument> + <argument>${java.home}/bin/java</argument> +  <argument>-Djboss.bind.address.management=${jboss.domain.bindAddress}</argument> <argument>-Djboss.bind.address=${jboss.domain.bindAddress}</argument> <argument>-Djboss.bind.address.unsecure=${jboss.domain.bindAddress}</argument> @@ -530,11 +538,6 @@ <argument>-Djboss.management.native.port=${jboss.domain.nativeManagementPort}</argument> <argument>-Djboss.management.http.port=${jboss.domain.httpManagementPort}</argument> <argument>-Djboss.management.https.port=${jboss.domain.httpsManagementPort}</argument> - <argument>--</argument> - -  - <argument>-default-jvm</argument> - <argument>${java.home}/bin/java</argument> </arguments> </configuration> </execution> commit 373f063e5e93ac25023860394ea38b331ef8a3ec Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 20 10:00:18 2012 -0400 remove an unused param diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index 5e654cf..bc81ed8 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -72,8 +72,8 @@ public class ServerStartScriptDiscoveryUtility { return startScriptFile; } - public static List<String> getStartScriptArgs(ProcessInfo serverProcess, ProcessInfo serverParentProcess, - List<String> serverArgs, Set<JavaCommandLineOption> optionExcludes) { + public static List<String> getStartScriptArgs(ProcessInfo serverParentProcess, List<String> serverArgs, + Set<JavaCommandLineOption> optionExcludes) { // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" // Windows: "standalone.bat --server-config=standalone-full.xml" int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; commit a2858881c34768dd01d18f21eee02688b316c3aa Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 20 09:56:30 2012 -0400 add new util classes for discovering server start script path, env, and args diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java new file mode 100644 index 0000000..3f4b64e --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java @@ -0,0 +1,70 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.core.pluginapi.configuration; + +import java.util.ArrayList; +import java.util.List; + +import org.rhq.core.domain.configuration.PropertySimple; + +/** + * @author Ian Springer + */ +public class ListPropertySimpleWrapper { + + private PropertySimple prop; + + public ListPropertySimpleWrapper(PropertySimple prop) { + if (prop == null) { + throw new IllegalArgumentException("'prop' parameter must not be null."); + } + this.prop = prop; + } + + public void setValue(List list) { + String stringValue; + if (list != null) { + StringBuilder buffer = new StringBuilder(); + for (Object element : list) { + buffer.append(element).append('\n'); + } + stringValue = buffer.toString(); + } else { + stringValue = null; + } + this.prop.setStringValue(stringValue); + } + + public List<String> getValue() { + List<String> list = new ArrayList<String>(); + + String stringValue = this.prop.getStringValue(); + if (stringValue != null) { + String[] lines = stringValue.split("\n+"); + for (String line : lines) { + String element = line.trim(); + //element = replacePropertyPatterns(element); // TODO + list.add(element); + } + } + + return list; + } + +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java new file mode 100644 index 0000000..6d306fa --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java @@ -0,0 +1,77 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.core.pluginapi.configuration; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.rhq.core.domain.configuration.PropertySimple; + +/** + * @author Ian Springer + */ +public class MapPropertySimpleWrapper { + + private PropertySimple prop; + + public MapPropertySimpleWrapper(PropertySimple prop) { + if (prop == null) { + throw new IllegalArgumentException("'prop' parameter must not be null."); + } + this.prop = prop; + } + + public void setValue(Map<String, String> map) { + String stringValue; + if (map != null) { + StringBuilder buffer = new StringBuilder(); + for (String key : map.keySet()) { + String value = map.get(key); + buffer.append(key).append('=').append(value).append('\n'); + } + stringValue = buffer.toString(); + } else { + stringValue = null; + } + this.prop.setStringValue(stringValue); + } + + public Map<String, String> getValue() { + Map<String, String> map = new LinkedHashMap<String, String>(); + + String stringValue = this.prop.getStringValue(); + if (stringValue != null) { + String[] lines = stringValue.split("\n+"); + for (String line : lines) { + String entry = line.trim(); + int equalsIndex = entry.indexOf('='); + if (equalsIndex == -1) { + throw new IllegalStateException("Malformed entry (no equals sign): " + entry); + } + String key = entry.substring(0, equalsIndex); + String value = entry.substring(equalsIndex + 1); + //value = replacePropertyPatterns(value); // TODO + map.put(key, value); + } + } + + return map; + } + +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java new file mode 100644 index 0000000..5e654cf --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -0,0 +1,141 @@ +/* + * RHQ Management Platform + * Copyright (C) 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.pluginapi.util; + +import java.io.File; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.hyperic.sigar.ProcExe; + +import org.rhq.core.system.ProcessInfo; + +/** + * @author Ian Springer + */ +public class ServerStartScriptDiscoveryUtility { + + private ServerStartScriptDiscoveryUtility() { + } + + public static File getStartScript(ProcessInfo serverParentProcess) { + // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" + // Windows: "standalone.bat --server-config=standalone-full.xml" + int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; + String[] serverParentProcessCommandLine = serverParentProcess.getCommandLine(); + String startScript = (serverParentProcessCommandLine.length > startScriptIndex) ? serverParentProcessCommandLine[startScriptIndex] : null; + + File startScriptFile; + + if (isScript(startScript)) { + // The parent process is a script - excellent! + startScriptFile = new File(startScript); + if (!startScriptFile.isAbsolute()) { + ProcExe parentProcessExe = serverParentProcess.getExecutable(); + if (parentProcessExe == null) { + startScriptFile = new File("bin", startScriptFile.getName()); + } else { + String cwd = parentProcessExe.getCwd(); + startScriptFile = new File(cwd, startScriptFile.getPath()); + startScriptFile = new File(FileUtils.getCanonicalPath(startScriptFile.getPath())); + } + } + } else { + // The parent process is not a script - either the user started the server via some other mechanism, or the + // script process got killed. + startScriptFile = null; + } + + return startScriptFile; + } + + public static List<String> getStartScriptArgs(ProcessInfo serverProcess, ProcessInfo serverParentProcess, + List<String> serverArgs, Set<JavaCommandLineOption> optionExcludes) { + // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" + // Windows: "standalone.bat --server-config=standalone-full.xml" + int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; + String[] startScriptCommandLine = serverParentProcess.getCommandLine(); + String startScript = (startScriptCommandLine.length > startScriptIndex) ? startScriptCommandLine[startScriptIndex] : null; + + List<String> startScriptArgs = new ArrayList<String>(); + if (isScript(startScript)) { + // Skip past the script to get the arguments that were passed to the script. + for (int i = (startScriptIndex + 1); i < startScriptCommandLine.length; i++) { + startScriptArgs.add(startScriptCommandLine[i]); + } + } else { + for (int i = 0, serverArgsSize = serverArgs.size(); i < serverArgsSize; i++) { + String serverArg = serverArgs.get(i); + // Skip any options that the start script will take care of specifying. + JavaCommandLineOption option = null; + for (JavaCommandLineOption optionExclude : optionExcludes) { + if ((optionExclude.getShortName() != null && + (serverArg.equals('-' + optionExclude.getShortName()) || + serverArg.startsWith('-' + optionExclude.getShortName() + "="))) || + ((optionExclude.getLongName() != null) && + (serverArg.equals("--" + optionExclude.getLongName()) || + serverArg.startsWith("--" + optionExclude.getLongName() + "=")))) { + option = optionExclude; + break; + } + } + if (option != null) { + if (option.isExpectsValue() && ((i + 1) < serverArgsSize)) { + // Skip the option's argument too. + i++; + } + } else { + startScriptArgs.add(serverArg); + } + } + } + return startScriptArgs; + } + + public static Map<String, String> getStartScriptEnv(ProcessInfo serverProcess, ProcessInfo serverParentProcess, + Set<String> envVarNameIncludes) { + Map<String, String> startScriptEnv = new LinkedHashMap<String, String>(); + Map<String, String> processEnvVars; + if (getStartScript(serverParentProcess) != null) { + processEnvVars = serverParentProcess.getEnvironmentVariables(); + } else { + processEnvVars = serverProcess.getEnvironmentVariables(); + } + for (String envVarName : envVarNameIncludes) { + String envVarValue = processEnvVars.get(envVarName); + if (envVarValue != null) { + startScriptEnv.put(envVarName, envVarValue); + } + } + return startScriptEnv; + } + + private static boolean isScript(String startScript) { + // TODO: What if CygWin was used to start AS7 on Windows via a shell script? + return (startScript != null) && (startScript.endsWith(".sh") || startScript.endsWith(".bat")); + } + +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java new file mode 100644 index 0000000..11f5248 --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java @@ -0,0 +1,100 @@ +/* +* RHQ Management Platform +* Copyright (C) 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, version 2, as +* published by the Free Software Foundation, and/or the GNU Lesser +* General Public License, version 2.1, also as published by the Free +* Software Foundation. +* +* 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 and the GNU Lesser General Public License +* for more details. +* +* You should have received a copy of the GNU General Public License +* and the GNU Lesser General Public License along with this program; +* if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +package org.rhq.core.pluginapi.util; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.configuration.ListPropertySimpleWrapper; +import org.rhq.core.pluginapi.configuration.MapPropertySimpleWrapper; + +/** + * @author Ian Springer + */ +public class StartScriptConfiguration { + + public static final String START_SCRIPT_CONFIG_PROP = "startScript"; + public static final String START_SCRIPT_ENV_CONFIG_PROP = "startScriptEnv"; + public static final String START_SCRIPT_ARGS_CONFIG_PROP = "startScriptArgs"; + + private Configuration pluginConfig; + + public StartScriptConfiguration(Configuration pluginConfig) { + this.pluginConfig = pluginConfig; + } + + @Nullable + public File getStartScript() { + String startScript = this.pluginConfig.getSimpleValue(START_SCRIPT_CONFIG_PROP); + return (startScript != null) ? new File(startScript) : null; + } + + public void setStartScript(File startScript) { + PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_CONFIG_PROP); + if (prop == null) { + prop = new PropertySimple(START_SCRIPT_CONFIG_PROP, null); + } + prop.setValue(startScript); + } + + @NotNull + public Map<String, String> getStartScriptEnv() { + PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ENV_CONFIG_PROP); + Map<String, String> map = (prop != null) ? + new MapPropertySimpleWrapper(prop).getValue() : new HashMap<String, String>(); + return map; + } + + public void setStartScriptEnv(Map<String, String> startScriptEnv) { + PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ENV_CONFIG_PROP); + if (prop == null) { + prop = new PropertySimple(START_SCRIPT_ENV_CONFIG_PROP, null); + } + new MapPropertySimpleWrapper(prop).setValue(startScriptEnv); + } + + @NotNull + public List<String> getStartScriptArgs() { + PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ARGS_CONFIG_PROP); + List<String> list = (prop != null) ? + new ListPropertySimpleWrapper(prop).getValue() : new ArrayList<String>(); + return list; + } + + public void setStartScriptArgs(List startScriptArgs) { + PropertySimple prop = this.pluginConfig.getSimple(START_SCRIPT_ARGS_CONFIG_PROP); + if (prop == null) { + prop = new PropertySimple(START_SCRIPT_ARGS_CONFIG_PROP, null); + } + new ListPropertySimpleWrapper(prop).setValue(startScriptArgs); + } + +} \ No newline at end of file commit 6fc7d50a95b8f7f012fa900777c4c10aee05327b Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 20 09:54:48 2012 -0400 add new API method - getParentProcess() diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java b/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java index 39da11d..21e7ef3 100644 --- a/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java @@ -73,6 +73,7 @@ public class ProcessInfo { protected ProcCred procCred; protected ProcCredName procCredName; protected Map<String, String> procEnv; + protected transient ProcessInfo parentProcess; private boolean loggedPermissionsError = false; private static final String UNKNOWN = "?"; @@ -406,6 +407,18 @@ public class ProcessInfo { } /** + * Returns the parent process of this process. + */ + public ProcessInfo getParentProcess() throws SystemInfoException { + if (this.parentProcess == null) { + this.parentProcess = new ProcessInfo(getParentPid(), sigar); + } else { + this.parentProcess.refresh(); + } + return this.parentProcess; + } + + /** * A process' pid makes it unique - this returns the {@link #getPid()} itself. * * @see java.lang.Object#hashCode() commit cd529aa95bb6e951fe99952345926535fdc68674 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 20 09:54:16 2012 -0400 add new API method - getSimpleValue(String) (should have added it a long time ago!) diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index 126c3c3..5f77d55 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -356,13 +356,13 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM return (PropertySimple) getMap().get(name); } + public String getSimpleValue(String name) { + return getSimpleValue(name, null); + } + public String getSimpleValue(String name, @Nullable String defaultValue) { PropertySimple property = (PropertySimple) getMap().get(name); - if ((property != null) && (property.getStringValue() != null)) { - return property.getStringValue(); - } else { - return defaultValue; - } + return ((property != null) && (property.getStringValue() != null)) ? property.getStringValue() : defaultValue; } /** commit e2bd7a9162bc988717a63c0fa7fd43e84b9dd658 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Apr 20 15:29:02 2012 +0200 BZ 814408 Port is no longer required - in the case of a multicast port set. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 8b4bc96..c33017c 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -3024,11 +3024,11 @@ required="false"> <c:option-source target="resource" expression="type='Network Interface' plugin=jboss-as-7"/> </c:simple-property> - <c:simple-property name="port:expr" displayName="Port" description="Number of the port to which the socket should be bound."/> + <c:simple-property name="port:expr" displayName="Port" required="false" description="Number of the port to which the socket should be bound. ${} Expresions are allowed. Can be omitted if multicast-port is set."/> <c:simple-property name="fixed-port" description="Whether the port value should remain fixed even if numeric offsets are applied to the other sockets in the socket group." type="boolean" defaultValue="false"/> <c:simple-property name="multicast-address" description="Multicast address on which the socket should receive multicast traffic. If unspecified, the socket will not be configured to receive multicast." required="false"/> - <c:simple-property name="multicast-port:expr" displayName="Multicast Port" description="Port on which the socket should receive multicast traffic. Must be configured if 'multicast-address' is configured." required="false"/> + <c:simple-property name="multicast-port:expr" displayName="Multicast Port" description="Port on which the socket should receive multicast traffic. Must be configured if 'multicast-address' is configured. ${} Expresions are allowed." required="false"/> </c:map-property> </c:list-property> </c:group> commit 575b76025e5f850a2eaf13762d019f6b9fb9974e Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Apr 20 14:45:20 2012 +0200 [BZ 796636] - fix the unit tests and make sure to obfuscate the passwords before any DB changes are performed while updating the content source. This prevents Hibernate from complaining when the configuration is being deleted. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java index 339e644..9b01413 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java @@ -507,6 +507,8 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { ContentSource loaded = entityManager.find(ContentSource.class, contentSource.getId()); + obfuscatePasswords(contentSource); + if (contentSource.getConfiguration() == null) { // this is a one-to-one and hibernate can't auto delete this orphan (HHH-2608), we manually do it here if (loaded.getConfiguration() != null) { @@ -527,8 +529,6 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { } } - obfuscatePasswords(contentSource); - // now we can merge the changes to the database contentSource = entityManager.merge(contentSource); log.debug("User [" + subject + "] updated content source [" + contentSource + "]"); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java index dd72437..9599bd1 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java @@ -97,7 +97,16 @@ public class ContentProviderManagerSyncContentProviderTest extends AbstractEJB3T // Create a sample content source type that will be used in this test testSourceType = new ContentSourceType("testType"); entityManager.persist(testSourceType); - + entityManager.flush(); + + //need to actually commit the tx so that the subsequent code can see the new entry in + //the database + tx.commit(); + + tx.begin(); + //new entity manager associated with the new tx + entityManager = getEntityManager(); + // Add a content source to sync in this test syncSource = new ContentSource("testSource1", testSourceType); contentManager.simpleCreateContentSource(overlord, syncSource); commit 4e2d986464c38a7064d23a0de32c69f274ae8c58 Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Apr 19 17:47:21 2012 -0400 Trivial, remove commented out node no longer used. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 407f5c4..8b4bc96 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -229,8 +229,7 @@ <!ENTITY logFile ' <c:map-property name="file" required="true" readOnly="false" description="The file description consisting of the path and optional relative to path."> <c:simple-property name="path" required="true" readOnly="false" description="The filesystem path."/> - <c:simple-property name="relative-to" required="false" readOnly="false" description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute. The standard paths provided by the system include:<ul><li>jboss.home - the root directory of the JBoss AS distribution</li><li>user.home - user's home directory</li><li>user.dir - user's current working directory</li><li>java.home - java installation directory</li><li>jboss.server.base.dir - root directory for an individual server instance</li><li>jboss.server.data.dir - directory the server will use for persistent data file storage</li><li>jboss.server.log.dir - directory the server will use for log file storage</li><li>jboss.server.tmp.dir - directory the server will use for temporary file storage</li><li>jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances</li></ul> -"> + <c:simple-property name="relative-to" required="false" readOnly="false" description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute. The standard paths provided by the system include:<ul><li>jboss.home - the root directory of the JBoss AS distribution</li><li>user.home - user's home directory</li><li>user.dir - user's current working directory</li><li>java.home - java installation directory</li><li>jboss.server.base.dir - root directory for an individual server instance</li><li>jboss.server.data.dir - directory the server will use for persistent data file storage</li><li>jboss.server.log.dir - directory the server will use for log file storage</li><li>jboss.server.tmp.dir - directory the server will use for temporary file storage</li><li>jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances</li></ul>"> <c:property-options> <c:option value="java.home" /> <c:option value="jboss.domain.servers.dir" /> @@ -2338,7 +2337,6 @@ <operation name="change-file" description="Change the file for a handler."> <parameters> -  &logFile; </parameters> <results> commit 16f2db3d262eb05a5ca15f2eaa501ffdf068010b Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Apr 19 15:47:50 2012 -0400 More logging subystem cleanup and initial support for file property. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 249fb47..407f5c4 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -167,19 +167,19 @@ <!ENTITY logLevel ' <c:simple-property name="level" required="false" type="string" readOnly="false" description="The log level specifying which message levels will be logged by this. Message levels lower than this value will be discarded."> <c:property-options> - <c:option value="ALL" name="ALL"/> - <c:option value="CONFIG" name="CONFIG"/> - <c:option value="DEBUG" name="DEBUG"/> - <c:option value="ERROR" name="ERROR"/> - <c:option value="FATAL" name="FATAL"/> - <c:option value="FINE" name="FINE"/> - <c:option value="FINER" name="FINER"/> - <c:option value="FINEST" name="FINEST"/> - <c:option value="INFO" name="INFO"/> - <c:option value="OFF" name="OFF"/> - <c:option value="TRACE" name="TRACE"/> - <c:option value="WARN" name="WARN"/> - <c:option value="WARNING" name="WARNING"/> + <c:option value="ALL"/> + <c:option value="CONFIG"/> + <c:option value="DEBUG"/> + <c:option value="ERROR"/> + <c:option value="FATAL"/> + <c:option value="FINE"/> + <c:option value="FINER"/> + <c:option value="FINEST"/> + <c:option value="INFO"/> + <c:option value="OFF"/> + <c:option value="TRACE"/> + <c:option value="WARN"/> + <c:option value="WARNING"/> </c:property-options> </c:simple-property> '> @@ -187,19 +187,20 @@ <!ENTITY logFilter ' <c:simple-property name="filter" required="false" description="Defines a simple filter type." > <c:property-options> - <c:option value="accept" name="accept"/> - <c:option value="all" name="all"/> - <c:option value="any" name="any"/> - <c:option value="change-level" name="change-level"/> - <c:option value="deny" name="deny"/> - <c:option value="level" name="level"/> - <c:option value="level-range" name="level-range"/> - <c:option value="match" name="match"/> - <c:option value="not" name="not"/> - <c:option value="replace" name="replace"/> + <c:option value="accept"/> + <c:option value="all"/> + <c:option value="any"/> + <c:option value="change-level"/> + <c:option value="deny"/> + <c:option value="level"/> + <c:option value="level-range"/> + <c:option value="match"/> + <c:option value="not"/> + <c:option value="replace"/> </c:property-options> </c:simple-property> '> + <!ENTITY jvmDefinitionResourceConfigProperties ' <c:simple-property name="agent-lib" required="false" type="string" readOnly="false" description="The JVM agent lib."/> <c:simple-property name="agent-path" required="false" type="string" readOnly="false" description="The JVM agent path."/> @@ -225,6 +226,26 @@ </c:simple-property> '> + <!ENTITY logFile ' + <c:map-property name="file" required="true" readOnly="false" description="The file description consisting of the path and optional relative to path."> + <c:simple-property name="path" required="true" readOnly="false" description="The filesystem path."/> + <c:simple-property name="relative-to" required="false" readOnly="false" description="The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute. The standard paths provided by the system include:<ul><li>jboss.home - the root directory of the JBoss AS distribution</li><li>user.home - user's home directory</li><li>user.dir - user's current working directory</li><li>java.home - java installation directory</li><li>jboss.server.base.dir - root directory for an individual server instance</li><li>jboss.server.data.dir - directory the server will use for persistent data file storage</li><li>jboss.server.log.dir - directory the server will use for log file storage</li><li>jboss.server.tmp.dir - directory the server will use for temporary file storage</li><li>jboss.domain.servers.dir - directory under which a host controller will create the working area for individual server instances</li></ul> +"> + <c:property-options> + <c:option value="java.home" /> + <c:option value="jboss.domain.servers.dir" /> + <c:option value="jboss.home" /> + <c:option value="jboss.server.base.dir" /> + <c:option value="jboss.server.data.dir" /> + <c:option value="jboss.server.log.dir" /> + <c:option value="jboss.server.tmp.dir" /> + <c:option value="user.dir" /> + <c:option value="user.home" /> + </c:property-options> + </c:simple-property> + </c:map-property> +'> + ]> <plugin name="jboss-as-7" displayName="JBoss Application Server 7.x" @@ -2317,7 +2338,8 @@ <operation name="change-file" description="Change the file for a handler."> <parameters> - <c:simple-property name="file" required="false" type="string" readOnly="false" description="The file description consisting of the path and optional relative to path."/> +  + &logFile; </parameters> <results> <c:simple-property name="operationResult" description="Change the file for a handler." /> @@ -2353,7 +2375,7 @@ <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" description="Automatically flush after each write."/> <c:simple-property name="append" required="false" type="boolean" readOnly="false" description="Specify whether to append to the target file."/> - <c:simple-property name="file" required="false" type="string" readOnly="false" description="The file description consisting of the path and optional relative to path."/> + &logFile; </parameters> <results> <c:simple-property name="operationResult" description="Update the properties of an existing file handler." /> @@ -2364,7 +2386,7 @@ <c:simple-property name="append" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specify whether to append to the target file. The default value is true."/> <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" defaultValue="true" description="Automatically flush after each write. The default value is true."/> <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - <c:simple-property name="file" required="false" description="The file description consisting of the path and optional relative to path." /> + &logFile; &logFilter; <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> @@ -2434,7 +2456,7 @@ <operation name="change-file" description="Change the file for a handler."> <parameters> - <c:simple-property name="file" required="false" type="string" readOnly="false" description="The file description consisting of the path and optional relative to path."/> + &logFile; </parameters> <results> <c:simple-property name="operationResult" description="Change the file for a handler." /> @@ -2470,7 +2492,7 @@ <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" description="Automatically flush after each write."/> <c:simple-property name="append" required="false" type="boolean" readOnly="false" description="Specify whether to append to the target file."/> - <c:simple-property name="file" required="false" type="string" readOnly="false" description="The file description consisting of the path and optional relative to path."/> + &logFile; <c:simple-property name="suffix" required="true" type="string" readOnly="false" description="Set the suffix string. The string is in a format which can be understood by java.text.SimpleDateFormat. The period of the rotation is automatically calculated based on the suffix."/> </parameters> <results> @@ -2482,10 +2504,8 @@ <c:simple-property name="append" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specify whether to append to the target file. The default value is true."/> <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" defaultValue="true" description="Automatically flush after each write. The default value is true."/> <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - <c:simple-property name="file" required="false" description="The file description consisting of the path and optional relative to path." /> - - &logFilter; - + &logFile; + &logFilter; <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; @@ -2505,7 +2525,7 @@ <operation name="change-file" description="Change the file for a handler."> <parameters> - <c:simple-property name="file" required="false" type="string" readOnly="false" description="The file description consisting of the path and optional relative to path."/> + &logFile; </parameters> <results> <c:simple-property name="operationResult" description="Change the file for a handler." /> @@ -2541,7 +2561,7 @@ <c:simple-property name="formatter" required="false" type="string" readOnly="false" description="Defines a formatter."/> <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" description="Automatically flush after each write."/> <c:simple-property name="append" required="false" type="boolean" readOnly="false" description="Specify whether to append to the target file."/> - <c:simple-property name="file" required="false" type="string" readOnly="false" description="The file description consisting of the path and optional relative to path."/> + &logFile; <c:simple-property name="rotate-size" required="true" type="string" readOnly="false" description="The size at which to rotate the log file."/> <c:simple-property name="max-backup-index" required="true" type="integer" readOnly="false" description="The maximum number of backups to keep."/> </parameters> @@ -2554,8 +2574,7 @@ <c:simple-property name="append" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specify whether to append to the target file. The default value is true."/> <c:simple-property name="autoflush" required="false" type="boolean" readOnly="false" defaultValue="true" description="Automatically flush after each write. The default value is true."/> <c:simple-property name="encoding" required="false" type="string" readOnly="false" description="The character encoding used by this Handler."/> - <c:simple-property name="file" required="false" description="The file description consisting of the path and optional relative to path." /> - + &logFile; &logFilter; <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" commit 6c75467aa4df6491fc95636bc85409e4df81c536 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Apr 19 17:15:28 2012 -0400 Some refactoring to share code between AS5 and AS7, and potentially other plugins in the future. Move the bulk of AS7CommandLine into JavaCommandLine, and move AS7CommandLineOption to JavaCommandLineOption. - add support for options that don't take values - add support for POSIX and non-POSIX parsing of class options - add support for -- (stop processing class options) - added some missing license headers - fixed JavaCommandLineTest for passing on windows and added tests for getClassOption(). diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java index 8962682..5a5ec96 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java @@ -49,6 +49,17 @@ import org.jetbrains.annotations.NotNull; */ public class JavaCommandLine { + /** + * When parsing command line options, determines the valid format. + * <p>POSIX for short command line options is equivalent to SPACE_ONLY.</P> + * <p>POSIX for long command line options is equivalent to EQUALS_ONLY.</P> * + * + * @see JavaCommandLine#getClassOption(JavaCommandLineOption) + */ + public enum OptionFormat { + POSIX, SPACE_OR_EQUALS + }; + private List<String> arguments; private File javaExecutable; private List<String> classPath; @@ -58,12 +69,32 @@ public class JavaCommandLine { private File executableJarFile; private List<String> classArguments; private boolean includeSystemPropertiesFromClassArguments; + private OptionFormat shortClassOptionFormat; + private OptionFormat longClassOptionFormat; + + /** + * Same as <code>JavaCommandLine(args, false, OptionFormat.POSIX, OptionFormat.POSIX)</code> + */ + public JavaCommandLine(String... args) { + this(args, false, OptionFormat.POSIX, OptionFormat.POSIX); + } - public JavaCommandLine(String ... args) { - this(args, false); + /** + * Same as <code>JavaCommandLine(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX)</code> + */ + public JavaCommandLine(boolean includeSystemPropertiesFromClassArguments, String... args) { + this(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX); } + /** + * Same as <code>JavaCommandLine(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX)</code> + */ public JavaCommandLine(String[] args, boolean includeSystemPropertiesFromClassArguments) { + this(args, includeSystemPropertiesFromClassArguments, OptionFormat.POSIX, OptionFormat.POSIX); + } + + public JavaCommandLine(String[] args, boolean includeSystemPropertiesFromClassArguments, + OptionFormat shortClassOptionFormat, OptionFormat longClassOptionFormat) { if (args == null) { throw new IllegalArgumentException("'commandLine' parameter is null."); } @@ -73,6 +104,8 @@ public class JavaCommandLine { } this.includeSystemPropertiesFromClassArguments = includeSystemPropertiesFromClassArguments; + this.shortClassOptionFormat = (shortClassOptionFormat == null) ? OptionFormat.POSIX : shortClassOptionFormat; + this.longClassOptionFormat = (longClassOptionFormat == null) ? OptionFormat.POSIX : longClassOptionFormat; parseCommandLine(args); } @@ -189,6 +222,81 @@ public class JavaCommandLine { return classArguments; } + /** + * @param option + * @return null if the option is not on the command line, "" if it is on the command line and + * either has no value or expects no value, otherwise the non-empty value. + */ + @Nullable + public String getClassOption(JavaCommandLineOption option) { + String shortOption = null; + String shortOptionEquals = null; + if (option.getShortName() != null) { + shortOption = "-" + option.getShortName(); + shortOptionEquals = shortOption + "="; + } + + String longOption = null; + String longOptionEquals = null; + if (option.getLongName() != null) { + longOption = "--" + option.getLongName(); + longOptionEquals = longOption + "="; + } + + for (int i = 0, classArgsLength = getClassArguments().size(); i < classArgsLength; i++) { + String classArg = getClassArguments().get(i); + + // If we hit a "stop processing options" option then don't look further, the rest of the + // options are actually deferred to a subsequent command. + // TODO: This behavior may need to be configurable. + if ("--".equals(classArg)) { + break; + } + + if (option.getShortName() != null && classArg.startsWith(shortOption)) { + if (!option.isExpectsValue()) { + return ""; + + } else { + switch (shortClassOptionFormat) { + case POSIX: + return (i != (classArgsLength - 1)) ? getClassArguments().get(i + 1) : ""; + + case SPACE_OR_EQUALS: + default: + int len = shortOptionEquals.length(); + if (classArg.startsWith(shortOptionEquals)) { + return (len < classArg.length()) ? (classArg.substring(len).trim()) : ""; + } + break; + } + } + + } else if (option.getLongName() != null && classArg.startsWith(longOption)) { + if (!option.isExpectsValue()) { + return ""; + + } else { + switch (longClassOptionFormat) { + case POSIX: + int len = longOptionEquals.length(); + if (classArg.startsWith(longOptionEquals)) { + return (len < classArg.length()) ? (classArg.substring(len).trim()) : ""; + } + break; + + case SPACE_OR_EQUALS: + default: + return (i != (classArgsLength - 1)) ? getClassArguments().get(i + 1) : ""; + } + } + } + } + + // If we reached here, the option wasn't on the command line. + return null; + } + @Override public String toString() { StringBuilder buffer = new StringBuilder(this.arguments.get(0)); diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLineOption.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLineOption.java new file mode 100644 index 0000000..b7bf674 --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLineOption.java @@ -0,0 +1,81 @@ +/* + * RHQ Management Platform + * Copyright (C) 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.pluginapi.util; + +/** + * The name(s) associated with a java command line option. + * + * @author Ian Springer + */ +public class JavaCommandLineOption { + + private String shortName; + private String longName; + private boolean expectsValue; + + /** + * Same as <code>JavaCommandLineOption(shortName, longName, true)</code> + */ + public JavaCommandLineOption(char shortName, String longName) { + this(new String(new char[] { shortName }), longName, true); + } + + public JavaCommandLineOption(char shortName, String longName, boolean expectsValue) { + this(new String(new char[] { shortName }), longName, expectsValue); + } + + /** + * Same as <code>JavaCommandLineOption(shortName, longName, true)</code> + */ + public JavaCommandLineOption(String shortName, String longName) { + this(shortName, longName, true); + } + + public JavaCommandLineOption(String shortName, String longName, boolean expectsValue) { + if ((shortName == null) && (longName == null)) { + throw new IllegalArgumentException("ShortName and longName cannot both be null."); + } + + this.shortName = shortName; + this.longName = longName; + this.expectsValue = expectsValue; + } + + public String getShortName() { + return shortName; + } + + public String getLongName() { + return longName; + } + + public boolean isExpectsValue() { + return expectsValue; + } + + @Override + public String toString() { + return "JavaCommandLineOption [shortName=" + shortName + ", longName=" + longName + ", expectsValue=" + + expectsValue + "]"; + } +} diff --git a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java index 7a5db84..72b6201 100644 --- a/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java +++ b/modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java @@ -48,7 +48,9 @@ public class JavaCommandLineTest { } public void testClass() throws Exception { - JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", "-ea", "-cp", "a.jar:b.jar:c.jar", "org.example.Main", "-x", "blah"); + String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; + JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", + "-ea", "-cp", cp, "org.example.Main", "-x", "blah"); Assert.assertEquals(javaCommandLine.getJavaExecutable(), new File("java")); Assert.assertEquals(javaCommandLine.getJavaOptions(), Arrays.asList("-Dshape=circle", "-Xmx100M", "-Dcolor=blue", "-ea"), @@ -69,7 +71,9 @@ public class JavaCommandLineTest { } public void testJarFile() throws Exception { - JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", "-ea", "-cp", "a.jar:b.jar:c.jar", "-jar", "main.jar", "-x", "blah"); + String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; + JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", + "-ea", "-cp", cp, "-jar", "main.jar", "-x", "blah"); Assert.assertEquals(javaCommandLine.getJavaExecutable(), new File("java")); Assert.assertEquals(javaCommandLine.getJavaOptions(), Arrays.asList("-Dshape=circle", "-Xmx100M", "-Dcolor=blue", "-ea"), @@ -110,4 +114,24 @@ public class JavaCommandLineTest { Assert.assertEquals(sysprops.get("prop4"), "boo"); } + public void testGetClassOption() throws Exception { + String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; + JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", + "-ea", "-cp", cp, "org.example.Main", "-x", "blah", "--novaluelong", "--long=longval", "-n"); + Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption("b", "bogus"))); + Assert.assertEquals("blah", javaCommandLine.getClassOption(new JavaCommandLineOption("x", null))); + Assert.assertEquals("", javaCommandLine.getClassOption(new JavaCommandLineOption(null, "novaluelong", false))); + Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption(null, "novaluelong"))); + Assert.assertEquals("longval", javaCommandLine.getClassOption(new JavaCommandLineOption(null, "long"))); + Assert.assertEquals("", javaCommandLine.getClassOption(new JavaCommandLineOption("n", null, false))); + } + + public void testGetClassOptionStopProcessing() throws Exception { + String cp = "a.jar" + File.pathSeparator + "b.jar" + File.pathSeparator + "c.jar"; + JavaCommandLine javaCommandLine = new JavaCommandLine("java", "-Dshape=circle", "-Xmx100M", "-Dcolor=blue", + "-ea", "-cp", cp, "org.example.Main", "-x", "blah", "--novaluelong", "--long=longval", "--", "-n"); + Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption("b", "bogus"))); + Assert.assertNull(javaCommandLine.getClassOption(new JavaCommandLineOption("n", null, false))); + } + } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java index 113bdc4..6227fae 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java @@ -1,7 +1,27 @@ +/* + * RHQ Management Platform + * Copyright (C) 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.modules.plugins.jbossas7; -import org.jetbrains.annotations.Nullable; - import org.rhq.core.pluginapi.util.JavaCommandLine; /** @@ -12,44 +32,7 @@ import org.rhq.core.pluginapi.util.JavaCommandLine; public class AS7CommandLine extends JavaCommandLine { public AS7CommandLine(String[] args) { - super(args, true); - } - - @Nullable - public String getClassOption(AS7CommandLineOption option) { - String shortOptionPrefix; - String shortOption; - if (option.getShortName() != null) { - shortOption = "-" + option.getShortName(); - shortOptionPrefix = shortOption + "="; - } else { - shortOption = null; - shortOptionPrefix = null; - } - String longOptionPrefix; - if (option.getLongName() != null) { - longOptionPrefix = "--" + option.getLongName() + "="; - } else { - longOptionPrefix = null; - } - - for (int i = 0, classArgsLength = getClassArguments().size(); i < classArgsLength; i++) { - String classArg = getClassArguments().get(i); - if (option.getShortName() != null) { - if (classArg.startsWith(shortOptionPrefix)) { - return (shortOptionPrefix.length() < classArg.length()) ? classArg.substring(shortOptionPrefix.length()) : ""; - } else if (classArg.equals(shortOption)) { - return (i != (classArgsLength - 1)) ? getClassArguments().get(i + 1) : ""; - } - } - if (option.getLongName() != null) { - if (classArg.startsWith(longOptionPrefix)) { - return (longOptionPrefix.length() < classArg.length()) ? classArg.substring(longOptionPrefix.length()) : ""; - } - } - } - // If we reached here, the option wasn't on the command line. - return null; + super(args, true, OptionFormat.SPACE_OR_EQUALS, OptionFormat.POSIX); } } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineOption.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineOption.java deleted file mode 100644 index 4ca0a84..0000000 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineOption.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.rhq.modules.plugins.jbossas7; - -/** - * The name(s) associated with an AS7 server command line option. - * - * @author Ian Springer - */ -public class AS7CommandLineOption { - - private String shortName; - private String longName; - - public AS7CommandLineOption(char shortName, String longName) { - this(new String(new char[] {shortName}), longName); - } - - public AS7CommandLineOption(String shortName, String longName) { - if ((shortName == null) && (longName == null)) { - throw new IllegalArgumentException("ShortName and longName cannot both be null."); - } - - this.shortName = shortName; - this.longName = longName; - } - - - public String getShortName() { - return shortName; - } - - public String getLongName() { - return longName; - } - - @Override - public String toString() { - return "AS7CommandLineOption{" + - "shortName='" + shortName + '\'' + - ", longName='" + longName + '\'' + - '}'; - } - -} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 06daa44..a39b615 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -52,6 +52,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.JavaCommandLine; +import org.rhq.core.pluginapi.util.JavaCommandLineOption; import org.rhq.core.system.ProcessInfo; import org.rhq.core.system.SystemInfo; import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; @@ -373,7 +374,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent // Returns the name of the host config xml file (domain controller) or server config xml file (standalone server), // e.g. "standalone.xml" or "host.xml". protected String getHostXmlFileName(AS7CommandLine commandLine) { - AS7CommandLineOption hostXmlFileNameOption = getHostXmlFileNameOption(); + JavaCommandLineOption hostXmlFileNameOption = getHostXmlFileNameOption(); String optionValue = commandLine.getClassOption(hostXmlFileNameOption); return (optionValue != null) ? optionValue : getDefaultHostXmlFileName(); } @@ -405,7 +406,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent protected abstract String getDefaultBaseDirName(); - protected abstract AS7CommandLineOption getHostXmlFileNameOption(); + protected abstract JavaCommandLineOption getHostXmlFileNameOption(); protected abstract String getDefaultHostXmlFileName(); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java index d4166bb..2374a91 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java @@ -22,6 +22,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.util.JavaCommandLineOption; import org.rhq.core.system.ProcessInfo; import org.rhq.modules.plugins.jbossas7.helper.HostPort; @@ -39,8 +40,8 @@ public class HostControllerDiscovery extends BaseProcessDiscovery { private static final String DEFAULT_DOMAIN_CONFIG_FILE_NAME = "domain.xml"; private static final String DEFAULT_HOST_CONFIG_FILE_NAME = "host.xml"; - private AS7CommandLineOption DOMAIN_CONFIG_OPTION = new AS7CommandLineOption("c", "domain-config"); - private AS7CommandLineOption HOST_CONFIG_OPTION = new AS7CommandLineOption(null, "host-config"); + private JavaCommandLineOption DOMAIN_CONFIG_OPTION = new JavaCommandLineOption("c", "domain-config"); + private JavaCommandLineOption HOST_CONFIG_OPTION = new JavaCommandLineOption(null, "host-config"); @Override protected AS7Mode getMode() { @@ -68,7 +69,7 @@ public class HostControllerDiscovery extends BaseProcessDiscovery { } @Override - protected AS7CommandLineOption getHostXmlFileNameOption() { + protected JavaCommandLineOption getHostXmlFileNameOption() { return HOST_CONFIG_OPTION; } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java index 3b4ab93..301be99 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java @@ -24,6 +24,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.util.JavaCommandLineOption; import org.rhq.core.system.ProcessInfo; import org.rhq.modules.plugins.jbossas7.helper.HostPort; @@ -40,7 +41,7 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { private static final String DEFAULT_SERVER_CONFIG_FILE_NAME = "standalone.xml"; - private AS7CommandLineOption SERVER_CONFIG_OPTION = new AS7CommandLineOption('c', "server-config"); + private JavaCommandLineOption SERVER_CONFIG_OPTION = new JavaCommandLineOption('c', "server-config"); @Override protected AS7Mode getMode() { @@ -68,7 +69,7 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { } @Override - protected AS7CommandLineOption getHostXmlFileNameOption() { + protected JavaCommandLineOption getHostXmlFileNameOption() { return SERVER_CONFIG_OPTION; } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java index bbb5d93..13560e6 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java @@ -34,8 +34,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; +import org.rhq.core.pluginapi.util.JavaCommandLineOption; import org.rhq.modules.plugins.jbossas7.AS7CommandLine; -import org.rhq.modules.plugins.jbossas7.AS7CommandLineOption; import org.rhq.modules.plugins.jbossas7.AS7Mode; /** @@ -50,7 +50,7 @@ public class HostConfiguration { private static final String BIND_ADDRESS_MANAGEMENT_SYSPROP = "jboss.bind.address.management"; private static final String SOCKET_BINDING_PORT_OFFSET_SYSPROP = "jboss.socket.binding.port-offset"; - private AS7CommandLineOption BIND_ADDRESS_MANAGEMENT_OPTION = new AS7CommandLineOption("bmanagement", null); + private JavaCommandLineOption BIND_ADDRESS_MANAGEMENT_OPTION = new JavaCommandLineOption("bmanagement", null); private final Log log = LogFactory.getLog(HostConfiguration.class); commit e7b96dc7e7356e1d29d937388bcb4f7b35ea356e Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Apr 19 17:12:30 2012 -0400 oops, the config vars at the top of the script should be commented out diff --git a/etc/scripts/jboss-as-spawn.sh b/etc/scripts/jboss-as-spawn.sh index 5ea11ea..0678b9b 100755 --- a/etc/scripts/jboss-as-spawn.sh +++ b/etc/scripts/jboss-as-spawn.sh @@ -3,14 +3,14 @@ ######### begin config ########## # the JBoss AS home directory -JBOSS_HOME="${HOME}/Applications/jboss-as-7.1.1.Final" +#JBOSS_HOME="${HOME}/Applications/jboss-as-7.1.1.Final" # the name of the config to be cloned # (e.g. for AS7, "standalone" or "domain"; for other AS versions, "default" or "all") -JBOSS_CONFIG="standalone" +#JBOSS_CONFIG="standalone" # the number of instances to start -JBOSS_INSTANCES="1" +#JBOSS_INSTANCES="1" # the AS7 config file name (optional, default value for standalone: standalone-full.xml, for domain: domain.xml) #JBOSS_CONFIG_FILE_NAME="standalone-full.xml" commit 61348bcd52f3ac126866b577c5453537ef5301c4 Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Apr 19 17:08:08 2012 -0400 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 diff --git a/etc/scripts/jboss-as-spawn.sh b/etc/scripts/jboss-as-spawn.sh index 4bdbf30..5ea11ea 100755 --- a/etc/scripts/jboss-as-spawn.sh +++ b/etc/scripts/jboss-as-spawn.sh @@ -3,84 +3,103 @@ ######### begin config ########## # the JBoss AS home directory -#JBOSS_HOME=${HOME}/Applications/jboss-as-7.1.1.Final +JBOSS_HOME="${HOME}/Applications/jboss-as-7.1.1.Final" # the name of the config to be cloned # (e.g. for AS7, "standalone" or "domain"; for other AS versions, "default" or "all") -#JBOSS_CONFIG=standalone +JBOSS_CONFIG="standalone" # the number of instances to start -#JBOSS_INSTANCES=2 +JBOSS_INSTANCES="1" -# options to pass to the JBoss AS JVM +# the AS7 config file name (optional, default value for standalone: standalone-full.xml, for domain: domain.xml) +#JBOSS_CONFIG_FILE_NAME="standalone-full.xml" + +# options to pass to the JBoss AS JVM (optional, default value shown below) #JAVA_OPTS="-Xms200M -Xmx400M -XX:MaxPermSize=150M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djava.net.preferIPv4Stack=true" ########## end config ########### if [ -z "${JBOSS_HOME}" ]; then - echo "The 'JBOSS_HOME' variable must be set to the JBoss install dir you want to spawn from." >&2 - exit 1 + echo "The 'JBOSS_HOME' variable must be set to the JBoss install dir you want to spawn from." >&2 + exit 1 fi if [ -z "${JBOSS_CONFIG}" ]; then - echo "The 'JBOSS_CONFIG' variable must be set to the name of the JBoss config you want to spawn from." >&2 - exit 1 + echo "The 'JBOSS_CONFIG' variable must be set to the name of the JBoss config you want to spawn from." >&2 + exit 1 fi if [ -z "${JBOSS_INSTANCES}" ]; then - echo "The 'JBOSS_INSTANCES' variable must be set to the number of JBoss instances you want to spawn." >&2 - exit 1 + echo "The 'JBOSS_INSTANCES' variable must be set to the number of JBoss instances you want to spawn." >&2 + exit 1 fi if [ -z "${JAVA_OPTS}" ]; then - JAVA_OPTS="-Xms200M -Xmx400M -XX:MaxPermSize=150M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djava.net.preferIPv4Stack=true" + JAVA_OPTS="-Xms200M -Xmx400M -XX:MaxPermSize=150M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djava.net.preferIPv4Stack=true" fi echo "JBOSS_HOME=${JBOSS_HOME}" +echo "JBOSS_CONFIG=${JBOSS_CONFIG}" +echo "JBOSS_INSTANCES=${JBOSS_INSTANCES}" echo "JAVA_OPTS=${JAVA_OPTS}" # export these, since they are used by the forked run.sh processes. export JBOSS_HOME JAVA_OPTS if [ -f "${JBOSS_HOME}/jboss-modules.jar" ]; then - AS7=1 - SERVER_BASE_DIR="${JBOSS_HOME}" + AS7=1 + SERVER_BASE_DIR="${JBOSS_HOME}" else - AS7= - SERVER_BASE_DIR="${JBOSS_HOME}/server" - OCTET=1 + AS7= + SERVER_BASE_DIR="${JBOSS_HOME}/server" fi JBOSS_CONFIG_DIR="${SERVER_BASE_DIR}/${JBOSS_CONFIG}" if [ ! -d "${JBOSS_CONFIG_DIR}" ]; then - echo "Invalid config name '${JBOSS_CONFIG}' - ${JBOSS_CONFIG_DIR} does not exist." >&2 - exit 1 + echo "Invalid value for JBOSS_CONFIG variable (${JBOSS_CONFIG}) - ${JBOSS_CONFIG_DIR} does not exist." >&2 + exit 1 fi -if [ -n "${AS7}" ]; then - if [ -f "${JBOSS_CONFIG_DIR}/configuration/standalone.xml" ]; then - AS7_STANDALONE=1 - CONFIG_FILE="${JBOSS_CONFIG_DIR}/configuration/standalone.xml" - OCTET=2 - elif [ -f "${JBOSS_CONFIG_DIR}/configuration/host.xml" ]; then - AS7_STANDALONE= - CONFIG_FILE="${JBOSS_CONFIG_DIR}/configuration/host.xml" - OCTET=3 - else - echo "AS7 config file not found." >&2 - exit 1 - fi - AS7_ENCODED_PASSWORD=`echo -n "rhqadmin:ManagementRealm:rhqadmin" | md5sum | awk '{printf $1}'` +if [ -z "${AS7}" ]; then + OCTET=1 +else + if [ "${JBOSS_CONFIG}" = "standalone" ]; then + AS7_STANDALONE=1 + if [ -z "${JBOSS_CONFIG_FILE_NAME}" ]; then + JBOSS_CONFIG_FILE_NAME="standalone-full.xml" + fi + OCTET=2 + elif [ "${JBOSS_CONFIG}" = "domain" ]; then + AS7_STANDALONE= + if [ -z "${JBOSS_CONFIG_FILE_NAME}" ]; then + JBOSS_CONFIG_FILE_NAME="domain.xml" + fi + OCTET=3 + else + echo "Illegal value for JBOSS_CONFIG_DIR variable (${JBOSS_CONFIG_DIR}) - value must be 'standalone' or 'domain'." >&2 + exit 1 + fi + + echo "JBOSS_CONFIG_FILE_NAME=${JBOSS_CONFIG_FILE_NAME}" + JBOSS_CONFIG_FILE="${JBOSS_CONFIG_DIR}/configuration/${JBOSS_CONFIG_FILE_NAME}" + if [ ! -f "${JBOSS_CONFIG_FILE}" ]; then + echo "AS7 config file (${JBOSS_CONFIG_FILE}) not found." >&2 + exit 1 + fi + + AS7_ENCODED_PASSWORD=`echo -n "rhqadmin:ManagementRealm:rhqadmin" | md5sum | awk '{printf $1}'` fi -for (( i = 1 ; i <= ${JBOSS_INSTANCES}; i++ )); do +for (( i = 1 ; i <= ${JBOSS_INSTANCES} ; i++ )); do CONFIG_DIR_NAME="${JBOSS_CONFIG}${i}" - CONFIG_DIR="${SERVER_BASE_DIR}/${CONFIG_DIR_NAME}" + CONFIG_DIR="${SERVER_BASE_DIR}/${CONFIG_DIR_NAME}" if [ ! -d "${CONFIG_DIR}" ]; then echo "Creating new config dir '${CONFIG_DIR}'..." cp -pr "${JBOSS_CONFIG_DIR}" "${CONFIG_DIR}" ( cd "${CONFIG_DIR}" ; rm -rf data log tmp work ) if [ -n "${AS7}" ]; then + CONFIG_FILE="${CONFIG_DIR}/configuration/${JBOSS_CONFIG_FILE_NAME}" sed -in '{s/<inet-address /<loopback-address /}' "${CONFIG_FILE}" echo "rhqadmin=${AS7_ENCODED_PASSWORD}" >"${CONFIG_DIR}/configuration/mgmt-users.properties" fi @@ -88,21 +107,25 @@ for (( i = 1 ; i <= ${JBOSS_INSTANCES}; i++ )); do BIND_ADDRESS="127.${OCTET}.0.${i}" if wget -q -P /tmp http://${BIND_ADDRESS}:8080/; then - echo "Not starting AS instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}', since an AS instance is already bound to ${BIND_ADDRESS}." - continue + echo "Not starting AS instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}', since an AS instance is already bound to ${BIND_ADDRESS}." + continue fi if [ -n "${AS7}" ]; then - if [ -n "${AS7_STANDALONE}" ]; then - echo "Starting AS7 standalone instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}'..." - nohup $JBOSS_HOME/bin/standalone.sh -Djboss.server.base.dir=${CONFIG_DIR} -b=${BIND_ADDRESS} -bmanagement=${BIND_ADDRESS} -bunsecure=${BIND_ADDRESS} >${JBOSS_HOME}/bin/${CONFIG_DIR_NAME}.out 2>&1 & - else - echo "Starting AS7 host controller instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}'..." - nohup $JBOSS_HOME/bin/domain.sh -Djboss.domain.base.dir=${CONFIG_DIR} -b=${BIND_ADDRESS} -bmanagement=${BIND_ADDRESS} -bunsecure=${BIND_ADDRESS} --pc-address=${BIND_ADDRESS} >${JBOSS_HOME}/bin/${CONFIG_DIR_NAME}.out 2>&1 & - fi + if [ -n "${AS7_STANDALONE}" ]; then + echo "Starting AS7 standalone instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}'..." + nohup $JBOSS_HOME/bin/standalone.sh -Djboss.server.base.dir=${CONFIG_DIR} --server-config=${JBOSS_CONFIG_FILE_NAME} -b=${BIND_ADDRESS} -bmanagement=${BIND_ADDRESS} -bunsecure=${BIND_ADDRESS} >${JBOSS_HOME}/bin/${CONFIG_DIR_NAME}.out 2>&1 & + else + echo "Starting AS7 host controller instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}'..." + nohup $JBOSS_HOME/bin/domain.sh -Djboss.domain.base.dir=${CONFIG_DIR} --domain-config=${JBOSS_CONFIG_FILE_NAME} -b=${BIND_ADDRESS} -bmanagement=${BIND_ADDRESS} -bunsecure=${BIND_ADDRESS} --pc-address=${BIND_ADDRESS} >${JBOSS_HOME}/bin/${CONFIG_DIR_NAME}.out 2>&1 & + fi else - echo "Starting AS instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}'..." - nohup $JBOSS_HOME/bin/run.sh -c ${CONFIG_DIR} -b ${BIND_ADDRESS} >$JBOSS_HOME/bin/${CONFIG_DIR_NAME}.out 2>&1 & + echo "Starting AS instance with config '${CONFIG_DIR_NAME}' and bind address '${BIND_ADDRESS}'..." + nohup $JBOSS_HOME/bin/run.sh -c ${CONFIG_DIR} -b ${BIND_ADDRESS} >$JBOSS_HOME/bin/${CONFIG_DIR_NAME}.out 2>&1 & + fi + + if [ "$i" -ne "${JBOSS_INSTANCES}" ]; then + sleep 5 fi done commit b83f2642e4391cc9c44ca424dceb32b3118957de Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Apr 19 16:18:34 2012 -0400 [BZ 813967] one-off hardcoding to fix a version problem we introduced in JON 3.0.1. diff --git a/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index b1e4b91..2d86cac 100644 --- a/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.Properties; import java.util.Locale; +import java.util.Properties; import java.util.Stack; /** @@ -324,6 +324,11 @@ public class ComparableVersion public final void parseVersion( String version ) { + // a complete hack to fix BZ 813967 + if (version.equals("4.2.0.JON300.GA")) { + version = "4.2.0.JON3.0.0.GA"; + } + this.value = version; items = new ListItem(); diff --git a/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java index 6d02842..8482306 100644 --- a/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java +++ b/modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java @@ -22,6 +22,10 @@ import org.testng.annotations.Test; @Test public class ComparableVersionTest { + public void testBZ_813967() { + compareVersions("4.2.0.JON300.GA", "4.2.0.JON.3.0.1.GA"); + } + public void testSimpleVersionCompare() { compareVersions("1.0", "1.1"); compareVersions("1.0", "2.0"); commit 714735336d8ba4c89e309fc79d3eec016b1efb8f Merge: f569966 8ba02a7 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Apr 19 21:43:55 2012 +0200 Merge commit '8ba02a773dd281cb2b9d8b6c7092c5bc1641244d' commit f569966d4de87824360b4a4565ff98349dfc5db2 Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Apr 19 15:38:43 2012 -0400 factor out the host config XML loading/parsing code into a HostConfiguration class, and remove the AbstractBaseDiscovery class which no longer serves any purpose diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java deleted file mode 100644 index 001ff1d..0000000 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java +++ /dev/null @@ -1,361 +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.modules.plugins.jbossas7; - -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.w3c.dom.Document; - -import org.rhq.core.pluginapi.inventory.ResourceComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.util.FileUtils; -import org.rhq.core.pluginapi.util.JavaCommandLine; -import org.rhq.core.system.ProcessInfo; - -/** - * Abstract base class for some discovery related functionality - especially - * in the area of processes and host.xml - * @author Heiko W. Rupp - */ -public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> implements ResourceDiscoveryComponent<T> { - - private static final String HOME_DIR_SYSPROP = "jboss.home.dir"; - private static final String BIND_ADDRESS_MANAGEMENT_SYSPROP = "jboss.bind.address.management"; - - private AS7CommandLineOption BIND_ADDRESS_MANAGEMENT_OPTION = new AS7CommandLineOption("bmanagement", null); - private static final String DJBOSS_SERVER_BASE_DIR = "-Djboss.server.base.dir"; - private static final String DJBOSS_DOMAIN_BASE_DIR = "-Djboss.domain.base.dir"; - private static final String DJBOSS_SOCKET_BIND_OFFSET = "-Djboss.socket.binding.port-offset"; - - static final int DEFAULT_MGMT_PORT = 9990; - - static final String CALL_READ_STANDALONE_OR_HOST_XML_FIRST = "hostXml is null. You need to call 'readStandaloneOrHostXml' first."; - private static final String SOCKET_BINDING_PORT_OFFSET_SYSPROP = "jboss.socket.binding.port-offset"; - protected Document hostXml; - protected final Log log = LogFactory.getLog(this.getClass()); - private XPathFactory factory; - - protected AbstractBaseDiscovery() { - synchronized (this) { - factory = XPathFactory.newInstance(); - } - } - - protected void readStandaloneOrHostXmlFromFile(File hostXmlFile) { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - try { - DocumentBuilder builder = factory.newDocumentBuilder(); - InputStream is = new FileInputStream(hostXmlFile); - try { - hostXml = builder.parse(is); - } finally { - is.close(); - } - } catch (Exception e) { - log.error(e.getMessage()); - } - } - - /** - * Try to obtain the management IP and port from the already parsed host.xml or standalone.xml - * @return an Object containing host and port - * @see #readStandaloneOrHostXmlFromFile(java.io.File) for how to obtain the parsed xml - * @param commandLine Command line arguments of the process to - */ - protected HostPort getManagementHostPortFromHostXml(AS7CommandLine commandLine) { - if (hostXml == null) - throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST); - - String portString; - String interfaceExpression; - - String socketBindingName; - - socketBindingName = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/socket-binding/@http"); - String socketInterface = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/socket/@interface"); - String portOffset = null; - - if (!socketInterface.isEmpty()) { - interfaceExpression = obtainXmlPropertyViaXPath("//interfaces/interface[@name='" + socketInterface - + "']/inet-address/@value"); - if (interfaceExpression.isEmpty()) { - interfaceExpression = obtainXmlPropertyViaXPath("//interfaces/interface[@name='" + socketInterface - + "']/loopback-address/@value"); - } - portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/socket/@port"); - } else if (socketBindingName.isEmpty()) { - // old AS7.0, early 7.1 style - portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@port"); - String interfaceName = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@interface"); - interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName - + "']/inet-address/@value"); - if (interfaceExpression.isEmpty()) { - interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName - + "']/loopback-address/@value"); - } - } else { - // later AS7.1 and EAP6 standalone.xml - portString = obtainXmlPropertyViaXPath("/server/socket-binding-group/socket-binding[@name='" - + socketBindingName + "']/@port"); - String interfaceName = obtainXmlPropertyViaXPath("/server/socket-binding-group/socket-binding[@name='" - + socketBindingName + "']/@interface"); - String socketBindingGroupName = "standard-sockets"; - // /server/socket-binding-group[@name='standard-sockets']/@port-offset - String xpathExpression = - "/server/socket-binding-group[@name='" + socketBindingGroupName + "']/@port-offset"; - portOffset = obtainXmlPropertyViaXPath(xpathExpression); - - // TODO the next may also be expressed differently - interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName - + "']/inet-address/@value"); - if (interfaceExpression.isEmpty()) { - interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName - + "']/loopback-address/@value"); - } - } - HostPort hp = new HostPort(); - - if (!interfaceExpression.isEmpty()) - hp.host = replaceDollarExpression(interfaceExpression, commandLine, "localhost"); - else - hp.host = "localhost"; // Fallback - - hp.port = 0; - - if (portString != null && !portString.isEmpty()) { - String tmp = replaceDollarExpression(portString, commandLine, String.valueOf(DEFAULT_MGMT_PORT)); - hp.port = Integer.valueOf(tmp); - } - - if (portOffset!=null && !portOffset.isEmpty()) { - String tmp = replaceDollarExpression(portOffset, commandLine, "0"); - Integer offset = Integer.valueOf(tmp); - hp.port += offset; - hp.withOffset=true; - } - return hp; - } - - /** - * Check if the passed value has an expression in the form of ${var} or ${var:default}, - * try to resolve it. Resolution is done by looking at the command line to see if - * there are -bmanagement or -Djboss.bind.address.management arguments present - * - * @param value a hostname or hostname expression - * @param commandLine The command line from the process - * @param lastResort fall back to this value if the value could not be found on the command line and - * the expression did not specify a default value - * @return resolved value - */ - private String replaceDollarExpression(String value, AS7CommandLine commandLine, String lastResort) { - if (!value.contains("${")) - return value; - - // remove ${ } - value = value.substring(2, value.length() - 1); - String fallback = lastResort; - String expression; - if (value.contains(":")) { - int i = value.indexOf(":"); - expression = value.substring(0, i); - fallback = ((i + 1) < value.length()) ? value.substring(i + 1) : ""; - } else { - expression = value; - } - - String resolvedValue = null; - if (expression.equals(BIND_ADDRESS_MANAGEMENT_SYSPROP)) { - // special case: mgmt address can be specified via either -bmanagement= or -Djboss.bind.address.management= - resolvedValue = commandLine.getClassOption(BIND_ADDRESS_MANAGEMENT_OPTION); - } - if (resolvedValue == null) { - resolvedValue = commandLine.getSystemProperties().get(expression); - } - if (resolvedValue == null) { - resolvedValue = fallback; - } - - return resolvedValue; - } - - /** - * Try to determine the host name - that is the name of a standalone server or a - * host in domain mode by looking at the standalone.xml/host.xml files - * @return server name - */ - protected String findHostName() { - if (hostXml == null) - throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST); - - String hostName = hostXml.getDocumentElement().getAttribute("name"); - return hostName; - } - - /** - * Try to obtain the domain controller's location from looking at host.xml - * @return host and port of the domain controller - */ - protected HostPort getHostPortFromHostXml() { - if (hostXml == null) - throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST); - - // first check remote, as we can't distinguish between a missing local element or - // and empty one which is the default - String remoteHost = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@host"); - String portString = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@port"); - - HostPort hp; - if (!remoteHost.isEmpty() && !portString.isEmpty()) { - hp = new HostPort(false); - hp.host = remoteHost; - hp.port = Integer.parseInt(portString); - } else { - hp = new HostPort(true); - hp.port = 9999; - } - - return hp; - - } - - String getManagementSecurityRealmFromHostXml() { - if (hostXml == null) - throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST); - - String realm = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); - - return realm; - } - - File getSecurityPropertyFileFromHostXml(File baseDir, AS7Mode mode, String realm) { - if (hostXml == null) - throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST); - - String fileName = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm - + "']/authentication/properties/@path"); - String relDir = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm - + "']/authentication/properties/@relative-to"); - - String dmode; - if (mode == AS7Mode.STANDALONE) - dmode = "server"; - else - dmode = "domain"; - - File configDir; - if (relDir.equals("jboss." + dmode + ".config.dir")) { - configDir = new File(baseDir, "configuration"); - } else { - configDir = new File(relDir); - } - File securityPropertyFile = new File(configDir, fileName); - - return securityPropertyFile; - } - - protected File getHomeDir(ProcessInfo processInfo, JavaCommandLine javaCommandLine) { - String home = javaCommandLine.getSystemProperties().get(HOME_DIR_SYSPROP); - File homeDir = new File(home); - if (!homeDir.isAbsolute()) { - if (processInfo.getExecutable() == null) { - throw new RuntimeException(HOME_DIR_SYSPROP + " for AS7 process " + processInfo - + " is a relative path, and the RHQ Agent process does not have permission to resolve it."); - } - String cwd = processInfo.getExecutable().getCwd(); - homeDir = new File(cwd, home); - } - - return new File(FileUtils.getCanonicalPath(homeDir.getPath())); - } - - /** - * Run the passed xpathExpression on the prepopulated hostXml document and - * return the target element or attribute as a String. - * @param xpathExpression XPath Expression to evaluate - * @return String value of the Element or Attribute the XPath was pointing to. - * Null in case the xpathExpression could not be evaluated. - * @throws IllegalArgumentException if hostXml is null - * - */ - protected String obtainXmlPropertyViaXPath(String xpathExpression) { - if (hostXml == null) - throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST); - - XPath xpath = factory.newXPath(); - try { - XPathExpression expr = xpath.compile(xpathExpression); - - Object result = expr.evaluate(hostXml, XPathConstants.STRING); - - return result.toString(); - } catch (XPathExpressionException e) { - log.error("Evaluation XPath expression failed: " + e.getMessage()); - return null; - } - } - - protected HostPort checkForSocketBindingOffset(HostPort managementPort, AS7CommandLine commandLine) { - String value = commandLine.getSystemProperties().get(SOCKET_BINDING_PORT_OFFSET_SYSPROP); - if (value != null) { - int offset = Integer.valueOf(value); - managementPort.port += offset; - } - - return managementPort; - } - - /** - * Helper class that holds information about the host,port tuple - */ - protected static class HostPort { - String host; - int port; - boolean isLocal = true; - boolean withOffset = false; - - public HostPort() { - host = "localhost"; - port = DEFAULT_MGMT_PORT; - isLocal = true; - } - - public HostPort(boolean local) { - this(); - isLocal = local; - } - - @Override - public String toString() { - return "HostPort{" + "host='" + host + '\'' + ", port=" + port + ", isLocal=" + isLocal + '}'; - } - } - -} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index ee7dbbd..06daa44 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -54,6 +54,8 @@ import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.JavaCommandLine; import org.rhq.core.system.ProcessInfo; import org.rhq.core.system.SystemInfo; +import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; +import org.rhq.modules.plugins.jbossas7.helper.HostPort; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.ReadAttribute; import org.rhq.modules.plugins.jbossas7.json.Result; @@ -62,12 +64,13 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Abstract base discovery component for the two server types - "JBossAS7 Host Controller" and * "JBossAS7 Standalone Server". */ -public abstract class BaseProcessDiscovery extends AbstractBaseDiscovery - implements ResourceDiscoveryComponent, ManualAddFacet { +public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent, ManualAddFacet { private static final String JBOSS_AS_PREFIX = "jboss-as-"; private static final String JBOSS_EAP_PREFIX = "jboss-eap-"; + private static final String HOME_DIR_SYSPROP = "jboss.home.dir"; + private static final String RHQADMIN = "rhqadmin"; private static final String RHQADMIN_ENCRYPTED = "35c160c1f841a889d4cda53f0bfc94b6"; @@ -126,8 +129,8 @@ public abstract class BaseProcessDiscovery extends AbstractBaseDiscovery if (!hostXmlFile.exists()) { throw new Exception("Server configuration file not found at the expected location (" + hostXmlFile + ")."); } - // This sets this.hostXml, which lots of other methods depend on being set. - readStandaloneOrHostXmlFromFile(hostXmlFile); + // This method must be called before getHostConfiguration() can be called. + HostConfiguration hostConfig = loadHostConfiguration(hostXmlFile); String domainHost = findHost(hostXmlFile); pluginConfig.put(new PropertySimple("domainHost", domainHost)); @@ -135,19 +138,19 @@ public abstract class BaseProcessDiscovery extends AbstractBaseDiscovery File logFile = getLogFile(getLogDir(process, commandLine, baseDir)); initLogEventSourcesConfigProp(logFile.getPath(), pluginConfig); - HostPort managementHostPort = getManagementHostPortFromHostXml(commandLine); + HostPort managementHostPort = hostConfig.getManagementHostPort(commandLine, getMode()); pluginConfig.put(new PropertySimple("hostname", managementHostPort.host)); pluginConfig.put(new PropertySimple("port", managementHostPort.port)); - pluginConfig.put(new PropertySimple("realm", getManagementSecurityRealmFromHostXml())); + pluginConfig.put(new PropertySimple("realm", hostConfig.getManagementSecurityRealm())); JBossProductType productType = JBossProductType.determineJBossProductType(homeDir); pluginConfig.put(new PropertySimple("productType", productType.name())); pluginConfig.put(new PropertySimple("hostXmlFileName", getHostXmlFileName(commandLine))); setStartScriptPluginConfigProps(discoveryContext.getSystemInformation(), process, commandLine, pluginConfig); - setUserAndPasswordPluginConfigProps(pluginConfig, baseDir); + setUserAndPasswordPluginConfigProps(pluginConfig, hostConfig, baseDir); String key = baseDir.getPath(); - HostPort hostPort = getHostPortFromHostXml(); + HostPort hostPort = hostConfig.getHostPort(); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String description = buildDefaultResourceDescription(hostPort, productType); @@ -169,6 +172,29 @@ public abstract class BaseProcessDiscovery extends AbstractBaseDiscovery pluginConfig, process); } + protected HostConfiguration loadHostConfiguration(File hostXmlFile) throws Exception { + try { + return new HostConfiguration(hostXmlFile); + } catch (Exception e) { + throw new Exception("Failed to load host configuration from [" + hostXmlFile + "].", e); + } + } + + protected File getHomeDir(ProcessInfo processInfo, JavaCommandLine javaCommandLine) { + String home = javaCommandLine.getSystemProperties().get(HOME_DIR_SYSPROP); + File homeDir = new File(home); + if (!homeDir.isAbsolute()) { + if (processInfo.getExecutable() == null) { + throw new RuntimeException(HOME_DIR_SYSPROP + " for AS7 process " + processInfo + + " is a relative path, and the RHQ Agent process does not have permission to resolve it."); + } + String cwd = processInfo.getExecutable().getCwd(); + homeDir = new File(cwd, home); + } + + return new File(FileUtils.getCanonicalPath(homeDir.getPath())); + } + private void setStartScriptPluginConfigProps(SystemInfo systemInfo, ProcessInfo process, AS7CommandLine commandLine, Configuration pluginConfig) { ProcessInfo parentProcess = getParentProcess(systemInfo, process); @@ -234,8 +260,9 @@ public abstract class BaseProcessDiscovery extends AbstractBaseDiscovery pluginConfig.put(new PropertySimple("startScriptEnv", startScriptEnv)); } - private void setUserAndPasswordPluginConfigProps(Configuration pluginConfig, File baseDir) { - Properties mgmtUsers = getManagementUsers(getMode(), baseDir); + private void setUserAndPasswordPluginConfigProps(Configuration pluginConfig, HostConfiguration hostConfig, + File baseDir) { + Properties mgmtUsers = getManagementUsers(hostConfig, getMode(), baseDir); String user; String password; if (!mgmtUsers.isEmpty()) { @@ -437,9 +464,9 @@ public abstract class BaseProcessDiscovery extends AbstractBaseDiscovery } // never returns null - private Properties getManagementUsers(AS7Mode mode, File baseDir) { - String realm = getManagementSecurityRealmFromHostXml(); - File mgmUsersPropsFile = getSecurityPropertyFileFromHostXml(baseDir, mode, realm); + private Properties getManagementUsers(HostConfiguration hostConfig, AS7Mode mode, File baseDir) { + String realm = hostConfig.getManagementSecurityRealm(); + File mgmUsersPropsFile = hostConfig.getSecurityPropertyFile(baseDir, mode, realm); Properties props = new Properties(); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index d782a50..cf97f7b 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -48,6 +48,7 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.ComplexResult; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -355,10 +356,15 @@ public class BaseServerComponent<T extends ResourceComponent<?>> extends BaseCom throw new IllegalArgumentException("Unsupported mode: " + mode); } File configFile = new File(configDir, configFileName); - processDiscovery.readStandaloneOrHostXmlFromFile(configFile); + HostConfiguration hostConfig; + try { + hostConfig = new HostConfiguration(configFile); + } catch (Exception e) { + throw new RuntimeException("Failed to parse configuration file [" + configFile + "].", e); + } String realm = pluginConfig.getSimpleValue("realm", "ManagementRealm"); - File propertiesFile = processDiscovery.getSecurityPropertyFileFromHostXml(baseDir, mode, realm); + File propertiesFile = hostConfig.getSecurityPropertyFile(baseDir, mode, realm); String encryptedPassword; try { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java index 2c35554..d4166bb 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java @@ -23,6 +23,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.ProcessInfo; +import org.rhq.modules.plugins.jbossas7.helper.HostPort; /** * Discovery component for "JBossAS7 Host Controller" Resources. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java index 69ee17a..501a4c6 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java @@ -25,12 +25,16 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.ComplexResult; @@ -45,7 +49,9 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * * @author Heiko W. Rupp */ -public class ManagedASDiscovery extends AbstractBaseDiscovery<HostControllerComponent<?>> { +public class ManagedASDiscovery implements ResourceDiscoveryComponent<HostControllerComponent<?>> { + + private final Log log = LogFactory.getLog(ManagedASDiscovery.class); private HostControllerComponent parentComponent; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java index 2c929fc..3b4ab93 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java @@ -25,6 +25,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.ProcessInfo; +import org.rhq.modules.plugins.jbossas7.helper.HostPort; /** * Discovery component for "JBossAS7 Standalone Server" Resources. @@ -92,15 +93,6 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { } @Override - protected HostPort getManagementHostPortFromHostXml(AS7CommandLine commandLine) { - HostPort managementPort = super.getManagementHostPortFromHostXml(commandLine); - if (!managementPort.withOffset) { - managementPort = checkForSocketBindingOffset(managementPort, commandLine); - } - return managementPort; - } - - @Override protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContext discoveryContext, ProcessInfo process, AS7CommandLine commandLine) throws Exception { DiscoveredResourceDetails resourceDetails = super.buildResourceDetails(discoveryContext, process, commandLine);//To change body of overridden methods use File | Settings | File Templates. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java new file mode 100644 index 0000000..bbb5d93 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java @@ -0,0 +1,292 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.modules.plugins.jbossas7.helper; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.w3c.dom.Document; + +import org.rhq.modules.plugins.jbossas7.AS7CommandLine; +import org.rhq.modules.plugins.jbossas7.AS7CommandLineOption; +import org.rhq.modules.plugins.jbossas7.AS7Mode; + +/** + * A host configuration - loaded from either standalone.xml or host.xml. + * + * @author Heiko Rupp + */ +public class HostConfiguration { + + public static final int DEFAULT_MGMT_PORT = 9990; + + private static final String BIND_ADDRESS_MANAGEMENT_SYSPROP = "jboss.bind.address.management"; + private static final String SOCKET_BINDING_PORT_OFFSET_SYSPROP = "jboss.socket.binding.port-offset"; + + private AS7CommandLineOption BIND_ADDRESS_MANAGEMENT_OPTION = new AS7CommandLineOption("bmanagement", null); + + private final Log log = LogFactory.getLog(HostConfiguration.class); + + private Document document; + private XPathFactory xpathFactory; + + /** + * + * @param hostXmlFile absolute path to standalone.xml or host.xml file + */ + public HostConfiguration(File hostXmlFile) throws Exception { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = factory.newDocumentBuilder(); + InputStream is = new FileInputStream(hostXmlFile); + try { + this.document = builder.parse(is); + } finally { + is.close(); + } + + this.xpathFactory = XPathFactory.newInstance(); + } + + /** + * Try to obtain the management IP and port from the already parsed host.xml or standalone.xml + * + * + * @param commandLine Command line arguments of the process to + * + * @return an Object containing host and port + */ + public HostPort getManagementHostPort(AS7CommandLine commandLine, AS7Mode mode) { + String portString; + String interfaceExpression; + + String socketBindingName; + + socketBindingName = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/socket-binding/@http"); + String socketInterface = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/socket/@interface"); + String portOffsetRaw = null; + + if (!socketInterface.isEmpty()) { + interfaceExpression = obtainXmlPropertyViaXPath("//interfaces/interface[@name='" + socketInterface + + "']/inet-address/@value"); + if (interfaceExpression.isEmpty()) { + interfaceExpression = obtainXmlPropertyViaXPath("//interfaces/interface[@name='" + socketInterface + + "']/loopback-address/@value"); + } + portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/socket/@port"); + } else if (socketBindingName.isEmpty()) { + // old AS7.0, early 7.1 style + portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@port"); + String interfaceName = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@interface"); + interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName + + "']/inet-address/@value"); + if (interfaceExpression.isEmpty()) { + interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName + + "']/loopback-address/@value"); + } + } else { + // later AS7.1 and EAP6 standalone.xml + portString = obtainXmlPropertyViaXPath("/server/socket-binding-group/socket-binding[@name='" + + socketBindingName + "']/@port"); + String interfaceName = obtainXmlPropertyViaXPath("/server/socket-binding-group/socket-binding[@name='" + + socketBindingName + "']/@interface"); + String socketBindingGroupName = "standard-sockets"; + // /server/socket-binding-group[@name='standard-sockets']/@port-offset + String xpathExpression = + "/server/socket-binding-group[@name='" + socketBindingGroupName + "']/@port-offset"; + portOffsetRaw = obtainXmlPropertyViaXPath(xpathExpression); + + // TODO the next may also be expressed differently + interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName + + "']/inet-address/@value"); + if (interfaceExpression.isEmpty()) { + interfaceExpression = obtainXmlPropertyViaXPath("/server/interfaces/interface[@name='" + interfaceName + + "']/loopback-address/@value"); + } + } + HostPort hp = new HostPort(); + + if (!interfaceExpression.isEmpty()) + hp.host = replaceDollarExpression(interfaceExpression, commandLine, "localhost"); + else + hp.host = "localhost"; // Fallback + + hp.port = 0; + + if (portString != null && !portString.isEmpty()) { + String tmp = replaceDollarExpression(portString, commandLine, String.valueOf(DEFAULT_MGMT_PORT)); + hp.port = Integer.valueOf(tmp); + } + + if (portOffsetRaw != null && !portOffsetRaw.isEmpty()) { + String portOffsetString = replaceDollarExpression(portOffsetRaw, commandLine, "0"); + Integer portOffset = Integer.valueOf(portOffsetString); + hp.port += portOffset; + hp.withOffset = true; + } + + // TODO (ips): We shouldn't need the below code if the above code that reads the port offset from the config + // file is working correctly. + if (!hp.withOffset && (mode == AS7Mode.STANDALONE)) { + // Only standalone applies the port offset to the management ports. + String value = commandLine.getSystemProperties().get(SOCKET_BINDING_PORT_OFFSET_SYSPROP); + if (value != null) { + int offset = Integer.valueOf(value); + hp.port += offset; + } + } + + return hp; + } + + /** + * Try to determine the host name - that is the name of a standalone server or a + * host in domain mode by looking at the standalone.xml/host.xml files + * @return server name + */ + public String getHostName() { + String hostName = this.document.getDocumentElement().getAttribute("name"); + return hostName; + } + + /** + * Try to obtain the domain controller's location from looking at host.xml + * @return host and port of the domain controller + */ + public HostPort getHostPort() { + // first check remote, as we can't distinguish between a missing local element or + // and empty one which is the default + String remoteHost = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@host"); + String portString = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@port"); + + HostPort hp; + if (!remoteHost.isEmpty() && !portString.isEmpty()) { + hp = new HostPort(false); + hp.host = remoteHost; + hp.port = Integer.parseInt(portString); + } else { + hp = new HostPort(true); + hp.port = 9999; + } + + return hp; + + } + + public String getManagementSecurityRealm() { + String realm = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); + return realm; + } + + public File getSecurityPropertyFile(File baseDir, AS7Mode mode, String realm) { + String fileName = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + + "']/authentication/properties/@path"); + String relDir = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + + "']/authentication/properties/@relative-to"); + + String dmode; + if (mode == AS7Mode.STANDALONE) + dmode = "server"; + else + dmode = "domain"; + + File configDir; + if (relDir.equals("jboss." + dmode + ".config.dir")) { + configDir = new File(baseDir, "configuration"); + } else { + configDir = new File(relDir); + } + File securityPropertyFile = new File(configDir, fileName); + + return securityPropertyFile; + } + + /** + * Run the passed xpathExpression on the prepopulated hostXml document and + * return the target element or attribute as a String. + * @param xpathExpression XPath Expression to evaluate + * @return String value of the Element or Attribute the XPath was pointing to. + * Null in case the xpathExpression could not be evaluated. + * @throws IllegalArgumentException if hostXml is null + */ + public String obtainXmlPropertyViaXPath(String xpathExpression) { + XPath xpath = this.xpathFactory.newXPath(); + try { + XPathExpression expr = xpath.compile(xpathExpression); + Object result = expr.evaluate(this.document, XPathConstants.STRING); + return result.toString(); + } catch (XPathExpressionException e) { + log.error("Evaluation of XPath expression failed: " + e.getMessage()); + return null; + } + } + + /** + * Check if the passed value has an expression in the form of ${var} or ${var:default}, + * try to resolve it. Resolution is done by looking at the command line to see if + * there are -bmanagement or -Djboss.bind.address.management arguments present + * + * @param value a hostname or hostname expression + * @param commandLine The command line from the process + * @param lastResort fall back to this value if the value could not be found on the command line and + * the expression did not specify a default value + * @return resolved value + */ + protected String replaceDollarExpression(String value, AS7CommandLine commandLine, String lastResort) { + if (!value.contains("${")) + return value; + + // remove ${ } + value = value.substring(2, value.length() - 1); + String fallback = lastResort; + String expression; + if (value.contains(":")) { + int i = value.indexOf(":"); + expression = value.substring(0, i); + fallback = ((i + 1) < value.length()) ? value.substring(i + 1) : ""; + } else { + expression = value; + } + + String resolvedValue = null; + if (expression.equals(BIND_ADDRESS_MANAGEMENT_SYSPROP)) { + // special case: mgmt address can be specified via either -bmanagement= or -Djboss.bind.address.management= + resolvedValue = commandLine.getClassOption(BIND_ADDRESS_MANAGEMENT_OPTION); + } + if (resolvedValue == null) { + resolvedValue = commandLine.getSystemProperties().get(expression); + } + if (resolvedValue == null) { + resolvedValue = fallback; + } + + return resolvedValue; + } + +} diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostPort.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostPort.java new file mode 100644 index 0000000..f85d5c0 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostPort.java @@ -0,0 +1,47 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.modules.plugins.jbossas7.helper; + +/** + * @author Heiko Rupp + */ +public class HostPort { + + public String host; + public int port; + public boolean isLocal = true; + public boolean withOffset = false; + + public HostPort() { + host = "localhost"; + port = HostConfiguration.DEFAULT_MGMT_PORT; + isLocal = true; + } + + public HostPort(boolean local) { + this(); + isLocal = local; + } + + @Override + public String toString() { + return "HostPort{" + "host='" + host + '\'' + ", port=" + port + ", isLocal=" + isLocal + '}'; + } + +} diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java index 851e3e4..4f5d713 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java @@ -5,32 +5,31 @@ import java.net.URL; import org.testng.annotations.Test; +import org.rhq.modules.plugins.jbossas7.helper.HostConfiguration; +import org.rhq.modules.plugins.jbossas7.helper.HostPort; + /** - * Test the ability to read information from the AS7 xml files (standalone.xml and so on) + * Test the ability to read information from the AS7 standalone.xml or host.xml config files using + * {@link HostConfiguration}. + * * @author Heiko W. Rupp */ @Test(groups = "unit") public class XmlFileReadingTest { public void hostPort70() throws Exception { - - BaseProcessDiscovery bd = new StandaloneASDiscovery(); URL url = getClass().getClassLoader().getResource("standalone70.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); - - AbstractBaseDiscovery.HostPort hp = bd.getManagementHostPortFromHostXml(new AS7CommandLine(new String [] {"java"})); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); + HostPort hp = hostConfig.getManagementHostPort(new AS7CommandLine(new String [] {"java"}), AS7Mode.STANDALONE); System.out.println(hp); assert hp.host.equals("127.0.0.70") : "Host is " + hp.host; assert hp.port==19990 : "Port is " + hp.port; } public void hostPort71() throws Exception { - - BaseProcessDiscovery bd = new StandaloneASDiscovery(); URL url = getClass().getClassLoader().getResource("standalone71.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); - - AbstractBaseDiscovery.HostPort hp = bd.getManagementHostPortFromHostXml(new AS7CommandLine(new String[] {"java"})); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); + HostPort hp = hostConfig.getManagementHostPort(new AS7CommandLine(new String[] {"java"}), AS7Mode.STANDALONE); System.out.println(hp); // hp : HostPort{host='localhost', port=9990, isLocal=true} assert hp.host.equals("127.0.0.71") : "Host is " + hp.host; @@ -38,129 +37,107 @@ public class XmlFileReadingTest { } public void domainController1() throws Exception { - - BaseProcessDiscovery bd = new HostControllerDiscovery(); URL url = getClass().getClassLoader().getResource("host1.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); - - AbstractBaseDiscovery.HostPort hp = bd.getHostPortFromHostXml(); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); + HostPort hp = hostConfig.getHostPort(); assert hp.isLocal : "DC is not local as expected: " + hp; - } public void domainController2() throws Exception { - - BaseProcessDiscovery bd = new HostControllerDiscovery(); URL url = getClass().getClassLoader().getResource("host2.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); - - AbstractBaseDiscovery.HostPort hp = bd.getHostPortFromHostXml(); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); + HostPort hp = hostConfig.getHostPort(); assert "192.168.100.1".equals(hp.host) : "DC is at " + hp.host; assert hp.port == 9559 : "DC port is at " + hp.port; } - public void testXpath70() throws Exception { - - BaseProcessDiscovery bd = new StandaloneASDiscovery(); URL url = getClass().getClassLoader().getResource("standalone70.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); - + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); /* String realm = bd.obtainXmlPropertyViaXPath("/management/management-interfaces/http-interface/@security-realm"); assert "ManagementRealm".equals(realm) : "Realm was " + realm; */ - String pathExpr = "//management/management-interfaces/http-interface/@port"; - String port = bd.obtainXmlPropertyViaXPath(pathExpr); + String port = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "19990".equals(port) : "Port was [" + port + "]"; pathExpr = "//management/management-interfaces/http-interface/@interface"; - String interfName = bd.obtainXmlPropertyViaXPath(pathExpr); + String interfName = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "management".equals(interfName) : "Interface was " + interfName; pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value"; - String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr); + String interfElem = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "${jboss.bind.address.management:127.0.0.70}".equals(interfElem) : "InterfElem was " + interfElem; - } public void testXpath71() throws Exception { - - BaseProcessDiscovery bd = new StandaloneASDiscovery(); URL url = getClass().getClassLoader().getResource("standalone71.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); - String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); + String realm = hostConfig.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); assert "ManagementRealm".equals(realm) : "Realm was " + realm; - String sbindingRef = bd.obtainXmlPropertyViaXPath( + String sbindingRef = hostConfig.obtainXmlPropertyViaXPath( ("//management/management-interfaces/http-interface/socket-binding/@http")); assert "management-http".equals(sbindingRef): "Socketbinding was " + sbindingRef; String pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@port"; - String port = bd.obtainXmlPropertyViaXPath(pathExpr); + String port = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "29990".equals(port) : "Port was [" + port + "]"; pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@interface"; - String interfName = bd.obtainXmlPropertyViaXPath(pathExpr); + String interfName = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "management".equals(interfName) : "Interface was " + interfName; pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value"; - String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr); + String interfElem = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "${jboss.bind.address.management:127.0.0.71}".equals(interfElem) : "InterfElem was " + interfElem; - } public void testXpath711() throws Exception { - - BaseProcessDiscovery bd = new StandaloneASDiscovery(); URL url = getClass().getClassLoader().getResource("standalone711.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); - String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); + String realm = hostConfig.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); assert "ManagementRealm".equals(realm) : "Realm was " + realm; - String sbindingRef = bd.obtainXmlPropertyViaXPath( + String sbindingRef = hostConfig.obtainXmlPropertyViaXPath( ("//management/management-interfaces/http-interface/socket-binding/@http")); assert "management-http".equals(sbindingRef): "Socketbinding was " + sbindingRef; String pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@port"; - String port = bd.obtainXmlPropertyViaXPath(pathExpr); + String port = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "${jboss.management.http.port:9990}".equals(port) : "Port was [" + port + "]"; pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@interface"; - String interfName = bd.obtainXmlPropertyViaXPath(pathExpr); + String interfName = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "management".equals(interfName) : "Interface was " + interfName; pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value"; - String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr); + String interfElem = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "${jboss.bind.address.management:127.0.0.71}".equals(interfElem) : "InterfElem was " + interfElem; String socketBindingGroupName = "standard-sockets"; pathExpr = "/server/socket-binding-group[@name='" + socketBindingGroupName + "']/@port-offset"; - String offsetAttr = bd.obtainXmlPropertyViaXPath(pathExpr); + String offsetAttr = hostConfig.obtainXmlPropertyViaXPath(pathExpr); assert "${jboss.socket.binding.port-offset:123}".equals(offsetAttr) : "Port-Offset was " + offsetAttr; - } public void testGetRealm() throws Exception { - - BaseProcessDiscovery bd = new StandaloneASDiscovery(); URL url = getClass().getClassLoader().getResource("standalone71.xml"); - bd.readStandaloneOrHostXmlFromFile(new File(url.getPath())); + HostConfiguration hostConfig = new HostConfiguration(new File(url.getPath())); - String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); + String realm = hostConfig.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm"); assert "ManagementRealm".equals(realm) : "Realm was " + realm; String xpathExpression = "//management//security-realm[@name ='%s']/authentication/properties/@path"; - String propsFileName = bd.obtainXmlPropertyViaXPath(String.format(xpathExpression,realm)); + String propsFileName = hostConfig.obtainXmlPropertyViaXPath(String.format(xpathExpression,realm)); assert "mgmt-users.properties".equals(propsFileName) : "File name was " + propsFileName; - String propsFilePathRel = bd.obtainXmlPropertyViaXPath("//management//security-realm[@name ='" + realm + "']/authentication/properties/@relative-to"); + String propsFilePathRel = hostConfig.obtainXmlPropertyViaXPath("//management//security-realm[@name ='" + realm + "']/authentication/properties/@relative-to"); assert "jboss.server.config.dir".equals(propsFilePathRel) : "Path was " + propsFileName; - } } commit 8ba02a773dd281cb2b9d8b6c7092c5bc1641244d Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Apr 19 17:49:37 2012 +0200 [BZ 796636] - Adding an upgrade task to obfuscate all the password properties in configurations of existing content sources. diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index e499c5b..a0dfc7e 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -15,7 +15,7 @@ <description>Database schema setup, upgrade and other utilities</description> <properties> - <db.schema.version>2.121</db.schema.version> + <db.schema.version>2.122</db.schema.version> <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name> <rhq.ds.connection-url>${rhq.test.ds.connection-url}</rhq.ds.connection-url> @@ -25,6 +25,12 @@ </properties> <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-core-util</artifactId> + <version>${project.version}</version> + </dependency> +  <dependency> <groupId>ant</groupId> diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/AbstractConfigurationObfuscationUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/AbstractConfigurationObfuscationUpgradeTask.java new file mode 100644 index 0000000..b0745ad --- /dev/null +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/AbstractConfigurationObfuscationUpgradeTask.java @@ -0,0 +1,313 @@ +/* + * 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.core.db.upgrade; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.rhq.core.db.DatabaseType; +import org.rhq.core.util.obfuscation.Obfuscator; + +/** + * Abstract base class for obfuscating the passwords in the database. + * Because configurations and configuration definitions are only loosely coupled to + * the entities, this class provides the upgrade functionality only from the point + * where the configuration - configuration definition pairs are known. + * + * It is the subclasses responsibility to provide those pairs based on the entity type + * the subclass handles. + * + * @author Lukas Krejci + */ +public abstract class AbstractConfigurationObfuscationUpgradeTask implements DatabaseUpgradeTask { + + protected Connection connection; + protected DatabaseType databaseType; + + enum PropertyType { + MAP, + LIST, + SIMPLE, + OBFUSCATED; + + static PropertyType fromName(String name) { + if ("map".equals(name)) { + return MAP; + } else if ("list".equals(name)) { + return LIST; + } else if ("property".equals(name)) { + return SIMPLE; + } else if ("obfuscated".equals(name)) { + return OBFUSCATED; + } else { + return null; + } + } + } + + enum PropertySimpleType { + VARIOUS, + PASSWORD; + + static PropertySimpleType fromName(String name) { + if ("PASSWORD".equals(name)) { + return PASSWORD; + } else { + return VARIOUS; + } + } + } + + class PropertyDefinition { + int id; + String name; + PropertyType type; + PropertySimpleType simpleType; + + List<PropertyDefinition> getChildDefinitions() throws SQLException { + if (type == PropertyType.SIMPLE || type == PropertyType.OBFUSCATED) { + return Collections.emptyList(); + } + + String sql = "SELECT id, name, dtype, simple_type FROM rhq_config_prop_def WHERE "; + switch (type) { + case MAP: + sql += "parent_map_definition_id = " + id; + break; + case LIST: + sql += "parent_list_definition_id = " + id; + break; + default: + return Collections.emptyList(); + } + + List<Object[]> results = databaseType.executeSelectSql(connection, sql); + List<PropertyDefinition> ret = new ArrayList<PropertyDefinition>(); + for (Object[] row : results) { + PropertyDefinition pd = new PropertyDefinition(); + pd.id = (Integer) row[0]; + pd.name = (String) row[1]; + pd.type = PropertyType.fromName((String) row[2]); + pd.simpleType = row[3] != null ? PropertySimpleType.fromName((String) row[3]) : null; + + ret.add(pd); + } + + return ret; + } + + @Override + public String toString() { + return "[id: " + id + ", name: '" + name + "', type: " + type.name() + "]"; + } + } + + class Property { + int id; + String name; + PropertyType type; + String value; + + List<Property> getChildren() throws SQLException { + if (type == PropertyType.SIMPLE || type == PropertyType.OBFUSCATED) { + return Collections.emptyList(); + } + + String sql = "SELECT id, name, dtype, string_value FROM rhq_config_property WHERE "; + switch (type) { + case MAP: + sql += "parent_map_id = " + id; + break; + case LIST: + sql += "parent_list_id = " + id; + break; + default: + return Collections.emptyList(); + } + + List<Object[]> results = databaseType.executeSelectSql(connection, sql); + List<Property> ret = new ArrayList<Property>(); + for (Object[] row : results) { + Property p = new Property(); + p.id = (Integer) row[0]; + p.name = (String) row[1]; + p.type = PropertyType.fromName((String) row[2]); + p.value = (String) row[3]; + + ret.add(p); + } + + return ret; + } + + @Override + public String toString() { + return "[id: " + id + ", name: '" + name + "', type: " + type.name() + "]"; + } + } + + /** + * Based on the entity type that the subclass handles, this method will return the pairs + * of configuration id and the corresponding configuration definition id for each of the + * entities that the subclass handles. + * + * For example if the subclass handles plugin configuration of the resources, the resulting + * map will contain the plugin configuration id of each resource as a key and the value + * of each key will be the plugin configuration definition id of the resource type of the + * resource. + * + * @throws SQLException + */ + protected abstract Map<Integer, Integer> getConfigurationIdConfigurationDefinitionIdPairs() throws SQLException; + + /** + * @return a textual human-friendly description of the entity type this subclass handles. + * This is only used in the error reporting. + */ + protected abstract String getEntityTypeDescription(); + + @Override + public void execute(DatabaseType type, Connection connection) throws SQLException { + this.connection = connection; + this.databaseType = type; + + for (Map.Entry<Integer, Integer> confAndDef : getConfigurationIdConfigurationDefinitionIdPairs().entrySet()) { + List<PropertyDefinition> defs = getTopDefinitions(confAndDef.getValue()); + List<Property> props = getTopProperties(confAndDef.getKey()); + + Map<PropertyDefinition, Property> pairs = matchDefinitionsAndProperties(defs, props); + for (Map.Entry<PropertyDefinition, Property> entry : pairs.entrySet()) { + try { + processProperty(entry.getKey(), entry.getValue()); + } catch (Exception e) { + throw new SQLException("Failed to obfuscate passwords while processing entities of type [" + + getEntityTypeDescription() + + "]. The failure happened while processing: configuration definition id: " + + confAndDef.getValue() + ", configuration id: " + confAndDef.getKey() + + ", property definition: " + entry.getKey() + ", property: " + entry.getValue(), e); + } + } + } + } + + private void processProperty(PropertyDefinition pd, Property p) throws Exception { + switch (pd.type) { + case LIST: + case MAP: + List<PropertyDefinition> childDefs = pd.getChildDefinitions(); + List<Property> childProps = p.getChildren(); + Map<PropertyDefinition, Property> pairs = matchDefinitionsAndProperties(childDefs, childProps); + for (Map.Entry<PropertyDefinition, Property> entry : pairs.entrySet()) { + processProperty(entry.getKey(), entry.getValue()); + } + break; + case SIMPLE: + if (pd.simpleType == PropertySimpleType.PASSWORD && p.type == PropertyType.SIMPLE) { + String sql; + if (p.value != null) { + String obfuscatedValue = Obfuscator.encode(p.value); + sql = + "UPDATE rhq_config_property SET string_value = '" + obfuscatedValue + + "', dtype = 'obfuscated' WHERE id = " + p.id; + } else { + sql = "UPDATE rhq_config_property SET dtype='obfuscated' WHERE id = " + p.id; + } + + databaseType.executeSql(connection, sql); + } + break; + } + } + + private List<PropertyDefinition> getTopDefinitions(int configurationDefinitionId) throws SQLException { + String sql = + "SELECT id, name, dtype, simple_type FROM rhq_config_prop_def WHERE config_def_id = " + configurationDefinitionId; + + List<Object[]> results = databaseType.executeSelectSql(connection, sql); + + List<PropertyDefinition> ret = new ArrayList<PropertyDefinition>(); + for (Object[] row : results) { + PropertyDefinition pd = new PropertyDefinition(); + pd.id = (Integer) row[0]; + pd.name = (String) row[1]; + pd.type = PropertyType.fromName((String) row[2]); + pd.simpleType = row[3] != null ? PropertySimpleType.fromName((String) row[3]) : null; + + ret.add(pd); + } + + return ret; + } + + private List<Property> getTopProperties(int configurationId) throws SQLException { + String sql = + "SELECT id, name, dtype, string_value FROM rhq_config_property WHERE configuration_id = " + configurationId; + + List<Object[]> results = databaseType.executeSelectSql(connection, sql); + + List<Property> ret = new ArrayList<Property>(); + for (Object[] row : results) { + Property p = new Property(); + p.id = (Integer) row[0]; + p.name = (String) row[1]; + p.type = PropertyType.fromName((String) row[2]); + p.value = (String) row[3]; + + ret.add(p); + } + + return ret; + } + + private Map<PropertyDefinition, Property> matchDefinitionsAndProperties(List<PropertyDefinition> defs, + List<Property> props) { + class DefAndProp { + PropertyDefinition def; + Property prop; + } + + Map<String, DefAndProp> mapping = new HashMap<String, DefAndProp>(); + + for (PropertyDefinition pd : defs) { + DefAndProp dap = new DefAndProp(); + dap.def = pd; + mapping.put(pd.name, dap); + } + + for (Property p : props) { + DefAndProp dap = mapping.get(p.name); + if (dap != null) { + dap.prop = p; + } + } + + Map<PropertyDefinition, Property> ret = new HashMap<PropertyDefinition, Property>(); + for (DefAndProp dap : mapping.values()) { + ret.put(dap.def, dap.prop); + } + + return ret; + } +} diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/ContentSourceConfigurationObfuscationUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/ContentSourceConfigurationObfuscationUpgradeTask.java new file mode 100644 index 0000000..9e2dacf --- /dev/null +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/ContentSourceConfigurationObfuscationUpgradeTask.java @@ -0,0 +1,57 @@ +/* + * 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.core.db.upgrade; + +import java.sql.SQLException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author Lukas Krejci + */ +public class ContentSourceConfigurationObfuscationUpgradeTask extends AbstractConfigurationObfuscationUpgradeTask { + + @Override + protected Map<Integer, Integer> getConfigurationIdConfigurationDefinitionIdPairs() throws SQLException { + Map<Integer, Integer> ret = new HashMap<Integer, Integer>(); + String sql = + "SELECT cs.configuration_id, ct.source_config_def_id FROM" + + " rhq_content_source cs, rhq_content_source_type ct WHERE" + " cs.content_source_type_id = ct.id"; + + List<Object[]> results = databaseType.executeSelectSql(connection, sql); + + for (Object[] row : results) { + Integer configId = (Integer) row[0]; + Integer configDefId = (Integer) row[1]; + + ret.put(configId, configDefId); + } + + return ret; + } + + @Override + protected String getEntityTypeDescription() { + return "Content Source"; + } +} diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 45c04ed..8bf4830 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -4011,6 +4011,9 @@ </schema-directSQL> </schemaSpec> + <schemaSpec version="2.122"> + <schema-javaTask className="ContentSourceConfigurationObfuscationUpgradeTask" /> + </schemaSpec> </dbupgrade> </target> </project> commit 4ba26f9a14158d7798fb6637c40834a6eed35044 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Apr 18 20:33:10 2012 +0200 [BZ 796636] - Adding support for obfuscating the passwords in the content source configurations. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java index 0246ea0..339e644 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java @@ -58,6 +58,7 @@ import org.jboss.util.StringPropertyReplacer; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.content.Advisory; import org.rhq.core.domain.content.AdvisoryBuglist; import org.rhq.core.domain.content.AdvisoryCVE; @@ -96,6 +97,7 @@ import org.rhq.core.domain.server.PersistenceUtility; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; +import org.rhq.core.domain.util.PasswordObfuscationUtility; import org.rhq.core.util.MessageDigestGenerator; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.stream.StreamUtil; @@ -475,6 +477,8 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { log.warn("Failed to start adapter for [" + contentSource + "]", e); } + obfuscatePasswords(contentSource); + entityManager.persist(contentSource); // these aren't cascaded during persist, but I want to set them to null anyway, just to be sure contentSource.setSyncResults(null); @@ -482,12 +486,15 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { log.debug("User [" + subject + "] created content source [" + contentSource + "]"); return contentSource; // now has the ID set } - + @RequiredPermission(Permission.MANAGE_REPOSITORIES) public ContentSource simpleCreateContentSource(Subject subject, ContentSource contentSource) throws ContentSourceException { validateContentSource(contentSource); contentSource.setSyncResults(new ArrayList<ContentSourceSyncResults>()); + + obfuscatePasswords(contentSource); + entityManager.persist(contentSource); return contentSource; } @@ -520,6 +527,8 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { } } + obfuscatePasswords(contentSource); + // now we can merge the changes to the database contentSource = entityManager.merge(contentSource); log.debug("User [" + subject + "] updated content source [" + contentSource + "]"); @@ -2479,4 +2488,14 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal { log.debug("Retrieved and sent [" + numBytes + "] bytes for [" + distFile.getRelativeFilename() + "]"); return numBytes; } + + private void obfuscatePasswords(ContentSource contentSource) { + ConfigurationDefinition configurationDefinition = contentSource.getContentSourceType().getContentSourceConfigurationDefinition(); + if (configurationDefinition == null) { + ContentSourceType attachedContentSourceType = getContentSourceType(contentSource.getContentSourceType().getName()); + configurationDefinition = attachedContentSourceType.getContentSourceConfigurationDefinition(); + } + + PasswordObfuscationUtility.obfuscatePasswords(configurationDefinition, contentSource.getConfiguration()); + } } commit daf99858ae9cdbff284adedbfe874c08702c93c1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Apr 18 20:30:44 2012 +0200 [BZ 796636] - Infrastructure needed for password obfuscation in the database. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java new file mode 100644 index 0000000..779b795 --- /dev/null +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java @@ -0,0 +1,138 @@ +/* + * 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.core.domain.configuration; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; +import javax.persistence.PostLoad; +import javax.persistence.PostPersist; +import javax.persistence.PostUpdate; +import javax.persistence.PrePersist; +import javax.persistence.PreUpdate; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.util.obfuscation.Obfuscator; + +/** + * This is a specialization of {@link PropertySimple} that provides password obfuscation + * methods. + * + * @author Lukas Krejci + */ +@DiscriminatorValue("obfuscated") +@Entity +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement +public class ObfuscatedPropertySimple extends PropertySimple { + + private static final long serialVersionUID = 1L; + + private static final Log LOG = LogFactory.getLog(ObfuscatedPropertySimple.class); + + public ObfuscatedPropertySimple() { + } + + /** + * A conversion constructor - makes the provided unobfuscated simple property + * an obfuscated one. + * + * @param unobfuscated + */ + public ObfuscatedPropertySimple(PropertySimple unobfuscated) { + this(unobfuscated, true); + } + + /** + * @param original + * @param keepId + */ + protected ObfuscatedPropertySimple(PropertySimple original, boolean keepId) { + super(original, keepId); + } + + /** + * @param name + * @param value + */ + public ObfuscatedPropertySimple(String name, Object value) { + super(name, value); + } + + @Override + public PropertySimple deepCopy(boolean keepId) { + return new ObfuscatedPropertySimple(this, keepId); + } + + /** + * We deobfuscate right after the entity has been loaded from the database or right + * after we persist or update the value. + * + * Because we change the value before persist or update, we have to swap the value back + * as soon as those DB changes are done, so that we only use the raw value in memory. + */ + @PostLoad + @PostPersist + @PostUpdate + protected void deobfuscate() { + String value = getStringValue(); + if (value != null) { + try { + setStringValue(Obfuscator.decode(getStringValue())); + } catch (Exception e) { + LOG.error("Failed to deobfuscate property value: [" + value + "]", e); + } + } + } + + /** + * Obfuscate the value right before it gets pushed down to the database. + */ + @PrePersist + @PreUpdate + protected void obfuscate() { + String value = getStringValue(); + if (value != null) { + try { + setStringValue(Obfuscator.encode(value)); + } catch (Exception e) { + LOG.error("Failed to obfuscate property value: [" + value + "]", e); + } + } + } + + private void writeObject(ObjectOutputStream str) throws IOException { + obfuscate(); + str.defaultWriteObject(); + } + + private void readObject(ObjectInputStream str) throws IOException, ClassNotFoundException { + str.defaultReadObject(); + deobfuscate(); + } +} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java index be176e4..cdccae0 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java @@ -84,7 +84,7 @@ import org.jetbrains.annotations.Nullable; @Table(name = "RHQ_CONFIG_PROPERTY") @XmlAccessorType(XmlAccessType.FIELD) @XmlRootElement -@XmlSeeAlso( { PropertySimple.class, PropertyList.class, PropertyMap.class }) +@XmlSeeAlso( { PropertySimple.class, PropertyList.class, PropertyMap.class, ObfuscatedPropertySimple.class }) public class Property implements Serializable, DeepCopyable<Property>, Comparable<Property> { private static final long serialVersionUID = 1L; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.java index ebb6d38..636c741 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.java @@ -256,6 +256,9 @@ public class PropertyDefinitionSimple extends PropertyDefinition { this.optionsSource.add(source); } + public boolean shouldBeObfuscated() { + return getType() == PropertySimpleType.PASSWORD; + } @Override public String toString() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/PasswordObfuscationUtility.java b/modules/core/domain/src/main/java/org/rhq/core/domain/util/PasswordObfuscationUtility.java new file mode 100644 index 0000000..01363ae --- /dev/null +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/util/PasswordObfuscationUtility.java @@ -0,0 +1,136 @@ +/* + * 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.core.domain.util; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ObfuscatedPropertySimple; +import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.configuration.definition.PropertyDefinition; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionList; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; + +/** + * A utility to obfuscate all the password entries in a configuration object. + * + * @author Lukas Krejci + */ +public class PasswordObfuscationUtility { + + private PasswordObfuscationUtility() { + + } + + public static void obfuscatePasswords(ConfigurationDefinition definition, Configuration config) { + if (config == null || config.getMap().isEmpty()) { + return; + } + + if (definition == null || definition.getPropertyDefinitions().isEmpty()) { + return; + } + + List<PropertySimple> replacementCandidates = new ArrayList<PropertySimple>(); + for(PropertyDefinition def : definition.getPropertyDefinitions().values()) { + Property prop = config.get(def.getName()); + propertySwitch(def, prop, replacementCandidates); + } + + for(PropertySimple prop : replacementCandidates) { + replace(prop); + } + } + + private static void propertySwitch(PropertyDefinition def, Property prop, List<PropertySimple> replacementCandidates) { + if (prop != null) { + if (def instanceof PropertyDefinitionMap) { + traverse((PropertyDefinitionMap) def, (PropertyMap) prop, replacementCandidates); + } else if (def instanceof PropertyDefinitionList) { + traverse((PropertyDefinitionList) def, (PropertyList) prop, replacementCandidates); + } else if (def instanceof PropertyDefinitionSimple) { + addIfShouldBeReplaced((PropertyDefinitionSimple) def, (PropertySimple) prop, replacementCandidates); + } + } + } + + private static void traverse(PropertyDefinitionMap definition, PropertyMap map, List<PropertySimple> replacementCandidates) { + for(PropertyDefinition def: definition.getMap().values()) { + Property prop = map.get(def.getName()); + propertySwitch(def, prop, replacementCandidates); + } + } + + private static void traverse(PropertyDefinitionList definition, PropertyList list, List<PropertySimple> replacementCandidates) { + PropertyDefinition memberDef = definition.getMemberDefinition(); + List<Property> members = list.getList(); + for(Property prop : members) { + propertySwitch(memberDef, prop, replacementCandidates); + } + } + + private static void addIfShouldBeReplaced(PropertyDefinitionSimple def, PropertySimple prop, List<PropertySimple> candidates) { + if(def.shouldBeObfuscated() && !(prop instanceof ObfuscatedPropertySimple)) { + candidates.add(prop); + } + } + + private static void replace(PropertySimple prop) { + ObfuscatedPropertySimple replacement = new ObfuscatedPropertySimple(prop); + replacement.setParentList(prop.getParentList()); + replacement.setParentMap(prop.getParentMap()); + replacement.setConfiguration(prop.getConfiguration()); + + if (prop.getParentList() != null) { + List<Property> list = prop.getParentList().getList(); + int idx = list.indexOf(prop); + list.remove(prop); + + list.add(idx, replacement); + } else if (prop.getParentMap() != null) { + Map<String, Property> map = prop.getParentMap().getMap(); + replaceInMap(replacement, map); + } else { + Configuration conf = prop.getConfiguration(); + replaceInMap(replacement, conf.getMap()); + } + } + + private static void replaceInMap(ObfuscatedPropertySimple replacement, Map<String, Property> map) { + //we need to maintain the order, so let's take a slightly more + //complicated approach + Iterator<Map.Entry<String, Property>> it = map.entrySet().iterator(); + while(it.hasNext()) { + Map.Entry<String, Property> entry = it.next(); + if (entry.getKey().equals(replacement.getName())) { + entry.setValue(replacement); + break; + } + } + } +} diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/util/PasswordObfuscationUtilityTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/util/PasswordObfuscationUtilityTest.java new file mode 100644 index 0000000..5df886a --- /dev/null +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/util/PasswordObfuscationUtilityTest.java @@ -0,0 +1,144 @@ +/* + * 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.core.domain.util; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.testng.Assert; +import org.testng.annotations.Test; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ObfuscatedPropertySimple; +import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionList; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; +import org.rhq.core.domain.configuration.definition.PropertySimpleType; + +/** + * + * + * @author Lukas Krejci + */ +@Test +public class PasswordObfuscationUtilityTest { + + private static final ConfigurationDefinition DEFINITION = new ConfigurationDefinition("test", null); + + private static final Configuration CONFIGURATION = new Configuration(); + + static { + DEFINITION.put(new PropertyDefinitionSimple("topLevelString", null, true, PropertySimpleType.STRING)); + DEFINITION.put(new PropertyDefinitionSimple("topLevelPassword", null, true, PropertySimpleType.PASSWORD)); + DEFINITION.put(new PropertyDefinitionList("topLevelPasswordList", null, true, new PropertyDefinitionSimple( + "listPassword", null, true, PropertySimpleType.PASSWORD))); + DEFINITION.put(new PropertyDefinitionList("topLevelListOfMaps", null, true, new PropertyDefinitionMap( + "mapWithPass", null, true, new PropertyDefinitionSimple("username", null, true, PropertySimpleType.STRING), + new PropertyDefinitionSimple("password", null, true, PropertySimpleType.PASSWORD)))); + + CONFIGURATION.put(new PropertySimple("topLevelString", "topLevelString")); + CONFIGURATION.put(new PropertySimple("topLevelPassword", "topLevelPassword")); + CONFIGURATION.put(new PropertyList("topLevelPasswordList", new PropertySimple("listPassword", "0"), + new PropertySimple("listPassword", "1"))); + CONFIGURATION.put(new PropertyList("topLevelListOfMaps", new PropertyMap("mapWithPass", new PropertySimple( + "username", "username"), new PropertySimple("password", "password")))); + } + + private Configuration getFreshConfig() { + return CONFIGURATION.deepCopy(); + } + + public void listMembersSwapped() { + Configuration testConfig = getFreshConfig(); + + PasswordObfuscationUtility.obfuscatePasswords(DEFINITION, testConfig); + + PropertyList list = testConfig.getList("topLevelPasswordList"); + + Assert.assertNotNull(list, "Could not find the 'topLevelPasswordList'"); + + int idx = 0; + for(Property p : list.getList()) { + Assert.assertTrue(p instanceof ObfuscatedPropertySimple, "Found a password property that was not swapped to obfuscated form"); + int value = ((PropertySimple) p).getIntegerValue(); + Assert.assertEquals(value, idx++, "Found an out-of-order element after obfuscation processing."); + } + } + + public void configurationMembersSwappedAndKeptPositions() { + Configuration testConfig = getFreshConfig(); + + //keep track of the order of the properies in the original map + PropertyMap originalMap = (PropertyMap) testConfig.getList("topLevelListOfMaps").getList().get(0); + List<Property> originalMapPropertiesInOrder = new ArrayList<Property>(originalMap.getMap().values()); + + PasswordObfuscationUtility.obfuscatePasswords(DEFINITION, testConfig); + + PropertyList list = testConfig.getList("topLevelListOfMaps"); + + PropertyMap map = (PropertyMap) list.getList().get(0); + + Assert.assertTrue(map.get("password") instanceof ObfuscatedPropertySimple, "The password in the map failed to be swapped to obfuscated form"); + + //now check that the positions in the map actually didn't change + List<Property> mapPropertiesInOrder = new ArrayList<Property>(map.getMap().values()); + + Assert.assertEquals(mapPropertiesInOrder.size(), originalMapPropertiesInOrder.size(), "Different number of properties in the map after obfuscation"); + + for(int i = 0; i < mapPropertiesInOrder.size(); ++i) { + Property originalProp = originalMapPropertiesInOrder.get(i); + Property prop = mapPropertiesInOrder.get(i); + + Assert.assertEquals(prop.getName(), originalProp.getName(), "Properties seem to be mixed up after obfuscation"); + } + } + + public void mapMembersSwappedAndKeptPositions() { + Configuration testConfig = getFreshConfig(); + + int origPassIdx = 0; + Iterator<Property> it = testConfig.getMap().values().iterator(); + while (it.hasNext()) { + if ("topLevelPassword".equals(it.next().getName())) { + break; + } + origPassIdx++; + } + + PasswordObfuscationUtility.obfuscatePasswords(DEFINITION, testConfig); + + Assert.assertTrue(testConfig.getSimple("topLevelPassword") instanceof ObfuscatedPropertySimple, "The top level password not obfuscated"); + + it = testConfig.getMap().values().iterator(); + int idx = 0; + while(it.hasNext()) { + if ("topLevelPassword".equals(it.next().getName())) { + Assert.assertEquals(idx, origPassIdx, "The topLevelPassword seems to have changed the position in the configuration map after obfuscation"); + } + idx++; + } + } +} diff --git a/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java new file mode 100644 index 0000000..f626235 --- /dev/null +++ b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java @@ -0,0 +1,102 @@ +/* + * 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.core.util.obfuscation; + +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.spec.SecretKeySpec; + +/** + * This class makes available methods for obfuscating a string in the very same way + * as the <code>org.jboss.resource.security.SecureIdentityLoginModule</code> in JBossAS 4.2.3. + * <p> + * This is to ensure backwards compatibility in case we switch containers that would start + * obfuscating the password in a different way and also to make those methods available to + * other code. The original methods in the SecureIdentityLoginModule are marked private. + * + * @author Lukas Krejci + */ +public final class Obfuscator { + + private static final byte[] KEY = "jaas is the way".getBytes(); + + //no instances, please + private Obfuscator() { + + } + + /** + * Encodes the secret string so that the value is not immediately readable by + * a "casual viewer". + * + * @param secret the string to encode + * @return encoded string + * @throws NoSuchPaddingException + * @throws NoSuchAlgorithmException + * @throws InvalidKeyException + * @throws BadPaddingException + * @throws IllegalBlockSizeException + */ + public static String encode(String secret) throws NoSuchPaddingException, NoSuchAlgorithmException, + InvalidKeyException, BadPaddingException, IllegalBlockSizeException { + SecretKeySpec key = new SecretKeySpec(KEY, "Blowfish"); + + Cipher cipher = Cipher.getInstance("Blowfish"); + cipher.init(Cipher.ENCRYPT_MODE, key); + byte[] encoding = cipher.doFinal(secret.getBytes()); + BigInteger n = new BigInteger(encoding); + return n.toString(16); + } + + /** + * Decodes the string obfuscated using the {@link #encode(String)} method back to the + * original value. + * <p> + * This method differs from its original <code>org.jboss.resource.security.SecureIdentityLoginModule#decode</code> + * private method in that it returns a String whereas the original method returns a char[]. + * + * @param secret the encoded (obfuscated) string + * @return the decoded string + * @throws NoSuchPaddingException + * @throws NoSuchAlgorithmException + * @throws InvalidKeyException + * @throws BadPaddingException + * @throws IllegalBlockSizeException + */ + public static String decode(String secret) throws NoSuchPaddingException, NoSuchAlgorithmException, + InvalidKeyException, BadPaddingException, IllegalBlockSizeException { + SecretKeySpec key = new SecretKeySpec(KEY, "Blowfish"); + + BigInteger n = new BigInteger(secret, 16); + byte[] encoding = n.toByteArray(); + + Cipher cipher = Cipher.getInstance("Blowfish"); + cipher.init(Cipher.DECRYPT_MODE, key); + byte[] decode = cipher.doFinal(encoding); + return new String(decode); + } + +} diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index ea4b89b..81347dd 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -246,6 +246,22 @@ <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> diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/core/RHQDomain.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/core/RHQDomain.gwt.xml index c8a85f0..a79e9ed 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/core/RHQDomain.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/core/RHQDomain.gwt.xml @@ -30,12 +30,16 @@ <entry-point class='org.rhq.core.client.RHQDomain'/> + <super-source path="gwtoverrides"/> <source path="client"/> <source path="domain">  <exclude name="**/JPADriftFileBits.*"/>  <exclude name="sync/**"/>  <exclude name="server/**"/>  + +  + <exclude name="**/ObfuscatedPropertySimple.*"/> </source>  - &driftConfig; - &bundleTarget; - - </platform> - - <platform name="Solaris" - class="PosixPlatformComponent" - discovery="SolarisPlatformDiscoveryComponent" - description="SUN Solaris Operating System"> - - <plugin-configuration> - &syslogEventConfigurationGroup; - </plugin-configuration> - - &platformSubcategories; - &platformOperations; - &nativeMetrics; - &platformCpu; - &metrics; - &syslogEventDefinition; - &driftConfig; - &bundleTarget; - - </platform> - - <platform name="HP-UX" - class="PlatformComponent" - discovery="HpuxPlatformDiscoveryComponent" - description="Hewlett-Packard HP-UX Operating System"> - &platformSubcategories; - &platformOperations; - &nativeMetrics; - &platformCpu; - &metrics; - &driftConfig; - &bundleTarget; - </platform> - - <platform name="AIX" - class="PlatformComponent" - discovery="AixPlatformDiscoveryComponent" - description="IBM AIX Operating System"> - &platformSubcategories; - &platformOperations; - &nativeMetrics; - &platformCpu; - &metrics; - &driftConfig; - &bundleTarget; - </platform> - - <platform name="FreeBSD" - class="PlatformComponent" - discovery="BsdPlatformDiscoveryComponent" - description="FreeBSD Operating System"> - &platformSubcategories; - &platformOperations; - &nativeMetrics; - &platformCpu; - &metrics; - &driftConfig; - &bundleTarget; - </platform> - - <platform name="Mac OS X" - class="PosixPlatformComponent" - discovery="MacOSXPlatformDiscoveryComponent" - description="Mac OS X Operating System"> - <plugin-configuration> - &syslogEventConfigurationGroup; - </plugin-configuration> - - &platformSubcategories; - &platformOperations; - &nativeMetrics; - &platformCpu; - &metrics; - &syslogEventDefinition; - &driftConfig; - &bundleTarget; - </platform> - - <platform name="Java" - class="PlatformComponent" - discovery="JavaPlatformDiscoveryComponent" - description="Platform with 100% Java capability but not natively supported"> - &platformSubcategories; - &platformOperations; - &metrics; - &driftConfig; - &bundleTarget; - </platform> - - <service name="Network Adapter" discovery="NetworkAdapterDiscoveryComponent" class="NetworkAdapterComponent"> - - <runs-inside> - <parent-resource-type name="Windows" plugin="Platforms"/> - <parent-resource-type name="Linux" plugin="Platforms"/> - <parent-resource-type name="Solaris" plugin="Platforms"/> - <parent-resource-type name="HP-UX" plugin="Platforms"/> - <parent-resource-type name="AIX" plugin="Platforms"/> - <parent-resource-type name="FreeBSD" plugin="Platforms"/> - <parent-resource-type name="Mac OS X" plugin="Platforms"/> - </runs-inside> - - <metric displayName="Inet4Address" - defaultOn="true" - property="Trait.net4.address" dataType="trait" displayType="summary" - description="IP address of the network adapter"/> - - <metric property="Trait.interfaceFlags" displayName="Interface Flags" dataType="trait" - description="Flag constants for network related operations"/> - - <metric property="rxBytes" displayName="Bytes Received" units="bytes" measurementType="trendsup" displayType="summary" - description="The total number of bytes received across this network interface since it started"/> - <metric property="rxPackets" displayName="Packets Received" measurementType="trendsup" - description="The total number of packets received across this network interface since it started"/> - - <metric property="txBytes" displayName="Bytes Transmitted" units="bytes" measurementType="trendsup" displayType="summary" - description="The total number of bytes transmitted across this network interface since it started"/> - <metric property="txPackets" displayName="Packets Transmitted" measurementType="trendsup" - description="The total number of packets transmitted across this network interface since it started"/> - - <metric property="rxErrors" displayName="Receive Errors" measurementType="trendsup" - description="'errors' statistic for received packets across this network interface since it started"/> - <metric property="rxDropped" displayName="Receive Packets Dropped" measurementType="trendsup" - description="'dropped' statistic for received packets across this network interface since it started"/> - <metric property="rxOverruns" displayName="Receive Overrurns" measurementType="trendsup" - description="'overruns' statistic for received packets across this network interface since it started"/> - <metric property="rxFrame" displayName="Receive Frame" measurementType="trendsup" - description="'frame' statistic for received packets across this network interface since it started"/> - - <metric property="txErrors" displayName="Transmit Errors" measurementType="trendsup" - description="'errors' statistic for transmitted packets across this network interface since it started"/> - <metric property="txDropped" displayName="Transmit Packets Dropped" measurementType="trendsup" - description="'dropped' statistic for transmitted packets across this network interface since it started"/> - <metric property="txOverruns" displayName="Transmit Overruns" measurementType="trendsup" - description="'overruns' statistic for transmitted packets across this network interface since it started"/> - <metric property="txCollisions" displayName="Transmit Collisions" measurementType="trendsup" - description="'collisions' statistic for transmitted packets across this network interface since it started"/> - <metric property="txCarrier" displayName="Transmit Carrier" measurementType="trendsup" - description="'carrier' statistic for transmitted packets across this network interface since it started"/> - - </service> - - <service name="File System" discovery="FileSystemDiscoveryComponent" class="FileSystemComponent"> - - <runs-inside> - <parent-resource-type name="Windows" plugin="Platforms"/> - <parent-resource-type name="Linux" plugin="Platforms"/> - <parent-resource-type name="Solaris" plugin="Platforms"/> - <parent-resource-type name="HP-UX" plugin="Platforms"/> - <parent-resource-type name="AIX" plugin="Platforms"/> - <parent-resource-type name="FreeBSD" plugin="Platforms"/> - <parent-resource-type name="Mac OS X" plugin="Platforms"/> - </runs-inside> - - <metric property="fileSystemUsage.free" displayName="Free Space" units="kilobytes" displayType="summary" - description="The total free bytes on filesystem"/> - <metric property="fileSystemUsage.usePercent" displayName="Used Percentage" units="percentage" displayType="summary" - description="The percentage of disk used"/> - <metric property="fileSystemUsage.total" displayName="Capacity" units="kilobytes" dataType="trait" - description="The total size of the filesystem"/> - <metric property="fileSystem.typeName" displayName="Volume Type" dataType="trait" displayType="summary" - description="The filesystem's generic type name"/> - <metric property="fileSystem.sysTypeName" displayName="Drive Type" dataType="trait" displayType="summary" - description="The filesystem's operating system-specific type name"/> - <metric property="fileSystem.devName" displayName="name" dataType="trait" - description="The name of this device"/> - <metric property="fileSystemUsage.freeFiles" displayName="Free Files" - description="The number of free file nodes on the filesystem"/> - <metric property="fileSystem.flags" displayName="Flags" dataType="trait" - description="The filesystem's flags"/> - <metric property="fileSystemUsage.used" displayName="Used" units="kilobytes" - description="The total bytes used on the filesystem"/> - <metric property="fileSystemUsage.diskReads" displayName="Disk Reads" measurementType="trendsup" - description="The number of physical disk reads"/> - <metric property="fileSystemUsage.diskWrites" displayName="Disk Writes" measurementType="trendsup" - description="The number of physical disk writes"/> - <metric property="fileSystemUsage.diskReadBytes" displayName="Disk Read Bytes" measurementType="trendsup" units="bytes" - description="The number of physical disk bytes read"/> - <metric property="fileSystemUsage.diskWriteBytes" displayName="Disk Write Bytes" measurementType="trendsup" units="bytes" - description="The number of physical disk bytes written"/> - <metric property="fileSystemUsage.diskQueue" displayName="Disk Queue" - description="The number of I/Os currently in progress"/> - - </service> - - <service name="CPU" discovery="CpuDiscoveryComponent" class="CpuComponent"> - - <runs-inside> - <parent-resource-type name="Windows" plugin="Platforms"/> - <parent-resource-type name="Linux" plugin="Platforms"/> - <parent-resource-type name="Solaris" plugin="Platforms"/> - <parent-resource-type name="HP-UX" plugin="Platforms"/> - <parent-resource-type name="AIX" plugin="Platforms"/> - <parent-resource-type name="FreeBSD" plugin="Platforms"/> - <parent-resource-type name="Mac OS X" plugin="Platforms"/> -  - </runs-inside> - - <metric displayName="Idle" property="CpuPerc.idle" units="percentage" description="Idle percentage of this CPU"/> - <metric displayName="System Load" property="CpuPerc.sys" displayType="summary" units="percentage" description="Percentage of this CPU running in system mode"/> - <metric displayName="User Load" property="CpuPerc.user" displayType="summary" units="percentage" description="Percentage of this CPU running in user mode"/> - <metric displayName="Wait Load" property="CpuPerc.wait" displayType="summary" units="percentage" description="Percentage of this CPU waiting on I/O"/> - - <metric displayName="User Time" property="Cpu.user" units="milliseconds" measurementType="trendsup" - description="The total system CPU user time"/> - <metric displayName="Nice Time" property="Cpu.nice" units="milliseconds" measurementType="trendsup" - description="The total system CPU nice time"/> - <metric displayName="System Time" property="Cpu.sys" units="milliseconds" measurementType="trendsup" - description="The total system CPU kernel time"/> - <metric displayName="Idle Time" property="Cpu.idle" units="milliseconds" measurementType="trendsup" - description="The total system CPU idle time"/> - <metric displayName="Wait Time" property="Cpu.wait" units="milliseconds" measurementType="trendsup" - description="The total system CPU I/O wait time"/> - - &cpuDetail; - -  + </runs-inside> + + <metric displayName="Idle" property="CpuPerc.idle" units="percentage" + description="Idle percentage of this CPU"/> + <metric displayName="System Load" property="CpuPerc.sys" displayType="summary" units="percentage" + description="Percentage of this CPU running in system mode"/> + <metric displayName="User Load" property="CpuPerc.user" displayType="summary" units="percentage" + description="Percentage of this CPU running in user mode"/> + <metric displayName="Wait Load" property="CpuPerc.wait" displayType="summary" units="percentage" + description="Percentage of this CPU waiting on I/O"/> + + <metric displayName="User Time" property="Cpu.user" units="milliseconds" measurementType="trendsup" + description="The total system CPU user time"/> + <metric displayName="Nice Time" property="Cpu.nice" units="milliseconds" measurementType="trendsup" + description="The total system CPU nice time"/> + <metric displayName="System Time" property="Cpu.sys" units="milliseconds" measurementType="trendsup" + description="The total system CPU kernel time"/> + <metric displayName="Idle Time" property="Cpu.idle" units="milliseconds" measurementType="trendsup" + description="The total system CPU idle time"/> + <metric displayName="Wait Time" property="Cpu.wait" units="milliseconds" measurementType="trendsup" + description="The total system CPU I/O wait time"/> + + &cpuDetail; + +  - </service> - - - <service name="Process" class="ProcessComponent" discovery="ProcessDiscoveryComponent" supportsManualAdd="true" - description="A generic process monitoring service to track native process information based on a pid file or process query"> - - <runs-inside> - <parent-resource-type name="Windows" plugin="Platforms"/> - <parent-resource-type name="Linux" plugin="Platforms"/> - <parent-resource-type name="Solaris" plugin="Platforms"/> - <parent-resource-type name="HP-UX" plugin="Platforms"/> - <parent-resource-type name="AIX" plugin="Platforms"/> - <parent-resource-type name="FreeBSD" plugin="Platforms"/> - <parent-resource-type name="Mac OS X" plugin="Platforms"/> -  - </runs-inside> - - <plugin-configuration> - <c:simple-property name="type" default="pidFile" description="Choice of using a pid file or a PIQL query to find the process to monitor"> - <c:property-options> - <c:option value="pidFile" name="Pid File"/> - <c:option value="piql" name="Process Query"/> - </c:property-options> - </c:simple-property> - <c:simple-property name="pidFile" required="false" description="Fully qualified path to the pid file for the process to monitor"/> - <c:simple-property name="piql" required="false" description="Process Information Query Language for process to monitor"/> - - <c:simple-property name="fullProcessTree" default="true" type="boolean" description="If true, the entire process tree will be monitored"/> - </plugin-configuration> - - <metric displayName="User Time" property="Process.cpu.user" measurementType="trendsup" units="milliseconds" - description="The aggregate amount of CPU user time spent by all processes"/> - <metric displayName="Kernel Time" property="Process.cpu.sys" measurementType="trendsup" units="milliseconds" - description="The aggregate amount of CPU kernel time spent by all processes"/> - <metric displayName="CPU Percentage" property="Process.cpu.percent" measurementType="dynamic" units="percentage" displayType="summary" - description="The percentage of CPU currently being used by all processes"/> - <metric displayName="Physical Memory" property="Process.memory.resident" measurementType="dynamic" units="bytes" displayType="summary" - description="The aggregate amount of resident memory used by all processes"/> - <metric displayName="Virtual Memory" property="Process.memory.size" measurementType="dynamic" units="bytes" displayType="summary" - description="The aggregate amount of virtual memory used by all processes"/> - <metric displayName="Open File Descriptors" property="Process.fileDescriptor.total" measurementType="dynamic" - description="The aggregate number of file descriptors open by all processes"/> - - </service> - - <help> - <![CDATA[ + </service> + + + <service name="Process" class="ProcessComponent" discovery="ProcessDiscoveryComponent" supportsManualAdd="true" + description="A generic process monitoring service to track native process information based on a pid file or process query"> + + <runs-inside> + <parent-resource-type name="Windows" plugin="Platforms"/> + <parent-resource-type name="Linux" plugin="Platforms"/> + <parent-resource-type name="Solaris" plugin="Platforms"/> + <parent-resource-type name="HP-UX" plugin="Platforms"/> + <parent-resource-type name="AIX" plugin="Platforms"/> + <parent-resource-type name="FreeBSD" plugin="Platforms"/> + <parent-resource-type name="Mac OS X" plugin="Platforms"/> +  + </runs-inside> + + <plugin-configuration> + <c:simple-property name="type" default="pidFile" + description="Choice of using a pid file or a PIQL query to find the process to monitor"> + <c:property-options> + <c:option value="pidFile" name="Pid File"/> + <c:option value="piql" name="Process Query"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="pidFile" required="false" + description="Fully qualified path to the pid file for the process to monitor"/> + <c:simple-property name="piql" required="false" + description="Process Information Query Language for process to monitor"/> + + <c:simple-property name="fullProcessTree" default="true" type="boolean" + description="If true, the entire process tree will be monitored"/> + </plugin-configuration> + + <metric displayName="User Time" property="Process.cpu.user" measurementType="trendsup" units="milliseconds" + description="The aggregate amount of CPU user time spent by all processes"/> + <metric displayName="Kernel Time" property="Process.cpu.sys" measurementType="trendsup" units="milliseconds" + description="The aggregate amount of CPU kernel time spent by all processes"/> + <metric displayName="CPU Percentage" property="Process.cpu.percent" measurementType="dynamic" units="percentage" + displayType="summary" + description="The percentage of CPU currently being used by all processes"/> + <metric displayName="Physical Memory" property="Process.memory.resident" measurementType="dynamic" units="bytes" + displayType="summary" + description="The aggregate amount of resident memory used by all processes"/> + <metric displayName="Virtual Memory" property="Process.memory.size" measurementType="dynamic" units="bytes" + displayType="summary" + description="The aggregate amount of virtual memory used by all processes"/> + <metric displayName="Open File Descriptors" property="Process.fileDescriptor.total" measurementType="dynamic" + description="The aggregate number of file descriptors open by all processes"/> + + </service> + + <help> + <![CDATA[ <p>This plugin handles interaction with the operating system and is the base on which other plugins run. It is required for the operation of any other plugin and can not be disabled.</p> ]]> commit 14e576b593fb1ac5ecfabca3fb0c2c455d0953fb Author: John Sanda <jsanda(a)redhat.com> Date: Thu Apr 19 10:45:32 2012 -0400 [BZ 800453] Adding debug logging and removing unused params This commit also removes application/xml from the @Produces annotations since we are not yet supporting and generating xml. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java index 77f50ac..d1be353 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java @@ -51,10 +51,10 @@ public class ReportsInterceptor { private final Log log = LogFactory.getLog(ReportsInterceptor.class); @Resource - EJBContext ejbContext; + private EJBContext ejbContext; @EJB - SubjectManagerLocal subjectManager; + private SubjectManagerLocal subjectManager; @AroundInvoke public Object setCaller(final InvocationContext ctx) throws Exception { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java index 6ab9e63..8d3d4c2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java @@ -10,7 +10,7 @@ import javax.ws.rs.core.*; public interface AlertDefinitionLocal { @GET - @Produces({"text/csv", "application/xml"}) + @Produces({"text/csv"}) StreamingOutput alertDefinitions(@Context HttpServletRequest request); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java index d4eb076..5abc5f6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java @@ -9,9 +9,10 @@ import javax.ejb.Stateless; import javax.interceptor.Interceptors; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; @@ -30,12 +31,16 @@ import static org.rhq.enterprise.server.rest.reporting.ReportFormatHelper.format @Stateless public class ConfigurationHistoryHandler extends AbstractRestBean implements ConfigurationHistoryLocal { + private final Log log = LogFactory.getLog(ConfigurationHistoryHandler.class); + @EJB private ConfigurationManagerLocal configurationManager; @Override - public StreamingOutput configurationHistory(UriInfo uriInfo, final HttpServletRequest request, - HttpHeaders headers ) { + public StreamingOutput configurationHistory(final HttpServletRequest request) { + if (log.isDebugEnabled()) { + log.debug("Received request to generate report for " + caller); + } return new StreamingOutput() { @Override diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java index 2f54968..6193363 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java @@ -6,19 +6,13 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; @Path("/configurationHistory") @Local public interface ConfigurationHistoryLocal { @GET - @Produces({"text/csv", "application/xml"}) - StreamingOutput configurationHistory( - @Context UriInfo uriInfo, - @Context HttpServletRequest request, - @Context HttpHeaders headers); - + @Produces({"text/csv"}) + StreamingOutput configurationHistory(@Context HttpServletRequest request); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java index 01a562b..e92bee7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java @@ -30,9 +30,10 @@ import javax.ejb.Stateless; import javax.interceptor.Interceptors; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.resource.composite.PlatformMetricsSummary; import org.rhq.core.domain.util.PageList; @@ -47,11 +48,16 @@ import org.rhq.enterprise.server.rest.ReportsInterceptor; @Stateless public class PlatformUtilizationHandler extends AbstractRestBean implements PlatformUtilizationLocal { + private final Log log = LogFactory.getLog(PlatformUtilizationHandler.class); + @EJB private PlatformUtilizationManagerLocal platformUtilizationMgr; @Override - public StreamingOutput generateReport(UriInfo uriInfo, HttpServletRequest request, HttpHeaders headers) { + public StreamingOutput generateReport(HttpServletRequest request) { + if (log.isDebugEnabled()) { + log.debug("Received request to generate report for " + caller); + } return new StreamingOutput() { private NumberFormat numberFormat; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java index e9e5637..097676f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java @@ -27,19 +27,14 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; @Path("/platformUtilization") @Local public interface PlatformUtilizationLocal { @GET - @Produces({"text/csv", "application/xml"}) - StreamingOutput generateReport( - @Context UriInfo uriInfo, - @Context HttpServletRequest request, - @Context HttpHeaders headers); + @Produces({"text/csv"}) + StreamingOutput generateReport(@Context HttpServletRequest request); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java index 226516b..6aaecc8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java @@ -12,9 +12,7 @@ import javax.ejb.Stateless; import javax.interceptor.Interceptors; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,8 +44,10 @@ public class RecentAlertHandler extends AbstractRestBean implements RecentAlertL @Override public StreamingOutput recentAlerts(final String alertPriority, final Long startTime, final Long endTime, - final UriInfo uriInfo, final HttpServletRequest request, - final HttpHeaders headers) { + final HttpServletRequest request) { + if (log.isDebugEnabled()) { + log.debug("Received request to generate report for " + caller); + } return new StreamingOutput() { @Override public void write(OutputStream stream) throws IOException, WebApplicationException { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java index 4cf460b..9c8bc8b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java @@ -2,24 +2,24 @@ package org.rhq.enterprise.server.rest.reporting; import javax.ejb.Local; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; @Path("/recentAlerts") @Local public interface RecentAlertLocal { @GET - @Produces({"text/csv", "application/xml"}) + @Produces({"text/csv"}) StreamingOutput recentAlerts( @QueryParam("alertPriority") @DefaultValue("high,medium,low") String alertPriority, @QueryParam("startTime") Long startTime, @QueryParam("endTime") Long endTime, - @Context UriInfo uriInfo, - @Context HttpServletRequest request, - @Context HttpHeaders headers); + @Context HttpServletRequest request); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java index 1a95608..8cb424b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java @@ -11,9 +11,7 @@ import javax.ejb.Stateless; import javax.interceptor.Interceptors; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,8 +40,10 @@ public class RecentDriftHandler extends AbstractRestBean implements RecentDriftL @Override public StreamingOutput recentDrift(final String categories, final Integer snapshot, final String path, - final String definitionName, final Long startTime, final Long endTime, final UriInfo uriInfo, - final HttpServletRequest request, final HttpHeaders headers) { + final String definitionName, final Long startTime, final Long endTime, final HttpServletRequest request) { + if (log.isDebugEnabled()) { + log.debug("Received request to generate report for " + caller); + } return new StreamingOutput() { @Override diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java index 1888d26..e3b7070 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java @@ -7,16 +7,14 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; @Path("/recentDrift") @Local public interface RecentDriftLocal { @GET - @Produces({"text/csv", "application/xml"}) + @Produces({"text/csv"}) StreamingOutput recentDrift( @QueryParam("categories") String categories, @QueryParam("snapshot") Integer snapshot, @@ -24,8 +22,6 @@ public interface RecentDriftLocal { @QueryParam("definition") String definitionName, @QueryParam("startTime") Long startTime, @QueryParam("endTime") Long endTime, - @Context UriInfo uriInfo, - @Context HttpServletRequest request, - @Context HttpHeaders headers); + @Context HttpServletRequest request); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java index a74b448..a5e515d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java @@ -11,9 +11,7 @@ import javax.ejb.Stateless; import javax.interceptor.Interceptors; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,9 +37,11 @@ public class RecentOperationsHandler extends AbstractRestBean implements RecentO private OperationManagerLocal operationManager; @Override - public StreamingOutput recentOperations(final String operationRequestStatus, - final Long startTime, final Long endTime, final UriInfo uriInfo, - final HttpServletRequest request, final HttpHeaders headers) { + public StreamingOutput recentOperations(final String operationRequestStatus, final Long startTime, + final Long endTime, final HttpServletRequest request) { + if (log.isDebugEnabled()) { + log.debug("Received request to generate report for " + caller); + } return new StreamingOutput() { @Override public void write(OutputStream stream) throws IOException, WebApplicationException { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java index b68dfcf..ebbc0b4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java @@ -2,24 +2,24 @@ package org.rhq.enterprise.server.rest.reporting; import javax.ejb.Local; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; @Path("/recentOperations") @Local public interface RecentOperationsLocal { @GET - @Produces({"text/csv", "application/xml"}) + @Produces({"text/csv"}) StreamingOutput recentOperations( @QueryParam("status") @DefaultValue("inprogress,success,failure,canceled") String operationRequestStatus, @QueryParam("startTime") Long startTime, @QueryParam("endTime") Long endTime, - @Context UriInfo uriInfo, - @Context HttpServletRequest request, - @Context HttpHeaders headers); + @Context HttpServletRequest request); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java index 60ee9c0..3393f13 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java @@ -8,9 +8,7 @@ import javax.ejb.Stateless; import javax.interceptor.Interceptors; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,7 +35,10 @@ public class SuspectMetricHandler extends AbstractRestBean implements SuspectMet private MeasurementOOBManagerLocal measurementOOBMManager; @Override - public StreamingOutput suspectMetrics(UriInfo uriInfo, HttpServletRequest request, HttpHeaders headers ) { + public StreamingOutput suspectMetrics(HttpServletRequest request) { + if (log.isDebugEnabled()) { + log.debug("Received request to generate report for " + caller); + } return new StreamingOutput() { @Override public void write(OutputStream output) throws IOException, WebApplicationException { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java index 8bf1377..455fbca 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java @@ -6,9 +6,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; @Path("/suspectMetrics") @Local @@ -16,9 +14,6 @@ public interface SuspectMetricLocal { @GET @Produces("text/csv") - StreamingOutput suspectMetrics( - @Context UriInfo uriInfo, - @Context HttpServletRequest request, - @Context HttpHeaders headers); + StreamingOutput suspectMetrics(@Context HttpServletRequest request); } commit 5b25bef96890db2bc75fe91da60bdcca4dc1d7b6 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Apr 19 16:39:53 2012 +0200 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. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index fe4b32f..923e3c8 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -68,6 +68,7 @@ import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE; import org.rhq.modules.plugins.jbossas7.json.ReadAttribute; +import org.rhq.modules.plugins.jbossas7.json.ReadChildrenNames; import org.rhq.modules.plugins.jbossas7.json.ReadResource; import org.rhq.modules.plugins.jbossas7.json.Remove; import org.rhq.modules.plugins.jbossas7.json.Result; @@ -318,6 +319,32 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone return deployContent(report); } else { ConfigurationDefinition configDef = report.getResourceType().getResourceConfigurationDefinition(); + + // Check for the Highlander principle + boolean isSingleton = report.getResourceType().isSingleton(); + if (isSingleton) { + // check if there is already a child with th desired type is present + Configuration pluginConfig = report.getPluginConfiguration(); + PropertySimple pathProperty = pluginConfig.getSimple("path"); + if (path==null || path.isEmpty()) { + report.setErrorMessage("No path property found in plugin configuration"); + report.setStatus(CreateResourceStatus.INVALID_CONFIGURATION); + return report; + } + + ReadChildrenNames op = new ReadChildrenNames(address,pathProperty.getStringValue()); + Result res = connection.execute(op); + if (res.isSuccess()) { + List<String> entries = (List<String>) res.getResult(); + if (!entries.isEmpty()) { + report.setErrorMessage("Resource is a singleton, but there are already children " + entries + " please remove them and retry"); + report.setStatus(CreateResourceStatus.FAILURE); + return report; + } + } + } + + CreateResourceDelegate delegate = new CreateResourceDelegate(configDef, connection, address); return delegate.createResource(report); } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDefinitionComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDefinitionComponent.java new file mode 100644 index 0000000..ba7a810 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDefinitionComponent.java @@ -0,0 +1,67 @@ +/* + * 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.modules.plugins.jbossas7; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.CreateResourceStatus; +import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet; +import org.rhq.core.pluginapi.inventory.CreateResourceReport; + +/** + * Component class for JVM definitions on managed server / server-group level + * @author Heiko W. Rupp + */ +public class JVMDefinitionComponent extends BaseComponent<JVMDefinitionComponent> implements CreateChildResourceFacet { + + private static final String BASE_DEFINITION = "baseDefinition"; + + @Override + public CreateResourceReport createResource(CreateResourceReport report) { + // We need to filter out the baseDefinition property and use its value as user selected resource name + + Configuration configuration = report.getResourceConfiguration(); + PropertySimple baseDefinitionProp = configuration.getSimple(BASE_DEFINITION); + if (baseDefinitionProp != null) { + configuration.remove(BASE_DEFINITION); + + String baseDefinitionName = baseDefinitionProp.getStringValue(); + + report.setUserSpecifiedResourceName(baseDefinitionName); + report = super.createResource(report); + } else { + report.setStatus(CreateResourceStatus.INVALID_CONFIGURATION); + report.setErrorMessage("No base definition given that we can use"); + } + return report; + } + + @Override + public Configuration loadResourceConfiguration() throws Exception { + Configuration configuration = super.loadResourceConfiguration(); + + // We need to sneak the baseDefinition back in, otherwise the UI will complain + String baseDefinitionName = path.substring(path.lastIndexOf('=') + 1); + PropertySimple propertySimple = new PropertySimple(BASE_DEFINITION, baseDefinitionName); + configuration.put(propertySimple); + + return configuration; + } +} diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index c3f6db8..249fb47 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -200,6 +200,31 @@ </c:property-options> </c:simple-property> '> + <!ENTITY jvmDefinitionResourceConfigProperties ' + <c:simple-property name="agent-lib" required="false" type="string" readOnly="false" description="The JVM agent lib."/> + <c:simple-property name="agent-path" required="false" type="string" readOnly="false" description="The JVM agent path."/> + <c:simple-property name="env-classpath-ignored" required="false" type="boolean" readOnly="false" description="Ignore the environment classpath."/> + <c:list-property name="environment-variables" required="false" description="The JVM environment variables." > + <c:simple-property name="environment-variable" type="string"/> + </c:list-property> + <c:simple-property name="heap-size" required="false" type="string" readOnly="false" description="The initial heap size allocated by the JVM."/> + <c:simple-property name="java-agent" required="false" type="string" readOnly="false" description="The java agent."/> + <c:simple-property name="java-home" required="false" type="string" readOnly="false" description="The java home"/> + <c:list-property name="jvm-options" required="false" description="The JVM options. Those can not be changed after initial creation of the definition." readOnly="true" > + <c:simple-property name="jvm-option" type="string"/> + </c:list-property> + <c:simple-property name="max-heap-size" required="false" type="string" readOnly="false" description="The maximum heap size that can be allocated by the JVM."/> + <c:simple-property name="max-permgen-size" required="false" type="string" readOnly="false" description="The maximum size of the permanent generation."/> + <c:simple-property name="permgen-size" required="false" type="string" readOnly="false" description="The initial permanent generation size."/> + <c:simple-property name="stack-size" required="false" type="string" readOnly="false" description="The JVM stack size settings."/> + <c:simple-property name="type" required="false" type="string" readOnly="true" description="The JVM type can be either SUN or IBM" default="SUN"> + <c:property-options> + <c:option value="SUN"/> + <c:option value="IBM"/> + </c:property-options> + </c:simple-property> +'> + ]> <plugin name="jboss-as-7" displayName="JBoss Application Server 7.x" @@ -1986,14 +2011,33 @@ </service> - <service name="JVM Definition" + <service name="JVM Definition (Host)" + description="A JVM Definition on Host level, that can serve as templates for server groups and managed servers" discovery="SubsystemDiscovery" class="BaseComponent" createDeletePolicy="both"> <runs-inside> + <parent-resource-type name="Host" plugin="jboss-as-7"/> + </runs-inside> + + <plugin-configuration> + <c:simple-property name="path" default="jvm" readOnly="true"/> + </plugin-configuration> + + <resource-configuration> + &jvmDefinitionResourceConfigProperties; + </resource-configuration> + </service> + + <service name="JVM Definition" + description="A JVM definition that can override host and server group level definitions with the same name" + discovery="SubsystemDiscovery" + class="JVMDefinitionComponent" + singleton="true" + createDeletePolicy="both"> + <runs-inside> <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> <parent-resource-type name="ServerGroup" plugin="jboss-as-7"/> - <parent-resource-type name="Host" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> @@ -2001,28 +2045,10 @@ </plugin-configuration> <resource-configuration> - <c:simple-property name="agent-lib" required="false" type="string" readOnly="false" description="The JVM agent lib."/> - <c:simple-property name="agent-path" required="false" type="string" readOnly="false" description="The JVM agent path."/> - <c:simple-property name="env-classpath-ignored" required="false" type="boolean" readOnly="false" description="Ignore the environment classpath."/> - <c:list-property name="environment-variables" required="false" description="The JVM environment variables." > - <c:simple-property name="environment-variable" type="string"/> - </c:list-property> - <c:simple-property name="heap-size" required="false" type="string" readOnly="false" description="The initial heap size allocated by the JVM."/> - <c:simple-property name="java-agent" required="false" type="string" readOnly="false" description="The java agent."/> - <c:simple-property name="java-home" required="false" type="string" readOnly="false" description="The java home"/> - <c:list-property name="jvm-options" required="false" description="The JVM options. Those can not be changed after initial creation of the definition." readOnly="true" > - <c:simple-property name="jvm-option" type="string"/> - </c:list-property> - <c:simple-property name="max-heap-size" required="false" type="string" readOnly="false" description="The maximum heap size that can be allocated by the JVM."/> - <c:simple-property name="max-permgen-size" required="false" type="string" readOnly="false" description="The maximum size of the permanent generation."/> - <c:simple-property name="permgen-size" required="false" type="string" readOnly="false" description="The initial permanent generation size."/> - <c:simple-property name="stack-size" required="false" type="string" readOnly="false" description="The JVM stack size settings."/> - <c:simple-property name="type" required="false" type="string" readOnly="true" description="The JVM type can be either SUN or IBM" default="SUN"> - <c:property-options> - <c:option value="SUN"/> - <c:option value="IBM"/> - </c:property-options> + <c:simple-property name="baseDefinition" required="true" readOnly="true" description="The definition from host level to use/override"> + <c:option-source target="resource" expression="type='JVM Definition (Host)' plugin=jboss-as-7"/> </c:simple-property> + &jvmDefinitionResourceConfigProperties; </resource-configuration> </service>

12 years

1
0
0 / 0

[rhq] modules/core

by Jay Shaughnessy

modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java | 3 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 62 ++++++---- 2 files changed, 41 insertions(+), 24 deletions(-) New commits: commit 26cbde9ab726fbf1c34e7e7f03f498e2530e72a3 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Apr 27 19:56:52 2012 -0400 [Bug 816680 - Child availability still up with down parent after shutdown operation on AS5] Availability checking work. - remove some confusion between use of null and UNKNOWN - remove some confusion around NOT UP and DOWN - improve some logic around deferring to a parent's DOWN status - protect against invalid return values from AvailabilityFacet.getAvailability() impls diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java index 9fbf014..ae6bafc 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java @@ -39,7 +39,8 @@ public interface AvailabilityFacet { * entity running inside it. Availability for all child resources would automatically be set to * {@link AvailabilityType#DOWN down} in this case. * - * @return {@link AvailabilityType#UP} if the resource can be accessed; otherwise {@link AvailabilityType#DOWN} + * @return {@link AvailabilityType#UP} if the resource can be accessed; otherwise {@link AvailabilityType#DOWN}. + * Any other return value is invalid. */ AvailabilityType getAvailability(); } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java index 24fdcf5..661dd20 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java @@ -261,24 +261,25 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo // find out what the avail was the last time we checked it. this may be null Availability previous = this.inventoryManager.getAvailabilityIfKnown(resource); - AvailabilityType current = (null == previous) ? null : previous.getAvailabilityType(); + AvailabilityType current = (null == previous) ? AvailabilityType.UNKNOWN : previous.getAvailabilityType(); - // regardless of whether the avail schedule is met, we still must check avail if isForce is true or if - // it's a full report and we don't yet have an avail for the resource. - if (!checkAvail && (isForced || (scan.isFull && null == previous))) { - checkAvail = true; - } + // If the resource's parent is DOWN, the rules are that the resource and all of the parent's other + // descendants, must also be DOWN. So, there's no need to even ask the resource component + // for its current availability - its current avail is set to the parent avail type and that's that. + // Otherwise, checkAvail as needed. + if (deferToParent || (AvailabilityType.DOWN == parentAvailType)) { + current = parentAvailType; + ++scan.numDeferToParent; - if (checkAvail) { - if (deferToParent || (AvailabilityType.UP != parentAvailType)) { - // If the resource's parent is not up, the rules are that the resource and all of the parent's other - // descendants, must also be of the parent avail type, so there's no need to even ask the resource component - // for its current availability - its current avail is set to the parent avail type and that's that. - current = parentAvailType; - ++scan.numDeferToParent; + } else { + // regardless of whether the avail schedule is met, we still must check avail if isForce is true or if + // it's a full report and we don't yet have an avail for the resource. + if (!checkAvail && (isForced || (scan.isFull && null == previous))) { + checkAvail = true; + } - } else { - current = null; + if (checkAvail) { + current = AvailabilityType.UNKNOWN; try { ++scan.numGetAvailabilityCalls; @@ -288,11 +289,11 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo // down (this is for the case when a plugin component can't start for whatever reason // or is just slow to start) if (resourceContainer.getResourceComponentState() == ResourceComponentState.STARTED) { - current = resourceComponent.getAvailability(); + current = safeGetAvailability(resourceComponent); } else { this.inventoryManager.activateResource(resource, resourceContainer, false); if (resourceContainer.getResourceComponentState() == ResourceComponentState.STARTED) { - current = resourceComponent.getAvailability(); + current = safeGetAvailability(resourceComponent); } } } catch (Throwable t) { @@ -308,18 +309,17 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo } } } - } - if (null == current) { - if (log.isDebugEnabled()) { - log.debug("Protecting against null getAvailability(). Setting DOWN to " + resource); + // Assume DOWN if for some reason the avail check failed + if (AvailabilityType.UNKNOWN == current) { + current = AvailabilityType.DOWN; } - current = AvailabilityType.DOWN; } } // Add the availability to the report if it changed from its previous state or if this is a full report. // Update the resource container only if the avail has changed. - boolean availChanged = (null != current && (null == previous) || (current != previous.getAvailabilityType())); + boolean availChanged = (null != current && AvailabilityType.UNKNOWN != current && (null == previous || current != previous + .getAvailabilityType())); if (availChanged || scan.isFull) { Availability availability; @@ -351,6 +351,22 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo return; } + private AvailabilityType safeGetAvailability(AvailabilityFacet component) { + AvailabilityType availType = component.getAvailability(); + switch (availType) { + case UP: + return AvailabilityType.UP; + case DOWN: + return AvailabilityType.DOWN; + default: + if (log.isDebugEnabled()) { + log.debug("ResourceComponent " + component + " getAvailability() returned " + availType + + ". This is invalid and is being replaced with DOWN."); + } + return AvailabilityType.DOWN; + } + } + /** * This tells the executor to send a full availability report the next time it sends one. Public-scoped so tests * can call this.

12 years

1
0
0 / 0

[rhq] 3 commits - modules/core modules/plugins

by ips

modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java | 156 ++++++---- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 4 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java | 7 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java | 6 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java | 27 + 5 files changed, 146 insertions(+), 54 deletions(-) New commits: commit b6aa68d296a9d27334ba578c8deb9efcbdc1ef9a Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 17:48:22 2012 -0400 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 diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 7fe7f5f..7285cec 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -240,7 +240,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent private void setStartScriptPluginConfigProps(ProcessInfo process, AS7CommandLine commandLine, Configuration pluginConfig) { StartScriptConfiguration startScriptConfig = new StartScriptConfiguration(pluginConfig); - ProcessInfo parentProcess = process.getParentProcess(); + ProcessInfo parentProcess = getPotentialStartScriptProcess(process); File startScript = ServerStartScriptDiscoveryUtility.getStartScript(parentProcess); if (startScript == null) { @@ -268,6 +268,8 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent startScriptConfig.setStartScriptArgs(startScriptArgs); } + protected abstract ProcessInfo getPotentialStartScriptProcess(ProcessInfo process); + private void setUserAndPasswordPluginConfigProps(ServerPluginConfiguration serverPluginConfig, HostConfiguration hostConfig, File baseDir) { Properties mgmtUsers = getManagementUsers(hostConfig, getMode(), baseDir); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java index 7886190..455717d 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java @@ -114,4 +114,11 @@ public class HostControllerDiscovery extends BaseProcessDiscovery { return resourceDetails; } + @Override + protected ProcessInfo getPotentialStartScriptProcess(ProcessInfo serverProcess) { + // If the server was started via domain.sh/bat, its parent process will be the process controller JVM, and the + // process controller JVM's parent process will be domain.sh/bat. + return serverProcess.getParentProcess().getParentProcess(); + } + } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java index 136a0af..f23c6e3 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java @@ -111,4 +111,10 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { return resourceDetails; } + @Override + protected ProcessInfo getPotentialStartScriptProcess(ProcessInfo process) { + // If the server was started via standalone.sh/bat, its parent process will be standalone.sh/bat. + return process.getParentProcess(); + } + } commit 651d54d74878daaba714b3096c6dd8ebf63be436 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 17:46:15 2012 -0400 fix a couple bugs, refactor a couple things, and add javadoc diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index 819e1e1..576ae41 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -32,6 +32,8 @@ import java.util.Map; import java.util.Set; import org.hyperic.sigar.ProcExe; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.rhq.core.system.ProcessInfo; @@ -43,15 +45,19 @@ import org.rhq.core.system.ProcessInfo; */ public class ServerStartScriptDiscoveryUtility { + private static final boolean OS_IS_WINDOWS = (File.separatorChar == '\\'); + private static final char OPTION_PREFIX = (OS_IS_WINDOWS) ? '/' : '-'; + // Generic OS-level PATH setting for LINUX. For Windows the PATH must be generated when we have // the system env vars. It will be of the form %SystemRoot%\\system32;%SystemRoot%; - private static final String CORE_ENV_VAR_PATH_LINUX = "/bin:/usr/bin"; + private static final String CORE_ENV_VAR_PATH_UNIX = "/bin:/usr/bin"; // Generic OS-level env vars that should be in every process's environment. private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList("PATH", "LD_LIBRARY_PATH")); + static { - if (File.separatorChar == '\\') { + if (OS_IS_WINDOWS) { CORE_ENV_VAR_NAME_INCLUDES.add("OS"); // many batch files use this to figure out if the OS type is NT or 9x CORE_ENV_VAR_NAME_INCLUDES.add("SYSTEMROOT"); // required on Windows to avoid winsock create errors } @@ -60,32 +66,32 @@ public class ServerStartScriptDiscoveryUtility { private ServerStartScriptDiscoveryUtility() { } + /** + * If the specified process is a script, return the path to the script - the returned path will be absolute and + * canonical if possible, or, if it is not a script, return <code>null</code>. + * + * @param serverParentProcess the parent process of a server (e.g. JBoss AS) process + * + * @return if the specified process is a script (the returned path will be absolute and + * canonical if possible), the path to the script, otherwise <code>null</code> + */ + @Nullable public static File getStartScript(ProcessInfo serverParentProcess) { // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" // Windows: "cmd.exe [options] standalone.bat --server-config=standalone-full.xml" - int startScriptIndex = 1; String[] serverParentProcessCommandLine = serverParentProcess.getCommandLine(); - - // advance past cmd.exe options. options start with '/' - if (File.separatorChar == '\\') { - for (; (startScriptIndex < serverParentProcessCommandLine.length); ++startScriptIndex) { - if (!serverParentProcessCommandLine[startScriptIndex].startsWith("/")) { - break; - } - } - } - - String startScript = (serverParentProcessCommandLine.length > startScriptIndex) ? serverParentProcessCommandLine[startScriptIndex] - : null; + Integer startScriptIndex = getStartScriptIndex(serverParentProcessCommandLine); File startScriptFile; - - if (isScript(startScript)) { - // The parent process is a script - excellent! + if (startScriptIndex != null) { + // The process is a script - excellent! + String startScript = (serverParentProcessCommandLine.length > startScriptIndex) ? serverParentProcessCommandLine[startScriptIndex] + : null; startScriptFile = new File(startScript); if (!startScriptFile.isAbsolute()) { ProcExe parentProcessExe = serverParentProcess.getExecutable(); if (parentProcessExe == null) { + // TODO: This isn't really generic startScriptFile = new File("bin", startScriptFile.getName()); } else { String cwd = parentProcessExe.getCwd(); @@ -102,52 +108,79 @@ public class ServerStartScriptDiscoveryUtility { return startScriptFile; } + /** + * Returns the list of arguments that should be passed to the start script for the specified server (e.g. JBoss AS) + * process in order to start a functionally equivalent server instance. + * + * @param serverParentProcess the parent process of a server (e.g. JBoss AS) process + * @param serverArgs the subset of arguments from the server (e.g. JBoss AS) process that should be used if the + * parent process is not a script + * @param optionExcludes options that should be excluded from the returned arguments if the parent process is not a + * script + * + * @return the list of arguments that should be passed to the start script for the specified server (e.g. JBoss AS) + * process in order to start a functionally equivalent server instance + */ + @NotNull public static List<String> getStartScriptArgs(ProcessInfo serverParentProcess, List<String> serverArgs, Set<CommandLineOption> optionExcludes) { - // e.g. UNIX: "/bin/sh ./standalone.sh --server-config=standalone-full.xml" - // Windows: "standalone.bat --server-config=standalone-full.xml" - int startScriptIndex = (File.separatorChar == '/') ? 1 : 0; String[] startScriptCommandLine = serverParentProcess.getCommandLine(); - String startScript = (startScriptCommandLine.length > startScriptIndex) ? startScriptCommandLine[startScriptIndex] - : null; + Integer startScriptIndex = getStartScriptIndex(startScriptCommandLine); List<String> startScriptArgs = new ArrayList<String>(); - if (isScript(startScript)) { + if (startScriptIndex != null) { // Skip past the script to get the arguments that were passed to the script. for (int i = (startScriptIndex + 1); i < startScriptCommandLine.length; i++) { startScriptArgs.add(startScriptCommandLine[i]); } } else { - for (int i = 0, serverArgsSize = serverArgs.size(); i < serverArgsSize; i++) { - String serverArg = serverArgs.get(i); - // Skip any options that the start script will take care of specifying. - CommandLineOption option = null; - for (CommandLineOption optionExclude : optionExcludes) { - if ((optionExclude.getShortName() != null && (serverArg.equals('-' + optionExclude.getShortName()) || serverArg - .startsWith('-' + optionExclude.getShortName() + "="))) - || ((optionExclude.getLongName() != null) && (serverArg.equals("--" - + optionExclude.getLongName()) || serverArg.startsWith("--" + optionExclude.getLongName() - + "=")))) { - option = optionExclude; - break; + if ((optionExcludes != null) && !optionExcludes.isEmpty()) { + for (int i = 0, serverArgsSize = serverArgs.size(); i < serverArgsSize; i++) { + String serverArg = serverArgs.get(i); + // Skip any options that the start script will take care of specifying. + CommandLineOption option = null; + for (CommandLineOption optionExclude : optionExcludes) { + if ((optionExclude.getShortName() != null && (serverArg.equals('-' + optionExclude.getShortName()) || serverArg + .startsWith('-' + optionExclude.getShortName() + "="))) + || ((optionExclude.getLongName() != null) && (serverArg.equals("--" + + optionExclude.getLongName()) || serverArg.startsWith("--" + optionExclude.getLongName() + + "=")))) { + option = optionExclude; + break; + } } - } - if (option != null) { - if (option.isExpectsValue() - && ((i + 1) < serverArgsSize) - && (((option.getShortName() != null) && serverArg.equals('-' + option.getShortName())) || (option - .getLongName() != null) && serverArg.equals("--" + option.getLongName()))) { - // If the option expects a value and the delimiter is a space, skip the next argument too. - i++; + if (option != null) { + if (option.isExpectsValue() + && ((i + 1) < serverArgsSize) + && (((option.getShortName() != null) && serverArg.equals('-' + option.getShortName())) || (option + .getLongName() != null) && serverArg.equals("--" + option.getLongName()))) { + // If the option expects a value and the delimiter is a space, skip the next argument too. + i++; + } + } else { + startScriptArgs.add(serverArg); } - } else { - startScriptArgs.add(serverArg); } + } else { + startScriptArgs.addAll(serverArgs); } } return startScriptArgs; } + /** + * Returns the set of environment variables that should be passed to the start script for the specified server + * (e.g. JBoss AS) process in order to start a functionally equivalent server instance. + * + * @param serverProcess a server (e.g. JBoss AS) process + * @param serverParentProcess the parent process of the server (e.g. JBoss AS) process + * @param envVarNameIncludes the names of the variables that should be included in the returned map, in addition to + * a core set of OS-level variables (PATH, LD_LIBRARY_PATH, etc.) + * + * @return the set of environment variables that should be passed to the start script for the specified server + * (e.g. JBoss AS) process + */ + @NotNull public static Map<String, String> getStartScriptEnv(ProcessInfo serverProcess, ProcessInfo serverParentProcess, Set<String> envVarNameIncludes) { Map<String, String> processEnvVars; @@ -157,7 +190,8 @@ public class ServerStartScriptDiscoveryUtility { processEnvVars = serverProcess.getEnvironmentVariables(); } - List<String> fullEnvVarNameIncludes = new ArrayList<String>(envVarNameIncludes); + List<String> fullEnvVarNameIncludes = (envVarNameIncludes != null) ? + new ArrayList<String>(envVarNameIncludes) : new ArrayList<String>(); // Add the core includes at the end of the list, since end users will probably be more interested in the // app-specific env vars. fullEnvVarNameIncludes.addAll(CORE_ENV_VAR_NAME_INCLUDES); @@ -178,15 +212,37 @@ public class ServerStartScriptDiscoveryUtility { String path = systemRoot + "\\system32;" + systemRoot; startScriptEnv.put("PATH", path); } else { - startScriptEnv.put("PATH", CORE_ENV_VAR_PATH_LINUX); + startScriptEnv.put("PATH", CORE_ENV_VAR_PATH_UNIX); } return startScriptEnv; } - private static boolean isScript(String startScript) { + @Nullable + private static Integer getStartScriptIndex(String[] serverParentProcessCommandLine) { + // Assuming the specified process actually is a script, it will look something like this: + // UNIX: "/bin/sh [options] ./standalone.sh --server-config=standalone-full.xml" + // Windows: "cmd.exe [options] standalone.bat --server-config=standalone-full.xml" + + if (serverParentProcessCommandLine.length == 1) { + // The command line is an executable with no arguments - there's no way it's a script, so return null. + return null; + } + + int startScriptIndex; + // Advance past any shell (e.g. /bin/sh or cmd.exe) options. + for (startScriptIndex = 1; (startScriptIndex < serverParentProcessCommandLine.length); ++startScriptIndex) { + if (serverParentProcessCommandLine[startScriptIndex].charAt(0) != OPTION_PREFIX) { + break; + } + } + String possibleStartScript = serverParentProcessCommandLine[startScriptIndex]; + return (isScript(possibleStartScript)) ? startScriptIndex : null; + } + + private static boolean isScript(String filePath) { // TODO: What if CygWin was used to start AS7 on Windows via a shell script? - return (startScript != null) && (startScript.endsWith(".sh") || startScript.endsWith(".bat")); + return (filePath != null) && (filePath.endsWith(".sh") || filePath.matches(".*\\.((bat)|(cmd))$(?i)")); } } commit e69ef1e6945f9ec15f7509d77dd4441b3e1206c5 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 17:13:51 2012 -0400 temporarily disable testAllResourceComponentsStarted test until the PC shutdown issue has been fixed diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java index c6cb36a..0f797d8 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java @@ -1,3 +1,21 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.modules.plugins.jbossas7.itest; import java.util.HashMap; @@ -6,11 +24,13 @@ import java.util.Map; import org.testng.annotations.Test; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.plugin.testutil.AbstractAgentPluginTest; import org.rhq.modules.plugins.jbossas7.itest.domain.ManagedServerTest; import org.rhq.test.arquillian.RunDiscovery; /** - * Generic AS7 plugin tests. + * AS7 plugin tests that are not specific to particular Resource types. The tests delegate to methods in + * {@link AbstractAgentPluginTest}, which provides generic impls of such tests. * * @author Ian Springer */ @@ -18,15 +38,16 @@ import org.rhq.test.arquillian.RunDiscovery; public class GenericJBossAS7PluginTest extends AbstractJBossAS7PluginTest { // ****************************** LIFECYCLE ****************************** // - @Test(priority = 1) + // TODO: Re-enable this once the PC shutdown issue has been fixed. + @Test(priority = 1, enabled = false) @RunDiscovery public void testAllResourceComponentsStarted() throws Exception { - Thread.sleep(30*1000L); assertAllResourceComponentsStarted(); } // ******************************* METRICS ******************************* // @Test(priority = 2) + @RunDiscovery public void testAllMetricsHaveNonNullValues() throws Exception { Map<ResourceType, String[]> excludedMetricNamesByType = new HashMap<ResourceType, String[]>(); // It's normal for the "startTime" trait to be null for a Managed Server that is down/disabled.

12 years

1
0
0 / 0

[rhq] modules/plugins

by snegrea

modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 27 +++------- 1 file changed, 10 insertions(+), 17 deletions(-) New commits: commit 4a28ce1dd2e2acfa8d8c00f1985120e2be821b91 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Apr 27 15:48:36 2012 -0500 Subsystem updates for discovery on the resource tree. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 81083c7..1ccd2cd 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -2051,11 +2051,9 @@ discovery="SubsystemDiscovery" class="BaseComponent" singleton="true" - description="General settings of the JCA engine. Not necessarily for end-users" - > + description="General settings of the JCA engine. Not necessarily for end-users"> <runs-inside> - <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> </runs-inside> @@ -2064,21 +2062,14 @@ </plugin-configuration> <resource-configuration> - <c:simple-property name="default-workmanager-short-running-thread-pool" required="true" type="string" readOnly="true" - description="Specify the name of short running thread pool"/> - <c:simple-property name="default-workmanager-long-running-thread-pool" required="true" type="string" readOnly="true" - description="Specify the name of long running thread pool"/> - <c:simple-property name="bean-validation-enabled" required="true" type="boolean" readOnly="true" - description="Specify whether bean validation is enabled"/> + <c:simple-property name="default-workmanager-short-running-thread-pool" required="true" type="string" readOnly="true" description="Specify the name of short running thread pool"/> + <c:simple-property name="default-workmanager-long-running-thread-pool" required="true" type="string" readOnly="true" description="Specify the name of long running thread pool"/> + <c:simple-property name="bean-validation-enabled" required="true" type="boolean" readOnly="true" description="Specify whether bean validation is enabled"/> <c:simple-property name="archive-validation-enabled" type="boolean" readOnly="true" description="Enabling the validation"/> - <c:simple-property name="archive-validation-fail-on-error" type="boolean" readOnly="true" defaultValue="true" - description="Should an archive validation error report fail the deployment. Default: true"/> - <c:simple-property name="archive-validation-fail-on-warn" type="boolean" readOnly="true" defaultValue="false" - description="Should an archive validation warning report fail the deployment. Default: false"/> - <c:simple-property name="cached-connection-manager-debug" type="boolean" readOnly="true" defaultValue="false" - description="enable/disable debug information logging for cached connection manager"/> - <c:simple-property name="cached-connection-manager-error" type="boolean" readOnly="true" defaultValue="false" - description="enable/disable error information logging for cached connection manager"/> + <c:simple-property name="archive-validation-fail-on-error" type="boolean" readOnly="true" defaultValue="true" description="Should an archive validation error report fail the deployment. Default: true"/> + <c:simple-property name="archive-validation-fail-on-warn" type="boolean" readOnly="true" defaultValue="false" description="Should an archive validation warning report fail the deployment. Default: false"/> + <c:simple-property name="cached-connection-manager-debug" type="boolean" readOnly="true" defaultValue="false" description="enable/disable debug information logging for cached connection manager"/> + <c:simple-property name="cached-connection-manager-error" type="boolean" readOnly="true" defaultValue="false" description="enable/disable error information logging for cached connection manager"/> </resource-configuration> </service> @@ -2950,6 +2941,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=naming"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <operation name="jndi-view" displayName="JNDIView" description="Peek at the JNDI tree"> @@ -4305,6 +4297,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=jpa" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration>

12 years

1
0
0 / 0

[rhq] 2 commits - modules/core modules/enterprise modules/plugins

by lkrejci

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/MD5Task.java | 2 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/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js | 455 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 222 +++- 7 files changed, 1012 insertions(+), 366 deletions(-) New commits: commit 70ea9ac32b250b0aa96db1215efe5f4720483745 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Apr 27 22:20:40 2012 +0200 [BZ 801638] - adding a sample CLI script that can make an AS7 standalone server join a cluster (and copy over the deployments to it). diff --git a/modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js b/modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js new file mode 100644 index 0000000..c629fe6 --- /dev/null +++ b/modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js @@ -0,0 +1,455 @@ +/** + * This script can be used to add a standalone vJBoss AS7 server into a cluster. + * + * All the functions with names starting with an underscore are considered + * private. + * + * @author: Lukas Krejci + */ + +/** + * This function adds an AS7 server to a cluster with another AS7 instance, using + * the provided node name as its identifier. + * <p> + * This method only makes the new member use the same configuration as the existing + * member and synchronizes its jgroups, messaging and modcluster socket bindings + * with the cluster. Optionally it also copies over all the deployments to the + * new member. + * <p> + * The configurations are therefore assumed to be otherwise compatible - i.e. + * the infinispan cache containers should be configured correctly (or left at + * default values, which are configured correctly), etc. + * + * @param newAs7Resource the resource proxy of the AS7 instance to add + * @param newNodeName the node name, i.e. unique identification, of the new member + * in the cluster + * @param existingClusterMemberResource an AS7 instance that belongs to a cluster + * the new member should join into. + * @param copyDeployments whether or not to copy the deployments from the existing + * member to the new member + */ +function addToCluster(newAs7Resource, newNodeName, existingClusterMemberResource, copyDeployments) { + println("Reading config of the existing cluster member"); + var clusterConfig = _getClusterSignificantConfig(existingClusterMemberResource); + + println("Reading config of the new member"); + var memberConfig = _getClusterSignificantConfig(newAs7Resource); + + var memberResourceConfiguration = newAs7Resource.resourceConfiguration; + + if (memberConfig['config'] != clusterConfig['config']) { + println("The configurations of the servers differ.\n" + + "The new cluster member's configuration will be changed to match the configuration of the existing member."); + + //switch to the same configuration + var pluginConfig = newAs7Resource.pluginConfiguration; + pluginConfig.getSimple('config').setValue(clusterConfig['config']); + newAs7Resource.updatePluginConfiguration(pluginConfig); + + //we need to restart straight away so that we see the changes to the + //rest of the configuration caused by the change of current config. + println("Restarting the new cluster member to switch it to the new configuration."); + newAs7Resource.restart(); + + //refresh the resource + newAs7Resource = ProxyFactory.getResource(newAs7Resource.id); + + //refresh the cluster specific config after the restart with the new + //config + memberConfig = _getClusterSignificantConfig(newAs7Resource); + memberResourceConfiguration = newAs7Resource.resourceConfiguration; + } + + //now check what's the node name we see + if (memberConfig['node-name'] != newNodeName) { + println("Updating the node name of the new cluster member from '" + memberConfig['node-name'] + "' to '" + newNodeName + "'"); + _updateNodeName(memberResourceConfiguration, newNodeName); + newAs7Resource.updateResourceConfiguration(memberResourceConfiguration); + } + + //now apply the socket binding changes for jgroups and other cluster + //significant subsystems + //first find the socket binding group config in the new member + for(i in newAs7Resource.children) { + var child = newAs7Resource.children[i]; + if (child.resourceType.name == 'SocketBindingGroup' && + child.resourceType.plugin == 'jboss-as-7') { + + println("Updating socket bindings of jgroups, messaging and modcluster subsystems"); + + var portOffset = javascriptString(child.resourceConfiguration.getSimpleValue('port-offset', '0')); + var clusterMemberPortOffset = clusterConfig['port-offset']; + + var newConfig = child.resourceConfiguration.deepCopy(false); + + _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['jgroups']); + _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['messaging']); + _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['modcluster']); + + child.updateResourceConfiguration(newConfig); + } + } + + println("Restarting the new member for the new socket bindings to take effect."); + newAs7Resource.restart(); + + if (copyDeployments) { + println("Copying the deployments to the new cluster member..."); + copyDeployments(existingClusterMemberResource, newAs7Resource); + + println("Restarting the new cluster member."); + newAs7Resource.restart(); + } +} + +/** + * Copies all deployments from the source to the target. Both resources must + * be standalone AS7 servers. + * + * @param sourceAS7 the resource id or object of the source AS7 standalone instance + * @param targetAS7 the resource id or object of the target AS7 standalone instance + */ +function copyDeployments(sourceAS7, targetAS7) { + if (typeof sourceAS7 == 'object') { + sourceAS7 = sourceAS7.id; + } + + if (typeof targetAS7 == 'object') { + targetAS7 = targetAS7.id; + } + + var deploymentResourceType = ResourceTypeManager.getResourceTypeByNameAndPlugin('Deployment', 'jboss-as-7'); + + var deploymentsCrit = new ResourceCriteria; + deploymentsCrit.addFilterParentResourceId(sourceAS7); + deploymentsCrit.addFilterResourceTypeId(deploymentResourceType.id); + + var unlimitedPageControl = PageControl.unlimitedInstance; + + var sourceDeployments = ResourceManager.findResourcesByCriteria(deploymentsCrit); + var iterator = sourceDeployments.iterator(); + while (iterator.hasNext()) { + var deploymentResource = iterator.next(); + //get a resource proxy for easy access to configurations, etc. + deploymentResource = ProxyFactory.getResource(deploymentResource.id); + + println("Copying deployment " + deploymentResource.name); + + var installedPackage = ContentManager.getBackingPackageForResource(deploymentResource.id); + var content = ContentManager.getPackageBytes(deploymentResource.id, installedPackage.id); + + var runtimeName = deploymentResource.resourceConfiguration.getSimpleValue('runtime-name', deploymentResource.name); + + var deploymentConfiguration = new Configuration; + deploymentConfiguration.put(new PropertySimple('runtimeName', runtimeName)); + + //so now we have both metadata and the data of the deployment, let's + //push a copy of it to the target server + var history = ResourceFactoryManager.createPackageBackedResource(targetAS7, + deploymentResourceType.id, deploymentResource.name, + deploymentResource.pluginConfiguration, + installedPackage.packageVersion.generalPackage.name, + installedPackage.packageVersion.version, + installedPackage.packageVersion.architecture.id, + deploymentConfiguration, content, null); + + while (history.status.name() == 'IN_PROGRESS') { + java.lang.Thread.sleep(1000); + //the API for checking the create histories is kinda weird.. + var histories = ResourceFactoryManager.findCreateChildResourceHistory(targetAS7, null, null, unlimitedPageControl); + var hit = histories.iterator(); + var found = false; + while(hit.hasNext()) { + var h = hit.next(); + + if (h.id == history.id) { + history = h; + found = true; + break; + } + } + + if (!found) { + throw "The history object for the deployment seems to have disappeared, this is very strange."; + } + } + + println("Deployment finished with status: " + history.status.toString() + + (history.status.name() == 'SUCCESS' ? "." : (", error message: " + history.errorMessage + "."))); + } +} + +/** + * The config properties of AS7 can have a form of ${propertyName:defaultvalue}. + * Because we can't figure out the value of the property if it is defined, + * (or get at its default value), we return the following hash from this function + * { + * property : propertyName, + * value : defaultvalue + * } + * + * At least one of the keys in the above hash will have a value. + */ +function _parseValueFromExpr(expr) { + var strExpr = expr + ''; + if (strExpr.indexOf('${') == 0) { + var colonIdx = strExpr.indexOf(':'); + if (colonIdx == -1) { + return { 'property' : expr }; + } else { + var property = strExpr.substring(2, colonIdx); + var value = strExpr.substring(colonIdx + 1, strExpr.length - 1); + + return { 'property' : property, 'value' : value }; + } + } else { + return { 'value' : expr }; + } +} + +/** + * This converts the result of _parseValueFromExpr() function back into the + * ${property:defaultvalue} format. + */ +function _composeValueExpr(parsedValue) { + if (parsedValue.property == undefined) { + return parsedValue.value; + } else { + return '${' + parsedValue.property + ':' + parsedValue.value + '}'; + } +} + +function _updateNodeName(serverResourceConfiguration, newNodeName) { + //define it as a system prop + var systemProps = serverResourceConfiguration.getList('*2'); + if (systemProps == null) { + systemProps = new PropertyList('*2'); + serverResourceConfiguration.put(systemProps); + } + + var it = systemProps.list.iterator(); + var updated = false; + while (it.hasNext()) { + var systemProp = it.next(); + var systemPropName = systemProp.getSimpleValue('name', null); + if (systemPropName == 'jboss.node.name') { + var systemPropValue = systemProp.getSimple('value'); + if (systemPropValue == null) { + systemPropValue = new PropertySimple('value', newNodeName); + systemProp.put(systemPropValue); + } else { + systemPropValue.setValue(newNodeName); + } + + updated = true; + break; + } + } + + if (!updated) { + var systemProp = new PropertyMap('*:name'); + systemProp.put(new PropertySimple('name', 'jboss.node.name')); + systemProp.put(new PropertySimple('value', newNodeName)); + systemProps.add(systemProp); + } +} + +function _updateSocketBindings(socketBindingsConfig, portOffset, clusterMemberPortOffset, socketBindingConfig) { + portOffset = _parseValueFromExpr(portOffset); + clusterMemberPortOffset = _parseValueFromExpr(clusterMemberPortOffset); + + var portOffsetValue = portOffset.value != undefined ? portOffset.value : 0; + var clusterMemberPortOffsetValue = clusterMemberPortOffset.value != undefined ? + clusterMemberPortOffset.value : 0; + + var portOffsetDiff = clusterMemberPortOffsetValue - portOffsetValue; + + var ports = socketBindingsConfig.get('*'); + var portIterator = ports.list.iterator(); + + var appliedProperties = []; + + while (portIterator.hasNext()) { + var port = portIterator.next(); + + var name = port.getSimpleValue('name', null); + + if (socketBindingConfig[name] != undefined) { + //k, this is a significant config, port it over + + //compute the value of the ports + if (socketBindingConfig[name]['fixed-port'] == 'true') { + port.put(new PropertySimple('port:expr', socketBindingConfig[name]['port:expr'])); + port.put(new PropertySimple('multicast-port:expr', socketBindingConfig[name]['multicast-port:expr'])); + port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address'])); + port.put(new PropertySimple('fixed-port', 'true')); + } else { + var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']); + if (portExprToUse.value != undefined) { + portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + ''; + } + + var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']); + if (multicastPortExprToUse.value != undefined) { + multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + ''; + } + + port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse))); + port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse))); + port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address'])); + port.put(new PropertySimple('fixed-port', 'false')); + } + appliedProperties.push(name); + } + } + + //I need contains() and Rhino's Array object apparently doesn't have indexOf() + //which I could otherwise use. + appliedProperties = java.util.Arrays.asList(appliedProperties); + + //now add to the list the props that were not there + for(name in socketBindingConfig) { + if (appliedProperties.contains(name)) { + continue; + } + + var port = new PropertyMap; + ports.add(port); + + port.put(new PropertySimple('name', name)); + port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address'])); + port.put(new PropertySimple('fixed-port', socketBindingConfig[name]['fixed-port'])); + + var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']); + if (portExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) { + portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + ''; + } + + var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']); + if (multicastPortExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) { + multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + ''; + } + + port.put(new PropertySimple('port:expr'), _composeValueExpr(portExprToUse)); + port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse))); + } +} + + +/** + * Returns a javascript hash of configuration properties significant for the + * cluster configuration. + * + * This method is quite simplistic - it merely reads out the important socket + * bindings and Infinispan configuration properties. + * + * It doesn't try to be smart about specifying which concrete caches and cache + * containers are used for individual subsystems like EJB3, JPA or web apps. + * + * @param resource the resource proxy of the AS7 + */ +function _getClusterSignificantConfig(as7Resource) { + var ret = {}; + + ret['config'] = javascriptString(as7Resource.pluginConfiguration.getSimpleValue('config', null)); + + ret['node-name'] = javascriptString(as7Resource.resourceConfiguration.getSimpleValue('node-name', null)); + + //the standalone server has a single socket binding group + for(var i in as7Resource.children) { + var child = as7Resource.children[i]; + if (child.resourceType.plugin != 'jboss-as-7') { + continue; + } + if (child.resourceType.name == 'SocketBindingGroup') { + ret['port-offset'] = javascriptString(child.resourceConfiguration.getSimpleValue('port-offset', '0')); + var ports = child.resourceConfiguration.get('*'); + var portIterator = ports.list.iterator(); + + var jgroups = {}; + var messaging = {}; + var modcluster = {}; + + ret['jgroups'] = jgroups; + ret['messaging'] = messaging; + ret['modcluster'] = modcluster; + + while (portIterator.hasNext()) { + var port = portIterator.next(); + var name = javascriptString(port.getSimpleValue('name', null)); + + if (name.indexOf('jgroups') == 0) { + jgroups[name] = _getSocketBinding(port); + } else if (name.indexOf('messaging') == 0) { + messaging[name] = _getSocketBinding(port); + } else if (name.indexOf('modcluster') == 0) { + modcluster[name] = _getSocketBinding(port); + } + } + } else if (child.resourceType.name == 'Infinispan') { + var ispn = {}; + ret['infinispan'] = ispn; + + //This has disappeared + //ispn['default-cache-container'] = javascriptString(child.defaultCacheContainer.value); + var cacheContainers = {}; + ispn['cache-containers'] = cacheContainers; + + for(cc in child.children) { + var cacheContainer = child.children[cc]; + + var caches = {}; + + cacheContainers[cacheContainer.name] = { + 'default-cache' : javascriptString(cacheContainer.resourceConfiguration.getSimpleValue('default-cache', null)), + 'aliases' : _asArray(cacheContainer.resourceConfiguration.get('aliases')), + 'caches' : caches + }; + + for (c in cacheContainer.children) { + var cache = cacheContainer.children[c]; + + caches[cache.name] = { + '_flavor' : javascriptString(cache.resourceConfiguration.getSimpleValue('_flavor', null)), + 'batching' : javascriptString(cache.resourceConfiguration.getSimpleValue('batching', null)), + 'indexing' : javascriptString(cache.resourceConfiguration.getSimpleValue('indexing', null)), + 'mode' : javascriptString(cache.resourceConfiguration.getSimpleValue('mode', null)) + }; + } + } + } + } + + return ret; +} + +function _getSocketBinding(port) { + return { + 'port:expr' : javascriptString(port.getSimpleValue('port:expr', '0')), + 'multicast-port:expr' : javascriptString(port.getSimpleValue('multicast-port:expr', null)), + 'multicast-address' : javascriptString(port.getSimpleValue('multicast-address', null)), + 'fixed-port' : javascriptString(port.getSimpleValue('fixed-port', null)) + }; +} + +function javascriptString(string) { + return string == null || string == undefined ? string : string + ''; +} + +function _asArray(propertyList) { + var ret = []; + if (propertyList == undefined || propertyList == null) { + return ret; + } + + var it = propertyList.list.iterator(); + while (it.hasNext()) { + var prop = it.next(); + + if (prop instanceof PropertySimple) { + ret.push(javascriptString(prop.stringValue)); + } + } + + return ret; +} commit d3927476f7f8f4f6172a1d92ee636ee853f931f7 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Apr 27 22:16:26 2012 +0200 [BZ 816593][BZ 816587] - Deployments now correctly advertise their content packages (we only support archived deployments for now). Also added support for retrieving the package bits. diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/Base64.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/Base64.java deleted file mode 100644 index e01f0fb..0000000 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/Base64.java +++ /dev/null @@ -1,319 +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. - */ -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.rhq.core.db.ant; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; - -/** - * Class to Base64 encode strings. - */ -public class Base64 { - private static final char[] S_BASE64CHAR = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', - 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '+', '/' }; - private static final char S_BASE64PAD = '='; - private static final byte[] S_DECODETABLE = new byte[128]; - - static { - for (int i = 0; i < S_DECODETABLE.length; i++) { - S_DECODETABLE[i] = Byte.MAX_VALUE; // 127 - } - - for (int i = 0; i < S_BASE64CHAR.length; i++) // 0 to 63 - { - S_DECODETABLE[S_BASE64CHAR[i]] = (byte) i; - } - } - - private static int decode0(char[] ibuf, byte[] obuf, int wp) { - int outlen = 3; - if (ibuf[3] == S_BASE64PAD) { - outlen = 2; - } - - if (ibuf[2] == S_BASE64PAD) { - outlen = 1; - } - - int b0 = S_DECODETABLE[ibuf[0]]; - int b1 = S_DECODETABLE[ibuf[1]]; - int b2 = S_DECODETABLE[ibuf[2]]; - int b3 = S_DECODETABLE[ibuf[3]]; - switch (outlen) { - case 1: { - obuf[wp] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); - return 1; - } - - case 2: { - obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); - obuf[wp] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); - return 2; - } - - case 3: { - obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); - obuf[wp++] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); - obuf[wp] = (byte) (((b2 << 6) & 0xc0) | (b3 & 0x3f)); - return 3; - } - - default: { - throw new RuntimeException("Internal Errror"); - } - } - } - - /** - */ - public static byte[] decode(char[] data, int off, int len) { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[(len / 4 * 3) + 3]; - int obufcount = 0; - for (int i = off; i < (off + len); i++) { - char ch = data[i]; - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - obufcount += decode0(ibuf, obuf, obufcount); - } - } - } - - if (obufcount == obuf.length) { - return obuf; - } - - byte[] ret = new byte[obufcount]; - System.arraycopy(obuf, 0, ret, 0, obufcount); - return ret; - } - - /** - */ - public static byte[] decode(String data) { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[(data.length() / 4 * 3) + 3]; - int obufcount = 0; - for (int i = 0; i < data.length(); i++) { - char ch = data.charAt(i); - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - obufcount += decode0(ibuf, obuf, obufcount); - } - } - } - - if (obufcount == obuf.length) { - return obuf; - } - - byte[] ret = new byte[obufcount]; - System.arraycopy(obuf, 0, ret, 0, obufcount); - return ret; - } - - /** - */ - public static void decode(char[] data, int off, int len, OutputStream ostream) throws IOException { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[3]; - for (int i = off; i < (off + len); i++) { - char ch = data[i]; - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - int obufcount = decode0(ibuf, obuf, 0); - ostream.write(obuf, 0, obufcount); - } - } - } - } - - /** - */ - public static void decode(String data, OutputStream ostream) throws IOException { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[3]; - for (int i = 0; i < data.length(); i++) { - char ch = data.charAt(i); - if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - int obufcount = decode0(ibuf, obuf, 0); - ostream.write(obuf, 0, obufcount); - } - } - } - } - - /** - * Returns base64 representation of specified byte array. - */ - public static String encode(byte[] data) { - return encode(data, 0, data.length); - } - - /** - * Returns base64 representation of specified byte array. - */ - public static String encode(byte[] data, int off, int len) { - if (len <= 0) { - return ""; - } - - char[] out = new char[(len / 3 * 4) + 4]; - int rindex = off; - int windex = 0; - int rest = len - off; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[windex++] = S_BASE64CHAR[i >> 18]; - out[windex++] = S_BASE64CHAR[(i >> 12) & 0x3f]; - out[windex++] = S_BASE64CHAR[(i >> 6) & 0x3f]; - out[windex++] = S_BASE64CHAR[i & 0x3f]; - rindex += 3; - rest -= 3; - } - - if (rest == 1) { - int i = data[rindex] & 0xff; - out[windex++] = S_BASE64CHAR[i >> 2]; - out[windex++] = S_BASE64CHAR[(i << 4) & 0x3f]; - out[windex++] = S_BASE64PAD; - out[windex++] = S_BASE64PAD; - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[windex++] = S_BASE64CHAR[i >> 10]; - out[windex++] = S_BASE64CHAR[(i >> 4) & 0x3f]; - out[windex++] = S_BASE64CHAR[(i << 2) & 0x3f]; - out[windex++] = S_BASE64PAD; - } - - return new String(out, 0, windex); - } - - /** - * Outputs base64 representation of the specified byte array to a byte stream. - */ - public static void encode(byte[] data, int off, int len, OutputStream ostream) throws IOException { - if (len <= 0) { - return; - } - - byte[] out = new byte[4]; - int rindex = off; - int rest = len - off; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[0] = (byte) S_BASE64CHAR[i >> 18]; - out[1] = (byte) S_BASE64CHAR[(i >> 12) & 0x3f]; - out[2] = (byte) S_BASE64CHAR[(i >> 6) & 0x3f]; - out[3] = (byte) S_BASE64CHAR[i & 0x3f]; - ostream.write(out, 0, 4); - rindex += 3; - rest -= 3; - } - - if (rest == 1) { - int i = data[rindex] & 0xff; - out[0] = (byte) S_BASE64CHAR[i >> 2]; - out[1] = (byte) S_BASE64CHAR[(i << 4) & 0x3f]; - out[2] = (byte) S_BASE64PAD; - out[3] = (byte) S_BASE64PAD; - ostream.write(out, 0, 4); - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[0] = (byte) S_BASE64CHAR[i >> 10]; - out[1] = (byte) S_BASE64CHAR[(i >> 4) & 0x3f]; - out[2] = (byte) S_BASE64CHAR[(i << 2) & 0x3f]; - out[3] = (byte) S_BASE64PAD; - ostream.write(out, 0, 4); - } - } - - /** - * Outputs base64 representation of the specified byte array to a character stream. - */ - public static void encode(byte[] data, int off, int len, Writer writer) throws IOException { - if (len <= 0) { - return; - } - - char[] out = new char[4]; - int rindex = off; - int rest = len - off; - int output = 0; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[0] = S_BASE64CHAR[i >> 18]; - out[1] = S_BASE64CHAR[(i >> 12) & 0x3f]; - out[2] = S_BASE64CHAR[(i >> 6) & 0x3f]; - out[3] = S_BASE64CHAR[i & 0x3f]; - writer.write(out, 0, 4); - rindex += 3; - rest -= 3; - output += 4; - if ((output % 76) == 0) { - writer.write("\n"); - } - } - - if (rest == 1) { - int i = data[rindex] & 0xff; - out[0] = S_BASE64CHAR[i >> 2]; - out[1] = S_BASE64CHAR[(i << 4) & 0x3f]; - out[2] = S_BASE64PAD; - out[3] = S_BASE64PAD; - writer.write(out, 0, 4); - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[0] = S_BASE64CHAR[i >> 10]; - out[1] = S_BASE64CHAR[(i >> 4) & 0x3f]; - out[2] = S_BASE64CHAR[(i << 2) & 0x3f]; - out[3] = S_BASE64PAD; - writer.write(out, 0, 4); - } - } -} \ No newline at end of file diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java index 824b777..2de2c86 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java @@ -24,6 +24,8 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; +import org.rhq.core.util.Base64; + /** * Encrypts a string. You can optionally have it base64 encode the MD5 string (which is the default). Set the "base64" * attribute to "false" if you do not want the string base64 encoded. diff --git a/modules/core/util/src/main/java/org/rhq/core/util/Base64.java b/modules/core/util/src/main/java/org/rhq/core/util/Base64.java new file mode 100644 index 0000000..34a3035 --- /dev/null +++ b/modules/core/util/src/main/java/org/rhq/core/util/Base64.java @@ -0,0 +1,319 @@ +/* + * 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. + */ +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package org.rhq.core.util; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; + +/** + * Class to Base64 encode strings. + */ +public class Base64 { + private static final char[] S_BASE64CHAR = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', + 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', '+', '/' }; + private static final char S_BASE64PAD = '='; + private static final byte[] S_DECODETABLE = new byte[128]; + + static { + for (int i = 0; i < S_DECODETABLE.length; i++) { + S_DECODETABLE[i] = Byte.MAX_VALUE; // 127 + } + + for (int i = 0; i < S_BASE64CHAR.length; i++) // 0 to 63 + { + S_DECODETABLE[S_BASE64CHAR[i]] = (byte) i; + } + } + + private static int decode0(char[] ibuf, byte[] obuf, int wp) { + int outlen = 3; + if (ibuf[3] == S_BASE64PAD) { + outlen = 2; + } + + if (ibuf[2] == S_BASE64PAD) { + outlen = 1; + } + + int b0 = S_DECODETABLE[ibuf[0]]; + int b1 = S_DECODETABLE[ibuf[1]]; + int b2 = S_DECODETABLE[ibuf[2]]; + int b3 = S_DECODETABLE[ibuf[3]]; + switch (outlen) { + case 1: { + obuf[wp] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); + return 1; + } + + case 2: { + obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); + obuf[wp] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); + return 2; + } + + case 3: { + obuf[wp++] = (byte) (((b0 << 2) & 0xfc) | ((b1 >> 4) & 0x3)); + obuf[wp++] = (byte) (((b1 << 4) & 0xf0) | ((b2 >> 2) & 0xf)); + obuf[wp] = (byte) (((b2 << 6) & 0xc0) | (b3 & 0x3f)); + return 3; + } + + default: { + throw new RuntimeException("Internal Errror"); + } + } + } + + /** + */ + public static byte[] decode(char[] data, int off, int len) { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[(len / 4 * 3) + 3]; + int obufcount = 0; + for (int i = off; i < (off + len); i++) { + char ch = data[i]; + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + obufcount += decode0(ibuf, obuf, obufcount); + } + } + } + + if (obufcount == obuf.length) { + return obuf; + } + + byte[] ret = new byte[obufcount]; + System.arraycopy(obuf, 0, ret, 0, obufcount); + return ret; + } + + /** + */ + public static byte[] decode(String data) { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[(data.length() / 4 * 3) + 3]; + int obufcount = 0; + for (int i = 0; i < data.length(); i++) { + char ch = data.charAt(i); + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + obufcount += decode0(ibuf, obuf, obufcount); + } + } + } + + if (obufcount == obuf.length) { + return obuf; + } + + byte[] ret = new byte[obufcount]; + System.arraycopy(obuf, 0, ret, 0, obufcount); + return ret; + } + + /** + */ + public static void decode(char[] data, int off, int len, OutputStream ostream) throws IOException { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[3]; + for (int i = off; i < (off + len); i++) { + char ch = data[i]; + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + int obufcount = decode0(ibuf, obuf, 0); + ostream.write(obuf, 0, obufcount); + } + } + } + } + + /** + */ + public static void decode(String data, OutputStream ostream) throws IOException { + char[] ibuf = new char[4]; + int ibufcount = 0; + byte[] obuf = new byte[3]; + for (int i = 0; i < data.length(); i++) { + char ch = data.charAt(i); + if ((ch == S_BASE64PAD) || ((ch < S_DECODETABLE.length) && (S_DECODETABLE[ch] != Byte.MAX_VALUE))) { + ibuf[ibufcount++] = ch; + if (ibufcount == ibuf.length) { + ibufcount = 0; + int obufcount = decode0(ibuf, obuf, 0); + ostream.write(obuf, 0, obufcount); + } + } + } + } + + /** + * Returns base64 representation of specified byte array. + */ + public static String encode(byte[] data) { + return encode(data, 0, data.length); + } + + /** + * Returns base64 representation of specified byte array. + */ + public static String encode(byte[] data, int off, int len) { + if (len <= 0) { + return ""; + } + + char[] out = new char[(len / 3 * 4) + 4]; + int rindex = off; + int windex = 0; + int rest = len - off; + while (rest >= 3) { + int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); + out[windex++] = S_BASE64CHAR[i >> 18]; + out[windex++] = S_BASE64CHAR[(i >> 12) & 0x3f]; + out[windex++] = S_BASE64CHAR[(i >> 6) & 0x3f]; + out[windex++] = S_BASE64CHAR[i & 0x3f]; + rindex += 3; + rest -= 3; + } + + if (rest == 1) { + int i = data[rindex] & 0xff; + out[windex++] = S_BASE64CHAR[i >> 2]; + out[windex++] = S_BASE64CHAR[(i << 4) & 0x3f]; + out[windex++] = S_BASE64PAD; + out[windex++] = S_BASE64PAD; + } else if (rest == 2) { + int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); + out[windex++] = S_BASE64CHAR[i >> 10]; + out[windex++] = S_BASE64CHAR[(i >> 4) & 0x3f]; + out[windex++] = S_BASE64CHAR[(i << 2) & 0x3f]; + out[windex++] = S_BASE64PAD; + } + + return new String(out, 0, windex); + } + + /** + * Outputs base64 representation of the specified byte array to a byte stream. + */ + public static void encode(byte[] data, int off, int len, OutputStream ostream) throws IOException { + if (len <= 0) { + return; + } + + byte[] out = new byte[4]; + int rindex = off; + int rest = len - off; + while (rest >= 3) { + int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); + out[0] = (byte) S_BASE64CHAR[i >> 18]; + out[1] = (byte) S_BASE64CHAR[(i >> 12) & 0x3f]; + out[2] = (byte) S_BASE64CHAR[(i >> 6) & 0x3f]; + out[3] = (byte) S_BASE64CHAR[i & 0x3f]; + ostream.write(out, 0, 4); + rindex += 3; + rest -= 3; + } + + if (rest == 1) { + int i = data[rindex] & 0xff; + out[0] = (byte) S_BASE64CHAR[i >> 2]; + out[1] = (byte) S_BASE64CHAR[(i << 4) & 0x3f]; + out[2] = (byte) S_BASE64PAD; + out[3] = (byte) S_BASE64PAD; + ostream.write(out, 0, 4); + } else if (rest == 2) { + int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); + out[0] = (byte) S_BASE64CHAR[i >> 10]; + out[1] = (byte) S_BASE64CHAR[(i >> 4) & 0x3f]; + out[2] = (byte) S_BASE64CHAR[(i << 2) & 0x3f]; + out[3] = (byte) S_BASE64PAD; + ostream.write(out, 0, 4); + } + } + + /** + * Outputs base64 representation of the specified byte array to a character stream. + */ + public static void encode(byte[] data, int off, int len, Writer writer) throws IOException { + if (len <= 0) { + return; + } + + char[] out = new char[4]; + int rindex = off; + int rest = len - off; + int output = 0; + while (rest >= 3) { + int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); + out[0] = S_BASE64CHAR[i >> 18]; + out[1] = S_BASE64CHAR[(i >> 12) & 0x3f]; + out[2] = S_BASE64CHAR[(i >> 6) & 0x3f]; + out[3] = S_BASE64CHAR[i & 0x3f]; + writer.write(out, 0, 4); + rindex += 3; + rest -= 3; + output += 4; + if ((output % 76) == 0) { + writer.write("\n"); + } + } + + if (rest == 1) { + int i = data[rindex] & 0xff; + out[0] = S_BASE64CHAR[i >> 2]; + out[1] = S_BASE64CHAR[(i << 4) & 0x3f]; + out[2] = S_BASE64PAD; + out[3] = S_BASE64PAD; + writer.write(out, 0, 4); + } else if (rest == 2) { + int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); + out[0] = S_BASE64CHAR[i >> 10]; + out[1] = S_BASE64CHAR[(i >> 4) & 0x3f]; + out[2] = S_BASE64CHAR[(i << 2) & 0x3f]; + out[3] = S_BASE64PAD; + writer.write(out, 0, 4); + } + } +} \ No newline at end of file diff --git a/modules/core/util/src/main/java/org/rhq/core/util/ByteUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/ByteUtil.java new file mode 100644 index 0000000..3600d7e --- /dev/null +++ b/modules/core/util/src/main/java/org/rhq/core/util/ByteUtil.java @@ -0,0 +1,59 @@ +/* + * 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.core.util; + +/** + * Utilities for working with bytes and byte arrays. + * + * @author Lukas Krejci + */ +public class ByteUtil { + + private static final char[] HEX_DIGITS = "0123456789abcdef".toCharArray(); + + private ByteUtil() { + + } + + /** + * Converts the byte array into a string of hexadecimal numbers. + * Each byte in the array is represented by exactly two characters + * in the resulting string, which form a hexadecimal number with the + * value that represents the bits in the byte. + * + * @param bytes + * @return a string of hexadecimal numbers representing the bytes + */ + public static String toHexString(byte[] bytes) { + char[] str = new char[bytes.length * 2]; + + for (int i = 0; i < bytes.length; ++i) { + byte b = bytes[i]; + + int lower = b & 0x0f; + int upper = (b & 0xf0) >>> 4; + + str[2 * i] = HEX_DIGITS[upper]; + str[2 * i + 1] = HEX_DIGITS[lower]; + } + + return new String(str); + } +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java index 09c25cd..851937b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java @@ -43,12 +43,12 @@ import org.rhq.core.clientapi.server.core.ConnectAgentRequest; import org.rhq.core.clientapi.server.core.ConnectAgentResults; import org.rhq.core.clientapi.server.core.CoreServerService; import org.rhq.core.clientapi.server.core.PingRequest; -import org.rhq.core.db.ant.Base64; import org.rhq.core.domain.cloud.PartitionEventType; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.cloud.composite.FailoverListComposite; import org.rhq.core.domain.plugin.Plugin; import org.rhq.core.domain.resource.Agent; +import org.rhq.core.util.Base64; import org.rhq.core.util.exception.WrappedRemotingException; import org.rhq.enterprise.communications.command.client.RemoteInputStream; import org.rhq.enterprise.server.alert.engine.AlertConditionCacheManagerLocal; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java index f8d48ec..9771cee 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java @@ -1,9 +1,13 @@ package org.rhq.modules.plugins.jbossas7; +import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -25,9 +29,17 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.content.ContentFacet; import org.rhq.core.pluginapi.content.ContentServices; +import org.rhq.core.pluginapi.content.FileContentDelegate; import org.rhq.core.pluginapi.inventory.CreateResourceReport; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ResourceComponent; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.Base64; +import org.rhq.core.util.ByteUtil; +import org.rhq.core.util.file.ContentFileInfo; +import org.rhq.core.util.file.JarContentFileInfo; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.ComplexResult; import org.rhq.modules.plugins.jbossas7.json.Operation; @@ -40,10 +52,17 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Deal with deployments * @author Heiko W. Rupp */ -public class DeploymentComponent extends BaseComponent implements OperationFacet, ContentFacet { +public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> implements OperationFacet, ContentFacet { private boolean verbose = ASConnection.verbose; - + private File deploymentFile; + + @Override + public void start(ResourceContext<ResourceComponent<?>> context) throws InvalidPluginConfigurationException, Exception { + super.start(context); + deploymentFile = determineDeploymentFile(); + } + @Override public AvailabilityType getAvailability() { Operation op = new ReadAttribute(getAddress(),"enabled"); @@ -170,59 +189,170 @@ public class DeploymentComponent extends BaseComponent implements OperationFacet @Override public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> packages) { - return null; // TODO: Customise this generated block + RemovePackagesResponse response = new RemovePackagesResponse(ContentResponseResult.NOT_PERFORMED); + response.setOverallRequestErrorMessage("Removal of packages backing the deployments is not supported."); + return response; } @Override public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) { + if (deploymentFile == null) { + return Collections.emptySet(); + } + + String name = getDeploymentName(); + String sha256 = getSHA256(deploymentFile); + String version = getVersion(sha256); + + PackageDetailsKey key = new PackageDetailsKey(name, version, type.getName(), "noarch"); + ResourcePackageDetails details = new ResourcePackageDetails(key); + + details.setDisplayVersion(getDisplayVersion(deploymentFile)); + details.setFileCreatedDate(null); //TODO figure this out from Sigar somehow? + details.setFileName(name); + details.setFileSize(deploymentFile.length()); + details.setInstallationTimestamp(deploymentFile.lastModified()); + details.setLocation(deploymentFile.getAbsolutePath()); + details.setSHA256(sha256); + + return Collections.singleton(details); + } - Set<ResourcePackageDetails> details = new HashSet<ResourcePackageDetails>(); - - // PackageType = "Deployment" - Address address1 = getAddress().getParent(); - Operation op = new ReadChildrenResources(address1,"deployment"); - ComplexResult cres = getASConnection().executeComplex(op); - - if (cres==null) - return details; - - if (!cres.isSuccess()) - return details; - - Map<String,Object> deployments = cres.getResult(); - for (String key : deployments.keySet()) { - Map<String,Object> deployment = (Map<String, Object>) deployments.get(key); - log.info("Discover package [" + key + "] for type [" + type + "]"); - - List<Map> contentList = (List<Map>) deployment.get("content"); - if (contentList!=null) { - - Map<String,Map> hashMap = contentList.get(0); - Map<String,String> bvMap = hashMap.get("hash"); - String content; - if (bvMap!=null) { - content = bvMap.get("BYTES_VALUE"); - } - else { - content = hashMap.get("relative-to") + File.separator + hashMap.get("path"); - } - PackageDetailsKey pdKey = new PackageDetailsKey(key, - content, // no way to obtain the user defined version from the server - type.getName(), - "noarch" - ); - ResourcePackageDetails detail = new ResourcePackageDetails(pdKey); - detail.setSHA256(content); - - details.add(detail); + @Override + public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) { + try { + return deploymentFile == null ? new ByteArrayInputStream(new byte[0]) : new FileInputStream(deploymentFile); + } catch (FileNotFoundException e) { + throw new IllegalStateException("Deployment file seems to have disappeared"); + } + } + + private File determineDeploymentFile() { + Operation op = new ReadAttribute(getAddress(), "content"); + Result result = getASConnection().execute(op); + + @SuppressWarnings("unchecked") + List<Map<String, Object>> content = (List<Map<String, Object>>) result.getResult(); + if (content.isEmpty()) { + log.warn("Could not determine the location of the deployment - the content descriptor wasn't found for deployment" + getAddress() + "."); + return null; + } + + Boolean archive = (Boolean) content.get(0).get("archive"); + if (archive != null && !archive) { + log.debug("Exploded deployments not supported for retrieving the content."); + return null; + } + + File deploymentFile = null; + if (content.get(0).containsKey("path")) { + String path = (String) content.get(0).get("path"); + String relativeTo = (String) content.get(0).get("relative-to"); + deploymentFile = getDeploymentFileFromPath(relativeTo, path); + } else if (content.get(0).containsKey("hash")) { + @SuppressWarnings("unchecked") + String base64Hash = ((Map<String, String>)content.get(0).get("hash")).get("BYTES_VALUE"); + byte[] hash = Base64.decode(base64Hash); + Address contentPathAddress = new Address("core-service", "server-environment"); + op = new ReadAttribute(contentPathAddress, "content-dir"); + result = getASConnection().execute(op); + + String contentPath = (String) result.getResult(); + deploymentFile = getDeploymentFileFromHash(hash, contentPath); + } else { + log.warn("Failed to determine the deployment file of " + getAddress() + " deployment. Neither path nor hash attributes were available."); + } + + return deploymentFile; + } + + private File getDeploymentFileFromPath(String relativeTo, String path) { + if (relativeTo == null || relativeTo.trim().isEmpty()) { + return new File(path); + } else { + //Transform the property name into the name used in the server environment + if (relativeTo.startsWith("jboss.server")) { + relativeTo = relativeTo.substring("jboss.server.".length()); + relativeTo = relativeTo.replace('.', '-'); + + //now look for the transformed relativeTo in the server environment + Operation op = new ReadAttribute(new Address("core-service", "server-environment"), relativeTo); + Result res = getASConnection().execute(op); + + relativeTo = (String) res.getResult(); + + return new File(relativeTo, path); + } else { + log.warn("Unsupported property used as a base for deployment path specification: " + relativeTo); + return null; + } + } + } + + private File getDeploymentFileFromHash(byte[] hash, String contentPath) { + String hashStr = ByteUtil.toHexString(hash); + + String head = hashStr.substring(0, 2); + String tail = hashStr.substring(2); + + File hashPath = new File(new File(head, tail), "content"); + + return new File(contentPath, hashPath.getPath()); + } + + /** + * Retrieve SHA256 for a deployed app. + * + * Shamelessly copied from the AS5 plugin. + * + * @param file application file + * @return SHA256 of the content + */ + private String getSHA256(File file) { + String sha256 = null; + + try { + FileContentDelegate fileContentDelegate = new FileContentDelegate(); + sha256 = fileContentDelegate.retrieveDeploymentSHA(file, context.getResourceDataDirectory()); + } catch (Exception iex) { + if (log.isDebugEnabled()) { + log.debug("Problem calculating digest of package [" + file.getPath() + "]." + iex.getMessage()); } } - return details; + return sha256; } - @Override - public InputStream retrievePackageBits(ResourcePackageDetails packageDetails) { - return null; // TODO: Customise this generated block + /** + * Shamelessly copied from the AS5 plugin. + * + * @param sha256 + * @return + */ + private static String getVersion(String sha256) { + return "[sha256=" + sha256 + "]"; + } + + /** + * Retrieve the display version for the component. The display version should be stored + * in the manifest of the application (implementation and/or specification version). + * It will attempt to retrieve the version for both archived or exploded deployments. + * + * Shamelessly copied from the AS5 plugin + * + * @param file component file + * @return + */ + private String getDisplayVersion(File file) { + //JarContentFileInfo extracts the version from archived and exploded deployments + ContentFileInfo contentFileInfo = new JarContentFileInfo(file); + return contentFileInfo.getVersion(null); + } + + private String getDeploymentName() { + Operation op = new ReadAttribute(getAddress(), "name"); + Result res = getASConnection().execute(op); + + return (String) res.getResult(); } }

12 years

1
0
0 / 0

[rhq] modules/helpers

by ips

modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java | 22 ++++++++-- modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java | 3 - 2 files changed, 21 insertions(+), 4 deletions(-) New commits: commit b118bbbebaa12bba82d02d0ff79c306e76081ddd Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 13:10:54 2012 -0400 [BZ 815889] fix for rtfilter subsystem (apparently implementing the config writer is not optional) (https://bugzilla.redhat.com/show_bug.cgi?id=815889) diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java index 06a300b..0e985d8 100644 --- a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java @@ -38,8 +38,8 @@ import org.jboss.staxmapper.XMLExtendedStreamWriter; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; -import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -73,7 +73,7 @@ public class RtFilterExtension implements Extension { protected static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME); private static final String RESOURCE_NAME = RtFilterExtension.class.getPackage().getName() + ".LocalDescriptions"; - public static final Map<String, String> INIT_PARAMS = new HashMap<String, String>(); + public static final Map<String, String> INIT_PARAMS = new LinkedHashMap<String, String>(); public static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String keyPrefix) { String prefix = SUBSYSTEM_NAME + (keyPrefix == null ? "" : "." + keyPrefix); @@ -199,7 +199,23 @@ public class RtFilterExtension implements Extension { @Override public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { context.startSubsystemElement(RtFilterExtension.NAMESPACE, false); - writer.writeEndElement(); + + for (String paramName : INIT_PARAMS.keySet()) { + writer.writeStartElement("init-param"); + + writer.writeStartElement("param-name"); + writer.writeCharacters(paramName); + writer.writeEndElement(); // param-name + + writer.writeStartElement("param-value"); + String paramValue = INIT_PARAMS.get(paramName); + writer.writeCharacters(paramValue); + writer.writeEndElement(); // param-value + + writer.writeEndElement(); // init-param + } + + writer.writeEndElement(); // subsystem } } diff --git a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java index aee7a6b..9ed5100 100644 --- a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java +++ b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java @@ -31,7 +31,7 @@ import org.testng.annotations.Test; * * @author Ian Springer */ -@Test(enabled = false) +@Test(enabled = true) public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest { public SubsystemXmlParsingTest() { @@ -44,6 +44,7 @@ public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest { super.initializeParser(); } + @Override public void testSubsystem() throws Exception { super.testSubsystem(); }

12 years

1
0
0 / 0

[rhq] modules/plugins

by snegrea

modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java | 6 +- modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 24 ++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) New commits: commit c828332bccc0ca270839ed9a7eeecd3a88a119ed Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Apr 27 11:38:15 2012 -0500 Add managed runtime property for discovery purposes for managed servers. Hardened the detection for managed servers runtime. And removed unneeded Host Controller parents. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java index d06567d..4db21ba 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java @@ -98,8 +98,10 @@ public class SubsystemDiscovery implements ResourceDiscoveryComponent<BaseCompon // path correction for managed servers, where the config is below host=x,server-config=y but // the runtime resource is below host=x,server=y - path = path.replaceAll(",server-config=", ",server="); - parentPath = parentPath.replaceAll(",server-config=", ",server="); + if (path.startsWith("host=")) { + path = path.replaceAll(",server-config=", ",server="); + parentPath = parentPath.replaceAll(",server-config=", ",server="); + } } if (Boolean.getBoolean("as7plugin.verbose")) diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index c48b453..81083c7 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -1618,10 +1618,12 @@ <runs-inside> <parent-resource-type name="Profile" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/> + <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=messaging"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="HornetQ" @@ -2209,6 +2211,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=datasources"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="DataSource (Managed)" @@ -2826,6 +2829,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=webservices"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <!-- REMOVING. These are lifecycle operations for AS container itself. Don't think we want to allow @@ -2864,7 +2868,7 @@ </plugin-configuration> <resource-configuration> - <c:simple-property name="protocol-bindings" required="false" type="string" readOnly="false" description="Protocol binding"/> + <c:simple-property name="protocol-bindings" required="false" type="string" readOnly="false" description="Protocol binding"/> <c:list-property name="property" required="false" description="A list of generic key/value properties."> <c:map-property name="property:collapsed" displayName="Property"> <c:simple-property name="name:0" type="string" displayName="Name" required="true"/> @@ -3047,7 +3051,6 @@ description="The transactions subsystem."> <runs-inside> - <parent-resource-type name="JBossAS7 Host Controller" plugin="jboss-as-7"/> <parent-resource-type name="Profile" plugin="jboss-as-7"/> </runs-inside> @@ -3083,12 +3086,12 @@ description="The transactions subsystem."> <runs-inside> - <parent-resource-type name="JBossAS7 Host Controller" plugin="jboss-as-7"/> <parent-resource-type name="Managed Server" plugin="jboss-as-7"/> </runs-inside> <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=transactions"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <metric property="number-of-nested-transactions" description="The total number of nested (sub) transactions created." measurementType="trendsup" defaultInterval="300000" defaultOn="false"/> @@ -4057,6 +4060,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=jacorb" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> @@ -4123,6 +4127,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=jdr" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <operation name="generate-jdr-report" displayName="Generate JDR Report" description="Request the generation of a JDR report."> @@ -4149,6 +4154,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=jca" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> @@ -4274,6 +4280,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=jaxr" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> @@ -4320,6 +4327,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=cmp" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="HiloKeygenerator" @@ -4364,6 +4372,7 @@ <plugin-configuration> <c:simple-property name="path" default="subsystem=ee" readOnly="true"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> @@ -4389,6 +4398,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=security"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <operation name="add" description="Adds the security subsystem."> @@ -4741,6 +4751,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=threads"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="ThreadFactory" @@ -4832,6 +4843,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=ejb3"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> @@ -5029,6 +5041,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=jmx"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> @@ -5055,6 +5068,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=resource-adapters"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="Resource Adapter" @@ -5221,6 +5235,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=infinispan"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="Cache Container" @@ -5334,6 +5349,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=remoting"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <resource-configuration> @@ -5362,6 +5378,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=osgi"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <operation name="subsystem:activate" displayName="Activate" description="Activate the OSGi subsystem."> @@ -5454,6 +5471,7 @@ <plugin-configuration> <c:simple-property name="path" readOnly="true" default="subsystem=mail"/> + <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/> </plugin-configuration> <service name="Mail Session"

12 years

1
0
0 / 0

[rhq] modules/enterprise modules/helpers

by ips

modules/enterprise/agent/src/etc/product_connectors/README.txt | 20 modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt | 22 + modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 20 modules/helpers/pom.xml | 1 modules/helpers/rtfilter-subsystem/pom.xml | 108 +++++ modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java | 207 ++++++++++ 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 | 67 +++ modules/helpers/rtfilter/pom.xml | 46 +- modules/helpers/rtfilter/src/main/resources/module/main/module.xml | 15 modules/helpers/rtfilter/src/main/scripts/module-assembly.xml | 31 + 19 files changed, 990 insertions(+), 37 deletions(-) New commits: commit 17261077b22265a59dc1aef5074945e5dd137320 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Apr 27 11:56:20 2012 -0400 [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) diff --git a/modules/enterprise/agent/src/etc/product_connectors/README.txt b/modules/enterprise/agent/src/etc/product_connectors/README.txt deleted file mode 100644 index 2118261..0000000 --- a/modules/enterprise/agent/src/etc/product_connectors/README.txt +++ /dev/null @@ -1,20 +0,0 @@ -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. The filter currently supports: - -- Embedded JBossAS Tomcat -- Standalone JBoss EWS Tomcat -- Standalone Apache EWS Tomcat - -Note, a commons-logging jar is supplied for use with Standalone Tomcat6. It -is not required for ealier, supported versions (e.g 5.5). - -The Tomcat Server must be instrumented with the Filter. For information on -configuring the filter, see the Response Times section at the following URL: - -http://www.redhat.com/docs/en-US/JBoss_ON/html/Feature_Guide/index.html \ No newline at end of file diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt b/modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt new file mode 100644 index 0000000..e0e10d5 --- /dev/null +++ b/modules/enterprise/server/container/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: + +http://rhq-project.org/display/JOPR2/Managed+Product+Configuration + diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml index 98bd130..50e891d 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml @@ -364,11 +364,11 @@ <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads" />  - <echo>Deploying static downloadable content</echo> + <echo>Deploying static downloadable content...</echo> <copy todir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads" verbose="true" failonerror="false"> - <fileset dir="${basedir}/src/main/downloadable-resources" /> + <fileset dir="${basedir}/src/main/downloadable-resources" /> </copy>  @@ -435,19 +435,23 @@ </target> <target name="package-connectors"> - <echo>Deploying the response-time servlet filter connectors ...</echo> + <echo>Deploying the response-time (RT) servlet filter connectors ...</echo> <delete file="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip" /> <zip destfile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip"> - <zipfileset dir="${basedir}/../../agent/src/etc/product_connectors"> - <include name="README.txt" /> - </zipfileset> - <zipfileset dir="${settings.localRepository}/org/rhq/rhq-rtfilter/${project.version}"> + <zipfileset dir="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}"> <include name="rhq-rtfilter-${project.version}.jar" /> </zipfileset> <zipfileset dir="${settings.localRepository}/commons-logging/commons-logging/1.1.1"> <include name="commons-logging-1.1.1.jar" /> </zipfileset> </zip> + +  + <copy file="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}/rhq-rtfilter-${project.version}.zip" + tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/rhq-rtfilter-module.zip" /> + + <copy file="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter-subsystem/${project.version}/rhq-rtfilter-subsystem-${project.version}.zip" + tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/rhq-rtfilter-subsystem-module.zip" /> </target> <target name="prepare-bin-dir"> @@ -842,7 +846,7 @@ rhq.autoinstall.public-endpoint-address= undeploy-ds, prepare-web-services-2" description="If this is a release build, make sure it is properly prepared."> - <echo>Adding license headers files...</echo> + <echo>Adding license files...</echo> <copy todir="${project.build.outputDirectory}"> <fileset dir="${basedir}/../../../.." includes="LICENSE*" /> </copy> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 797f302..1f3754d 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -29,6 +29,7 @@ <modules> <module>rtfilter</module> + <module>rtfilter-subsystem</module>  + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-subsystem-test</artifactId> + <version>${version.jboss.as}</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java new file mode 100644 index 0000000..06a300b --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java @@ -0,0 +1,207 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.controller.Extension; +import org.jboss.as.controller.ExtensionContext; +import org.jboss.as.controller.PathElement; +import org.jboss.as.controller.SubsystemRegistration; +import org.jboss.as.controller.descriptions.StandardResourceDescriptionResolver; +import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler; +import org.jboss.as.controller.parsing.ExtensionParsingContext; +import org.jboss.as.controller.parsing.ParseUtils; +import org.jboss.as.controller.persistence.SubsystemMarshallingContext; +import org.jboss.as.controller.registry.ManagementResourceRegistration; +import org.jboss.as.controller.registry.OperationEntry; +import org.jboss.dmr.ModelNode; +import org.jboss.staxmapper.XMLElementReader; +import org.jboss.staxmapper.XMLElementWriter; +import org.jboss.staxmapper.XMLExtendedStreamReader; +import org.jboss.staxmapper.XMLExtendedStreamWriter; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; + +/** + * A JBoss AS7 extension that configures the RHQ response-time servlet filter for all deployed webapps. + * + * @author Ian Springer + */ +public class RtFilterExtension implements Extension { + + /** + * The name space used for the {@code subsystem} element + */ + public static final String NAMESPACE = "urn:rhq:rtfilter:1.0"; + + /** + * The name of our subsystem within the model. + */ + public static final String SUBSYSTEM_NAME = "rhq-rtfilter"; + + private final SubsystemReader reader = new SubsystemReader(); + private final SubsystemWriter writer = new SubsystemWriter(); + + protected static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME); + private static final String RESOURCE_NAME = RtFilterExtension.class.getPackage().getName() + ".LocalDescriptions"; + + public static final Map<String, String> INIT_PARAMS = new HashMap<String, String>(); + + public static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String keyPrefix) { + String prefix = SUBSYSTEM_NAME + (keyPrefix == null ? "" : "." + keyPrefix); + return new StandardResourceDescriptionResolver(prefix, RESOURCE_NAME, RtFilterExtension.class.getClassLoader(), + true, false); + } + + @Override + public void initializeParsers(ExtensionParsingContext context) { + context.setSubsystemXmlMapping(SUBSYSTEM_NAME, NAMESPACE, reader); + } + + @Override + public void initialize(ExtensionContext context) { + final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, 1, 0); + final ManagementResourceRegistration registration = + subsystem.registerSubsystemModel(RtFilterSubsystemDefinition.INSTANCE); + registration.registerOperationHandler(DESCRIBE, GenericSubsystemDescribeHandler.INSTANCE, + GenericSubsystemDescribeHandler.INSTANCE, false, OperationEntry.EntryType.PRIVATE); + subsystem.registerXMLElementWriter(writer); + } + + /** + * The subsystem reader, which uses STAX to read the subsystem XML. + */ + private static class SubsystemReader implements XMLStreamConstants, XMLElementReader<List<ModelNode>> { + + /** + * {@inheritDoc} + */ + @Override + public void readElement(XMLExtendedStreamReader reader, List<ModelNode> list) throws XMLStreamException { + INIT_PARAMS.clear(); + + // Parse the 'subsystem' element... + ParseUtils.requireNoAttributes(reader); + + list.add(createAddSubsystemOperation()); + + // Read the child elements + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { + if (reader.getLocalName().equals("init-param")) { + readInitParam(reader); + } else { + throw ParseUtils.unexpectedElement(reader); + } + // TODO: Add support for configuring filter mappings. + } + } + + private void readInitParam(XMLExtendedStreamReader reader) throws XMLStreamException { + String id = null; + for (int i = 0; i < reader.getAttributeCount(); i++) { + if (reader.getAttributeLocalName(i).equals("id")) { + if (id != null) { + throw ParseUtils.unexpectedAttribute(reader, i); + } + id = reader.getAttributeValue(i); + } else { + throw ParseUtils.unexpectedAttribute(reader, i); + } + } + + String description = null; + String paramName = null; + String paramValue = null; + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { + if (reader.isStartElement()) { + if (reader.getLocalName().equals("description")) { + if (description != null) { + throw ParseUtils.unexpectedElement(reader); + } + description = reader.getElementText(); + } else if (reader.getLocalName().equals("param-name")) { + if (paramName != null) { + throw ParseUtils.unexpectedElement(reader); + } + paramName = reader.getElementText(); + } else if (reader.getLocalName().equals("param-value")) { + if (paramValue != null) { + throw ParseUtils.unexpectedElement(reader); + } + paramValue = reader.getElementText(); + } else { + throw ParseUtils.unexpectedElement(reader); + } + } + } + + Set<String> missingRequiredElements = new HashSet<String>(); + if (paramName == null) { + missingRequiredElements.add("param-name"); + } + if (paramValue == null) { + missingRequiredElements.add("param-value"); + } + if (!missingRequiredElements.isEmpty()) { + throw ParseUtils.missingRequiredElement(reader, missingRequiredElements); + } + + // There's no need for us to expose the init params via the AS7 management model. Just store them in a + // static Map that RtFilterDeploymentUnitProcessor will be able to access. + INIT_PARAMS.put(paramName, paramValue); + } + + private static ModelNode createAddSubsystemOperation() { + final ModelNode subsystem = new ModelNode(); + subsystem.get(OP).set(ADD); + subsystem.get(OP_ADDR).add(SUBSYSTEM, SUBSYSTEM_NAME); + return subsystem; + } + + } + + /** + * The subsystem writer, which uses STAX to write the subsystem XML. + */ + private static class SubsystemWriter implements XMLStreamConstants, XMLElementWriter<SubsystemMarshallingContext> { + + /** + * {@inheritDoc} + */ + @Override + public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { + context.startSubsystemElement(RtFilterExtension.NAMESPACE, false); + writer.writeEndElement(); + } + + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemAdd.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemAdd.java new file mode 100644 index 0000000..d767e17 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemAdd.java @@ -0,0 +1,69 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import java.util.List; + +import org.jboss.as.controller.AbstractBoottimeAddStepHandler; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.ServiceVerificationHandler; +import org.jboss.as.server.AbstractDeploymentChainStep; +import org.jboss.as.server.DeploymentProcessorTarget; +import org.jboss.dmr.ModelNode; +import org.jboss.msc.service.ServiceController; + +import org.rhq.helpers.rtfilter.subsystem.deployment.RtFilterDeploymentUnitProcessor; + +/** + * Handler responsible for adding the rqh-rtfilter-subsystem resource to the model + * + * @author Ian Springer + */ +class RtFilterSubsystemAdd extends AbstractBoottimeAddStepHandler { + + static final RtFilterSubsystemAdd INSTANCE = new RtFilterSubsystemAdd(); + + private RtFilterSubsystemAdd() { + } + + /** {@inheritDoc} */ + @Override + protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException { + model.setEmptyObject(); + } + + /** {@inheritDoc} */ + @Override + public void performBoottime(OperationContext context, ModelNode operation, ModelNode model, + ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) + throws OperationFailedException { + + // Add our deployment processor + //see SubDeploymentProcessor for explanation of the phases + context.addStep(new AbstractDeploymentChainStep() { + public void execute(DeploymentProcessorTarget processorTarget) { + processorTarget.addDeploymentProcessor(RtFilterDeploymentUnitProcessor.PHASE, + RtFilterDeploymentUnitProcessor.PRIORITY, new RtFilterDeploymentUnitProcessor()); + + } + }, OperationContext.Stage.RUNTIME); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemDefinition.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemDefinition.java new file mode 100644 index 0000000..ce5cee0 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemDefinition.java @@ -0,0 +1,45 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.controller.SimpleResourceDefinition; +import org.jboss.as.controller.registry.ManagementResourceRegistration; + +/** + * Definition of the rhq-rtfilter-subsystem resource. + * + * @author Ian Springer + */ +public class RtFilterSubsystemDefinition extends SimpleResourceDefinition { + + public static final RtFilterSubsystemDefinition INSTANCE = new RtFilterSubsystemDefinition(); + + private RtFilterSubsystemDefinition() { + super(RtFilterExtension.SUBSYSTEM_PATH, + RtFilterExtension.getResourceDescriptionResolver(null), + RtFilterSubsystemAdd.INSTANCE, + RtFilterSubsystemRemove.INSTANCE); + } + + @Override + public void registerOperations(ManagementResourceRegistration resourceRegistration) { + super.registerOperations(resourceRegistration); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemRemove.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemRemove.java new file mode 100644 index 0000000..242f1f1 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemRemove.java @@ -0,0 +1,44 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.controller.AbstractRemoveStepHandler; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.dmr.ModelNode; + +/** + * Handler responsible for removing the rqh-rtfilter-subsystem resource from the model + * + * @author Ian Springer + */ +class RtFilterSubsystemRemove extends AbstractRemoveStepHandler { + + static final RtFilterSubsystemRemove INSTANCE = new RtFilterSubsystemRemove(); + + private RtFilterSubsystemRemove() { + } + + @Override + protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException { + //Remove any services installed by the corresponding add handler here + //context.removeService(ServiceName.of("some", "name")); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/deployment/RtFilterDeploymentUnitProcessor.java b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/deployment/RtFilterDeploymentUnitProcessor.java new file mode 100644 index 0000000..d8bce4e --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/deployment/RtFilterDeploymentUnitProcessor.java @@ -0,0 +1,141 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem.deployment; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.jboss.as.ee.structure.DeploymentType; +import org.jboss.as.ee.structure.DeploymentTypeMarker; +import org.jboss.as.server.deployment.DeploymentPhaseContext; +import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.server.deployment.DeploymentUnitProcessingException; +import org.jboss.as.server.deployment.DeploymentUnitProcessor; +import org.jboss.as.server.deployment.Phase; +import org.jboss.as.web.deployment.WarMetaData; +import org.jboss.logging.Logger; +import org.jboss.metadata.javaee.spec.ParamValueMetaData; +import org.jboss.metadata.web.spec.FilterMappingMetaData; +import org.jboss.metadata.web.spec.FilterMetaData; +import org.jboss.metadata.web.spec.FiltersMetaData; +import org.jboss.metadata.web.spec.WebMetaData; + +import org.rhq.helpers.rtfilter.filter.RtFilter; +import org.rhq.helpers.rtfilter.subsystem.RtFilterExtension; + +/** + * A deployment unit processor that configures the RHQ RT filter on each WAR that is deployed. + * + * @author Ian Springer + */ +public class RtFilterDeploymentUnitProcessor implements DeploymentUnitProcessor { + + private static final String RT_FILTER_NAME = "RHQ Response-Time Filter"; + private final Logger log = Logger.getLogger(RtFilterDeploymentUnitProcessor.class); + + /** + * See {@link Phase} for descriptions of the different phases. + */ + public static final Phase PHASE = Phase.DEPENDENCIES; + + /** + * The relative order of this processor within the {@link #PHASE}. + * The current number is large enough for it to happen after all + * the standard deployment unit processors that come with JBoss AS. + */ + public static final int PRIORITY = 0x4000; + + @Override + public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { + final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); + if (isWar(deploymentUnit)) { + log.debug("Configuring RHQ response-time servlet filter for WAR " + deploymentUnit.getName() + "..."); + + final WarMetaData warMetaData = deploymentUnit.getAttachment(WarMetaData.ATTACHMENT_KEY); + WebMetaData webMetaData = warMetaData.getSharedWebMetaData(); + + FilterMetaData rtFilter = null; + FiltersMetaData filters = webMetaData.getFilters(); + if (filters != null) { + for (FilterMetaData filter : filters) { + if (RtFilter.class.getName().equals(filter.getFilterClass())) { + // the filter's already configured in this webapp. + rtFilter = filter; + break; + } + } + } else { + filters = new FiltersMetaData(); + webMetaData.setFilters(filters); + } + if (rtFilter == null) { + rtFilter = new FilterMetaData(); + rtFilter.setFilterName(RT_FILTER_NAME); + rtFilter.setFilterClass(RtFilter.class.getName()); + filters.add(rtFilter); + } + + List<ParamValueMetaData> initParams = rtFilter.getInitParam(); + if (initParams == null) { + initParams = new ArrayList<ParamValueMetaData>(); + rtFilter.setInitParam(initParams); + } + for (String paramName : RtFilterExtension.INIT_PARAMS.keySet()) { + ParamValueMetaData initParam = new ParamValueMetaData(); + initParam.setParamName(paramName); + String paramValue = RtFilterExtension.INIT_PARAMS.get(paramName); + initParam.setParamValue(paramValue); + initParams.add(initParam); + } + + boolean filterMappingAlreadyConfigured = false; + List<FilterMappingMetaData> filterMappings = webMetaData.getFilterMappings(); + if (filterMappings != null) { + for (FilterMappingMetaData filterMapping : filterMappings) { + if (filterMapping.getFilterName().equals(rtFilter.getFilterName())) { + // a mapping for the filter's already configured in this webapp. + filterMappingAlreadyConfigured = true; + break; + } + } + } else { + filterMappings = new ArrayList<FilterMappingMetaData>(); + webMetaData.setFilterMappings(filterMappings); + } + + if (!filterMappingAlreadyConfigured) { + FilterMappingMetaData filterMapping = new FilterMappingMetaData(); + filterMapping.setFilterName(rtFilter.getFilterName()); + filterMapping.setUrlPatterns(Arrays.asList("/*")); + filterMappings.add(filterMapping); + } + } + } + + @Override + public void undeploy(DeploymentUnit context) { + return; + } + + private static boolean isWar(final DeploymentUnit deploymentUnit) { + return (DeploymentTypeMarker.isType(DeploymentType.WAR, deploymentUnit)); + } + +} diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/modules/helpers/rtfilter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension new file mode 100644 index 0000000..1c3a869 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension @@ -0,0 +1 @@ +org.rhq.helpers.rtfilter.subsystem.RtFilterExtension diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/module/main/module.xml b/modules/helpers/rtfilter-subsystem/src/main/resources/module/main/module.xml new file mode 100644 index 0000000..3a2dd34 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/module/main/module.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.0" name="${moduleName}"> + + <resources> + <resource-root path="${project.build.finalName}.jar"/> + </resources> + + <dependencies> +  + <module name="javax.api"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.vfs"/> + +  + <module name="org.jboss.metadata"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.web"/> + <module name="org.rhq.helpers.rhq-rtfilter"/> + </dependencies> + +</module> diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/org/rhq/helpers/rtfilter/subsystem/LocalDescriptions.properties b/modules/helpers/rtfilter-subsystem/src/main/resources/org/rhq/helpers/rtfilter/subsystem/LocalDescriptions.properties new file mode 100644 index 0000000..e60d1d7 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/org/rhq/helpers/rtfilter/subsystem/LocalDescriptions.properties @@ -0,0 +1,3 @@ +rhq-rtfilter=RHQ Response-Time Servlet Filter Subsystem +rhq-rtfilter.add=Operation Adds subsystem +rhq-rtfilter.remove=Operation Removes subsystem diff --git a/modules/helpers/rtfilter-subsystem/src/main/resources/schema/rtfilter-subsystem.xsd b/modules/helpers/rtfilter-subsystem/src/main/resources/schema/rtfilter-subsystem.xsd new file mode 100644 index 0000000..16cb468 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/resources/schema/rtfilter-subsystem.xsd @@ -0,0 +1,129 @@ +<xsd:schema + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:org.rhq:rtfilter:1.0" + xmlns="urn:rhq:rtfilter:1.0" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + +  + <xsd:element name="subsystem" type="subsystemType"/> + + <xsd:complexType name="subsystemType"> + <xsd:sequence> + <xsd:element name="init-param" + type="param-valueType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + The init-param element contains a name/value pair as + an initialization param of the RHQ response-time servlet filter + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + +  + + <xsd:complexType name="param-valueType"> + <xsd:annotation> + <xsd:documentation> + This type is a general type that can be used to declare + parameter/value lists. + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:element name="description" + type="descriptionType" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="param-name" + type="string"> + <xsd:annotation> + <xsd:documentation> + The param-name element contains the name of a + parameter. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="param-value" + type="xsdStringType"> + <xsd:annotation> + <xsd:documentation> + The param-value element contains the value of a + parameter. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +  + + <xsd:complexType name="descriptionType"> + <xsd:annotation> + <xsd:documentation> + + The description type is used by a description element to + provide text describing the parent element. The elements + that use this type should include any information that the + Deployment Component's Deployment File file producer wants + to provide to the consumer of the Deployment Component's + Deployment File (i.e., to the Deployer). Typically, the + tools used by such a Deployment File consumer will display + the description when processing the parent element that + contains the description. + + The lang attribute defines the language that the + description is provided in. The default value is "en" (English). + + </xsd:documentation> + </xsd:annotation> + <xsd:simpleContent> + <xsd:extension base="xsdStringType"> + <xsd:attribute ref="xml:lang"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +  + + <xsd:complexType name="string"> + <xsd:annotation> + <xsd:documentation> + + This is a special string datatype that is defined by J2EE as + a base type for defining collapsed strings. When schemas + require trailing/leading space elimination as well as + collapsing the existing whitespace, this base type may be + used. + + </xsd:documentation> + </xsd:annotation> + <xsd:simpleContent> + <xsd:extension base="xsd:token"> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +  + + <xsd:complexType name="xsdStringType"> + <xsd:annotation> + <xsd:documentation> + This type adds an "id" attribute to xsd:string. + </xsd:documentation> + </xsd:annotation> + <xsd:simpleContent> + <xsd:extension base="xsd:string"> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:extension> + </xsd:simpleContent> + </xsd:complexType> + +</xsd:schema> diff --git a/modules/helpers/rtfilter-subsystem/src/main/scripts/module-assembly.xml b/modules/helpers/rtfilter-subsystem/src/main/scripts/module-assembly.xml new file mode 100644 index 0000000..5570b77 --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/main/scripts/module-assembly.xml @@ -0,0 +1,31 @@ +<?xml version="1.0"?> + +<assembly> + <id>module-assembly</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>${project.build.finalName}-module</baseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}/module</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}</outputDirectory> + <includes> + <include>main/module.xml</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <directory>${project.build.directory}</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}/main</outputDirectory> + <includes> + <include>${project.build.finalName}.jar</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + </fileSets> +</assembly> + diff --git a/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java new file mode 100644 index 0000000..aee7a6b --- /dev/null +++ b/modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java @@ -0,0 +1,67 @@ +/* + * RHQ Management Platform + * Copyright (C) 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.helpers.rtfilter.subsystem; + +import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest; + +import java.io.IOException; + +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + +/** + * Test for parsing of the subsystem XML. + * + * @author Ian Springer + */ +@Test(enabled = false) +public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest { + + public SubsystemXmlParsingTest() { + super(RtFilterExtension.SUBSYSTEM_NAME, new RtFilterExtension()); + } + + @Override + @BeforeTest + public void initializeParser() throws Exception { + super.initializeParser(); + } + + public void testSubsystem() throws Exception { + super.testSubsystem(); + } + + @Override + @AfterTest + public void cleanup() throws Exception { + super.cleanup(); + } + + @Override + protected String getSubsystemXml() throws IOException { + return "<subsystem xmlns=\"" + RtFilterExtension.NAMESPACE + "\">" + + "<init-param>" + + "<param-name>foo</param-name>" + + "<param-value>bar</param-value>" + + "</init-param>" + + "</subsystem>"; + } + +} diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 761f3ec..6683a46 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -1,4 +1,6 @@ -<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"> +<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> @@ -8,16 +10,14 @@ <version>4.4.0-SNAPSHOT</version> </parent> - <groupId>org.rhq</groupId> + <groupId>org.rhq.helpers</groupId> <artifactId>rhq-rtfilter</artifactId> - <packaging>jar</packaging> - <name>RHQ rtfilter</name> - <description>Filter to gather response time metrics from web applcations</description> + <name>RHQ Response-Time Filter</name> + <description>a servlet filter that logs response times for HTTP requests to JEE web applications</description> <properties> - <final.name>rhq-rtfilter</final.name> - <war.dir>${basedir}/target/${final.name}</war.dir> + <moduleName>${groupId}.${artifactId}</moduleName> </properties> <dependencies> @@ -41,16 +41,44 @@ </dependencies> <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> <configuration> - <optimize>false</optimize> +  <source>1.4</source> <target>1.4</target> </configuration> </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/scripts/module-assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>module-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/modules/helpers/rtfilter/src/main/resources/module/main/module.xml b/modules/helpers/rtfilter/src/main/resources/module/main/module.xml new file mode 100644 index 0000000..1d0075c --- /dev/null +++ b/modules/helpers/rtfilter/src/main/resources/module/main/module.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<module xmlns="urn:jboss:module:1.0" name="${moduleName}"> + + <resources> + <resource-root path="${project.build.finalName}.jar"/> + </resources> + + <dependencies> + <module name="javax.servlet.api"/> + <module name="javax.api"/> + <module name="org.apache.commons.logging"/> + </dependencies> + +</module> diff --git a/modules/helpers/rtfilter/src/main/scripts/module-assembly.xml b/modules/helpers/rtfilter/src/main/scripts/module-assembly.xml new file mode 100644 index 0000000..5570b77 --- /dev/null +++ b/modules/helpers/rtfilter/src/main/scripts/module-assembly.xml @@ -0,0 +1,31 @@ +<?xml version="1.0"?> + +<assembly> + <id>module-assembly</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>${project.build.finalName}-module</baseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}/module</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}</outputDirectory> + <includes> + <include>main/module.xml</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <directory>${project.build.directory}</directory> + <outputDirectory>/org/rhq/helpers/${artifactId}/main</outputDirectory> + <includes> + <include>${project.build.finalName}.jar</include> + </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + </fileSets> +</assembly> +

12 years

1
0
0 / 0

[rhq] 2 commits - modules/core modules/plugins

by Jay Shaughnessy

modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java | 22 +++++++--- modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 6 ++ modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java | 12 ----- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 1 4 files changed, 24 insertions(+), 17 deletions(-) New commits: commit 1e48ab86c6423839d8693894aab79fd8bb8c60de Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Apr 27 11:50:08 2012 -0400 - Remove JAVA_OPTS from AS5 and AS7 startScriptEnv discovery as it will end up hiding changes to run.conf, which will likely be the preferred mechanism for setting the java options. It can still be added manually to the connection property if desired. - Also, ignore the discovered PATH and set to a minimal PATH required for startup; "/bin:/usr/bin" for linux and, lazily set using SYSTEMROOT env var, "%SYSTEMROOT%\system32:%SYSTEMROOT%" for Windows. This considerably shortens the PATH length, avoiding LongString limits and unnecessary entries, while still providing a predictable PATH for restart. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java index 3209557..819e1e1 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java @@ -43,11 +43,13 @@ import org.rhq.core.system.ProcessInfo; */ public class ServerStartScriptDiscoveryUtility { + // Generic OS-level PATH setting for LINUX. For Windows the PATH must be generated when we have + // the system env vars. It will be of the form %SystemRoot%\\system32;%SystemRoot%; + private static final String CORE_ENV_VAR_PATH_LINUX = "/bin:/usr/bin"; + // Generic OS-level env vars that should be in every process's environment. - private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList( - "PATH", - "LD_LIBRARY_PATH" - )); + private static final Set<String> CORE_ENV_VAR_NAME_INCLUDES = new HashSet<String>(Arrays.asList("PATH", + "LD_LIBRARY_PATH")); static { if (File.separatorChar == '\\') { CORE_ENV_VAR_NAME_INCLUDES.add("OS"); // many batch files use this to figure out if the OS type is NT or 9x @@ -55,7 +57,6 @@ public class ServerStartScriptDiscoveryUtility { } } - private ServerStartScriptDiscoveryUtility() { } @@ -169,6 +170,17 @@ public class ServerStartScriptDiscoveryUtility { startScriptEnv.put(envVarName, envVarValue); } } + + // Add the fixed PATH + if (File.separatorChar == '\\') { + String systemRoot = processEnvVars.get("SYSTEMROOT"); + systemRoot = (systemRoot == null) ? "C:\\Windows" : systemRoot; + String path = systemRoot + "\\system32;" + systemRoot; + startScriptEnv.put("PATH", path); + } else { + startScriptEnv.put("PATH", CORE_ENV_VAR_PATH_LINUX); + } + return startScriptEnv; } diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index d333463..31c6ab3 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -131,8 +131,12 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom private static final Set<CommandLineOption> START_SCRIPT_OPTION_EXCLUDES = new HashSet<CommandLineOption>(); static { + // Note that JAVA_OPTS is not included on purpose. If present the setting will override that + // which is set in run.conf or possibly in a custom script. We opt to let run.conf provide the setting + // as that is quite likely what users will expect. JAVA_OPTS can be added manually to the + // startScriptEnv settings at which time it would provide an override. Not discovering JAVA_OPTS also + // avoids issues with duplicate settings, due to manipulations made to it by run.conf. START_SCRIPT_ENV_VAR_NAMES.addAll(Arrays.asList( // - "JAVA_OPTS", // "JAVA_HOME", // "JAVA", // "JAVAC_JAR", // diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index d28cfb1..7fe7f5f 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -87,7 +87,6 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent "PROFILER", // "JAVA_HOME", // "JAVA", // - "JAVA_OPTS", // "PRESERVE_JAVA_OPTS", // "PROCESS_CONTROLLER_JAVA_OPTS", // "HOST_CONTROLLER_JAVA_OPTS", // commit 24fc319f79585970163ff8aade0ac8a17c23b75a Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Apr 26 12:21:42 2012 -0400 trivial - remove some dev logging diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java index f98bf19..e439250 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java @@ -75,7 +75,6 @@ public class JBossInstanceInfo { String[] args = this.processInfo.getCommandLine(); Map<String, String> envVars = this.processInfo.getEnvironmentVariables(); - printEnvVars(envVars); for (i = 0; i < args.length; i++) { if (args[i].equals(JBOSS_MAIN_CLASS_NAME)) { @@ -318,20 +317,13 @@ public class JBossInstanceInfo { } } - private void printEnvVars(Map<String, String> envVars) { - log.info("******** Env Vars=" + envVars); - } - private void printSysProps(String[] commandLine) { - if (null != commandLine) { - log.info("******** commandLine=" + Arrays.toString(commandLine)); - } - //if (log.isDebugEnabled()) { + if (log.isDebugEnabled()) { printSysProp(JBossProperties.HOME_DIR); printSysProp(JBossProperties.SERVER_HOME_DIR); printSysProp(JBossProperties.SERVER_NAME); printSysProp(JBossProperties.BIND_ADDRESS); - //} + } } private void printSysProp(String name) {

12 years

1
0
0 / 0

[rhq] modules/plugins

by Heiko W. Rupp

modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 13 ++++------ 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit bc7689cb215dd918de822d70e69294332b1397fc Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Apr 27 09:55:21 2012 +0200 There is no "MaxWaitCount". Sort alphabetically to match the :read-resource output diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 9dd66a0..c48b453 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -253,19 +253,18 @@ <metric property="PreparedStatementCacheAccessCount" measurementType="trendsup" description="The number of times that the statement cache was accessed"/> <metric property="PreparedStatementCacheDeleteCount" measurementType="trendsup" description="The number of statements discarded from the cache"/> <metric property="PreparedStatementCacheHitCount" measurementType="trendsup" description="The number of times that statements from the cache were used"/> - <metric property="AverageBlockingTime" units="milliseconds" description="The average time spent blocking for a connection"/> - <metric property="MaxWaitTime" units="milliseconds" description="The maximum wait time for a connection" displayType="summary"/> <metric property="ActiveCount" description="The active count"/> + <metric property="AvailableCount" description="The available count" units="none"/> + <metric property="AverageBlockingTime" units="milliseconds" description="The average time spent blocking for a connection"/> + <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> <metric property="CreatedCount" description="The created count" measurementType="trendsup"/> + <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> <metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/> - <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/> - <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> - <metric property="AvailableCount" description="The available count" units="none"/> <metric property="MaxUsedCount" description="The maximum number of connections used"/> + <metric property="MaxWaitTime" units="milliseconds" description="The maximum wait time for a connection" displayType="summary"/> <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/> + <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> <metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/> - <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> - <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> <metric property="connectionAvailable" displayName="Connection Available?" dataType="trait" displayType="summary" defaultInterval="300000"/> <metric property="min-pool-size" displayName="Min Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The min pool size setting"/> <metric property="max-pool-size" displayName="Max Pool Size setting" defaultOn="true" defaultInterval="14400000" description="The max pool size setting"/>

12 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits April 2012