Return-Path: 
 <svn-return-6517-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 38704 invoked from network); 1 Feb 2007 13:41:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Feb 2007 13:41:17 -0000
Received: (qmail 78777 invoked by uid 500); 1 Feb 2007 13:41:24 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 78721 invoked by uid 500); 1 Feb 2007 13:41:23 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 78710 invoked by uid 99); 1 Feb 2007 13:41:23 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Feb 2007 05:41:23 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Feb 2007 05:41:16 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 430211A981A; Thu,  1 Feb 2007 05:40:56 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r502211 -
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap
Date: Thu, 01 Feb 2007 13:40:56 -0000
To: svn@forrest.apache.org
From: thorsten@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070201134056.430211A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: thorsten
Date: Thu Feb  1 05:40:55 2007
New Revision: 502211

URL: http://svn.apache.org/viewvc?view=rev&rev=502211
Log:
Solr needs UTF-8 as incoming encoding.
Using the encoding in the component setup makes sure that the cli is not requesting ISO.
Now we always output utf-8.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap?view=diff&rev=502211&r1=502210&r2=502211
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/output.xmap Thu Feb  1 05:40:55 2007
@@ -21,6 +21,11 @@
       <map:generator name="solrUpdate"
         src="org.apache.forrest.solr.client.SolrUpdateGenerator"/>
     </map:generators>
+    <map:serializers default="xml-utf8" >
+      <map:serializer name="xml-utf8" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
+        <encoding>UTF-8</encoding>
+      </map:serializer>
+    </map:serializers>
   </map:components>
 <!--  <map:flow language="javascript">
     <!-#- Flow will use the javascript functions defined in game.js -#->
@@ -34,12 +39,12 @@
         <map:generate type="solrUpdate" src="cocoon:/{1}">
           <map:parameter name="destinationUrl" value="{properties:solr.update.url}"/>
         </map:generate>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>
       <!-- Static solr commands -->
       <map:match pattern="solr.*">
         <map:generate src="resources/xml/{1}.xml"/>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>
       <!-- Output the whole project as solr docs 
         as add comand-->
@@ -48,7 +53,7 @@
         <map:transform src="{lm:transform.site.book}"/>
         <map:transform src="resources/stylesheets/book-to-cinclude-solr.xsl"/>
         <map:transform type="cinclude"/>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>
       <!-- Output xdocs as solr docs -->
       <map:match pattern="**.solr">
@@ -57,20 +62,20 @@
           <map:parameter name="document-url" value="{1}.xml"/>
           <map:parameter name="project" value="{properties:project.name}"/>
         </map:transform>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>
       <!-- Implemented solr commands -->
       <!-- ADD -->
       <map:match pattern="**.solr.add">
         <map:generate src="cocoon://{1}.solr"/>
         <map:transform src="resources/stylesheets/solrDoc-add.xsl"/>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>
       <!-- DELETE -->
       <map:match pattern="**.solr.delete">
         <map:generate src="cocoon://{1}.solr"/>
         <map:transform src="resources/stylesheets/solrDoc-delete.xsl"/>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>
       <!--Testing-->
       <!--<map:match pattern="resolvePluginContract.*.**">
@@ -78,13 +83,13 @@
         <map:transform src="resources/stylesheets/test.xsl">
           <map:parameter name="document-url" value="{forrest:forrest.plugins}/org.apache.forrest.plugin.output.solr/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.{1}**{lm:resolvePluginThemes.{1}.{2}}-#-{lm:themes/{1}.{1}}"/>
         </map:transform>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>-->
       <!-- OLD flow approach -->
           <!-- use JXtemplate to generate page content -->
 <!--      <map:match pattern="*.jx">
         <map:generate type="jx" src="resources/flow/{1}.jx"/>
-        <map:serialize type="xml"/>
+        <map:serialize/>
       </map:match>-->
       <!--      <map:match pattern="**solr.*.do">
         <map:call function="update">