You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/05/17 18:54:13 UTC

svn commit: r539009 - in /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice: ServletConnection.java util/BlockCallHttpServletResponse.java

Author: gkossakowski
Date: Thu May 17 09:54:12 2007
New Revision: 539009

URL: http://svn.apache.org/viewvc?view=rev&rev=539009
Log:
Implementing handling of content (mime) type.

Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletConnection.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletResponse.java

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletConnection.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletConnection.java?view=diff&rev=539009&r1=539008&r2=539009
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletConnection.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletConnection.java Thu May 17 09:54:12 2007
@@ -152,6 +152,10 @@
     	return getHeaderFieldDate("Last-Modified", 0);
     }
     
+    public String getContentType() {
+    	return getHeaderField("Content-Type");
+    }
+
     public long getHeaderFieldDate(String name, long Default) {
     	try {
     	    return response.getDateHeader(name);

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletResponse.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletResponse.java?view=diff&rev=539009&r1=539008&r2=539009
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletResponse.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/BlockCallHttpServletResponse.java Thu May 17 09:54:12 2007
@@ -275,9 +275,9 @@
      * @see javax.servlet.ServletResponse#setContentType(java.lang.String)
      */
     public void setContentType(String type) {
-        // Ignore
+        setHeader("Content-Type", type);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, long)
      */
@@ -355,8 +355,7 @@
     }
 
     public String getContentType() {
-        // TODO Auto-generated method stub
-        return null;
+    	return getHeader("Content-Type");
     }
 
     public void setCharacterEncoding(String arg0) {