Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2806] [RHQ-1424] - use the passed user to [re]calculate group definitions (note: we don't need to pass the overlord here because all group definition / dynagroup functionality is hidden behind the MANAGE_INVENTORY permission, which is sufficient for all operations on a resource group including creation, deletion, and membership changes);
|
From: <jma...@rh...> - 2009-01-28 20:15:12
|
<!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] [2806] [RHQ-1424] - use the passed user to [re]calculate group definitions (note: we don't need to pass the overlord here because all group definition / dynagroup functionality is hidden behind the MANAGE_INVENTORY permission, which is sufficient for all operations on a resource group including creation, deletion, and membership changes);</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2806</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-01-28 14:15:10 -0600 (Wed, 28 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1424] - use the passed user to [re]calculate group definitions (note: we don't need to pass the overlord here because all group definition / dynagroup functionality is hidden behind the MANAGE_INVENTORY permission, which is sufficient for all operations on a resource group including creation, deletion, and membership changes);</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourcegroupdefinitionGroupDefinitionManagerBeanjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverresourcegroupdefinitionGroupDefinitionManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java (2805 => 2806)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java 2009-01-28 19:58:46 UTC (rev 2805) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java 2009-01-28 20:15:10 UTC (rev 2806) </span><span class="lines">@@ -274,7 +274,6 @@ </span><span class="cx"> doomedResourceGroupIds.add(managedGroupId); } </span><span class="rem">- Subject overlord = subjectManager.getOverlord(); </span><span class="cx"> for (ExpressionEvaluator.Result result : evaluator) { if (result == null) { /* </span><span class="lines">@@ -286,8 +285,12 @@ </span><span class="cx"> /* * do one group at a time, to help prevent xaction timeouts </span><span class="add">+ * + * note: we don't need to pass the overlord here because all group definition / dynagroup functionality + * is hidden behind the MANAGE_INVENTORY permission, which is sufficient for all operations on a + * resource group including creation, deletion, and membership changes </span><span class="cx"> */ </span><span class="rem">- Integer nextResourceGroupId = calculateGroupMembership_helper(overlord, groupDefinitionId, result); </span><span class="add">+ Integer nextResourceGroupId = calculateGroupMembership_helper(subject, groupDefinitionId, result); </span><span class="cx"> /* * remove all ids returned from the helper. by the time we're done looping over all </span><span class="lines">@@ -301,9 +304,13 @@ </span><span class="cx"> /* * and ids that are left over are doomed, but since deleting a resource group is related to the size of the * group, remove each group in it's own transaction </span><span class="add">+ * + * note: we don't need to pass the overlord here because all group definition / dynagroup functionality + * is hidden behind the MANAGE_INVENTORY permission, which is sufficient for all operations on a + * resource group including creation, deletion, and membership changes </span><span class="cx"> */ for (Integer doomedGroupId : doomedResourceGroupIds) { </span><span class="rem">- removeManagedResource_helper(overlord, groupDefinitionId, doomedGroupId); </span><span class="add">+ removeManagedResource_helper(subject, groupDefinitionId, doomedGroupId); </span><span class="cx"> } // re-attach the group, because it was cleared from the session during the callout to the helper </span> </pre> </div> </div> </body> </html> |