Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java,v
diff -u -r1.11 -r1.11.6.1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java	17 Sep 2006 06:12:05 -0000	1.11
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java	27 Apr 2007 00:29:54 -0000	1.11.6.1
@@ -39,5 +39,4 @@
 	
 	// used for tool content folder creation.
 	public static final String LAMS_WWW_FOLDER = "www/";
-	public static final String LAMS_LAMS_FOLDER = "lams/";
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java,v
diff -u -r1.5 -r1.5.6.1
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java	30 Oct 2006 04:09:17 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java	27 Apr 2007 00:29:54 -0000	1.5.6.1
@@ -80,6 +80,7 @@
 	
 	private static String baseDir;
 	private String realBaseDir;
+	private String lamsContextPath;
 	private static boolean debug=false;
 	
 	/**
@@ -96,6 +97,7 @@
 			baseDir="secure";
 		
 		realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR + File.separator + baseDir;
+		lamsContextPath = "/" + Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH) +"/";
 		
 		File baseFile=new File(realBaseDir);
 		if(!baseFile.exists()){
@@ -127,7 +129,7 @@
 		String currentDirPath=realBaseDir + currentFolderStr;
 		String validCurrentDirPath = currentDirPath.replace('/', File.separatorChar);
 		
-		String currentWebPath= "/" + AuthoringConstants.LAMS_LAMS_FOLDER + AuthoringConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr + "/";
+		String currentWebPath= lamsContextPath + AuthoringConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr + "/";
 		
 		File currentContentDir=new File(validCurrentDirPath);
 		if(!currentContentDir.exists()){
Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java,v
diff -u -r1.5 -r1.5.6.1
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	30 Oct 2006 04:09:17 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	27 Apr 2007 00:29:54 -0000	1.5.6.1
@@ -75,6 +75,7 @@
 	
 	private static String baseDir;
 	private String realBaseDir;
+	private String lamsContextPath;
 	private static boolean debug=false;
 	private static boolean enabled=false;
 	private static Hashtable allowedExtensions;
@@ -100,7 +101,8 @@
 			baseDir="secure";
 		
 		realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR + File.separator + baseDir;
-		
+		lamsContextPath = "/" + Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH) +"/";
+
 		File baseFile=new File(realBaseDir);
 		if(!baseFile.exists()){
 			baseFile.mkdir();
@@ -167,7 +169,7 @@
 		String currentDirPath=realBaseDir + currentFolderStr;
 		String validCurrentDirPath = currentDirPath.replace('/', File.separatorChar);
 		
-		String currentWebPath= "/" + AuthoringConstants.LAMS_LAMS_FOLDER + AuthoringConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr;
+		String currentWebPath= lamsContextPath + AuthoringConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr;
 		
 		File currentContentDir=new File(validCurrentDirPath);
 		if(!currentContentDir.exists()){