[rhq] Branch 'feature/embeddedagent' - 2 commits - modules/enterprise

modules/enterprise/server/embeddedagent/pom.xml | 55 ++++++++++ modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentService.java | 26 ++++ modules/enterprise/server/embeddedagent/src/main/java/org/rhq/embeddedagent/extension/AgentSubsystemAdd.java | 10 + modules/enterprise/server/embeddedagent/src/main/resources/module/main/module.xml | 1 modules/enterprise/server/embeddedagent/src/main/scripts/module-assembly.xml | 6 + modules/enterprise/server/embeddedagent/src/test/java/org/rhq/embeddedagent/extension/SubsystemParsingTestCase.java | 13 +- 6 files changed, 103 insertions(+), 8 deletions(-) New commits: commit 9a36d10aea8237c8058e75090100f914d747227c Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Tue Jan 28 17:13:02 2014 -0500 inject the server env service into our service so we can get things like data dir, hostname, etc add the rhq-agent distro to the exported resource roots so we can get the config xml 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 383f012..7860479 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 @@ -5,12 +5,16 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import org.jboss.as.server.ServerEnvironment; import org.jboss.logging.Logger; +import org.jboss.modules.Module; +import org.jboss.modules.Resource; import org.jboss.msc.service.Service; import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.StartContext; import org.jboss.msc.service.StartException; import org.jboss.msc.service.StopContext; +import org.jboss.msc.value.InjectedValue; public class AgentService implements Service<AgentService> { @@ -20,11 +24,17 @@ public class AgentService implements Service<AgentService> { private final Logger log = Logger.getLogger(AgentService.class); /** + * Our subsystem add-step handler will inject this as a dependency for us. + * This service gives us information about the server, like the install directory, data directory, etc. + */ + InjectedValue<ServerEnvironment> envServiceValue = new InjectedValue<ServerEnvironment>(); + + /** * This service can be configured to be told explicitly about certain plugins to be * enabled or disabled. This map holds that configuration. These aren't necessarily * all the plugins that will be loaded, but they are those plugins this service was * explicitly told about and indicates if they should be enabled or disabled. - * TODO: For any plugin not specified will, by default, be WHAT? Disabled??? + * TODO: For any plugin not specified will, by default, be WHAT? Disabled??? */ private Map<String, Boolean> plugins = Collections.synchronizedMap(new HashMap<String, Boolean>()); @@ -95,4 +105,18 @@ public class AgentService implements Service<AgentService> { log.info("Stopping the embedded agent now"); agentStarted.set(false); } + + /** + * Gets information about a file that is inside our module. Use this to + * obtain files locationed in the embedded agent, for example, pass in + * "conf/agent-configuration.xml" to get the config file. + * + * @param name name of the agent file + * @return object referencing the file from our module + */ + private Resource getExportedResource(String name) { + Module module = Module.forClass(getClass()); + Resource r = module.getExportedResource("rhq-agent", name); + return r; + } } 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 7541da1..f9d3291 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 @@ -7,6 +7,8 @@ import org.jboss.as.controller.AbstractAddStepHandler; import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.ServiceVerificationHandler; +import org.jboss.as.server.ServerEnvironment; +import org.jboss.as.server.ServerEnvironmentService; import org.jboss.dmr.ModelNode; import org.jboss.dmr.Property; import org.jboss.logging.Logger; @@ -62,8 +64,12 @@ class AgentSubsystemAdd extends AbstractAddStepHandler { service.setPlugins(pluginsWithEnableFlag); ServiceName name = AgentService.SERVICE_NAME; - ServiceController<AgentService> controller = context.getServiceTarget().addService(name, service) - .addListener(verificationHandler).setInitialMode(Mode.ACTIVE).install(); + ServiceController<AgentService> controller = context.getServiceTarget() // + .addService(name, service) // + .addDependency(ServerEnvironmentService.SERVICE_NAME, ServerEnvironment.class, service.envServiceValue) // + .addListener(verificationHandler) // + .setInitialMode(Mode.ACTIVE) // + .install(); newControllers.add(controller); return; } diff --git a/modules/enterprise/server/embeddedagent/src/main/resources/module/main/module.xml b/modules/enterprise/server/embeddedagent/src/main/resources/module/main/module.xml index c041115..2cc72ef 100644 --- a/modules/enterprise/server/embeddedagent/src/main/resources/module/main/module.xml +++ b/modules/enterprise/server/embeddedagent/src/main/resources/module/main/module.xml @@ -4,6 +4,7 @@ <resources> <resource-root path="${project.build.finalName}.jar"/> + <resource-root path="rhq-agent"/> <resource-root path="rhq-agent/lib/commons-httpclient-2.0.2.jar" /> <!-- agent seems to want this specific version --> <resource-root path="rhq-agent/lib/commons-io-${commons-io.version}.jar" /> <resource-root path="rhq-agent/lib/commons-logging-${commons-logging.version}.jar" /> 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 40054b9..b33fb4f 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 @@ -16,16 +16,17 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.WRI import java.util.ArrayList; import java.util.List; +import org.testng.Assert; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + import org.jboss.as.controller.PathAddress; import org.jboss.as.controller.PathElement; import org.jboss.as.subsystem.test.KernelServices; import org.jboss.dmr.ModelNode; import org.jboss.dmr.Property; import org.jboss.msc.service.ServiceNotFoundException; -import org.testng.Assert; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; @Test public class SubsystemParsingTestCase extends SubsystemBaseParsingTestCase { @@ -291,11 +292,13 @@ public class SubsystemParsingTestCase extends SubsystemBaseParsingTestCase { Assert.assertEquals(plugins.get(2).getName(), "foo"); // foo plugin we added above Assert.assertEquals(plugins.get(2).getValue().asBoolean(), true); + /* TODO: I think we need to mock the ServerEnvironmentService dependency before we can do this // execute status ModelNode statusOp = new ModelNode(); statusOp.get(OP).set(AgentSubsystemExtension.AGENT_STATUS_OP); statusOp.get(OP_ADDR).set(agentSubsystemPath.toModelNode()); result = services.executeOperation(statusOp); - Assert.assertEquals(checkResultAndGetContents(result).asString(), "STARTED"); + Assert.assertTrue(checkResultAndGetContents(result).asBoolean()); + */ } } commit 0f68e44f99567c21a4643814d514f3ccd28b8502 Author: John Mazzitelli <mazz(a)redhat.com&gt; Date: Tue Jan 28 15:29:31 2014 -0500 putting native libs in their proper place for EAP to find them diff --git a/modules/enterprise/server/embeddedagent/pom.xml b/modules/enterprise/server/embeddedagent/pom.xml index d20815b..c6118a6 100644 --- a/modules/enterprise/server/embeddedagent/pom.xml +++ b/modules/enterprise/server/embeddedagent/pom.xml @@ -54,6 +54,61 @@ </plugin> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>rename-native-libs-and-reconfigure</id> + <phase>process-resources</phase> + <configuration> + <target> + <echo>Must move native libraries so JBoss Modules can find them</echo> + <property name="agent.lib" location="${project.build.directory}/rhq-agent/lib"/> + <property name="module.lib" location="${project.build.directory}/module-lib"/> + <!-- Notice that the agent's "augeas" native libs are not copied. + I think its only used for some plugins we won't be using in embedded mode anyway. --> + <!-- TODO these should probably be "move", I don't think we need dup copies in agent lib anymore --> + <copy tofile="${module.lib}/linux-i686/libsigar.so" file="${agent.lib}/libsigar-x86-linux.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/linux-x86_64/libsigar.so" file="${agent.lib}/libsigar-amd64-linux.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/linux-ia64/libsigar.so" file="${agent.lib}/libsigar-ia64-linux.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/linux-ppc64/libsigar.so" file="${agent.lib}/libsigar-ppc64-linux.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/linux-ppc/libsigar.so" file="${agent.lib}/libsigar-ppc-linux.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/linux-s390x/libsigar.so" file="${agent.lib}/libsigar-s390x-linux.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/win-i686/sigar.dll" file="${agent.lib}/sigar-x86-winnt.dll" preservelastmodified="true"/> + <copy tofile="${module.lib}/win-x86_64/sigar.dll" file="${agent.lib}/sigar-amd64-winnt.dll" preservelastmodified="true"/> + <copy tofile="${module.lib}/hpux-ia64w/libsigar.sl" file="${agent.lib}/libsigar-ia64-hpux-11.sl" preservelastmodified="true"/> + <copy tofile="${module.lib}/hpux-parisc/libsigar.sl" file="${agent.lib}/libsigar-pa-hpux-11.sl" preservelastmodified="true"/> + <copy tofile="${module.lib}/aix-ppc/libsigar.so" file="${agent.lib}/libsigar-ppc-aix-5.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/aix-ppc64/libsigar.so" file="${agent.lib}/libsigar-ppc64-aix-5.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/solaris-i686/libsigar.so" file="${agent.lib}/libsigar-x86-solaris.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/solaris-x86_64/libsigar.so" file="${agent.lib}/libsigar-amd64-solaris.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/solaris-sparc/libsigar.so" file="${agent.lib}/libsigar-sparc-solaris.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/solaris-sparcv9/libsigar.so" file="${agent.lib}/libsigar-sparc64-solaris.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/freebsd-i686/libsigar.so" file="${agent.lib}/libsigar-x86-freebsd-6.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/freebsd-x86_64/libsigar.so" file="${agent.lib}/libsigar-amd64-freebsd-6.so" preservelastmodified="true"/> + <copy tofile="${module.lib}/macosx-i686/libsigar.dylib" file="${agent.lib}/libsigar-universal-macosx.dylib" preservelastmodified="true"/> + <copy tofile="${module.lib}/macosx-x86_64/libsigar.dylib" file="${agent.lib}/libsigar-universal64-macosx.dylib" preservelastmodified="true"/> + + <echo>Adjust default configuration</echo> + <property name="config.xml" location="${project.build.directory}/rhq-agent/conf/agent-configuration.xml"/> + <!-- because we are embedded, as can't have a prompt and ask user, so we will ensure the agent is always fully setup --> + <replaceregexp file="${config.xml}" flags="s" + match='&lt;!--(\s*)&lt;entry key="rhq.agent.configuration-setup-flag" value="false" /&gt;(\s*)--&gt;' + replace='&lt;entry key="rhq.agent.configuration-setup-flag" value="true" /&gt; BOOO' /> + <!-- we don't support agent auto-update while the agent is embedded --> + <replaceregexp file="${config.xml}" + match='&lt;entry key="rhq.agent.agent-update.enabled" value="true" /&gt;' + replace='&lt;entry key="rhq.agent.agent-update.enabled" value="false" /&gt; BOOO' /> + + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> diff --git a/modules/enterprise/server/embeddedagent/src/main/scripts/module-assembly.xml b/modules/enterprise/server/embeddedagent/src/main/scripts/module-assembly.xml index c526e5c..b9310c4 100644 --- a/modules/enterprise/server/embeddedagent/src/main/scripts/module-assembly.xml +++ b/modules/enterprise/server/embeddedagent/src/main/scripts/module-assembly.xml @@ -35,6 +35,12 @@ <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> </fileSet> + <fileSet> + <directory>${project.build.directory}/module-lib</directory> + <outputDirectory>/org/rhq/${artifactId}/main/lib</outputDirectory> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> </fileSets> </assembly>