modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 319 +---------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java | 132 ----
3 files changed, 61 insertions(+), 403 deletions(-)
New commits:
commit d7e0f2de7a91644600c7120a5474922d53ef57e4
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Oct 12 16:13:11 2010 -0400
bad merge cleanup.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
index d57e2d8..9cd749c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
@@ -63,20 +63,9 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
public RoleLdapGroupSelector(String locatorId, Integer integer) {
super(locatorId);
- //define datasource for AvailableLdap groups
- // dataSource = new LdapGroupsDataSource();
- // getAvailableGrid().setDataSource(dataSource);
- System.out.println("------- instantiating ldapGroupsDataSource:" + integer);
- this.currentRole = integer.intValue();
- // assignedDataSource = new LdapAssignedGroupsDatasource(integer);
- System.out.println("----- instantiated: about to assign:");
- // getAssignedGrid().setDataSource(assignedDataSource);
- // System.out.println("--- set the datasource");
- // if (integer != null) {
- // // ListGridRecord[] data = (new RolesDataSource()).buildRecords(set);
- // ListGridRecord[] data = dataSource.buildAssignedRecords(integer);
- // setAssigned(data);
- // }
+ if (integer != null) {
+ this.currentRole = integer.intValue();
+ }
}
@Override
@@ -86,67 +75,63 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
@Override
protected RPCDataSource<HashSet<Map<String, String>>> getDataSource() {
- // return new SelectedRolesDataSource();
if (availableDatasource == null) {
availableDatasource = new LdapGroupsDataSource();
//add subsequent listener
- //add listener to AvailableGrid, to act after successfully populated.
- getAvailableGrid().addDataArrivedHandler(new DataArrivedHandler() {
- @Override
- public void onDataArrived(DataArrivedEvent event) {
- System.out.println("----------- in ldapAss.executeFetch:" + getCurrentRole() + ":initialLdapLoad:"
- + initialLdapSelectionsLoad);
- int currentRoleId = getCurrentRole();
- if (initialLdapSelectionsLoad) {
- GWTServiceLookup.getLdapService().findLdapGroupsAssignedToRole(currentRoleId,
- new AsyncCallback<Set<Map<String, String>>>() {
-
- public void onFailure(Throwable throwable) {
- CoreGUI.getErrorHandler().handleError(
- "Failed to load LdapGroups available for role.", throwable);
- }
-
- public void onSuccess(Set<Map<String, String>> currentlyAssignedLdapGroups) {
- System.out.println("------ ldapAss.fetch.success:" + currentlyAssignedLdapGroups);
- //translate groups into records for grid
- // response.setData(buildRecords(locatedGroups));
- // response.setData(buildAssignedRecords(currentlyAssignedLdapGroups));
- //instead of setting the data, find which ones are shared and transfer as before
- if ((currentlyAssignedLdapGroups != null)
- && (!currentlyAssignedLdapGroups.isEmpty())) {
- RecordList loaded = availableGrid.getDataAsRecordList();
- ArrayList<Integer> located = new ArrayList<Integer>();
- // for (LdapGroup group : currentlyAssignedLdapGroups) {
- for (Map groupMap : currentlyAssignedLdapGroups) {
- System.out.println("------- ldapAss.fetch.suc.grpName:"
- + groupMap.get(name) + ":");
- // .println("------- ldapAss.fetch.suc.grpName:" + group.getName() + ":");
- // int index = loaded.findIndex(name, group.getName());
- int index = loaded.findIndex(name, (String) groupMap.get(name));
- if (index > -1) {
- located.add(Integer.valueOf(index));
- }
+ int currentRoleId = getCurrentRole();
+ if (currentRoleId > -1) {
+
+ //add listener to AvailableGrid, to act after successfully populated.
+ getAvailableGrid().addDataArrivedHandler(new DataArrivedHandler() {
+ @Override
+ public void onDataArrived(DataArrivedEvent event) {
+ int currentRoleId = getCurrentRole();
+ if (currentRoleId > -1) {
+ if (initialLdapSelectionsLoad) {
+ GWTServiceLookup.getLdapService().findLdapGroupsAssignedToRole(currentRoleId,
+ new AsyncCallback<Set<Map<String, String>>>() {
+
+ public void onFailure(Throwable throwable) {
+ CoreGUI.getErrorHandler().handleError(
+ "Failed to load LdapGroups available for role.", throwable);
}
- System.out.println("--------located:" + located.size());
- int[] records = new int[located.size()];
- int i = 0;
- for (Integer index : located) {
- records[i++] = index.intValue();
+
+ public void onSuccess(Set<Map<String, String>> currentlyAssignedLdapGroups) {
+ //translate groups into records for grid
+ // response.setData(buildRecords(locatedGroups));
+ // response.setData(buildAssignedRecords(currentlyAssignedLdapGroups));
+ //instead of setting the data, find which ones are shared and transfer as before
+ if ((currentlyAssignedLdapGroups != null)
+ && (!currentlyAssignedLdapGroups.isEmpty())) {
+ RecordList loaded = availableGrid.getDataAsRecordList();
+ ArrayList<Integer> located = new ArrayList<Integer>();
+ // for (LdapGroup group : currentlyAssignedLdapGroups) {
+ for (Map groupMap : currentlyAssignedLdapGroups) {
+ int index = loaded.findIndex(name, (String) groupMap.get(name));
+ if (index > -1) {
+ located.add(Integer.valueOf(index));
+ }
+ }
+ int[] records = new int[located.size()];
+ int i = 0;
+ for (Integer index : located) {
+ records[i++] = index.intValue();
+ }
+ availableGrid.selectRecords(records);
+ //now simulate button push
+ assignedGrid.transferSelectedData(availableGrid);
+ initialLdapSelectionsLoad = false;
+ select(assignedGrid.getSelection());
+ updateButtons();
+ assignedGrid.deselectAllRecords();
+ }
}
- availableGrid.selectRecords(records);
- //now simulate button push
- assignedGrid.transferSelectedData(availableGrid);
- initialLdapSelectionsLoad = false;
- select(assignedGrid.getSelection());
- updateButtons();
- assignedGrid.deselectAllRecords();
- }
- }
- });
+ });
+ }
+ }
}
- }
- });
-
+ });
+ }
}
return availableDatasource;
}
@@ -156,118 +141,23 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
return null; // TODO: Implement this method.
}
- // @Override
- // protected void onInit() {
- // super.onInit();
- // removeButton = new LocatableTransferImgButton(this.getLocatorId(), TransferImgButton.LEFT);
- // removeButton.setDisabled(true);
- // // addAllButton = new LocatableTransferImgButton(this.getLocatorId(), TransferImgButton.RIGHT_ALL);
- // removeAllButton = new LocatableTransferImgButton(this.getLocatorId(), TransferImgButton.LEFT_ALL);
- // removeAllButton.setDisabled(true);
- // removeButton.addClickHandler(new ClickHandler() {
- // public void onClick(ClickEvent clickEvent) {
- // System.out.println("Custom remove Button:");
- // ListGridRecord[] storedSelection = assignedGrid.getSelection();
- // deselect(assignedGrid.getSelection());
- // assignedGrid.removeSelectedData();
- // //now walk through and re-enable all selected elements in Available grid
- // RecordList availList = availableGrid.getDataAsRecordList();
- // for (ListGridRecord r : storedSelection) {
- // Record record = availList.find(name, r.getAttributeAsString(name));
- // if (record != null)
- // ((ListGridRecord) record).setEnabled(true);
- // }
- // updateButtons();
- // }
- // });
- // removeAllButton.addClickHandler(new ClickHandler() {
- // public void onClick(ClickEvent clickEvent) {
- // assignedGrid.selectAllRecords();
- // deselect(assignedGrid.getSelection());
- // assignedGrid.removeSelectedData();
- // updateButtons();
- // }
- // });
- //
- // }
-
- // HashSet<String> selection = new HashSet<String>();
-
- // @Override
- // protected void select(ListGridRecord[] records) {
- // availableGrid.deselectAllRecords();
- // // RecordList recordList = availableGrid.getDataAsRecordList();
- // for (ListGridRecord record : records) {
- // record.setEnabled(false);
- // // selection.add(record.getAttributeAsInt("id"));
- // // int selectedIndex = -1;
- // String groupName = record.getAttributeAsString(name);
- // // selectedIndex = recordList.findIndex(name, groupName);
- // // selection.add(Integer.valueOf(selectedIndex));
- // selection.add(groupName);
- // }
- // assignedGrid.markForRedraw();
- // }
protected void select(ListGridRecord[] records) {
- System.out.println("********** Current Group Selection size:" + getGroupSelection().size());
- System.out.println("******** RoleLdapGroupSelector.select:" + records.length);
availableGrid.deselectAllRecords();
for (ListGridRecord record : records) {
record.setEnabled(false);
- // selection.add(record.getAttributeAsInt("id"));
- // selection.add(record.getAttributeAsString(name));
selection.add(record.getAttributeAsString(name));
}
- System.out.println("********** Current Group Selection size:" + getGroupSelection().size());
assignedGrid.markForRedraw();
}
- @Override
- // protected void deselect(ListGridRecord[] records) {
- // HashSet<Integer> toRemove = new HashSet<Integer>();
- // for (ListGridRecord record : records) {
- // // System.out.println("------- record.getAttribAsInt:" + record.getAttributeAsInt(name));
- // String value = null;
- // // System.out.println("------- record.getAttribAsInt:" + record.getAttribute(name));
- // // System.out.println("------- record.getAttribAsString:" + (value = record.getAttributeAsString(name)));
- // // System.out.println("------- record.getAttribAsString-id:" + record.getAttributeAsString(id));
- // // if (record.getAttributeAsInt("id") != null) {
- // if (value != null) {
- // // toRemove.add(record.getAttributeAsInt("id"));
- // System.out.println("--------Inside getAttr as string:" + value + ":");
- // int found = availableGrid.getDataAsRecordList().findIndex(name, record.getAttributeAsString(name));
- // System.out.println("---------- index:" + found);
- // if (found > -1) {
- // toRemove.add(Integer.valueOf(found));
- // }
- // }
- // }
- // selection.removeAll(toRemove);
- //
- // for (Integer id : toRemove) {
- // // Record r = availableGrid.getDataAsRecordList().find("id", id);
- // Record r = availableGrid.getDataAsRecordList().get(id);
- // if (r != null) {
- // ((ListGridRecord) r).setEnabled(true);
- // }
- // }
- // availableGrid.markForRedraw();
- // }
protected void deselect(ListGridRecord[] records) {
- System.out.println("********** Current Group Selection size:" + getGroupSelection().size());
- System.out.println("******** RoleLdapGroupSelector.deselect:" + records.length);
- // HashSet<Integer> toRemove = new HashSet<Integer>();
HashSet<String> toRemove = new HashSet<String>();
for (ListGridRecord record : records) {
- // toRemove.add(record.getAttributeAsInt("id"));
toRemove.add(record.getAttributeAsString(name));
}
selection.removeAll(toRemove);
- System.out.println("Selection size:" + selection.size());
- // for (Integer id : toRemove) {
for (String name : toRemove) {
- // Record r = availableGrid.getDataAsRecordList().find("id", id);
Record r = availableGrid.getDataAsRecordList().find(name, name);
if (r != null) {
((ListGridRecord) r).setEnabled(true);
@@ -279,74 +169,20 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
cnt++;
}
}
- System.out.println("------ availableGrid.enabledCount.size:" + cnt);
- System.out.println("********** Current Group Selection size:" + getGroupSelection().size());
availableGrid.markForRedraw();
}
- // protected void updateButtons() {
- // super.updateButtons();
- // System.out.println("+++++++updateButtons, called Super()");
- // assignedGrid.deselectAllRecords();
- // System.out.println("********** After Update Group Selection size:" + getGroupSelection().size());
- // // addButton.setDisabled(!availableGrid.anySelected() || availableGrid.getTotalRows() == 0);
- // // removeButton.setDisabled(!assignedGrid.anySelected() || assignedGrid.getTotalRows() == 0);
- // // addAllButton.setDisabled(availableGrid.getTotalRows() == 0);
- // // removeAllButton.setDisabled(assignedGrid.getTotalRows() == 0);
- // }
-
- // public class SelectedRolesDataSource extends RolesDataSource {
- //
- // @Override
- // public ListGridRecord[] buildRecords(Collection<Role> roles) {
- // ListGridRecord[] records = super.buildRecords(roles);
- // for (ListGridRecord record : records) {
- // if (selection.contains(record.getAttributeAsInt("id"))) {
- // record.setEnabled(false);
- // }
- // }
- // return records;
- // }
- // }
-
public class LdapGroupsDataSource extends RPCDataSource<HashSet<Map<String, String>>> {
public LdapGroupsDataSource() {
- // DataSourceTextField idField = new DataSourceTextField(id, id);
- // idField.setPrimaryKey(true);
-
DataSourceTextField nameField = new DataSourceTextField(name, name);
nameField.setPrimaryKey(true);
DataSourceTextField descriptionField = new DataSourceTextField(description, description);
- // DataSourceImageField availablilityField = new DataSourceImageField(available, "Current Availability");
-
setFields(nameField, descriptionField);
}
- // public ListGridRecord[] buildAssignedRecords(Set<LdapGroup> currentlyAssignedLdapGroups) {
- // ListGridRecord[] records = new ListGridRecord[0];
- // int index = 0;
- // if ((currentlyAssignedLdapGroups != null) && (!currentlyAssignedLdapGroups.isEmpty())) {
- // //load groupsData
- // records = new ListGridRecord[currentlyAssignedLdapGroups.size()];
- // for (LdapGroup group : currentlyAssignedLdapGroups) {
- // ListGridRecord record = new ListGridRecord();
- // //load identifier
- // // record.setAttribute(id, group.get(id));
- // record.setAttribute(id, group.getName());
- // //load name
- // record.setAttribute(name, group.getName());
- // //load description
- // record.setAttribute(description, group.getDescription());
- //
- // records[index++] = record;
- // }
- // }
- // return records;
- // }
-
public ListGridRecord[] buildRecords(Set<Map<String, String>> locatedGroups) {
ListGridRecord[] records = new ListGridRecord[0];
int indx = 0;
@@ -361,7 +197,6 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
//iterate over the group data to translate into records
ListGridRecord record = new ListGridRecord();
//load identifier
- // record.setAttribute(id, group.get(id));
record.setAttribute(id, index++);
//load name
record.setAttribute(name, group.get(name));
@@ -414,20 +249,10 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
});
}
-
- // @Override
- // public Set<String> getSelection() {
- // // System.out.println("------------ Returning selection:" + selection.size() + "selection:" + selection);
- // return selection;
- // }
-
}
public HashSet<String> getGroupSelection() {
- System.out.println("------- selection is:" + selection + ":cnt:" + selection.size());
- System.out.println("------- actual size is:" + assignedGrid.getSelection().length);
RecordList records = assignedGrid.getDataAsRecordList();
- System.out.println("------- Rec list cnt:" + records.toArray().length);
//empty out selection and populate with actual contents
selection.clear();
if (!records.isEmpty()) {
@@ -435,10 +260,6 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
selection.add(r.getAttributeAsString(name));
}
}
- System.out.println("------- selection is:" + selection + ":cnt:" + selection.size());
- System.out.println("-------AS selection is:" + assignedGrid.getSelection() + ":cnt:"
- + assignedGrid.getSelection().length);
- // return selection;
HashSet<String> assignedSelections = new HashSet<String>();
for (ListGridRecord r : assignedGrid.getSelection()) {
assignedSelections.add(r.getAttributeAsString(name));
@@ -447,7 +268,6 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
for (Record r : assignedGrid.getDataAsRecordList().toArray()) {
remainingRecords.add(r.getAttributeAsString(name));
}
- // return assignedSelections;
return remainingRecords;
}
@@ -455,7 +275,6 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
private Integer currentRoleId = Integer.valueOf(-1);
public LdapAssignedGroupsDatasource(Integer integer) {
- System.out.println("----------- LdapAssigned.Constructor:" + integer);
if (integer != null) {
this.currentRoleId = integer;
}
@@ -465,34 +284,22 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
@Override
public Set<String> copyValues(ListGridRecord from) {
- // Set<String> copied = new HashSet<String>();
- // if (from != null) {
- // copied.add(from.getAttributeAsString(name));
- // }
- // return copied;
return null;
}
@Override
public ListGridRecord copyValues(Set<String> from) {
- // ListGridRecord lgr = new ListGridRecord();
- // if (from != null) {
- // lgr.setAttribute(name, from.iterator().next());
- // }
- // return lgr;
return null;
}
@Override
protected void executeFetch(final DSRequest request, final DSResponse response) {
- System.out.println("----------- in ldapAss.executeFetch:" + getCurrentRoleId());
int currentRoleId = -1;
if ((getCurrentRoleId() != null) && (getCurrentRoleId().intValue() > -1)) {
currentRoleId = getCurrentRoleId().intValue();
}
GWTServiceLookup.getLdapService().findLdapGroupsAssignedToRole(currentRoleId,
- // new AsyncCallback<Set<LdapGroup>>() {
new AsyncCallback<Set<Map<String, String>>>() {
public void onFailure(Throwable throwable) {
@@ -500,24 +307,19 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
throwable);
}
- // public void onSuccess(Set<LdapGroup> currentlyAssignedLdapGroups) {
public void onSuccess(Set<Map<String, String>> currentlyAssignedLdapGroups) {
- System.out.println("------ ldapAss.fetch.success:" + currentlyAssignedLdapGroups);
//translate groups into records for grid
// response.setData(buildRecords(locatedGroups));
// response.setData(buildAssignedRecords(currentlyAssignedLdapGroups));
//instead of setting the data, find which ones are shared and transfer as before
RecordList loaded = getAssignedGrid().getDataAsRecordList();
ArrayList<Integer> located = new ArrayList<Integer>();
- // for (LdapGroup group : currentlyAssignedLdapGroups) {
for (Map groupMap : currentlyAssignedLdapGroups) {
- // int index = loaded.findIndex(name, group.getName());
int index = loaded.findIndex(name, (String) groupMap.get(name));
if (index > -1) {
located.add(Integer.valueOf(index));
}
}
- System.out.println("--------located:" + located.size());
int[] records = new int[located.size()];
int i = 0;
for (Integer index : located) {
@@ -539,13 +341,9 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
processResponse(request.getRequestId(), response);
}
});
- //now find out which groups are shared
- //mock up transfer via buttons
- //TODO: above
}
public ListGridRecord[] buildAssignedRecords(Set<LdapGroup> currentlyAssignedLdapGroups) {
- System.out.println("----- buildAssRecords:");
ListGridRecord[] records = new ListGridRecord[0];
int index = 0;
if ((currentlyAssignedLdapGroups != null) && (!currentlyAssignedLdapGroups.isEmpty())) {
@@ -553,8 +351,6 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
records = new ListGridRecord[currentlyAssignedLdapGroups.size()];
for (LdapGroup group : currentlyAssignedLdapGroups) {
ListGridRecord record = new ListGridRecord();
- //load identifier
- // record.setAttribute(id, group.get(id));
record.setAttribute(id, group.getName());
//load name
record.setAttribute(name, group.getName());
@@ -579,11 +375,4 @@ public class RoleLdapGroupSelector extends AbstractSelector<HashSet<Map<String,
public int getCurrentRole() {
return currentRole;
}
-
- // @Override
- // public HashSet<Integer> getSelection() {
- // // TODO Auto-generated method stub
- // return super.getSelection();
- // }
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java
index 7c232b7..5daf50e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java
@@ -40,12 +40,6 @@ public interface LdapGWTService extends RemoteService {
*/
Set<Map<String, String>> findAvailableGroups();
- // /** Fin
- // *
- // * @return
- // */
- // Set<String> findAvailableGroupsFor();
-
/**
* Updates the role with the ldap groups selected.
*/
@@ -69,6 +63,13 @@ public interface LdapGWTService extends RemoteService {
*/
Subject checkSubjectForLdapAuth(Subject currentSubject, String user, String password);
+ /**
+ *
+ * @param currentSubject
+ * @param user
+ * @param password
+ * @return
+ */
void updateLdapGroupAssignmentsForSubject(Subject subject);
/** Finds ldap groups already assigned to this role.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java
index f52f493..41d49bb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java
@@ -59,38 +59,9 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
}
}
- // @Override
- // public Set<String> findAvailableGroupsFor() {
- // Set<String> locatedGroups = new HashSet<String>();
- // try {
- // locatedGroups = ldapManager.findAvailableGroupsFor(getSessionSubject().getName());
- // return SerialUtility.prepare(locatedGroups, "findAvailableGroupsFor");
- // } catch (Exception e) {
- // throw new RuntimeException(ThrowableUtil.getAllMessages(e));
- // }
- //
- // }
-
@Override
public void addLdapGroupsToRole(int roleId, List<String> groupIds) {
- // //clean out existing roles as this defines the new list of roles
- // PageList<LdapGroup> existing = ldapManager.findLdapGroupsByRole(roleId, PageControl.getUnlimitedInstance());
- // com.allen_sauer.gwt.log.client.Log.info("------EXISTING:" + existing.getTotalSize() + ":obj:" + existing);
- // if (!existing.isEmpty()) {
- // int i = 0;
- // int[] groupIndices = new int[existing.size()];
- // for (LdapGroup g : existing) {
- // groupIndices[i] = i++;
- // }
- // System.out.println("------- pre-existing:" + groupIndices);
- // com.allen_sauer.gwt.log.client.Log.info("------- pre-existing:" + groupIndices);
- // ldapManager.removeLdapGroupsFromRole(getSessionSubject(), roleId, groupIndices);
- // }
- // System.out.println("------ Adding ldap groups to role:" + roleId + ":gpIds:" + groupIds);
- // com.allen_sauer.gwt.log.client.Log.info("------ Adding ldap groups to role:" + roleId + ":gpIds:" + groupIds);
- // ldapManager.addLdapGroupsToRole(getSessionSubject(), roleId, groupIds);
try {
- // ldapManager.addLdapGroupsToRole(getSessionSubject(), roleId, groupIds);
ldapManager.addLdapGroupsToRole(subjectManager.getOverlord(), roleId, groupIds);
} catch (Exception e) {
throw new RuntimeException(ThrowableUtil.getAllMessages(e));
@@ -99,15 +70,11 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
}
public void setLdapGroupsForRole(int roleId, List<String> groupIds) {
- System.out.println("----------------- Group ids:" + groupIds);
try {
//clean out existing roles as this defines the new list of roles
PageList<LdapGroup> existing = ldapManager.findLdapGroupsByRole(roleId, PageControl.getUnlimitedInstance());
com.allen_sauer.gwt.log.client.Log.debug("Removing " + existing.getTotalSize() + " groups from role '"
+ roleId + "'.");
- System.out.println("Removing " + existing.getTotalSize() + " groups from role '" + roleId + "'.");
- // PageList<LdapGroup> currentLdapGroups = ldapManager.findLdapGroupsByRole(roleId, PageControl.getUnlimitedInstance());
- // Log.debug("Found "+currentLdapGroups.size()+" current LDAP groups for role'"+roleId+".");
int[] groupIndices = new int[existing.size()];
int indx = 0;
for (LdapGroup lg : existing) {
@@ -115,12 +82,9 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
}
com.allen_sauer.gwt.log.client.Log
.debug("Removing " + groupIndices.length + " LDAP Groups." + groupIndices);
- System.out.println("Removing " + groupIndices.length + " LDAP Groups." + groupIndices);
- // ldapManager.removeLdapGroupsFromRole(getSessionSubject(), roleId, groupIndices);
ldapManager.removeLdapGroupsFromRole(subjectManager.getOverlord(), roleId, groupIndices);
PageList<LdapGroup> nowGroups = ldapManager
.findLdapGroupsByRole(roleId, PageControl.getUnlimitedInstance());
- System.out.println("LDAP GROUP count for '" + roleId + "' after deletion. Cnt:" + nowGroups.size());
//from among all available groups, if group name matches then add it to the list.
ArrayList<String> validGroupIds = new ArrayList<String>();
@@ -134,61 +98,11 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
}
com.allen_sauer.gwt.log.client.Log.debug("Adding " + validGroupIds.size() + " ldap groups to role["
+ roleId + "].");
- System.out.println("NOW adding the following " + validGroupIds.size() + " groupIds");
- // ldapManager.addLdapGroupsToRole(getSessionSubject(), roleId, groupIds);
ldapManager.addLdapGroupsToRole(subjectManager.getOverlord(), roleId, groupIds);
nowGroups = ldapManager.findLdapGroupsByRole(roleId, PageControl.getUnlimitedInstance());
- System.out.println("LDAP GROUP count for '" + roleId + "' after addition. Cnt:" + nowGroups.size());
} catch (Exception e) {
throw new RuntimeException(ThrowableUtil.getAllMessages(e));
}
-
- // if (!existing.isEmpty() && (groupIds != null) && (!groupIds.isEmpty())) {
- // ArrayList<Integer> located = new ArrayList<Integer>();
- // for (String groupName : groupIds) {
- // for (LdapGroup storedGroup : existing) {
- // if (groupName.equals(storedGroup.getName())) {
- // located.add(storedGroup.getId());
- // }
- // }
- // }
- //
- // int i = 0;
- // groupIndices = new int[located.size()];
- // for (Integer l : located) {
- // groupIndices[i++] = l;
- // }
- // // for (LdapGroup g : existing) {
- // //// groupIndices[i] = i++;
- // // //translate the group name into LdapGroup id
- // // if(g.getName().equalsIgnoreCase("")){
- // // groupIndices[i] = i++;
- // // }
- // // }
- // for (int j : groupIndices) {
- // System.out.println("------- Existing LDAP GROUP ID:" + j);
- // }
- // com.allen_sauer.gwt.log.client.Log
- // .debug("Removing " + groupIndices.length + " LDAP Groups." + groupIndices);
- // System.out.println("Removing " + groupIndices.length + " LDAP Groups." + groupIndices);
- // // ldapManager.removeLdapGroupsFromRole(getSessionSubject(), roleId, groupIndices);
- // ldapManager.removeLdapGroupsFromRole(subjectManager.getOverlord(), roleId, groupIndices);
- // PageList<LdapGroup> nowGroups = ldapManager.findLdapGroupsByRole(roleId, PageControl.getUnlimitedInstance());
- // System.out.println("LDAP GROUP count for '"+roleId+"' after deletion. Cnt:"+nowGroups.size());
- // }
- // // System.out.println("------ Adding ldap groups to role:" + roleId + ":gpIds:" + groupIds);
- // com.allen_sauer.gwt.log.client.Log.debug("Adding " + groupIndices.length + " ldap groups to role[" + roleId
- // + "].");
- // System.out.println("NOW adding the following "+groupIn+" groupIds");
- // // ldapManager.addLdapGroupsToRole(getSessionSubject(), roleId, groupIds);
- // ldapManager.addLdapGroupsToRole(subjectManager.getOverlord(), roleId, groupIds);
- // try {
- // // ldapManager.addLdapGroupsToRole(getSessionSubject(), roleId, groupIds);
- // ldapManager.addLdapGroupsToRole(subjectManager.getOverlord(), roleId, groupIds);
- // } catch (Exception e) {
- // throw new RuntimeException(ThrowableUtil.getAllMessages(e));
- // }
-
}
public void updateLdapGroupAssignmentsForSubject(Subject subject) {
@@ -253,52 +167,19 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
}
@Override
- // public Set<LdapGroup> findLdapGroupsAssignedToRole(int roleId) {
public Set<Map<String, String>> findLdapGroupsAssignedToRole(int roleId) {
-
- // System.out.println("------- LDAPGWtServicveIMpl.findLdapGroupsAssignedToRole:" + roleId);
- // PageList<LdapGroup> allAssignedLdapGroups = ldapManager.findLdapGroupsByRole(roleId, PageControl
- // .getUnlimitedInstance());
- // // Set<LdapGroup> ldapGroups = new HashSet<LdapGroup>();
- // Set<Map<String, String>> ldapGroups = new HashSet<Map<String, String>>();
- // // for(LdapGroup group : allAssignedLdapGroups){
- // // ldapGroups.add(group);
- // // }
- // // allAssignedLdapGroups.addAll(ldapGroups);
- // // System.out.println("------------------ assignedGroups:" + ldapGroups.size());
- //
- // for (LdapGroup group : allAssignedLdapGroups) {
- // // ldapGroups.add(group);
- // HashMap<String, String> map = new HashMap<String, String>();
- // map.put("name", group.getName());
- // map.put("id", group.getName());
- // map.put("description", group.getDescription());
- // ldapGroups.add(map);
- // }
- // System.out.println("------------------ assignedGroups-2:" + ldapGroups.size());
-
- // return ldapGroups;
try {
- System.out.println("------- LDAPGWtServicveIMpl.findLdapGroupsAssignedToRole:" + roleId);
PageList<LdapGroup> allAssignedLdapGroups = ldapManager.findLdapGroupsByRole(roleId, PageControl
.getUnlimitedInstance());
- // Set<LdapGroup> ldapGroups = new HashSet<LdapGroup>();
Set<Map<String, String>> ldapGroups = new HashSet<Map<String, String>>();
- // for(LdapGroup group : allAssignedLdapGroups){
- // ldapGroups.add(group);
- // }
- // allAssignedLdapGroups.addAll(ldapGroups);
- // System.out.println("------------------ assignedGroups:" + ldapGroups.size());
for (LdapGroup group : allAssignedLdapGroups) {
- // ldapGroups.add(group);
HashMap<String, String> map = new HashMap<String, String>();
map.put("name", group.getName());
map.put("id", group.getName());
map.put("description", group.getDescription());
ldapGroups.add(map);
}
- System.out.println("------------------ assignedGroups:" + ldapGroups.size());
return SerialUtility.prepare(ldapGroups, "findLdapGroupsAssignedToRole");
} catch (Exception e) {
@@ -332,8 +213,6 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
com.allen_sauer.gwt.log.client.Log.debug("Subject has id of :" + currentSubject.getId()
+ "and requires Registration:" + needsRegistrationOrCaseIncorrectOnAccountName);
- // System.out.println("Subject has id of :" + currentSubject.getId() + ":needsRegistration:"
- // + needsRegistration);
// figure out if the user has a principal
String provider = LookupUtil.getSystemManager().getSystemConfiguration().getProperty(
@@ -341,8 +220,6 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
boolean ldapEnabled = ((provider != null) && provider.equals(RHQConstants.LDAPJAASProvider));
com.allen_sauer.gwt.log.client.Log.debug("LDAP Authentication has been enabled :" + ldapEnabled);
- // System.out.println("ldapAuthentication enabled :" + usingLDAP);
-
boolean hasPrincipal = false;
if (ldapEnabled) {
@@ -369,10 +246,6 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
LookupUtil.getSubjectManager().getOverlord(), subjectCriteria);
com.allen_sauer.gwt.log.client.Log.debug("Subjects located with name '" + user + "' and found:"
+ subjectsLocated.size());
- // System.out.println("Subjects located with name '" + currentSubject.getName() + "' and found:"
- // + subjectsLocated.size());
- // System.out.println("Subjects located with name '" + user + "' and found:"
- // + subjectsLocated.size());
//if subject variants located then take the first one with a principal otherwise do nothing
//To defend against the case where they create an account with the same name but not
@@ -383,16 +256,11 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW
+ ldapSubject.getName() + "]. "
+ "Attempting to authenticate with that account instead.";
com.allen_sauer.gwt.log.client.Log.info(msg);
- // System.out.println(msg);
com.allen_sauer.gwt.log.client.Log
.debug("Attempting to log back in with credentials passed in.");
- // System.out.println("-------------- About to log back in:");
newSubject = subjectManager.login(user, password);
- // sessionId = subject.getSessionId();
com.allen_sauer.gwt.log.client.Log.debug("Logged in as [" + ldapSubject.getName()
+ "] with session id [" + newSubject.getSessionId() + "]");
- // System.out.println("Logged in as [" + ldapSubject.getName() + "] with session id ["
- // + newSubject.getSessionId() + "]");
needsRegistrationOrCaseIncorrectOnAccountName = false;
}
}