Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2863] fix the ability to download the agent from the server
|
From: <ma...@rh...> - 2009-01-31 05:31:34
|
<!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] [2863] fix the ability to download the agent from the server</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2863</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2009-01-30 23:31:29 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>fix the ability to download the agent from the server</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunketcagentspawnsrcscriptsagentcopyxml">rhq/trunk/etc/agentspawn/src/scripts/agentcopy.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunketcagentspawnsrcscriptsagentcopyxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/etc/agentspawn/src/scripts/agentcopy.xml (2862 => 2863)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/etc/agentspawn/src/scripts/agentcopy.xml 2009-01-31 05:15:13 UTC (rev 2862) +++ rhq/trunk/etc/agentspawn/src/scripts/agentcopy.xml 2009-01-31 05:31:29 UTC (rev 2863) </span><span class="lines">@@ -11,6 +11,14 @@ </span><span class="cx"> <property file="${basedir}/agentcopy.properties" /> <if> </span><span class="add">+ <not><isset property="agentcopy.agent.dist.dir"/></not> + <then> + <property name="need-to-download-agent" value="true"/> + <property name="agentcopy.agent.dist.dir" location="${agentcopy.agent.spawn.dir}/agent-binary-update/rhq-agent"/> + </then> + </if> + + <if> </span><span class="cx"> <os family="windows"/> <then> <property name="iswindows" value="true" /> </span><span class="lines">@@ -223,14 +231,14 @@ </span><span class="cx"> </target> <!-- ========== --> </span><span class="rem">- <target name="download-agent" unless="agentcopy.agent.dist.dir"> </span><span class="add">+ <target name="download-agent" if="need-to-download-agent"> + <mkdir dir="${agentcopy.agent.spawn.dir}" /> </span><span class="cx"> <property name="_url" value="http://${agentcopy.server.bind-address}:${agentcopy.server.bind-port}/agentupdate/download" /> <get src="${_url}" dest="${agentcopy.agent.spawn.dir}/agent-binary-update.jar" /> <java jar="${agentcopy.agent.spawn.dir}/agent-binary-update.jar" fork="true"> <arg value="--install=${agentcopy.agent.spawn.dir}/agent-binary-update"/> <arg value="--log=${agentcopy.agent.spawn.dir}/agent-binary-update.log"/> </java> </span><span class="rem">- <property name="agentcopy.agent.dist.dir" location="${agentcopy.agent.spawn.dir}/agent-binary-update/rhq-agent"/> </span><span class="cx"> </target> <!-- ========== --> </span> </pre> </div> </div> </body> </html> |