Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [4857] fix copy-n-paste typo in error message, remove unused code
|
From: <ma...@rh...> - 2009-08-11 14:57:44
|
<!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] [4857] fix copy-n-paste typo in error message, remove unused code</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4857</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2009-08-11 09:57:38 -0500 (Tue, 11 Aug 2009)</dd> </dl> <h3>Log Message</h3> <pre>fix copy-n-paste typo in error message, remove unused code</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservercontentContentManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservercontentContentManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java (4856 => 4857)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java 2009-08-11 13:54:11 UTC (rev 4856) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java 2009-08-11 14:57:38 UTC (rev 4857) </span><span class="lines">@@ -65,7 +65,6 @@ </span><span class="cx"> import org.rhq.core.domain.content.PackageInstallationStep; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; </span><span class="rem">-import org.rhq.core.domain.content.composite.PackageListItemComposite; </span><span class="cx"> import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; import org.rhq.core.domain.content.transfer.ContentResponseResult; import org.rhq.core.domain.content.transfer.DeletePackagesRequest; </span><span class="lines">@@ -84,7 +83,6 @@ </span><span class="cx"> import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.CriteriaQueryGenerator; import org.rhq.core.domain.util.PageList; </span><span class="rem">-import org.rhq.core.domain.util.PageControl; </span><span class="cx"> import org.rhq.core.util.collection.ArrayUtils; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.stream.StreamUtil; </span><span class="lines">@@ -132,9 +130,6 @@ </span><span class="cx"> private ContentManagerLocal contentManager; @EJB </span><span class="rem">- private ContentUIManagerLocal contentUIManager; - - @EJB </span><span class="cx"> private ResourceTypeManagerLocal resourceTypeManager; // ContentManagerLocal Implementation -------------------------------------------- </span><span class="lines">@@ -785,12 +780,12 @@ </span><span class="cx"> } } </span><span class="rem">- </span><span class="cx"> public byte[] getPackageBytes(Subject user, int resourceId, int installedPackageId) { // Check permissions first if (!authorizationManager.hasResourcePermission(user, Permission.MANAGE_CONTENT, resourceId)) { </span><span class="rem">- throw new PermissionException("User [" + user.getName() + "] does not have permission to delete package " - + installedPackageId + " for resource ID [" + resourceId + "]"); </span><span class="add">+ throw new PermissionException("User [" + user.getName() + + "] does not have permission to obtain package content for installed package id [" + + installedPackageId + "] for resource ID [" + resourceId + "]"); </span><span class="cx"> } InstalledPackage installedPackage = entityManager.find(InstalledPackage.class, installedPackageId); </span><span class="lines">@@ -804,8 +799,6 @@ </span><span class="cx"> return bits.getBits(); } </span><span class="rem">- - </span><span class="cx"> public List<DeployPackageStep> translateInstallationSteps(int resourceId, ResourcePackageDetails packageDetails) throws Exception { log.info("Retrieving installation steps for package [" + packageDetails + "]"); </span><span class="lines">@@ -1065,7 +1058,6 @@ </span><span class="cx"> return result; } </span><span class="rem">- </span><span class="cx"> @SuppressWarnings("unchecked") public void checkForTimedOutRequests(Subject subject) { if (!authorizationManager.isOverlord(subject)) { </span> </pre> </div> </div> </body> </html> |