Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java
===================================================================
diff -u -re59129bed6eaac41c89b856a645f10bc239b2fbe -rfa2d26e27db1732228b9b890dc1f71eeb8507a6d
--- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java	(.../LearningDesignRepositorySoapBindingImpl.java)	(revision e59129bed6eaac41c89b856a645f10bc239b2fbe)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java	(.../LearningDesignRepositorySoapBindingImpl.java)	(revision fa2d26e27db1732228b9b890dc1f71eeb8507a6d)
@@ -39,7 +39,6 @@
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
 import org.lamsfoundation.lams.integration.security.Authenticator;
 import org.lamsfoundation.lams.integration.service.IntegrationService;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException;
 import org.lamsfoundation.lams.util.MessageService;
@@ -161,24 +160,24 @@
 			Authenticator.authenticate(serverMap, datetime, username, hashValue);
 			ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(serverMap, username);
 			integrationService.getExtCourseClassMap(serverMap, userMap, courseId, country, lang);
-			return buildContentTree(userMap.getUser()).toString();
+			return buildContentTree(userMap.getUser().getUserId()).toString();
 		} catch (Exception e) {
 			log.debug(e.getMessage(),e);
 			throw new RemoteException(e.getMessage(), e);
 		}
 
 	}
 
-	private ContentTreeNode buildContentTree(User user) throws IOException,
+	private ContentTreeNode buildContentTree(Integer userId) throws IOException,
 			UserAccessDeniedException, RepositoryCheckedException {
-		log.debug("User Id - "+user.getUserId());
+		log.debug("User Id - "+userId);
 		FolderContentDTO rootFolder = new FolderContentDTO(msgService
 				.getMessage("label.workspace.root_folder"), msgService.getMessage("folder"), null,
 				null, FolderContentDTO.FOLDER, WorkspaceAction.BOOTSTRAP_FOLDER_ID.longValue(),
 				WorkspaceFolder.READ_ACCESS, null);
 		ContentTreeNode root = new ContentTreeNode(rootFolder);
-		FolderContentDTO userFolder = service.getUserWorkspaceFolder(user.getUserId());
-		root.addChild(buildContentTreeNode(userFolder, user.getUserId()));
+		FolderContentDTO userFolder = service.getUserWorkspaceFolder(userId);
+		root.addChild(buildContentTreeNode(userFolder, userId));
 		FolderContentDTO dummyOrgFolder = new FolderContentDTO(msgService
 				.getMessage("organisations"), msgService.getMessage("folder"), null, null,
 				FolderContentDTO.FOLDER, new Long(WorkspaceAction.ORG_FOLDER_ID.longValue()),
@@ -187,10 +186,10 @@
 		//tried using service.getAccessibleOrganisationWorkspaceFolders(userId) api, 
 		//but it doesn't work, the userOrganisations set of the user 
 		// got from workspaceManagementService with the userId supplied is empty, which is not true.
-		Vector orgFolders = service.getAccessibleOrganisationWorkspaceFolders(user);
+		Vector orgFolders = service.getAccessibleOrganisationWorkspaceFolders(userId);
 		for (int i = 0; i < orgFolders.size(); i++) {
 			FolderContentDTO orgFolder = (FolderContentDTO) orgFolders.get(i);
-			dummyOrgNode.addChild(buildContentTreeNode(orgFolder, user.getUserId()));
+			dummyOrgNode.addChild(buildContentTreeNode(orgFolder, userId));
 		}
 		root.addChild(dummyOrgNode);
 		return root;