Index: lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rb0481095d432ab860d263a74c20969fd000f6b9b
--- lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java	(.../ThemeAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/themes/web/ThemeAction.java	(.../ThemeAction.java)	(revision b0481095d432ab860d263a74c20969fd000f6b9b)
@@ -61,12 +61,6 @@
 	
 	private static Logger log = Logger.getLogger(ThemeAction.class);
 
-	/** If you want the output given as a jsp, set the request parameter "jspoutput" to 
-     * some value other than an empty string (e.g. 1, true, 0, false, blah). 
-     * If you want it returned as a stream (ie for Flash), do not define this parameter
-     */  
-	public static String USE_JSP_OUTPUT = "jspoutput";
-	
 	/** Id of theme to be retrieved from the db */
 	public static final String THEME_ID_PARAMETER = "themeID";
 	
@@ -103,15 +97,9 @@
 	 */
 	private ActionForward outputPacket(ActionMapping mapping, HttpServletRequest request, HttpServletResponse response,
 	        		String wddxPacket, String parameterName) throws IOException {
-	    String useJSP = WebUtil.readStrParam(request, USE_JSP_OUTPUT, true);
-	    if ( useJSP != null && useJSP.length() >= 0 ) {
-		    request.getSession().setAttribute(parameterName,wddxPacket);
-		    return mapping.findForward("success");
-	    } else {
-	        PrintWriter writer = response.getWriter();
-	        writer.println(wddxPacket);
-	        return null;
-	    }
+		PrintWriter writer = response.getWriter();
+		writer.println(wddxPacket);
+		return null;
 	}
 	
 	
@@ -129,7 +117,6 @@
 		Long themeId = new Long(WebUtil.readLongParam(request,THEME_ID_PARAMETER));
 		IThemeService themeService = getThemeService();
 		String message = themeService.getTheme(themeId);
-		request.getSession().setAttribute("message",message);
 		return outputPacket(mapping, request, response, message, "message");
 	}
 
@@ -149,7 +136,6 @@
 	    
 	    IThemeService themeService = getThemeService();
 	    String message = themeService.getThemes();
-	    request.getSession().setAttribute("message",message);
 	    return outputPacket(mapping, request, response, message, "message");
 	}
 	
@@ -189,7 +175,6 @@
 		} catch ( Exception e) {
 		     flashMessage = FlashMessage.getExceptionOccured("setTheme", e.getMessage());
 		}
-		request.getSession().setAttribute("message", flashMessage.serializeMessage());
 		return outputPacket(mapping, request, response, flashMessage.serializeMessage(), "message");
 		
 	}