Index: lams_documents/lams_tool_laqa/DeployAndRunQaAuthoringModule.doc =================================================================== RCS file: /usr/local/cvsroot/lams_documents/lams_tool_laqa/DeployAndRunQaAuthoringModule.doc,v diff -u Binary files differ Index: lams_documents/lams_tool_laqa/UsingQaAuthoringUrl.doc =================================================================== RCS file: /usr/local/cvsroot/lams_documents/lams_tool_laqa/UsingQaAuthoringUrl.doc,v diff -u Binary files differ Index: lams_documents/lams_tool_laqa/authoringOutput.GIF =================================================================== RCS file: /usr/local/cvsroot/lams_documents/lams_tool_laqa/authoringOutput.GIF,v diff -u Binary files differ Index: lams_tool_laqa/docs/DeployAndRunQaAuthoringModule.doc =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/docs/Attic/DeployAndRunQaAuthoringModule.doc,v diff -u Binary files differ Index: lams_tool_laqa/docs/UsingQaAuthoringUrl.doc =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/docs/Attic/UsingQaAuthoringUrl.doc,v diff -u Binary files differ Index: lams_tool_laqa/docs/authoringOutput.GIF =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/docs/Attic/authoringOutput.GIF,v diff -u Binary files differ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v diff -u -r1.14 -r1.15 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 18 Jul 2005 23:33:04 -0000 1.14 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 20 Jul 2005 01:16:02 -0000 1.15 @@ -61,6 +61,10 @@ * */ +/* + * check back QaUtils.configureContentRepository(request); + */ + package org.lamsfoundation.lams.tool.qa.web; import java.io.IOException; import java.util.Iterator; @@ -120,8 +124,41 @@ request.getSession().setAttribute(TOOL_SERVICE, qaService); } - QaUtils.configureContentRepository(request); + //QaUtils.configureContentRepository(request); + /** + * obtain and setup the current user's data + */ + String userId=""; + User toolUser=(User)request.getSession().getAttribute(TOOL_USER); + if (toolUser != null) + userId=toolUser.getUserId().toString(); + else + { + userId=request.getParameter(USER_ID); + if ((userId == null) || (userId.length()==0)) + { + logger.debug("error: The tool expects userId"); + persistError(request,"error.authoringUser.notAvailable"); + request.setAttribute(USER_EXCEPTION_USERID_NOTAVAILABLE, new Boolean(true)); + return (mapping.findForward(LOAD_QUESTIONS)); + } + + try + { + /* Check QaUtils.createAuthoringUser again User Management Service is ready */ + User user=QaUtils.createSimpleUser(new Integer(userId)); + request.getSession().setAttribute(TOOL_USER, user); + } + catch(NumberFormatException e) + { + persistError(request,"error.userId.notNumeric"); + request.setAttribute(USER_EXCEPTION_USERID_NOTNUMERIC, new Boolean(true)); + return (mapping.findForward(LOAD_QUESTIONS)); + } + } + + /** * retrieve the default content id based on tool signature */ @@ -190,39 +227,7 @@ request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(false)); request.setAttribute(FORM_INDEX, "0"); - /** - * obtain and setup the current user's data - */ - String userId=""; - User toolUser=(User)request.getSession().getAttribute(TOOL_USER); - if (toolUser != null) - userId=toolUser.getUserId().toString(); - else - { - userId=request.getParameter(USER_ID); - try - { - /* Check QaUtils.createAuthoringUser again User Management Service is ready */ - User user=QaUtils.createSimpleUser(new Integer(userId)); - request.getSession().setAttribute(TOOL_USER, user); - } - catch(NumberFormatException e) - { - persistError(request,"error.userId.notNumeric"); - request.setAttribute(USER_EXCEPTION_USERID_NOTNUMERIC, new Boolean(true)); - return (mapping.findForward(LOAD_QUESTIONS)); - } - } - if ((userId == null) || (userId.length()==0)) - { - logger.debug("error: The tool expects userId"); - persistError(request,"error.authoringUser.notAvailable"); - request.setAttribute(USER_EXCEPTION_USERID_NOTAVAILABLE, new Boolean(true)); - return (mapping.findForward(LOAD_QUESTIONS)); - } - - /** * find out whether the request is coming from monitoring module for EditActivity tab or from authoring environment url */