Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u -r022d9c018529c0a56fbfedce29fde64624d1071a -r60a2ec1b6dc4618652303d3c30b3854599942366
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 022d9c018529c0a56fbfedce29fde64624d1071a)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 60a2ec1b6dc4618652303d3c30b3854599942366)
@@ -72,7 +72,6 @@
 	
 	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
 		<property name="toolService"><ref bean="lamsCoreToolService"/></property>
-		<property name="baseURL"><value>http://localhost:8080/lams/learning</value></property>
 	</bean>
 	
 	<!-- bean id="dummyLearnerService" class="org.lamsfoundation.lams.learning.service.DummyLearnerService" singleton="false">
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
diff -u -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b -r60a2ec1b6dc4618652303d3c30b3854599942366
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	(.../ActivityMapping.java)	(revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	(.../ActivityMapping.java)	(revision 60a2ec1b6dc4618652303d3c30b3854599942366)
@@ -40,6 +40,8 @@
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
 
 /**
@@ -61,11 +63,11 @@
     public static final String NO_SESSION_ERROR = "noSessionError";
     public static final String NO_ACCESS_ERROR = "noAccessError";
     public static final String DOUBLE_SUBMIT_ERROR = "doubleSubmitError";
+    public static final String LEARNING = "learning";
 
     private ActivityMappingStrategy activityMappingStrategy = new ActivityMappingStrategy();
 
     private ILamsCoreToolService toolService;
-    private String baseURL;
 
     /**
      * Creates a Struts ActionForward to display an activity.
@@ -274,18 +276,13 @@
         }
         if (useContext)
         {
-            String lamsUrl = getLamsURL();
+            String lamsUrl = Configuration.get(ConfigurationKeys.SERVER_URL) + LEARNING;
             url = lamsUrl + url;
         }
 
         return url;
     }
 
-    private String getLamsURL()
-    {
-        return baseURL;
-    }
-
     /**
      * Creates a Struts ActionForward for an action and activity.
      * @param strutsAction, the struts action
@@ -343,11 +340,6 @@
         this.toolService = toolService;
     }
 
-    public void setBaseURL(String baseURL)
-    {
-        this.baseURL = baseURL;
-    }
-
     public ActivityMappingStrategy getActivityMappingStrategy()
     {
         return activityMappingStrategy;