Mailing-List: contact dev-help@forrest.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@forrest.apache.org
Received-SPF: pass (nike.apache.org: domain of williamstw@gmail.com designates
 209.85.160.176 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:date:message-id:subject:from:to:content-type
         :content-transfer-encoding;
        b=v1knEdnTRULXM43sE1qCa0HJ3i0/Qtwmnf3bwwhvxPCYJ8CTFhhf5mbH8vuAvvnqfr
         B6yC4zzmmKIWIr3NT0+77riQD5zzx4IwvMOBKdtzfCBVH9xYvGcfXy8nwp9afCA3h+hR
         ZDE6vxTuRpcL/u05o2uIe/MVTu0d9LMuk1210=
MIME-Version: 1.0
Date: Mon, 17 May 2010 17:24:36 -0400
Message-ID: <AANLkTinb1nHtVoInneGezvVqQqM84qkxU6F5JRVe-d1D@mail.gmail.com>
Subject: Re: svn commit: r945269 - in
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src:
	cocoon-2.2-block/src/main/resources/COB-INF/
 cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/
	java/org/apache/forrest/dispatc
From: Tim Williams <williamstw@gmail.com>
To: Forrest Developers List <dev@forrest.apache.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Hi Thorsten, is this working for you locally?  I noticed the
Forrestbot failure just now and I'm also failing locally (with a NPE)
on a dispatcher sample site.  Was thinking it might be related but
don't see anything obvious in here...

--tim

On Mon, May 17, 2010 at 1:42 PM,  <thorsten@apache.org> wrote:
> Author: thorsten
> Date: Mon May 17 17:42:05 2010
> New Revision: 945269
>
> URL: http://svn.apache.org/viewvc?rev=3D945269&view=3Drev
> Log:
> FOR-1194 Fixing utf-8 compability by forcing to use UTF-8 in every step
>
> Modified:
> =A0 =A0forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.interna=
l.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
> =A0 =A0forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.interna=
l.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon=
/dispatcher-sitemapcomponents.xconf
> =A0 =A0forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.interna=
l.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XSLContract.java
> =A0 =A0forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.interna=
l.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XSLContract=
Helper.java
> =A0 =A0forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.interna=
l.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/Dispatch=
erTransformer.java
> =A0 =A0forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.interna=
l.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/Dispatch=
erWrapperTransformer.java
>
> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.inte=
rnal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xma=
p
> URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.ap=
ache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resou=
rces/COB-INF/sitemap.xmap?rev=3D945269&r1=3D945268&r2=3D945269&view=3Ddiff
> =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=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap (ori=
ginal)
> +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap Mon =
May 17 17:42:05 2010
> @@ -22,7 +22,7 @@ xmlns:map=3D"http://apache.org/cocoon/site
> =A0 =A0 <map:pipeline id=3D"lm">
> =A0 =A0 =A0 <map:match pattern=3D"locationmap.xml">
> =A0 =A0 =A0 =A0 <map:generate src=3D"locationmap.xml" />
> - =A0 =A0 =A0 =A0<map:serialize type=3D"xml" />
> + =A0 =A0 =A0 =A0<map:serialize/>
> =A0 =A0 =A0 </map:match>
> =A0 =A0 </map:pipeline>
> =A0 =A0 <map:pipeline id=3D"dispatcher">
> @@ -61,7 +61,7 @@ xmlns:map=3D"http://apache.org/cocoon/site
> =A0 =A0 =A0 =A0 </map:transform>
> =A0 =A0 =A0 =A0 <map:transform src=3D"lm://hooks-to-fo.xsl" />
> =A0 =A0 =A0 =A0 <map:transform src=3D"lm://strip-dispatcher-remains-fo.xs=
l" />
> - =A0 =A0 =A0 =A0<map:serialize type=3D"xml" />
> + =A0 =A0 =A0 =A0<map:serialize/>
> =A0 =A0 =A0 </map:match>
> =A0 =A0 =A0 <map:match pattern=3D"**.prepare.dispatcher.css">
> =A0 =A0 =A0 =A0 <map:generate src=3D"lm://resolve.structurer.{1}" type=3D=
"jx">
> @@ -93,11 +93,11 @@ xmlns:map=3D"http://apache.org/cocoon/site
> =A0 =A0 =A0 <map:act type=3D"locale">
> =A0 =A0 =A0 =A0 <map:match pattern=3D"resolve.structurer.**">
> =A0 =A0 =A0 =A0 =A0 <map:generate src=3D"lm://resolve.structurer.{1}" />
> - =A0 =A0 =A0 =A0 =A0<map:serialize type=3D"xml" />
> + =A0 =A0 =A0 =A0 =A0<map:serialize/>
> =A0 =A0 =A0 =A0 </map:match>
> =A0 =A0 =A0 =A0 <map:match pattern=3D"resolve.contract.*.**">
> =A0 =A0 =A0 =A0 =A0 <map:generate src=3D"{lm:resolve.contract.{1}.{2}}" /=
>
> - =A0 =A0 =A0 =A0 =A0<map:serialize type=3D"xml" />
> + =A0 =A0 =A0 =A0 =A0<map:serialize/>
> =A0 =A0 =A0 =A0 </map:match>
> =A0 =A0 =A0 =A0 <map:match pattern=3D"prepare.contract.*.**">
> =A0 =A0 =A0 =A0 =A0 <map:generate src=3D"{lm:resolve.contract.{1}.{2}}" /=
>
> @@ -105,7 +105,7 @@ xmlns:map=3D"http://apache.org/cocoon/site
> =A0 =A0 =A0 =A0 =A0 <map:transform type=3D"i18n">
> =A0 =A0 =A0 =A0 =A0 =A0 <map:parameter name=3D"locale" value=3D"{../local=
e}" />
> =A0 =A0 =A0 =A0 =A0 </map:transform>
> - =A0 =A0 =A0 =A0 =A0<map:serialize type=3D"xml" />
> + =A0 =A0 =A0 =A0 =A0<map:serialize/>
> =A0 =A0 =A0 =A0 </map:match>
> =A0 =A0 =A0 </map:act>
> =A0 =A0 </map:pipeline>
> @@ -116,7 +116,7 @@ xmlns:map=3D"http://apache.org/cocoon/site
> =A0 =A0 =A0 <map:match pattern=3D"prepare.panels.**">
> =A0 =A0 =A0 =A0 <map:generate src=3D"{lm:resolve.panels.{1}}" />
> =A0 =A0 =A0 =A0 <map:transform src=3D"{lm:root-strip.xsl}" />
> - =A0 =A0 =A0 =A0<map:serialize type=3D"xml" />
> + =A0 =A0 =A0 =A0<map:serialize/>
> =A0 =A0 =A0 </map:match>
> =A0 =A0 </map:pipeline>
> =A0 =A0 <map:pipeline>
> @@ -126,7 +126,7 @@ xmlns:map=3D"http://apache.org/cocoon/site
> =A0 =A0 =A0 =A0 =A0 <map:parameter name=3D"path" value=3D"{1}.html" />
> =A0 =A0 =A0 =A0 =A0 <map:parameter name=3D"theme" value=3D"{global:dispat=
cher.theme}" />
> =A0 =A0 =A0 =A0 </map:transform>
> - =A0 =A0 =A0 =A0<map:serialize type=3D"xml" />
> + =A0 =A0 =A0 =A0<map:serialize/>
> =A0 =A0 =A0 </map:match>
> =A0 =A0 </map:pipeline>
> =A0 =A0 <map:pipeline id=3D"resources">
>
> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.inte=
rnal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/ava=
lon/dispatcher-sitemapcomponents.xconf
> URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.ap=
ache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resou=
rces/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf?rev=3D945269=
&r1=3D945268&r2=3D945269&view=3Ddiff
> =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=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/di=
spatcher-sitemapcomponents.xconf (original)
> +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/di=
spatcher-sitemapcomponents.xconf Mon May 17 17:42:05 2010
> @@ -28,7 +28,7 @@ limitations under the License.
> =A0 =A0 =A0 <cache-at-startup>true</cache-at-startup>
> =A0 =A0 </map:transformer>
> =A0 </map:transformers>
> - =A0<map:serializers default=3D"xhtml">
> + =A0<map:serializers default=3D"xml-utf8">
> =A0 =A0 <map:serializer logger=3D"sitemap.serializer.xhtml"
> =A0 =A0 mime-type=3D"text/html; charset=3DUTF-8" name=3D"xhtml" ppool-max=
=3D"64"
> =A0 =A0 src=3D"org.apache.cocoon.serialization.XMLSerializer">
> @@ -57,5 +57,9 @@ limitations under the License.
> =A0 =A0 =A0 <encoding>UTF-8</encoding>
> =A0 =A0 =A0 <indent>true</indent>
> =A0 =A0 </map:serializer>
> - =A0</map:serializers>
> + =A0 =A0<map:serializer name=3D"xml-utf8" mime-type=3D"text/xml"
> + =A0 =A0src=3D"org.apache.cocoon.serialization.XMLSerializer">
> + =A0 =A0 =A0<encoding>UTF-8</encoding>
> + =A0 =A0</map:serializer>
> + =A0 </map:serializers>
> =A0</map:components>
>
> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.inte=
rnal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XSLContract.jav=
a
> URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.ap=
ache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatc=
her/impl/XSLContract.java?rev=3D945269&r1=3D945268&r2=3D945269&view=3Ddiff
> =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=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/impl/XSLContract.java (ori=
ginal)
> +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/impl/XSLContract.java Mon =
May 17 17:42:05 2010
> @@ -21,6 +21,8 @@ import java.io.BufferedOutputStream;
> =A0import java.io.ByteArrayInputStream;
> =A0import java.io.ByteArrayOutputStream;
> =A0import java.io.InputStream;
> +import java.io.OutputStreamWriter;
> +import java.io.UnsupportedEncodingException;
> =A0import java.util.Map;
>
> =A0import javax.xml.stream.XMLStreamException;
> @@ -105,17 +107,23 @@ public class XSLContract extends Loggabl
> =A0 =A0 =A0 }
> =A0 =A0 }
> =A0 =A0 ByteArrayOutputStream out =3D new ByteArrayOutputStream();
> + =A0 =A0byte[] bytes =3D null;
> + =A0 =A0String utf8 =3D "";
> =A0 =A0 // create a StreamResult and use it for the transformation
> - =A0 =A0Result streamResult =3D new StreamResult(new BufferedOutputStrea=
m(out));
> =A0 =A0 try {
> - =A0 =A0 =A0helper.transform(dataStream,streamResult);
> + =A0 =A0 =A0 =A0OutputStreamWriter writer =3D new OutputStreamWriter(out=
,"UTF-8");
> + =A0 =A0 =A0 =A0Result streamResult =3D new StreamResult(writer);
> + =A0 =A0 =A0 =A0helper.transform(dataStream,streamResult);
> + =A0 =A0 =A0 =A0utf8 =3D out.toString("UTF-8");
> + =A0 =A0 =A0 =A0log.debug(utf8);
> + =A0 =A0 =A0 =A0bytes =3D utf8.getBytes("utf-8");
> =A0 =A0 } catch (Exception e) {
> =A0 =A0 =A0 String message =3D "Could not invoke the transformation for "
> =A0 =A0 =A0 =A0 =A0 + "the contract \""+name+"\". "+"\n"+ e;
> =A0 =A0 =A0 throw new ContractException(message);
> =A0 =A0 }
> - =A0 =A0log.debug(out.toString());
> - =A0 =A0return new BufferedInputStream(new ByteArrayInputStream(out.toBy=
teArray()));
> +
> + =A0 =A0return new BufferedInputStream(new ByteArrayInputStream(bytes));
> =A0 }
>
> =A0 /* (non-Javadoc)
>
> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.inte=
rnal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XSLContr=
actHelper.java
> URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.ap=
ache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatc=
her/impl/helper/XSLContractHelper.java?rev=3D945269&r1=3D945268&r2=3D945269=
&view=3Ddiff
> =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=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XSLContractHel=
per.java (original)
> +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XSLContractHel=
per.java Mon May 17 17:42:05 2010
> @@ -20,6 +20,7 @@ import java.io.BufferedInputStream;
> =A0import java.io.ByteArrayInputStream;
> =A0import java.io.IOException;
> =A0import java.io.InputStream;
> +import java.io.InputStreamReader;
> =A0import java.io.PrintWriter;
> =A0import java.util.Iterator;
> =A0import java.util.Map;
> @@ -124,6 +125,7 @@ public class XSLContractHelper extends L
> =A0 =A0 =A0 SAXException, IOException {
> =A0 =A0 // prepare transformation
> =A0 =A0 transformer =3D transFact.newTransformer(xslSource);
> + =A0 =A0transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
> =A0 =A0 transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "y=
es");
> =A0 =A0 transformer.setOutputProperty(OutputKeys.INDENT, "yes");
> =A0 =A0 transformer.setOutputProperty(OutputKeys.METHOD, "xml");
> @@ -220,8 +222,8 @@ public class XSLContractHelper extends L
> =A0 =A0 }
> =A0 =A0 // Setting the necessary attributes of the contract
> =A0 =A0 // xsl
> - =A0 =A0contract.setXslSource(new StreamSource(new ByteArrayInputStream(=
handler
> - =A0 =A0 =A0 =A0.getBytes())));
> + =A0 =A0byte[] bytes =3D handler.getBytes();
> + =A0 =A0contract.setXslSource(new StreamSource(new ByteArrayInputStream(=
bytes)));
> =A0 =A0 /* DEBUG_CODE:
> =A0 =A0 =A0* The following is useful to see what is going on
> =A0 =A0 =A0*
> @@ -254,7 +256,9 @@ public class XSLContractHelper extends L
> =A0 =A0 =A0 throws ContractException {
> =A0 =A0 //Source dataSource =3D new StreamSource(dataStream);
> =A0 =A0 try {
> - =A0 =A0 =A0SAXSource saxSource =3D new SAXSource(xmlReader,new InputSou=
rce(dataStream));
> + =A0 =A0 =A0InputSource inputSource =3D new InputSource(new InputStreamR=
eader(dataStream, "UTF-8"));
> + =A0 =A0 =A0inputSource.setEncoding("UTF-8");
> + =A0 =A0 =A0SAXSource saxSource =3D new SAXSource(xmlReader,inputSource)=
;
> =A0 =A0 =A0 transformer.transform(saxSource, streamResult);
> =A0 =A0 } catch (Exception e) {
> =A0 =A0 =A0 String message =3D "The xsl transformation has thrown an exce=
ption. for "
>
> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.inte=
rnal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/Dispa=
tcherTransformer.java
> URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.ap=
ache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatc=
her/transformation/DispatcherTransformer.java?rev=3D945269&r1=3D945268&r2=
=3D945269&view=3Ddiff
> =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=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherT=
ransformer.java (original)
> +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherT=
ransformer.java Mon May 17 17:42:05 2010
> @@ -20,6 +20,7 @@ import java.io.BufferedInputStream;
> =A0import java.io.File;
> =A0import java.io.IOException;
> =A0import java.io.InputStream;
> +import java.io.InputStreamReader;
> =A0import java.io.Serializable;
> =A0import java.io.StringReader;
> =A0import java.util.HashMap;
> @@ -490,7 +491,7 @@ public class DispatcherTransformer exten
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 throw new SAXException(e);
> =A0 =A0 =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 =A0 =A0 if (null !=3D property) {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0localParams.put(currentProperty, property.ge=
tBytes());
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0localParams.put(currentProperty, property.ge=
tBytes("UTF-8"));
> =A0 =A0 =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 }
> @@ -695,7 +696,7 @@ public class DispatcherTransformer exten
> =A0 =A0 =A0 =A0 root.serialize(out);
> =A0 =A0 =A0 }
>
> - =A0 =A0 =A0InputSource is =3D new InputSource(new StringReader(out.toSt=
ring()));
> + =A0 =A0 =A0InputSource is =3D new InputSource(new StringReader(out.toSt=
ring("UTF-8")));
> =A0 =A0 =A0 // adding the result to the consumer
> =A0 =A0 =A0 parser.parse(is, super.xmlConsumer);
> =A0 =A0 } catch (Exception e) {
> @@ -1099,8 +1100,9 @@ public class DispatcherTransformer exten
> =A0 =A0*/
> =A0 private static InputSource getInputSource(final Source source)
> =A0 =A0 =A0 throws IOException, SourceException {
> - =A0 =A0final InputSource newObject =3D new InputSource(source.getInputS=
tream());
> - =A0 =A0newObject.setSystemId(source.getURI());
> - =A0 =A0return newObject;
> + =A0 =A0final InputSource inputSource =3D new InputSource(new InputStrea=
mReader(source.getInputStream(), "UTF-8"));
> + =A0 =A0inputSource.setEncoding("UTF-8");
> + =A0 =A0inputSource.setSystemId(source.getURI());
> + =A0 =A0return inputSource;
> =A0 }
> =A0}
>
> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.inte=
rnal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/Dispa=
tcherWrapperTransformer.java
> URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.ap=
ache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatc=
her/transformation/DispatcherWrapperTransformer.java?rev=3D945269&r1=3D9452=
68&r2=3D945269&view=3Ddiff
> =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=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherW=
rapperTransformer.java (original)
> +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.d=
ispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherW=
rapperTransformer.java Mon May 17 17:42:05 2010
> @@ -374,7 +374,7 @@ public class DispatcherWrapperTransforme
> =A0 =A0 =A0 }
> =A0 =A0 =A0 // get the result of the structurer as stream
> =A0 =A0 =A0 InputStream result =3D structurer.execute(new BufferedInputSt=
ream(
> - =A0 =A0 =A0 =A0 =A0new ByteArrayInputStream(document.getBytes())), requ=
estedFormat);
> + =A0 =A0 =A0 =A0 =A0new ByteArrayInputStream(document.getBytes("UTF-8"))=
), requestedFormat);
> =A0 =A0 =A0 // requesting a parser
> =A0 =A0 =A0 parser =3D (SAXParser) manager.lookup(SAXParser.ROLE);
> =A0 =A0 =A0 // adding the result to the consumer
>
>
>