Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2849] [RHQ-1396] make sure ContentServerService methods match timeouts for the ContentManagerBean and ContentSourceManagerBean SLSB tx timeouts.
<!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] [2849] [RHQ-1396] make sure ContentServerService methods match timeouts for the ContentManagerBean and ContentSourceManagerBean SLSB tx timeouts.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2849</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2009-01-30 09:35:27 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1396] make sure ContentServerService methods match timeouts for the ContentManagerBean and ContentSourceManagerBean SLSB tx timeouts.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulescoreclientapisrcmainjavaorgrhqcoreclientapiservercontentContentServerServicejava">rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulescoreclientapisrcmainjavaorgrhqcoreclientapiservercontentContentServerServicejava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java (2848 => 2849)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java 2009-01-30 14:38:20 UTC (rev 2848) +++ rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java 2009-01-30 15:35:27 UTC (rev 2849) </span><span class="lines">@@ -1,25 +1,25 @@ </span><span class="rem">- /* - * 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, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * 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 and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ </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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ </span><span class="cx"> package org.rhq.core.clientapi.server.content; import java.io.InputStream; </span><span class="lines">@@ -28,6 +28,7 @@ </span><span class="cx"> import org.rhq.core.communications.command.annotation.Asynchronous; import org.rhq.core.communications.command.annotation.LimitedConcurrency; </span><span class="add">+import org.rhq.core.communications.command.annotation.Timeout; </span><span class="cx"> import org.rhq.core.domain.content.Channel; import org.rhq.core.domain.content.PackageDetailsKey; import org.rhq.core.domain.content.PackageVersion; </span><span class="lines">@@ -121,6 +122,7 @@ </span><span class="cx"> * @return the number of bytes written to the output stream - this is the size of the package version that was * downloaded */ </span><span class="add">+ @Timeout(45 * 60 * 1000L) </span><span class="cx"> @LimitedConcurrency(CONCURRENCY_LIMIT_CONTENT_DOWNLOAD) long downloadPackageBitsGivenResource(int resourceId, PackageDetailsKey packageDetailsKey, OutputStream outputStream); </span><span class="lines">@@ -140,6 +142,7 @@ </span><span class="cx"> * * @return the number of bytes written to the output stream - this is the size of the chunk downloaded */ </span><span class="add">+ @Timeout(45 * 60 * 1000L) </span><span class="cx"> @LimitedConcurrency(CONCURRENCY_LIMIT_CONTENT_DOWNLOAD) long downloadPackageBitsRangeGivenResource(int resourceId, PackageDetailsKey packageDetailsKey, OutputStream outputStream, long startByte, long endByte); </span><span class="lines">@@ -156,6 +159,7 @@ </span><span class="cx"> * * @return the number of bytes written to the output stream */ </span><span class="add">+ @Timeout(45 * 60 * 1000L) </span><span class="cx"> @LimitedConcurrency(CONCURRENCY_LIMIT_CONTENT_DOWNLOAD) long downloadPackageBitsForChildResource(int parentResourceId, String resourceTypeName, PackageDetailsKey packageDetailsKey, OutputStream outputStream); </span> </pre> </div> </div> </body> </html> |
