From do-not-reply at jboss.org Fri Feb 26 11:12:41 2010
Content-Type: multipart/mixed; boundary="===============8878801281096218044=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r1886 - in portal/trunk:
 webui/portal/src/main/java/org/exoplatform/portal/application and 1 other
 directory.
Date: Fri, 26 Feb 2010 11:12:41 -0500
Message-ID: <201002261612.o1QGCf2b006120@svn01.web.mwc.hst.phx2.redhat.com>

--===============8878801281096218044==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mwringe
Date: 2010-02-26 11:12:40 -0500 (Fri, 26 Feb 2010)
New Revision: 1886

Modified:
   portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UI=
PortalApplication.gtmpl
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicati=
on/PortalRequestContext.java
Log:
Return the markup headers as strings instead of elements so that we can pri=
nt the markup headers without the xml encoding line (GTNPORTAL-762).

Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/works=
pace/UIPortalApplication.gtmpl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/U=
IPortalApplication.gtmpl	2010-02-26 14:54:09 UTC (rev 1885)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/U=
IPortalApplication.gtmpl	2010-02-26 16:12:40 UTC (rev 1886)
@@ -89,7 +89,7 @@
     <script type=3D"text/javascript" src=3D"/eXoResources/javascript/eXo/i=
18n/MessageResource_<%=3Dlang%>.js"></script>
 =

     <% =

-     def headerElements =3D rcontext.getExtraMarkupHeaders();
+     def headerElements =3D rcontext.getExtraMarkupHeadersAsStrings();
      if (headerElements !=3D null) =

      {
        for (element in headerElements)

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/ap=
plication/PortalRequestContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/PortalRequestContext.java	2010-02-26 14:54:09 UTC (rev 1885)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/applicat=
ion/PortalRequestContext.java	2010-02-26 16:12:40 UTC (rev 1886)
@@ -42,7 +42,14 @@
 =

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
 import java.io.IOException;
+import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.net.URLDecoder;
@@ -355,6 +362,27 @@
       }
    }
    =

+   public List<String> getExtraMarkupHeadersAsStrings() throws Exception
+   {
+      List<String> markupHeaders =3D new ArrayList<String>();
+      =

+      if (extraMarkupHeaders !=3D null && !extraMarkupHeaders.isEmpty())
+      {
+         Transformer transformer =3D TransformerFactory.newInstance().newT=
ransformer();
+         transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "y=
es");
+
+         for (Element element : extraMarkupHeaders)
+         {
+            DOMSource source =3D new DOMSource(element);
+            StreamResult result =3D new StreamResult(new StringWriter());
+            transformer.transform(source, result);
+            markupHeaders.add(result.getWriter().toString());
+         }
+      }
+      =

+       return markupHeaders;
+   }
+   =

    /**
     * Get the extra markup headers to add to the head of the html.
     * @return The markup to be added.


--===============8878801281096218044==--