Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r6a4cc1cba568d6ed7af70248ad7f89b757e8f468 -r486b433974e9f87034b1c4a16ec7d21f7072b964 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java =================================================================== diff -u -r8e8a1f2b58ed44e9480b576fbbbea82b98a028a2 -r486b433974e9f87034b1c4a16ec7d21f7072b964 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java (.../AuthoringConstants.java) (revision 8e8a1f2b58ed44e9480b576fbbbea82b98a028a2) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java (.../AuthoringConstants.java) (revision 486b433974e9f87034b1c4a16ec7d21f7072b964) @@ -33,10 +33,7 @@ /** Spring context name for refering to the authoring service */ public static final String AUTHORING_SERVICE_BEAN_NAME = "authoringService"; public static final String TOOL_SERVICE_BEAN_NAME = "lamsToolService"; - public static final String EXPORT_TOOLCONTENT_SERVICE_BEAN_NAME = "exportToolContentService"; - public static final String PARAM_LEARING_DESIGN_ID = "learingDesignID"; - //used by all tool authoring action class to mark the success flag. public static final String LAMS_AUTHORING_SUCCESS_FLAG = "LAMS_AUTHORING_SUCCESS_FLAG"; } Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentServlet.java =================================================================== diff -u -r8e8a1f2b58ed44e9480b576fbbbea82b98a028a2 -r486b433974e9f87034b1c4a16ec7d21f7072b964 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentServlet.java (.../ExportToolContentServlet.java) (revision 8e8a1f2b58ed44e9480b576fbbbea82b98a028a2) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentServlet.java (.../ExportToolContentServlet.java) (revision 486b433974e9f87034b1c4a16ec7d21f7072b964) @@ -38,6 +38,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; +import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -50,21 +51,24 @@ public class ExportToolContentServlet extends HttpServlet { private static final long serialVersionUID = 1L; + public static final String EXPORT_TOOLCONTENT_SERVICE_BEAN_NAME = "exportToolContentService"; + public static final String PARAM_LEARING_DESIGN_ID = "learningDesignID"; + private Logger log = Logger.getLogger(ExportToolContentServlet.class); /* * @see javax.servlet.http.HttpServlet.service(HttpServletRequest, HttpServletResponse) */ public void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - Long learningDesignId = WebUtil.readLongParam(request,AuthoringConstants.PARAM_LEARING_DESIGN_ID); + Long learningDesignId = WebUtil.readLongParam(request,PARAM_LEARING_DESIGN_ID); IExportToolContentService service = getExportService(); try { - String zipFilename = service.exportToolContent(learningDesignId); + String zipFilename = service.exportLearningDesign(learningDesignId); //write zip file as response stream. response.setContentType("application/zip"); - response.setHeader("Content-Disposition","attachment;"); + response.setHeader("Content-Disposition","attachment;filename="+FileUtil.getFileName(zipFilename)); InputStream in = new BufferedInputStream(new FileInputStream(zipFilename)); OutputStream out = response.getOutputStream(); try { @@ -101,6 +105,6 @@ //*************************************************************************************** private IExportToolContentService getExportService(){ WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext()); - return (IExportToolContentService) webContext.getBean(AuthoringConstants.EXPORT_TOOLCONTENT_SERVICE_BEAN_NAME); + return (IExportToolContentService) webContext.getBean(EXPORT_TOOLCONTENT_SERVICE_BEAN_NAME); } }