ejtools-cvs

[Laurent E. <let...@us...>]

Update of /cvsroot/ejtools/libraries/common/src/main/net/sourceforge/ejtools/servlet/http
In directory usw-pr-cvs1:/tmp/cvs-serv29135/src/main/net/sourceforge/ejtools/servlet/http

Modified Files:
	XSLFilter.java 
Log Message:
Change content type management

Index: XSLFilter.java
===================================================================
RCS file: /cvsroot/ejtools/libraries/common/src/main/net/sourceforge/ejtools/servlet/http/XSLFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XSLFilter.java	19 Apr 2002 07:04:50 -0000	1.1
--- XSLFilter.java	20 Apr 2002 11:43:52 -0000	1.2
***************
*** 22,25 ****
--- 22,26 ----
  {
  	protected Transformer transformer = null;
+ 	protected String stylePath = null;
  	protected String contentType = null;
  	protected FilterConfig config = null;
***************
*** 29,43 ****
  		this.config = config;
  
- 		System.out.println("Acquiring parameters...");
  		this.contentType = config.getInitParameter("mime-type");
  		String styleSheet = config.getInitParameter("stylesheet");
! 		System.out.println("Acquiring styletsheet " + styleSheet );
! 
  		String stylePath = config.getServletContext().getRealPath(styleSheet);
  
  		try
  		{
! 			System.out.println("Compiling styletsheet " + stylePath);
! 
  			TransformerFactory tFactory = TransformerFactory.newInstance();
  			transformer = tFactory.newTransformer(new StreamSource(stylePath));
--- 30,42 ----
  		this.config = config;
  
  		this.contentType = config.getInitParameter("mime-type");
+ 		System.out.println("Acquiring parameter mime-type=" + contentType);
  		String styleSheet = config.getInitParameter("stylesheet");
! 		System.out.println("Acquiring parameter stylesheet=" + styleSheet);
  		String stylePath = config.getServletContext().getRealPath(styleSheet);
  
  		try
  		{
! 			System.out.println("Compiling stylesheet...");
  			TransformerFactory tFactory = TransformerFactory.newInstance();
  			transformer = tFactory.newTransformer(new StreamSource(stylePath));
***************
*** 45,50 ****
  		catch (Exception e)
  		{
! 			transformer = null;
! 			throw new ServletException(e.toString());
  		}
  	}
--- 44,48 ----
  		catch (Exception e)
  		{
! 			System.out.println(e.toString());
  		}
  	}
***************
*** 57,65 ****
  	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
  	{
  		StringResponseWrapper wrapper = new StringResponseWrapper((HttpServletResponse) response);
  		chain.doFilter(request, wrapper);
  
- 		response.setContentType(contentType);
- 		PrintWriter out = response.getWriter();
  		StringReader reader = new StringReader(wrapper.toString());
  		Source source = new StreamSource(reader);
--- 55,64 ----
  	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
  	{
+ 		response.setContentType(contentType);
+ 		PrintWriter out = response.getWriter();
+ 
  		StringResponseWrapper wrapper = new StringResponseWrapper((HttpServletResponse) response);
  		chain.doFilter(request, wrapper);
  
  		StringReader reader = new StringReader(wrapper.toString());
  		Source source = new StreamSource(reader);
***************
*** 67,75 ****
--- 66,77 ----
  		try
  		{
+ 			System.out.println("Creating Writer...");
  			StringWriter writer = new StringWriter();
  			StreamResult result = new StreamResult(writer);
  
+ 			System.out.println("Applying stylesheet...");
  			transformer.transform(source, result);
  
+ 			System.out.println("Ouputing...");
  			response.setContentLength(writer.toString().length());
  			out.println(writer.toString());