Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java,v
diff -u -r1.6 -r1.7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	1 Jun 2006 04:47:53 -0000	1.6
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	9 Jun 2006 00:00:18 -0000	1.7
@@ -90,7 +90,7 @@
 		while (i.hasNext()) {
 			Activity subActivity = (Activity)i.next();
 			ActivityURL activityURL = new ActivityURL();
-			String url = actionMappings.getActivityURL(subActivity, learnerProgress);
+			String url = actionMappings.getActivityURL(subActivity);
 			activityURL.setUrl(url);
 			activityURL.setActivityId(subActivity.getActivityId());
 			activityURL.setTitle(subActivity.getTitle());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java,v
diff -u -r1.6 -r1.7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java	5 Apr 2006 23:08:08 -0000	1.6
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java	9 Jun 2006 00:00:18 -0000	1.7
@@ -70,7 +70,6 @@
 		
 		actionMappings.setActivityMappingStrategy(new ParallelActivityMappingStrategy());
 		
-		LearnerProgress learnerProgress = getLearnerProgress(request);
 		Activity activity = LearningWebUtil.getActivityFromRequest(request, getLearnerService());
 		if (!(activity instanceof ParallelActivity)) {
 		    log.error(className+": activity not ParallelActivity "+activity.getActivityId());
@@ -87,7 +86,7 @@
 		{
 			Activity subActivity = (Activity)i.next();
 			ActivityURL activityURL = new ActivityURL(); 
-			String url = actionMappings.getActivityURL(subActivity, learnerProgress);
+			String url = actionMappings.getActivityURL(subActivity);
 			activityURL.setUrl(url);
 			activityURLs.add(activityURL);
 		}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java,v
diff -u -r1.19 -r1.20
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	8 Jun 2006 01:03:02 -0000	1.19
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	9 Jun 2006 00:00:18 -0000	1.20
@@ -86,8 +86,7 @@
         ActionForward actionForward = null;
 
         //String strutsAction = getActivityAction(activity, progress);
-        String strutsAction = this.activityMappingStrategy.getActivityAction(activity,
-                                                                             progress);
+        String strutsAction = this.activityMappingStrategy.getActivityAction(activity);
         if (activity.isToolActivity())
         {
             // always use redirect false for a ToolActivity as ToolDisplayActivity
@@ -152,8 +151,7 @@
                     // if previous activity was a parallel activity then we need to
                     // clear frames.
                     String strutsAction = "/requestDisplay.do";
-                    String activityURL = this.getActivityURL(progress.getNextActivity(),
-                                                             progress);
+                    String activityURL = this.getActivityURL(progress.getNextActivity());
                     strutsAction += "?url=" + activityURL;
                     actionForward = strutsActionToForward(strutsAction,
                                                           null,
@@ -225,10 +223,9 @@
      * @param activity, the Activity to be displayed
      * @param progress, the LearnerProgress associated with the Activity and learner
      */
-    public String getActivityURL(Activity activity, LearnerProgress progress)
+    public String getActivityURL(Activity activity)
     {
-        String strutsAction = this.activityMappingStrategy.getActivityAction(activity,
-                                                                             progress);
+        String strutsAction = this.activityMappingStrategy.getActivityAction(activity);
         return strutsActionToURL(strutsAction, activity, true);
     }
 
@@ -265,8 +262,7 @@
             else
             {
                 // display next activity
-                activityURL = this.getActivityURL(progress.getNextActivity(),
-                                                  progress);
+                activityURL = this.getActivityURL(progress.getNextActivity());
                 if (progress.getPreviousActivity().isParallelActivity())
                 {
                     // if previous activity was a parallel activity then we need to
@@ -376,16 +372,13 @@
                                                       Activity activity)
     {
 
-        if (activity.isToolActivity())
+        if (activity.isToolActivity() || activity.isSystemToolActivity())
         {
-            return getLearnerToolURL(lesson, ((ToolActivity) activity), learner);
+            return WebUtil.convertToFullURL(getLearnerToolURL(lesson, ((ToolActivity) activity), learner));
+        } else {
+        	// fall back to the strategy for complex activities
+        	return getActivityURL(activity);
         }
-        else if (activity.isGroupingActivity())
-            //TODO need to be changed when group action servlet is done
-            return getActivityURL(activity, null);
-
-        throw new LearnerServiceException("Fails to get the progress url view"
-                + " for activity[" + activity.getActivityId().longValue() + "]");
     }
 
     public void setToolService(ILamsCoreToolService toolService)
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java,v
diff -u -r1.9 -r1.10
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java	10 May 2006 05:30:46 -0000	1.9
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java	9 Jun 2006 00:00:18 -0000	1.10
@@ -41,9 +41,8 @@
 	 * @param progress, LearnerProgress for the activity, used to check activity status
 	 * @return String representing a struts action
 	 */
-	protected String getActivityAction(Activity activity, LearnerProgress progress) {
+	protected String getActivityAction(Activity activity) {
 		String strutsAction = null;
-		
 		if ( activity.isComplexActivity() ) {
 			if ( activity.isParallelActivity() )
 		        strutsAction = "/DisplayParallelActivity.do";
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ParallelActivityMappingStrategy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ParallelActivityMappingStrategy.java,v
diff -u -r1.3 -r1.4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ParallelActivityMappingStrategy.java	5 Apr 2006 23:08:08 -0000	1.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ParallelActivityMappingStrategy.java	9 Jun 2006 00:00:18 -0000	1.4
@@ -46,7 +46,7 @@
 		if (progress.getProgressState(activity) == LearnerProgress.ACTIVITY_COMPLETED) 
 	        strutsAction = "/parallelWait.do";
 		else
-			strutsAction = super.getActivityAction(activity, progress);
+			strutsAction = super.getActivityAction(activity);
 		return strutsAction;
 	}