Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [4530] reformatting only
|
From: <jma...@rh...> - 2009-07-21 18:28:42
|
<!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] [4530] reformatting only</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4530</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-07-21 13:28:41 -0500 (Tue, 21 Jul 2009)</dd> </dl> <h3>Log Message</h3> <pre>reformatting only</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomainauthzRolejava">rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulescoredomainsrcmainjavaorgrhqcoredomainauthzRolejava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java (4529 => 4530)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java 2009-07-21 18:17:21 UTC (rev 4529) +++ rhq/trunk/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java 2009-07-21 18:28:41 UTC (rev 4530) </span><span class="lines">@@ -58,24 +58,39 @@ </span><span class="cx"> * @author Greg Hinkle */ @Entity </span><span class="rem">-@NamedQueries( { - @NamedQuery(name = Role.QUERY_FIND_BY_IDS, query = "SELECT r FROM Role AS r WHERE r.id IN ( :ids )"), - @NamedQuery(name = Role.QUERY_FIND_ALL, query = "SELECT r FROM Role AS r"), - @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_WITH_EXCLUDES, query = " SELECT DISTINCT r " - + " FROM Role AS r " + "LEFT JOIN r.subjects AS s " + " WHERE r.id NOT IN " + " ( " - + " SELECT rr.id " + " FROM Subject ss " + " JOIN ss.roles AS rr " - + " WHERE ss.id = :subjectId " + " ) " + " AND r.id NOT IN ( :excludes )"), - @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES, query = " SELECT DISTINCT r " + " FROM Role AS r " - + "LEFT JOIN r.subjects AS s " + " WHERE r.id NOT IN " + " ( " + " SELECT rr.id " - + " FROM Subject ss " + " JOIN ss.roles AS rr " - + " WHERE ss.id = :subjectId" + " )"), - @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION_WITH_EXCLUDES, query = "SELECT r" - + " FROM Role r" + " WHERE r.id NOT IN" + " ( " + " SELECT rn.role.id" - + " FROM RoleNotification rn" + " WHERE rn.alertDefinition.id = :alertDefinitionId " - + " ) " + " AND r.id NOT IN ( :excludes )"), - @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION, query = "SELECT r" + " FROM Role r" - + " WHERE r.id NOT IN" + " ( " + " SELECT rn.role.id" + " FROM RoleNotification rn" - + " WHERE rn.alertDefinition.id = :alertDefinitionId " + " ) ") }) </span><span class="add">+@NamedQueries( { // +@NamedQuery(name = Role.QUERY_FIND_BY_IDS, query = "SELECT r FROM Role AS r WHERE r.id IN ( :ids )"), // + @NamedQuery(name = Role.QUERY_FIND_ALL, query = "SELECT r FROM Role AS r"), // + @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_WITH_EXCLUDES, query = "" // + + " SELECT DISTINCT r " // + + " FROM Role AS r " // + + "LEFT JOIN r.subjects AS s " // + + " WHERE r.id NOT IN ( SELECT rr.id " // + + " FROM Subject ss " // + + " JOIN ss.roles AS rr " // + + " WHERE ss.id = :subjectId ) " // + + " AND r.id NOT IN ( :excludes )"), // + @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES, query = "" // + + " SELECT DISTINCT r " // + + " FROM Role AS r " // + + "LEFT JOIN r.subjects AS s " // + + " WHERE r.id NOT IN ( SELECT rr.id " // + + " FROM Subject ss " // + + " JOIN ss.roles AS rr " // + + " WHERE ss.id = :subjectId )"), // + @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION_WITH_EXCLUDES, query = "" // + + "SELECT r" // + + " FROM Role r" // + + " WHERE r.id NOT IN ( SELECT rn.role.id " // + + " FROM RoleNotification rn" // + + " WHERE rn.alertDefinition.id = :alertDefinitionId ) " // + + " AND r.id NOT IN ( :excludes )"), // + @NamedQuery(name = Role.QUERY_FIND_AVAILABLE_ROLES_FOR_ALERT_DEFINITION, query = "" // + + "SELECT r" // + + " FROM Role r" // + + " WHERE r.id NOT IN ( SELECT rn.role.id " // + + " FROM RoleNotification rn" // + + " WHERE rn.alertDefinition.id = :alertDefinitionId ) ") }) </span><span class="cx"> @SequenceGenerator(name = "RHQ_ROLE_ID_SEQ", sequenceName = "RHQ_ROLE_ID_SEQ") @Table(name = "RHQ_ROLE") public class Role implements Serializable { </span> </pre> </div> </div> </body> </html> |