Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [1988] [RHQ-1112] agent can now be configured to point to any URL for the agent update binary information
|
From: <ma...@rh...> - 2008-11-13 06:16:13
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [1988] [RHQ-1112] agent can now be configured to point to any URL for the agent update binary information</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1988</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2008-11-13 00:16:10 -0600 (Thu, 13 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1112] agent can now be configured to point to any URL for the agent update binary information</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagentAgentConfigurationjava">rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagentAgentConfigurationConstantsjava">rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagenti18nAgentSetupInstructionsjava">rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentSetupInstructions.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagentpromptcmdSetupPromptCommandjava">rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseagentsrcmainresourcesagentconfigurationxml">rhq/trunk/modules/enterprise/agent/src/main/resources/agent-configuration.xml</a></li> <li><a href="#rhqtrunkmodulesenterprisecommsrcmainjavaorgrhqenterprisecommunicationsi18nCommI18NResourceKeysjava">rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserversarsagentsarsrcmainresourcesMETAINFembeddedagentconfigurationxml">rhq/trunk/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml</a></li> <li><a href="#rhqtrunkmodulespluginsrhqagentsrcmainresourcesMETAINFrhqpluginxml">rhq/trunk/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterprisecommsrcmainjavaorgrhqenterprisecommunicationsutilprefsUrlSetupValidityCheckerjava">rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/util/prefs/UrlSetupValidityChecker.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagentAgentConfigurationjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java (1987 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java 2008-11-13 04:57:08 UTC (rev 1987) +++ rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -32,6 +32,7 @@ </span><span class="cx"> import org.rhq.enterprise.communications.ServiceContainerConfiguration; import org.rhq.enterprise.communications.command.client.ClientCommandSenderConfiguration; import org.rhq.enterprise.communications.command.client.PersistentFifo; </span><span class="add">+import org.rhq.enterprise.communications.util.SecurityUtil; </span><span class="cx"> /** * Just provides some convienence methods to extract agent configuration properties. </span><span class="lines">@@ -321,6 +322,82 @@ </span><span class="cx"> } /** </span><span class="add">+ * This will return the URL that the agent should use when it needs to find out + * the version information of the latest agent update binary. + * + * @return version URL if defined, <code>null</code> if not defined + */ + public String getAgentUpdateVersionUrlIfDefined() { + String str = m_preferences.get(AgentConfigurationConstants.AGENT_UPDATE_VERSION_URL, null); + + return str; + } + + /** + * This will return the URL that the agent should use when it needs to find out + * the version information of the latest agent update binary. + * <p> + * If the URL is not defined, this will return a default URL that points to this agent's server. + * If the {@link #getServerTransport() server transport} is secure, the URL returned + * will be over "https", otherwise, it will go over "http". The + * {@link #getServerBindAddress() server address} and {@link #getServerBindPort() server port} + * will be the same regardless of the security transport. + * </p> + * + * @return version URL + */ + public String getAgentUpdateVersionUrl() { + String str = m_preferences.get(AgentConfigurationConstants.AGENT_UPDATE_VERSION_URL, null); + + if (str == null) { + String transport = SecurityUtil.isTransportSecure(getServerTransport()) ? "https" : "http"; + String address = getServerBindAddress(); + int port = getServerBindPort(); + str = transport + "://" + address + ":" + port + "/agentupdate/version"; + } + + return str; + } + + /** + * This will return the URL that the agent should use when it needs to download + * the latest agent update binary. + * + * @return download URL if defined, <code>null</code> if not defined + */ + public String getAgentUpdateDownloadUrlIfDefined() { + String str = m_preferences.get(AgentConfigurationConstants.AGENT_UPDATE_DOWNLOAD_URL, null); + + return str; + } + + /** + * This will return the URL that the agent should use when it needs to download + * the latest agent update binary. + * <p> + * If the URL is not defined, this will return a default URL that points to this agent's server. + * If the {@link #getServerTransport() server transport} is secure, the URL returned + * will be over "https", otherwise, it will go over "http". The + * {@link #getServerBindAddress() server address} and {@link #getServerBindPort() server port} + * will be the same regardless of the security transport. + * </p> + * + * @return version URL + */ + public String getAgentUpdateDownloadUrl() { + String str = m_preferences.get(AgentConfigurationConstants.AGENT_UPDATE_DOWNLOAD_URL, null); + + if (str == null) { + String transport = SecurityUtil.isTransportSecure(getServerTransport()) ? "https" : "http"; + String address = getServerBindAddress(); + int port = getServerBindPort(); + str = transport + "://" + address + ":" + port + "/agentupdate/download"; + } + + return str; + } + + /** </span><span class="cx"> * This defines how many milliseconds the agent should wait between each check that ensures it is connected * to the primary server, as opposed to one of its failure servers. * </span></pre></div> <a id="rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagentAgentConfigurationConstantsjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java (1987 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java 2008-11-13 04:57:08 UTC (rev 1987) +++ rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -146,6 +146,16 @@ </span><span class="cx"> boolean DEFAULT_AGENT_UPDATE_ENABLED = true; /** </span><span class="add">+ * If this preference is defined (its default is null), this will be the URL that contains the agent update version info. + */ + String AGENT_UPDATE_VERSION_URL = PROPERTY_NAME_PREFIX + "agent-update.version-url"; + + /** + * If this preference is defined (its default is null), this will be the URL the agent downloads the agent update from. + */ + String AGENT_UPDATE_DOWNLOAD_URL = PROPERTY_NAME_PREFIX + "agent-update.download-url"; + + /** </span><span class="cx"> * The amount of milliseconds the agent will wait at startup for the server to be detected. */ String WAIT_FOR_SERVER_AT_STARTUP_MSECS = PROPERTY_NAME_PREFIX + "wait-for-server-at-startup-msecs"; </span></pre></div> <a id="rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagenti18nAgentSetupInstructionsjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentSetupInstructions.java (1987 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentSetupInstructions.java 2008-11-13 04:57:08 UTC (rev 1987) +++ rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentSetupInstructions.java 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -778,6 +778,27 @@ </span><span class="cx"> + "If false, the agent will never apply updates; therefore any agent updates\\n\\\n" + "must be done manually.") }) String SETUP_INSTRUCTION_AGENTUPDATEENABLED_HELP = "PromptCommand.setup.instruction.agentupdateenabled.help"; </span><span class="add">+ // AGENT UPDATE VERSION URL + String SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_PREF = AgentConfigurationConstants.AGENT_UPDATE_VERSION_URL; + String SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_DEFAULT = null; + @I18NMessages( { @I18NMessage("Agent Update Version URL") }) + String SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_PROMPT = "PromptCommand.setup.instruction.agentupdateversionurl.prompt"; + @I18NMessages( { @I18NMessage("If this is defined, it will be the URL the agent uses when it\\n\\\n" + + "needs to retrieve information about the latest available\\n\\\n" + + "agent update binary. If this is not defined, the agent will\\n\\\n" + + "ask its server for the agent update binary version information.") }) + String SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_HELP = "PromptCommand.setup.instruction.agentupdateversionurl.help"; + + // AGENT UPDATE DOWNLOAD URL + String SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_PREF = AgentConfigurationConstants.AGENT_UPDATE_DOWNLOAD_URL; + String SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_DEFAULT = null; + @I18NMessages( { @I18NMessage("Agent Update Download URL") }) + String SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_PROMPT = "PromptCommand.setup.instruction.agentupdatedownloadurl.prompt"; + @I18NMessages( { @I18NMessage("If this is defined, it will be the URL the agent uses when it\\n\\\n" + + "needs to download the latest available agent update binary.\\n\\\n" + + "If this is not defined, the agent will download the agent\\n\\\n" + "update binary from its server.") }) + String SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_HELP = "PromptCommand.setup.instruction.agentupdatedownloadurl.help"; + </span><span class="cx"> // AGENT NAME String SETUP_INSTRUCTION_AGENTNAME_PREF = AgentConfigurationConstants.NAME; @I18NMessages( { @I18NMessage("Agent Name") }) </span></pre></div> <a id="rhqtrunkmodulesenterpriseagentsrcmainjavaorgrhqenterpriseagentpromptcmdSetupPromptCommandjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java (1987 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java 2008-11-13 04:57:08 UTC (rev 1987) +++ rhq/trunk/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -52,6 +52,7 @@ </span><span class="cx"> import org.rhq.enterprise.communications.util.prefs.Setup; import org.rhq.enterprise.communications.util.prefs.SetupInstruction; import org.rhq.enterprise.communications.util.prefs.SetupValidityChecker; </span><span class="add">+import org.rhq.enterprise.communications.util.prefs.UrlSetupValidityChecker; </span><span class="cx"> /** * Sets up the agent with configuration information that the user enters at the prompt. </span><span class="lines">@@ -481,6 +482,16 @@ </span><span class="cx"> SETUPMSG.getMsg(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEENABLED_PROMPT), SETUPMSG .getMsg(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEENABLED_HELP))); </span><span class="add">+ instr.add(new DefaultSetupInstruction(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_PREF, + AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_DEFAULT, new UrlSetupValidityChecker(), + SETUPMSG.getMsg(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_PROMPT), SETUPMSG + .getMsg(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEVERSIONURL_HELP))); + + instr.add(new DefaultSetupInstruction(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_PREF, + AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_DEFAULT, new UrlSetupValidityChecker(), + SETUPMSG.getMsg(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_PROMPT), SETUPMSG + .getMsg(AgentSetupInstructions.SETUP_INSTRUCTION_AGENTUPDATEDOWNLOADURL_HELP))); + </span><span class="cx"> instr.add(new DefaultSetupInstruction( AgentSetupInstructions.SETUP_INSTRUCTION_REGISTERWITHSERVERATSTARTUP_PREF, AgentSetupInstructions.SETUP_INSTRUCTION_REGISTERWITHSERVERATSTARTUP_DEFAULT, </span></pre></div> <a id="rhqtrunkmodulesenterpriseagentsrcmainresourcesagentconfigurationxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/agent/src/main/resources/agent-configuration.xml (1987 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/agent/src/main/resources/agent-configuration.xml 2008-11-13 04:57:08 UTC (rev 1987) +++ rhq/trunk/modules/enterprise/agent/src/main/resources/agent-configuration.xml 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -188,6 +188,32 @@ </span><span class="cx"> <!-- _______________________________________________________________ </span><span class="add">+ rhq.agent.agent-update.version-url + + If this is defined, it will be the URL the agent uses when it + needs to retrieve information about the latest available + agent update binary. If this is not defined, the agent will + ask its server for the agent update binary version information. + --> + <!-- + <entry key="rhq.agent.agent-update.version-url" value="http://127.0.0.1:7080/agentupdate/version" /> + --> + + <!-- + _______________________________________________________________ + rhq.agent.agent-update.download-url + + If this is defined, it will be the URL the agent uses when it + needs to download the latest available agent update binary. + If this is not defined, the agent will download the agent + update binary from its server. + --> + <!-- + <entry key="rhq.agent.agent-update.download-url" value="http://127.0.0.1:7080/agentupdate/download" /> + --> + + <!-- + _______________________________________________________________ </span><span class="cx"> rhq.agent.primary-server-switchover-check-interval-msecs The agent will periodically check to ensure that the server </span></pre></div> <a id="rhqtrunkmodulesenterprisecommsrcmainjavaorgrhqenterprisecommunicationsi18nCommI18NResourceKeysjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java (1987 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java 2008-11-13 04:57:08 UTC (rev 1987) +++ rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -911,6 +911,10 @@ </span><span class="cx"> @I18NMessage(value = "Dies ist keine gültige Zahl: {0}", locale = "de") }) String SETUP_NOT_A_FLOAT = "Setup.float-checker.not-a-float"; </span><span class="add">+ @I18NMessages( { @I18NMessage("That is not a valid URL: {0}"), + @I18NMessage(value = "Dies ist keine gültige URL: {0}", locale = "de") }) + String SETUP_NOT_A_URL = "Setup.float-checker.not-a-url"; + </span><span class="cx"> @I18NMessages( { @I18NMessage("That new value [{0}] is too low - it must be greater than or equal to [{1}]"), @I18NMessage(value = "Der neue Wert [{0}] ist zu niedrig - er muss größer oder gleich [{1}] sein", locale = "de") }) </span></pre></div> <a id="rhqtrunkmodulesenterprisecommsrcmainjavaorgrhqenterprisecommunicationsutilprefsUrlSetupValidityCheckerjava"></a> <div class="addfile"><h4>Added: rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/util/prefs/UrlSetupValidityChecker.java (0 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/util/prefs/UrlSetupValidityChecker.java (rev 0) +++ rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/util/prefs/UrlSetupValidityChecker.java 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -0,0 +1,49 @@ </span><span class="add">+/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.communications.util.prefs; + +import java.io.PrintWriter; +import java.net.URL; +import java.util.prefs.Preferences; + +import org.rhq.enterprise.communications.i18n.CommI18NFactory; +import org.rhq.enterprise.communications.i18n.CommI18NResourceKeys; + +/** + * A setup validity checker that validates that the new value is a valid URL. + * + * @author John Mazzitelli + */ +public class UrlSetupValidityChecker implements SetupValidityChecker { + /** + * Checks to make sure the <code>value_to_check</code> is a valid URL string. + * + * @see SetupValidityChecker#checkValidity(String, String, java.util.prefs.Preferences, PrintWriter) + */ + public boolean checkValidity(String pref_name, String value_to_check, Preferences preferences, PrintWriter out) { + try { + new URL(value_to_check); + } catch (Exception e) { + out.println(CommI18NFactory.getMsg().getMsg(CommI18NResourceKeys.SETUP_NOT_A_URL, value_to_check)); + return false; + } + + return true; + } +} </span><span class="cx">\ No newline at end of file Property changes on: rhq/trunk/modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/util/prefs/UrlSetupValidityChecker.java ___________________________________________________________________ </span></pre></div> <a id="svnmimetype"></a> <div class="addfile"><h4>Added: svn:mime-type ( => )</h4> <pre class="diff"> <span class="info">Added: svn:keywords + Date Author Id Revision HeadURL </span></pre></div> <a id="svneolstyle"></a> <div class="addfile"><h4>Added: svn:eol-style ( => )</h4> <pre class="diff"> <span class="info"> Modified: rhq/trunk/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml </span><span class="cx">=================================================================== </span><span class="rem">--- rhq/trunk/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml 2008-11-13 04:57:08 UTC (rev 1987) </span><span class="add">+++ rhq/trunk/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -167,13 +167,39 @@ </span><span class="cx"> be allowed to update itself. EMBEDDED: we never have to worry about being up-to-date, </span><span class="rem">- the embedded agent will always be able to talk - to the server it is embedded in. </span><span class="add">+ the embedded agent will always be the latest + when embedded in its server. </span><span class="cx"> --> <entry key="rhq.agent.agent-update.enabled" value="false" /> <!-- _______________________________________________________________ </span><span class="add">+ rhq.agent.agent-update.version-url + + If this is defined, it will be the URL the agent uses when it + needs to retrieve information about the latest available + agent update binary. If this is not defined, the agent will + ask its server for the agent update binary version information. + --> + <!-- + <entry key="rhq.agent.agent-update.version-url" value="http://127.0.0.1:7080/agentupdate/version" /> + --> + + <!-- + _______________________________________________________________ + rhq.agent.agent-update.download-url + + If this is defined, it will be the URL the agent uses when it + needs to download the latest available agent update binary. + If this is not defined, the agent will download the agent + update binary from its server. + --> + <!-- + <entry key="rhq.agent.agent-update.download-url" value="http://127.0.0.1:7080/agentupdate/download" /> + --> + + <!-- + _______________________________________________________________ </span><span class="cx"> rhq.agent.primary-server-switchover-check-interval-msecs The agent will periodically check to ensure that the server </span></pre></div> <a id="rhqtrunkmodulespluginsrhqagentsrcmainresourcesMETAINFrhqpluginxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml (1987 => 1988)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml 2008-11-13 04:57:08 UTC (rev 1987) +++ rhq/trunk/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml 2008-11-13 06:16:10 UTC (rev 1988) </span><span class="lines">@@ -530,6 +530,11 @@ </span><span class="cx"> <c:simple-property name="rhq.agent.wait-for-server-at-startup-msecs" required="false" type="integer" activationPolicy="restart" default="5000" displayName="Time To Wait For RHQ Server At Startup" description="This is the number of milliseconds the agent will wait for the RHQ Server to come up" /> <c:simple-property name="rhq.agent.update-plugins-at-startup" required="false" type="boolean" activationPolicy="restart" default="true" displayName="Update Plugins At Startup" description="This will force the agent to download plugin updates from the RHQ Server" /> </c:group> </span><span class="add">+ <c:group name="agentupdate" displayName="Agent Auto-Update" hiddenByDefault="true"> + <c:simple-property name="rhq.agent.agent-update.enabled" required="false" type="boolean" activationPolicy="immediate" default="true" displayName="Enable Agent Update" description="If true, the agent will be allowed to update itself if it finds there is a new agent update binary available. If this feature is not enabled, the agent will never be allowed to update itself." /> + <c:simple-property name="rhq.agent.agent-update.version-url" required="false" type="string" activationPolicy="immediate" displayName="Agent Update Binary Version URL" description="If defined, this will be the URL the agent uses when it needs to retrieve information about the latest available agent update binary. If this is not defined, the agent will ask its server for the agent update binary version information." />" + <c:simple-property name="rhq.agent.agent-update.download-url" required="false" type="string" activationPolicy="immediate" displayName="Agent Update Binary Download URL" description="If defined, this will be the URL the agent uses when it needs to download the latest available agent update binary. If this is not defined, the agent will download the agent update binary from its server." /> + </c:group> </span><span class="cx"> <c:group name="misc" displayName="Miscellaneous Settings" hiddenByDefault="true"> <c:description>Settings that usually do not need to change under normal circumstances</c:description> <c:simple-property name="rhq.agent.data-directory" required="false" type="string" activationPolicy="restart" default="data" displayName="Data Directory" description="Location where the agent can persist data to the file system" /> </span><span class="lines">@@ -562,7 +567,6 @@ </span><span class="cx"> <c:float-constraint minimum="0.00" maximum="1.00" /> </c:constraint> </c:simple-property> </span><span class="rem">- <c:simple-property name="rhq.agent.agent-update.enabled" required="false" type="boolean" activationPolicy="immediate" default="true" displayName="Enable Agent Update" description="If true, the agent will be allowed to update itself if it finds there is a new agent update binary available. If this feature is not enabled, the agent will never be allowed to update itself." /> </span><span class="cx"> </c:group> </resource-configuration> </span> </pre> </div> </div> </body> </html> |