Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
   Merged /authz/trunk:r69108

Index: authz-tool/tool/src/java/org/sakaiproject/authz/tool/RealmsAction.java
===================================================================
--- authz-tool/tool/src/java/org/sakaiproject/authz/tool/RealmsAction.java	(revision 67249)
+++ authz-tool/tool/src/java/org/sakaiproject/authz/tool/RealmsAction.java	(working copy)
@@ -23,6 +23,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Vector;
 
 import org.sakaiproject.authz.api.AuthzGroup;
@@ -30,7 +31,6 @@
 import org.sakaiproject.authz.api.GroupAlreadyDefinedException;
 import org.sakaiproject.authz.api.GroupIdInvalidException;
 import org.sakaiproject.authz.api.GroupNotDefinedException;
-import org.sakaiproject.authz.api.GroupProvider;
 import org.sakaiproject.authz.api.Member;
 import org.sakaiproject.authz.api.Role;
 import org.sakaiproject.authz.api.RoleAlreadyDefinedException;
@@ -47,8 +47,6 @@
 import org.sakaiproject.cheftool.menu.MenuEntry;
 import org.sakaiproject.cheftool.menu.MenuImpl;
 import org.sakaiproject.component.cover.ComponentManager;
-import org.sakaiproject.coursemanagement.api.CourseManagementService;
-import org.sakaiproject.coursemanagement.api.exception.IdNotFoundException;
 import org.sakaiproject.event.api.SessionState;
 import org.sakaiproject.javax.PagingPosition;
 import org.sakaiproject.user.api.User;
@@ -67,10 +65,7 @@
 
 	/** Resource bundle using current language locale */
 	private static ResourceLoader rb = new ResourceLoader("authz-tool");
-	
-	private org.sakaiproject.coursemanagement.api.CourseManagementService cms = (org.sakaiproject.coursemanagement.api.CourseManagementService) ComponentManager
-	.get(org.sakaiproject.coursemanagement.api.CourseManagementService.class);
-	
+
 	private org.sakaiproject.authz.api.GroupProvider groupProvider = (org.sakaiproject.authz.api.GroupProvider) ComponentManager
 	.get(org.sakaiproject.authz.api.GroupProvider.class);
 
@@ -771,9 +766,17 @@
 			{
- 				try
- 				{
-				cms.getSection(providers[i]);
+				// no Exception is defined to be thrown from GroupProvider's getuserRolesForGroup(String) call
+				// we will check for the null or empty returned value as an indicator for invalid provider id.
+				Map<String, String> userRoles = groupProvider.getUserRolesForGroup(providers[i]);
+				if (userRoles == null || userRoles.isEmpty())
+				{
+					// if provider id isn't found or is null then an empty collection should be returned.
+					// is it proper to issue the following alert?
+					addAlert(state, rb.getString("realm.noProviderIdFound") + " " +  rb.getString("realm.edit.provider") + providers[i] + ". ");
+				}
- 				}
-				catch (IdNotFoundException e)
- 				{
- 					addAlert(state, rb.getString("realm.noProviderIdFound") + " " +  rb.getString("realm.edit.provider") + providers[i] + ". ");
- 				}
Index: authz-tool/tool/pom.xml
===================================================================
--- authz-tool/tool/pom.xml	(revision 67249)
+++ authz-tool/tool/pom.xml	(working copy)
@@ -61,10 +61,6 @@
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-velocity-tool</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-coursemanagement-api</artifactId>
-    </dependency>
 <!--org.sakaiprojectsakai-component${sakai.version}-->
 <!-- velocity and dependencies (logkit, oro, collections) -->
     <dependency>