Index: lams_central/src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/Attic/ShibExportPortfolioServlet.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_central/src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java	24 Jul 2007 00:46:17 -0000	1.1.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java	24 Jul 2007 04:08:50 -0000	1.1.2.2
@@ -44,7 +44,7 @@
  * @author jliew
  * 
  * @web:servlet name="ShibExportPortfolioServlet" load-on-startup="1"
- * @web:servlet-mapping url-pattern="/servlet/shibexportportfolio"
+ * @web:servlet-mapping url-pattern="/shibexportportfolio"
  */
 public class ShibExportPortfolioServlet extends HttpServlet {
 	
Index: lams_central/src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/Attic/ShibLearnerServlet.java,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_central/src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java	24 Jul 2007 00:46:17 -0000	1.1.2.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java	24 Jul 2007 04:08:50 -0000	1.1.2.6
@@ -44,7 +44,7 @@
  * @author jliew
  * 
  * @web:servlet name="ShibLearnerServlet" load-on-startup="1"
- * @web:servlet-mapping url-pattern="/servlet/shiblearner"
+ * @web:servlet-mapping url-pattern="/shiblearner"
  */
 public class ShibLearnerServlet extends HttpServlet {
 	
Index: lams_central/src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/Attic/ShibMonitorServlet.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_central/src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java	24 Jul 2007 00:46:17 -0000	1.1.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java	24 Jul 2007 04:08:50 -0000	1.1.2.2
@@ -44,7 +44,7 @@
  * @author jliew
  * 
  * @web:servlet name="ShibMonitorServlet" load-on-startup="1"
- * @web:servlet-mapping url-pattern="/servlet/shibmonitor"
+ * @web:servlet-mapping url-pattern="/shibmonitor"
  */
 public class ShibMonitorServlet extends HttpServlet {
 	
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.20.2.6 -r1.20.2.7
--- lams_central/web/includes/javascript/openUrls.js	24 Jul 2007 00:46:16 -0000	1.20.2.6
+++ lams_central/web/includes/javascript/openUrls.js	24 Jul 2007 04:08:50 -0000	1.20.2.7
@@ -118,7 +118,7 @@
 		
 		function openFedMonitorLesson( lessonId, fedServerHost, localIdPHandler, providerId )
 		{
-			var target = fedServerHost+'/lams/servlet/shibmonitor?lessonID='+lessonId;
+			var target = fedServerHost+'/lams/shibmonitor?lessonID='+lessonId;
 			var shire = fedServerHost+'/Shibboleth.sso/SAML/POST';
 			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId='+providerId;
 			
@@ -194,7 +194,7 @@
 		
 		function openFedLearner( lessonId, fedServerHost, localIdPHandler, providerId )
 		{
-			var target = fedServerHost+'/lams/servlet/shiblearner?lessonID='+lessonId;
+			var target = fedServerHost+'/lams/shiblearner?lessonID='+lessonId;
 			var shire = fedServerHost+'/Shibboleth.sso/SAML/POST';
 			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId='+providerId;
 			
@@ -239,24 +239,24 @@
 		
 		function openFedExportPortfolio( lessonId, fedServerHost, localIdPHandler, providerId )
 		{
-			var target = fedServerHost+'/lams/servlet/shibexportportfolio?lessonID='+lessonId;
+			var target = fedServerHost+'/lams/shibexportportfolio?lessonID='+lessonId;
 			var shire = fedServerHost+'/Shibboleth.sso/SAML/POST';
 			var url = localIdPHandler+'?target='+target+'&shire='+shire+'&providerId='+providerId;
 			
 			if(isMac)
 			{
-				epWin = window.open('learning/exportWaitingPage.jsp?mode=learner&lessonID='+lessonId,'epWindow','width=796,height=570,resizable,status=yes');
+				epWin = window.open(url,'epWindow','width=796,height=570,resizable,status=yes');
 			}
 			else
 			{
 				if(epWin && !epWin.closed )
 				{
-					epWin.location = 'learning/exportWaitingPage.jsp?mode=learner&lessonID='+lessonId;		
+					epWin.location = url;		
 					ep.focus();
 				}
 				else
 				{
-					epWin = window.open('learning/exportWaitingPage.jsp?mode=learner&lessonID='+lessonId,'epWindow','width=796,height=570,resizable,status=yes');
+					epWin = window.open(url,'epWindow','width=796,height=570,resizable,status=yes');
 				}
 			}
 		}