[rhq] Branch 'feature/embeddedagent' - 3 commits - .classpath modules/enterprise

.classpath | 4 modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentConfigurationSetup.java | 23 +-- modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentEnabledAttributeHandler.java | 22 +-- modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentService.java | 19 ++- modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemAdd.java | 17 ++ modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemDefinition.java | 8 + modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemExtension.java | 27 +++- modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/PluginsAttributeHandler.java | 6 - modules/enterprise/server/embeddedagent/src/main/resources/org/rhq/embeddedagent/extension/LocalDescriptions.properties | 3 modules/enterprise/server/embeddedagent/src/main/resources/schema/embeddedagent.xsd | 1 modules/enterprise/server/embeddedagent/src/test/java/org/rhq/embeddedagent/extension/SubsystemParsingTestCase.java | 58 +++++----- modules/enterprise/server/embeddedagent/src/test/resources/org/rhq/embeddedagent/extension/subsystem.xml | 1 12 files changed, 120 insertions(+), 69 deletions(-) New commits: commit e70d32f70a1ee39eb82b5919844ef15ef4803977 Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Fri Jan 31 01:08:04 2014 -0500 starting to add config overrides to the extension subsystem - first one is the agent name (we can now set the agent name in the config) diff --git a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentConfigurationSetup.java b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentConfigurationSetup.java index 24c3d2d..7b654fc 100644 --- a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentConfigurationSetup.java +++ b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentConfigurationSetup.java @@ -38,7 +38,7 @@ public class AgentConfigurationSetup { * Properties that will be used to override preferences found in the preferences node and the configuration * preferences file. */ - private final Properties configurationOverrides; + private final Map<String, String> configurationOverrides; /** * If <code>true</code>, will revert the agent's configuration back to the original configuration file. @@ -57,14 +57,14 @@ public class AgentConfigurationSetup { private final ServerEnvironment serverEnvironment; public AgentConfigurationSetup(Resource configFile, boolean resetConfigurationAtStartup, - Properties configurationOverrides, ServerEnvironment serverEnv) { + Map<String, String> overrides, ServerEnvironment serverEnv) { this.configFile = configFile; this.resetConfigurationAtStartup = resetConfigurationAtStartup; this.serverEnvironment = serverEnv; - this.configurationOverrides = prepareConfigurationOverrides(configurationOverrides); + this.configurationOverrides = prepareConfigurationOverrides(overrides); - String agentName = configurationOverrides.getProperty(AgentConfigurationConstants.NAME, "embeddedagent"); + String agentName = this.configurationOverrides.get(AgentConfigurationConstants.NAME); preferencesNodeName = agentName; System.setProperty("rhq.agent.preferences-node", preferencesNodeName); } @@ -73,13 +73,12 @@ public class AgentConfigurationSetup { return this.preferencesNodeName; } - private Properties prepareConfigurationOverrides(Properties overrides) { + private Map<String, String> prepareConfigurationOverrides(Map<String, String> overrides) { // perform some checking to setup defaults if need be - String agentName = overrides.getProperty(AgentConfigurationConstants.NAME, ""); - if (agentName.trim().length() == 0 || "-".equals(agentName)) { + String agentName = overrides.get(AgentConfigurationConstants.NAME); + if (agentName == null || agentName.trim().length() == 0 || "-".equals(agentName)) { agentName = "embeddedagent-" + serverEnvironment.getNodeName(); } - agentName = StringPropertyReplacer.replaceProperties(agentName); overrides.put(AgentConfigurationConstants.NAME, agentName); @@ -201,11 +200,11 @@ public class AgentConfigurationSetup { } // now that the configuration preferences are loaded, we need to override them with any bootstrap override properties - Properties overrides = configurationOverrides; + Map<String, String> overrides = configurationOverrides; if (overrides != null) { - for (Map.Entry<Object, Object> entry : overrides.entrySet()) { - String key = entry.getKey().toString(); - String value = entry.getValue().toString(); + for (Map.Entry<String, String> entry : overrides.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); // allow ${var} notation in the values so we can provide variable replacements in the values value = StringPropertyReplacer.replaceProperties(value); diff --git a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentService.java b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentService.java index 64d11fd..018519d 100644 --- a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentService.java +++ b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentService.java @@ -4,7 +4,6 @@ import java.io.File; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; import org.jboss.as.server.ServerEnvironment; @@ -44,6 +43,12 @@ public class AgentService implements Service<AgentService> { private Map<String, Boolean> plugins = Collections.synchronizedMap(new HashMap<String, Boolean>()); /** + * Configuration settings that override the out-of-box configuration file. These are settings + * that the user set in the subsystem (e.g. standalone.xml or via AS CLI). + */ + private Map<String, String> configOverrides = Collections.synchronizedMap(new HashMap<String, String>()); + + /** * This is the actual embedded agent. This is what handles the plugin container lifecycle * and communication to/from the server. */ @@ -103,6 +108,15 @@ public class AgentService implements Service<AgentService> { log.info("New plugin definitions: " + pluginsWithEnableFlag); } + protected void setConfigurationOverrides(Map<String, String> overrides) { + synchronized (configOverrides) { + configOverrides.clear(); + if (overrides != null) { + configOverrides.putAll(overrides); + } + } + } + protected boolean isAgentStarted() { AgentMain agent = theAgent.get(); return (agent != null && agent.isStarted()); @@ -118,10 +132,9 @@ public class AgentService implements Service<AgentService> { try { // make sure we pre-configure the agent with some settings taken from our runtime environment ServerEnvironment env = envServiceValue.getValue(); - Properties overrides = new Properties(); boolean resetConfigurationAtStartup = true; AgentConfigurationSetup configSetup = new AgentConfigurationSetup( - getExportedResource("conf/agent-configuration.xml"), resetConfigurationAtStartup, overrides, env); + getExportedResource("conf/agent-configuration.xml"), resetConfigurationAtStartup, configOverrides, env); // prepare the agent logging first thing so the agent logs messages using this config configSetup.prepareLogConfigFile(getExportedResource("conf/log4j.xml")); configSetup.preConfigureAgent(); diff --git a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemAdd.java b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemAdd.java index f9d3291..4867ef7 100644 --- a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemAdd.java +++ b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemAdd.java @@ -2,6 +2,7 @@ package org.rhq.embeddedagent.extension; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.jboss.as.controller.AbstractAddStepHandler; import org.jboss.as.controller.OperationContext; @@ -16,6 +17,8 @@ import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceController.Mode; import org.jboss.msc.service.ServiceName; +import org.rhq.enterprise.agent.AgentConfigurationConstants; + /** * Handler responsible for adding the subsystem resource to the model */ @@ -32,6 +35,7 @@ class AgentSubsystemAdd extends AbstractAddStepHandler { protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException { AgentSubsystemDefinition.AGENT_ENABLED_ATTRIBDEF.validateAndSet(operation, model); AgentSubsystemDefinition.PLUGINS_ATTRIBDEF.validateAndSet(operation, model); + AgentSubsystemDefinition.PREF_AGENT_NAME_ATTRIBDEF.validateAndSet(operation, model); log.info("Populating the embedded agent subsystem model: " + operation + "=" + model); } @@ -49,6 +53,8 @@ class AgentSubsystemAdd extends AbstractAddStepHandler { } log.info("Embedded agent is enabled and will be deployed"); + + // figure out what plugins we are to support HashMap<String, Boolean> pluginsWithEnableFlag = new HashMap<String, Boolean>(); ModelNode pluginsNode = AgentSubsystemDefinition.PLUGINS_ATTRIBDEF.resolveModelAttribute(context, model); if (pluginsNode != null && pluginsNode.isDefined()) { @@ -60,9 +66,20 @@ class AgentSubsystemAdd extends AbstractAddStepHandler { } } + // set up our runtime configuration overrides that should be used instead of the out-of-box config + Map<String, String> overrides = new HashMap<String, String>(); + ModelNode agentNameNode = AgentSubsystemDefinition.PREF_AGENT_NAME_ATTRIBDEF.resolveModelAttribute(context, + model); + if (agentNameNode.isDefined()) { + overrides.put(AgentConfigurationConstants.NAME, agentNameNode.asString()); + } + + // create our service AgentService service = new AgentService(); service.setPlugins(pluginsWithEnableFlag); + service.setConfigurationOverrides(overrides); + // install the service ServiceName name = AgentService.SERVICE_NAME; ServiceController<AgentService> controller = context.getServiceTarget() // .addService(name, service) // diff --git a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemDefinition.java b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemDefinition.java index e43c6c5..0dffb92 100644 --- a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemDefinition.java +++ b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemDefinition.java @@ -2,6 +2,7 @@ package org.rhq.embeddedagent.extension; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE; +import org.jboss.as.controller.ReloadRequiredWriteAttributeHandler; import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.as.controller.SimpleResourceDefinition; @@ -22,6 +23,11 @@ public class AgentSubsystemDefinition extends SimpleResourceDefinition { .setXmlName(AgentSubsystemExtension.AGENT_ENABLED).setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES) .setDefaultValue(new ModelNode(AgentSubsystemExtension.AGENT_ENABLED_DEFAULT)).setAllowNull(false).build(); + protected static final SimpleAttributeDefinition PREF_AGENT_NAME_ATTRIBDEF = new SimpleAttributeDefinitionBuilder( + AgentSubsystemExtension.ATTRIB_AGENT_NAME, ModelType.STRING).setAllowExpression(true) + .setXmlName(AgentSubsystemExtension.ATTRIB_AGENT_NAME).setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES) + .setAllowNull(true).build(); + protected static final PluginsAttributeDefinition PLUGINS_ATTRIBDEF = new PluginsAttributeDefinition(); private AgentSubsystemDefinition() { @@ -33,6 +39,8 @@ public class AgentSubsystemDefinition extends SimpleResourceDefinition { public void registerAttributes(ManagementResourceRegistration rr) { rr.registerReadWriteAttribute(AGENT_ENABLED_ATTRIBDEF, null, AgentEnabledAttributeHandler.INSTANCE); rr.registerReadWriteAttribute(PLUGINS_ATTRIBDEF, null, PluginsAttributeHandler.INSTANCE); + rr.registerReadWriteAttribute(PREF_AGENT_NAME_ATTRIBDEF, null, new ReloadRequiredWriteAttributeHandler( + PREF_AGENT_NAME_ATTRIBDEF)); } @Override diff --git a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemExtension.java b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemExtension.java index 1ab7a7e..37ec585 100644 --- a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemExtension.java +++ b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemExtension.java @@ -29,6 +29,8 @@ import org.jboss.staxmapper.XMLElementWriter; import org.jboss.staxmapper.XMLExtendedStreamReader; import org.jboss.staxmapper.XMLExtendedStreamWriter; +import org.rhq.enterprise.agent.AgentConfigurationConstants; + public class AgentSubsystemExtension implements Extension { private final Logger log = Logger.getLogger(AgentSubsystemExtension.class); @@ -53,6 +55,8 @@ public class AgentSubsystemExtension implements Extension { protected static final String AGENT_STOP_OP = "stop"; protected static final String AGENT_STATUS_OP = "status"; + protected static final String ATTRIB_AGENT_NAME = AgentConfigurationConstants.NAME; + protected static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME); static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String keyPrefix) { @@ -97,17 +101,20 @@ public class AgentSubsystemExtension implements Extension { opAdd.get(AGENT_ENABLED).set(agentEnabledValue); } - ModelNode pluginsAttributeNode = opAdd.get(PLUGINS_ELEMENT); - // Read the children elements while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { - if (!reader.getLocalName().equals(PLUGINS_ELEMENT)) { - throw ParseUtils.unexpectedElement(reader); - } - while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { - if (reader.isStartElement()) { - readPlugin(reader, pluginsAttributeNode); + String elementName = reader.getLocalName(); + if (elementName.equals(PLUGINS_ELEMENT)) { + ModelNode pluginsAttributeNode = opAdd.get(PLUGINS_ELEMENT); + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { + if (reader.isStartElement()) { + readPlugin(reader, pluginsAttributeNode); + } } + } else if (elementName.equals(ATTRIB_AGENT_NAME)) { + opAdd.get(ATTRIB_AGENT_NAME).set(reader.getElementText()); + } else { + throw ParseUtils.unexpectedElement(reader); } } @@ -153,6 +160,10 @@ public class AgentSubsystemExtension implements Extension { writer.writeAttribute(AGENT_ENABLED, String.valueOf(node.get(AGENT_ENABLED).asBoolean(AGENT_ENABLED_DEFAULT))); + writer.writeStartElement(ATTRIB_AGENT_NAME); + writer.writeCharacters(node.get(ATTRIB_AGENT_NAME).asString()); + writer.writeEndElement(); + // <plugins> writer.writeStartElement(PLUGINS_ELEMENT); ModelNode plugins = node.get(PLUGINS_ELEMENT); diff --git a/modules/enterprise/server/embeddedagent/src/main/resources/org/rhq/embeddedagent/extension/LocalDescriptions.properties b/modules/enterprise/server/embeddedagent/src/main/resources/org/rhq/embeddedagent/extension/LocalDescriptions.properties index 790232a..05bcfce 100644 --- a/modules/enterprise/server/embeddedagent/src/main/resources/org/rhq/embeddedagent/extension/LocalDescriptions.properties +++ b/modules/enterprise/server/embeddedagent/src/main/resources/org/rhq/embeddedagent/extension/LocalDescriptions.properties @@ -5,4 +5,5 @@ embeddedagent.restart=Starts the RHQ Agent. If it is already started, it will be embeddedagent.stop=Stops the RHQ Agent if it is running. embeddedagent.status=Tells you if the RHQ Agent is currently started or stopped. embeddedagent.enabled=When true, the RHQ Agent will be deployed and started. Otherwise, it will be disabled. -embeddedagent.plugins=Indicates what plugins should be enabled or disabled. \ No newline at end of file +embeddedagent.plugins=Indicates what plugins should be enabled or disabled. +embeddedagent.rhq.agent.name=Name to uniquely identify this agent among all other agents in the environment \ No newline at end of file diff --git a/modules/enterprise/server/embeddedagent/src/main/resources/schema/embeddedagent.xsd b/modules/enterprise/server/embeddedagent/src/main/resources/schema/embeddedagent.xsd index 2882729..3e0c546 100644 --- a/modules/enterprise/server/embeddedagent/src/main/resources/schema/embeddedagent.xsd +++ b/modules/enterprise/server/embeddedagent/src/main/resources/schema/embeddedagent.xsd @@ -10,6 +10,7 @@ <xs:complexType name="subsystemType"> <xs:attribute name="enabled" type="xs:boolean" use="required" default="false"/> <xs:all> + <xs:element name="rhq.agent.name" type="xs:string"/> <xs:element name="plugins" type="pluginsType"/> </xs:all> </xs:complexType> diff --git a/modules/enterprise/server/embeddedagent/src/test/java/org/rhq/embeddedagent/extension/SubsystemParsingTestCase.java b/modules/enterprise/server/embeddedagent/src/test/java/org/rhq/embeddedagent/extension/SubsystemParsingTestCase.java index b33fb4f..e857af4 100644 --- a/modules/enterprise/server/embeddedagent/src/test/java/org/rhq/embeddedagent/extension/SubsystemParsingTestCase.java +++ b/modules/enterprise/server/embeddedagent/src/test/java/org/rhq/embeddedagent/extension/SubsystemParsingTestCase.java @@ -14,6 +14,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.VAL import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.WRITE_ATTRIBUTE_OPERATION; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.testng.Assert; @@ -132,31 +133,24 @@ public class SubsystemParsingTestCase extends SubsystemBaseParsingTestCase { * operations from its describe action results in the same model */ public void testDescribeHandler() throws Exception { - // test two subsystem xmls - one that is empty of plugins, and the second is our normal test xml - String subsystemXml1 = "<subsystem xmlns=\"" + AgentSubsystemExtension.NAMESPACE + "\" " - + AgentSubsystemExtension.AGENT_ENABLED + "=\"true\"" + "></subsystem>"; - String subsystemXml2 = getSubsystemXml(); - - String[] subsystemXmlAll = new String[] { subsystemXml1, subsystemXml2 }; - for (String subsystemXml : subsystemXmlAll) { - KernelServices servicesA = super.installInController(subsystemXml); - // Get the model and the describe operations from the first controller - ModelNode modelA = servicesA.readWholeModel(); - ModelNode describeOp = new ModelNode(); - describeOp.get(OP).set(DESCRIBE); - describeOp.get(OP_ADDR).set( - PathAddress.pathAddress(PathElement.pathElement(SUBSYSTEM, AgentSubsystemExtension.SUBSYSTEM_NAME)) - .toModelNode()); - ModelNode executeOperation = servicesA.executeOperation(describeOp); - List<ModelNode> operations = super.checkResultAndGetContents(executeOperation).asList(); - - // Install the describe options from the first controller into a second controller - KernelServices servicesB = super.installInController(operations); - ModelNode modelB = servicesB.readWholeModel(); - - // Make sure the models from the two controllers are identical - super.compare(modelA, modelB); - } + String subsystemXml = getSubsystemXml(); + KernelServices servicesA = super.installInController(subsystemXml); + // Get the model and the describe operations from the first controller + ModelNode modelA = servicesA.readWholeModel(); + ModelNode describeOp = new ModelNode(); + describeOp.get(OP).set(DESCRIBE); + describeOp.get(OP_ADDR).set( + PathAddress.pathAddress(PathElement.pathElement(SUBSYSTEM, AgentSubsystemExtension.SUBSYSTEM_NAME)) + .toModelNode()); + ModelNode executeOperation = servicesA.executeOperation(describeOp); + List<ModelNode> operations = super.checkResultAndGetContents(executeOperation).asList(); + + // Install the describe options from the first controller into a second controller + KernelServices servicesB = super.installInController(operations); + ModelNode modelB = servicesB.readWholeModel(); + + // Make sure the models from the two controllers are identical + super.compare(modelA, modelB); } /** @@ -202,9 +196,17 @@ public class SubsystemParsingTestCase extends SubsystemBaseParsingTestCase { // check the attributes Assert.assertTrue(content.get("attributes").isDefined()); List<Property> attributes = content.get("attributes").asPropertyList(); - Assert.assertEquals(attributes.size(), 2); - Assert.assertEquals(attributes.get(0).getName(), AgentSubsystemExtension.AGENT_ENABLED); - Assert.assertEquals(attributes.get(1).getName(), AgentSubsystemExtension.PLUGINS_ELEMENT); + Assert.assertEquals(attributes.size(), 3); + + List<String> expectedAttributes = Arrays.asList( // + AgentSubsystemExtension.AGENT_ENABLED, // + AgentSubsystemExtension.PLUGINS_ELEMENT, // + AgentSubsystemExtension.ATTRIB_AGENT_NAME); + + for (int i = 0 ; i < attributes.size(); i++) { + String attrib = attributes.get(i).getName(); + Assert.assertTrue(expectedAttributes.contains(attrib), "missing attrib: " + attrib); + } // check the operations Assert.assertTrue(content.get("operations").isDefined()); diff --git a/modules/enterprise/server/embeddedagent/src/test/resources/org/rhq/embeddedagent/extension/subsystem.xml b/modules/enterprise/server/embeddedagent/src/test/resources/org/rhq/embeddedagent/extension/subsystem.xml index 4e4a85d..8d60c99 100644 --- a/modules/enterprise/server/embeddedagent/src/test/resources/org/rhq/embeddedagent/extension/subsystem.xml +++ b/modules/enterprise/server/embeddedagent/src/test/resources/org/rhq/embeddedagent/extension/subsystem.xml @@ -1,4 +1,5 @@ <subsystem xmlns="urn:org.rhq:embeddedagent:1.0" enabled="true"> + <rhq.agent.name>embeddedagent-test</rhq.agent.name> <plugins> <plugin name="platform" enabled="true" /> <plugin name="blah" enabled="false" /> commit ec473d3ad469ffbc63f6b0ac0504ff992c744d14 Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Fri Jan 31 01:06:00 2014 -0500 add source to eclipse classpath diff --git a/.classpath b/.classpath index cb9f5bc..455f739 100644 --- a/.classpath +++ b/.classpath @@ -329,13 +329,13 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/msc/jboss-msc/1.0.2.GA/jboss-msc-1.0.2.GA.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-dmr/1.1.1.Final/jboss-dmr-1.1.1.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-naming/7.2.0.Alpha1-redhat-4/jboss-as-naming-7.2.0.Alpha1-redhat-4.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-server/7.2.0.Alpha1-redhat-4/jboss-as-server-7.2.0.Alpha1-redhat-4.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-server/7.2.0.Alpha1-redhat-4/jboss-as-server-7.2.0.Alpha1-redhat-4.jar" sourcepath="/M2_REPO/org/jboss/as/jboss-as-server/7.2.0.Alpha1-redhat-4/jboss-as-server-7.2.0.Alpha1-redhat-4-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-ee/7.2.0.Alpha1-redhat-4/jboss-as-ee-7.2.0.Alpha1-redhat-4.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-ejb3/7.2.0.Alpha1-redhat-4/jboss-as-ejb3-7.2.0.Alpha1-redhat-4.jar" sourcepath="/M2_REPO/org/jboss/as/jboss-as-ejb3/7.2.0.Alpha1-redhat-4/jboss-as-ejb3-7.2.0.Alpha1-redhat-4-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/staxmapper/1.1.0.Final/staxmapper-1.1.0.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/modules/jboss-modules/1.1.1.GA/jboss-modules-1.1.1.GA.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-subsystem-test/7.1.1.Final/jboss-as-subsystem-test-7.1.1.Final.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-controller/7.1.1.Final/jboss-as-controller-7.1.1.Final.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-controller/7.1.1.Final/jboss-as-controller-7.1.1.Final.jar" sourcepath="/M2_REPO/org/jboss/as/jboss-as-controller/7.2.0.Alpha1-redhat-4/jboss-as-controller-7.2.0.Alpha1-redhat-4-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-controller-client/7.1.1.Final/jboss-as-controller-client-7.1.1.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-links/2.3.5.Final/resteasy-links-2.3.5.Final.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.3.5.Final/resteasy-jaxrs-2.3.5.Final.jar"/> commit 5b9e02a9cd8249844507fff12395edfdd842797a Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Thu Jan 30 23:13:16 2014 -0500 trivial - reformat diff --git a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentEnabledAttributeHandler.java b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentEnabledAttributeHandler.java index a815600..59419c1 100644 --- a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentEnabledAttributeHandler.java +++ b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentEnabledAttributeHandler.java @@ -8,28 +8,26 @@ import org.jboss.logging.Logger; class AgentEnabledAttributeHandler extends AbstractWriteAttributeHandler<Void> { - public static final AgentEnabledAttributeHandler INSTANCE = new AgentEnabledAttributeHandler(); + public static final AgentEnabledAttributeHandler INSTANCE = new AgentEnabledAttributeHandler(); private final Logger log = Logger.getLogger(AgentEnabledAttributeHandler.class); - private AgentEnabledAttributeHandler() { - super(AgentSubsystemDefinition.AGENT_ENABLED_ATTRIBDEF); + private AgentEnabledAttributeHandler() { + super(AgentSubsystemDefinition.AGENT_ENABLED_ATTRIBDEF); } - @Override - protected boolean applyUpdateToRuntime(OperationContext context, - ModelNode operation, String attributeName, ModelNode resolvedValue, - ModelNode currentValue, HandbackHolder<Void> handbackHolder) - throws OperationFailedException { + @Override + protected boolean applyUpdateToRuntime(OperationContext context, ModelNode operation, String attributeName, + ModelNode resolvedValue, ModelNode currentValue, HandbackHolder<Void> handbackHolder) + throws OperationFailedException { log.info("Embedded agent enabled attribute changed: " + attributeName + "=" + resolvedValue); // there is nothing for us to do - this only affects us when we are restarted, return true to say we must reload return true; } - @Override - protected void revertUpdateToRuntime(OperationContext context, - ModelNode operation, String attributeName, - ModelNode valueToRestore, ModelNode valueToRevert, Void handback) { + @Override + protected void revertUpdateToRuntime(OperationContext context, ModelNode operation, String attributeName, + ModelNode valueToRestore, ModelNode valueToRevert, Void handback) { // no-op } } diff --git a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/PluginsAttributeHandler.java b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/PluginsAttributeHandler.java index 1d51294..078bf17 100644 --- a/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/PluginsAttributeHandler.java +++ b/modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/PluginsAttributeHandler.java @@ -13,15 +13,15 @@ import org.jboss.msc.service.ServiceNotFoundException; class PluginsAttributeHandler extends AbstractWriteAttributeHandler<Void> { - public static final PluginsAttributeHandler INSTANCE = new PluginsAttributeHandler(); + public static final PluginsAttributeHandler INSTANCE = new PluginsAttributeHandler(); private final Logger log = Logger.getLogger(PluginsAttributeHandler.class); - private PluginsAttributeHandler() { + private PluginsAttributeHandler() { super(AgentSubsystemDefinition.PLUGINS_ATTRIBDEF); } - @Override + @Override protected boolean applyUpdateToRuntime(OperationContext context, ModelNode operation, String attributeName, ModelNode resolvedValue, ModelNode currentValue, HandbackHolder<Void> handbackHolder) throws OperationFailedException {