svn commit: r1726886 - /portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLookupManagerAbstract.java

[taylor]

Author: taylor
Date: Tue Jan 26 20:29:02 2016
New Revision: 1726886

URL: http://svn.apache.org/viewvc?rev=1726886&view=rev
Log:
fixing join issues on Ajax User Manager

Modified:
    
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLookupManagerAbstract.java

Modified: 
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLookupManagerAbstract.java
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLookupManagerAbstract.java?rev=1726886&r1=1726885&r2=1726886&view=diff
==============================================================================
--- 
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLookupManagerAbstract.java
 (original)
+++ 
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLookupManagerAbstract.java
 Tue Jan 26 20:29:02 2016
@@ -16,19 +16,6 @@
  */
 package org.apache.jetspeed.security.spi.impl;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.swing.text.Segment;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.jetspeed.security.JetspeedPrincipal;
 import org.apache.jetspeed.security.JetspeedPrincipalAssociationType;
@@ -44,6 +31,18 @@ import org.apache.ojb.broker.query.Query
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.text.Segment;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Abstract base class for the principal lookup manager. Defines possible
  * database specific abstract methods and provides more generic methods to all
@@ -201,8 +200,9 @@ public abstract class JetspeedPrincipalL
         String attributeConstraint = null;
         String fromPart = "SECURITY_PRINCIPAL";
 
+        int cnt = 1;
+
         if (queryContext.getSecurityAttributes() != null) {
-            int cnt = 1;
 
             for (Map.Entry<String, String> attribute : 
queryContext.getSecurityAttributes().entrySet()) {
                 if (attributeConstraint == null) {
@@ -240,14 +240,13 @@ public abstract class JetspeedPrincipalL
 
         if (queryContext.getAssociatedRoles() != null && 
queryContext.getAssociatedRoles().size() > 0
                 && queryContext.getAssociatedRoles().get(0).length() > 0) {
-            int cnt = 1;
 
             for (String roleName : queryContext.getAssociatedRoles()) {
                 _paramPlaceHolderName = 
putParamPlaceHolder(_paramPlaceHolders, convertWildcardsForLike(roleName));
 
                 if (roleConstraints == null) {
                     roleConstraints = "r" + cnt + ".ASSOC_NAME = '" + 
JetspeedPrincipalAssociationType.IS_MEMBER_OF
-                            + "' " + "' AND r" + cnt + ".TO_PRINCIPAL_ID=rp" + 
cnt + ".PRINCIPAL_ID AND rp" + cnt
+                            + "' AND r" + cnt + ".TO_PRINCIPAL_ID=rp" + cnt + 
".PRINCIPAL_ID AND rp" + cnt
                             + ".PRINCIPAL_NAME LIKE " + _paramPlaceHolderName 
+ " AND rp" + cnt
                             + ".PRINCIPAL_TYPE='role' AND r" + cnt
                             + 
".FROM_PRINCIPAL_ID=SECURITY_PRINCIPAL.PRINCIPAL_ID";
@@ -270,7 +269,6 @@ public abstract class JetspeedPrincipalL
 
         if (queryContext.getAssociatedGroups() != null && 
queryContext.getAssociatedGroups().size() > 0
                 && queryContext.getAssociatedGroups().get(0).length() > 0) {
-            int cnt = 1;
 
             for (String groupName : queryContext.getAssociatedGroups()) {
                 _paramPlaceHolderName = 
putParamPlaceHolder(_paramPlaceHolders, convertWildcardsForLike(groupName));
@@ -299,7 +297,6 @@ public abstract class JetspeedPrincipalL
         String userConstraints = null;
 
         if (queryContext.getAssociatedUsers() != null && 
queryContext.getAssociatedUsers().size() > 0) {
-            int cnt = 1;
 
             for (String userName : queryContext.getAssociatedGroups()) {
                 _paramPlaceHolderName = 
putParamPlaceHolder(_paramPlaceHolders, convertWildcardsForLike(userName));



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org