modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 21 ++++++---- 1 file changed, 14 insertions(+), 7 deletions(-)
New commits: commit 4939d0d0617401d420ca499236b7f68eb733cdc7 Author: John Mazzitelli mazz@redhat.com Date: Tue Oct 2 11:35:22 2012 -0400
do not deploy embedded agent. it is not working yet
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 2a5da0d..54dcbc4 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -244,11 +244,24 @@ dest="${jboss.deploy.dir}/rhq-installer.war" /> <touch file="${jboss.deploy.dir}/rhq-installer.war.dodeploy" />
+ <!--TODO - this isn't working now - we need to: + 1) add AS7's jars jboss-as-[jmx,server]-7.x.x.Final.jar to META-INF/embedded-agent/lib + 2) get the agent to successfully see that the server is started (AgentMain.waitForServer was hanging for me) + So until we fix this we need to not deploy this at all. + Note that I also took out the sysprops for embedded agent from rhq-server.properties. + If we resurrect embedded agent, add this to the rhq-server.properties created down below: + # Embedded RHQ Agent + rhq.server.embedded-agent.enabled=false + rhq.server.embedded-agent.name= + rhq.server.embedded-agent.reset-configuration=true + rhq.server.embedded-agent.disable-native-system=false + <echo>Deploying embedded agent sar ...</echo> <mkdir dir="${jboss.deploy.dir}/rhq-agent.sar" /> <unjar src="${settings.localRepository}/org/rhq/rhq-enterprise-server-agent-sar/${rhq.version}/rhq-enterprise-server-agent-sar-${rhq.version}.sar" dest="${jboss.deploy.dir}/rhq-agent.sar" /> - <touch file="${jboss.deploy.dir}/rhq-agent.sar.skipdeploy" /> <!-- TODO: make this dodeploy --> + <touch file="${jboss.deploy.dir}/rhq-agent.sar.dodeploy" /> + -->
<echo>Delete docs, README, et. al. files</echo> <delete dir="${jboss.home}/docs/examples" /> @@ -443,12 +456,6 @@ rhq.server.client.security.truststore.type=JKS rhq.server.client.security.truststore.password=RHQManagement rhq.server.client.security.server-auth-mode-enabled=false
-# Embedded RHQ Agent -rhq.server.embedded-agent.enabled=false -rhq.server.embedded-agent.name= -rhq.server.embedded-agent.reset-configuration=true -rhq.server.embedded-agent.disable-native-system=false - # Email rhq.server.email.smtp-host=localhost rhq.server.email.smtp-port=25
rhq-commits@lists.fedorahosted.org