Author: julien(a)jboss.com Date: 2008-04-11 17:13:10 -0400 (Fri, 11 Apr 2008) New Revision: 10542 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java Log: correct content type value Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2008-04-11 20:54:23 UTC (rev 10541) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2008-04-11 21:13:10 UTC (rev 10542) @@ -73,8 +73,7 @@ public void render(MarkupInfo markupInfo, ServletContextDispatcher dispatcher) throws IOException, ServletException { // Compute correct content type response header -// String contentType = rendererContext.getContentType() + "; charset=" + rendererContext.getCharset(); - String contentType = markupInfo.getMediaType() + "; charset=" + markupInfo.getCharset(); + String contentType = markupInfo.getMediaType().getValue() + "; charset=" + markupInfo.getCharset(); // Set charset and content type on the response dispatcher.getResponse().setContentType(contentType); Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml 2008-04-11 20:54:23 UTC (rev 10541) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml 2008-04-11 21:13:10 UTC (rev 10542) @@ -101,11 +101,6 @@ <!-- Service injected in the portlet context. --> <service> - <service-name>WebAppRegistry</service-name> - <service-class>org.jboss.portal.portlet.container.PortletApplicationRegistry</service-class> - <service-ref>:service=WebAppRegistry</service-ref> - </service> - <service> <service-name>PortalObjectContainer</service-name> <service-class>org.jboss.portal.core.model.portal.PortalObjectContainer</service-class> <service-ref>:container=PortalObject</service-ref>