### Eclipse Workspace Patch 1.0
#P Ametys Plugin Cms HEAD
Index: main/plugin-cms/sitemap.xmap
===================================================================
--- main/plugin-cms/sitemap.xmap	(revision 9193)
+++ main/plugin-cms/sitemap.xmap	(working copy)
@@ -583,7 +583,7 @@
 	                    <map:parameter name="locale" value="{locale:locale}"/>
 	                    <map:parameter name="default-catalogue-id" value="plugin.{request-attr:pluginName}"/>
 	                </map:transform>
-            		<map:serialize type="xhtml"/>
+            		<map:serialize type="xhtml-configurable"/>
             	</map:act>
 			</map:match>
 
Index: main/plugin-cms/src/org/ametys/cms/transformation/EnhancementTransformer.java
===================================================================
--- main/plugin-cms/src/org/ametys/cms/transformation/EnhancementTransformer.java	(revision 9193)
+++ main/plugin-cms/src/org/ametys/cms/transformation/EnhancementTransformer.java	(working copy)
@@ -34,7 +34,7 @@
 import org.xml.sax.ext.LexicalHandler;
 
 /**
- * This cocoon transformer use the DocbookEnhancementExtensionPoint to be based upon a serie of EnhancementHandler
+ * This abstract cocoon transformer have its content and lexical handler configurable
  */
 public abstract class EnhancementTransformer implements Transformer, Serviceable, Recyclable
 {
Index: main/workspace-cms/sitemap.xmap
===================================================================
--- main/workspace-cms/sitemap.xmap	(revision 9193)
+++ main/workspace-cms/sitemap.xmap	(working copy)
@@ -75,7 +75,7 @@
                     <map:parameter name="locale" value="{locale:locale}"/>
                     <map:parameter name="default-catalogue-id" value="plugin.cms"/>
                 </map:transform>
-                <map:serialize/>
+                <map:serialize type="xhtml-strict"/>
             </map:match>
             
             <map:match pattern="login_failed.html">
@@ -90,7 +90,7 @@
                     <map:parameter name="locale" value="{locale:locale}"/>
                     <map:parameter name="default-catalogue-id" value="plugin.cms"/>
                 </map:transform>
-                <map:serialize/>
+                <map:serialize type="xhtml-strict"/>
             </map:match>
             
 			<map:match pattern="ws/todo-list.xml">
@@ -160,7 +160,7 @@
 				<map:transform type="i18n">
 					<map:parameter name="locale" value="{locale:locale}"/>
 				</map:transform>
-				<map:serialize type="xhtml"/>
+				<map:serialize type="xhtml-strict"/>
 			</map:match>            
             
             <map:match pattern="plugins/*/**">
@@ -192,7 +192,7 @@
                         <map:transform src="{wrapper-uri}">
     						<map:parameter name="contextPath" value="{request:contextPath}"/>
                         </map:transform>
-                        <map:serialize type="xhtml"/>
+                        <map:serialize type="xhtml-configurable"/>
                     </map:act>
                 </map:act>
             </map:match>
@@ -218,7 +218,7 @@
                       	<map:transform src="{wrapper-uri}">
     						<map:parameter name="contextPath" value="{request:contextPath}"/>
                         </map:transform>
-                        <map:serialize type="xhtml"/>
+                        <map:serialize type="xhtml-configurable"/>
                     </map:act>
                 </map:act>
             </map:match>
@@ -253,7 +253,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="404"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="404"/>		          		
 					</map:when>
 					<map:when test="authorization-required">
 						<map:act type="set-authorization-header"/>
@@ -267,7 +267,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="401"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="401"/>		          		
 					</map:when>
 					<map:when test="access-denied">
 		        		<map:generate type="exception" label="content"/>
@@ -280,7 +280,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="403"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="403"/>		          		
 					</map:when>
 					<map:otherwise>					
 		        		<map:generate type="exception" label="content"/>
@@ -293,7 +293,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="500"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="500"/>		          		
 					</map:otherwise>
 				</map:select>
 			</map:handle-errors> 
#P Ametys Plugin Site HEAD
Index: .settings/org.eclipse.jdt.core.prefs
===================================================================
--- .settings/org.eclipse.jdt.core.prefs	(revision 0)
+++ .settings/org.eclipse.jdt.core.prefs	(revision 0)
@@ -0,0 +1,12 @@
+#Fri Feb 12 22:20:35 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Index: main/workspace-site/sitemap.xmap
===================================================================
--- main/workspace-site/sitemap.xmap	(revision 9193)
+++ main/workspace-site/sitemap.xmap	(working copy)
@@ -148,7 +148,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-                        <map:serialize status-code="404"/>                      
+                        <map:serialize type="xhtml-strict" status-code="404"/>                      
                     </map:when>
                     <map:when test="authorization-required">
                         <map:act type="set-authorization-header"/>
@@ -162,7 +162,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-                        <map:serialize status-code="401"/>                      
+                        <map:serialize type="xhtml-strict" status-code="401"/>                      
                     </map:when>
                     <map:when test="access-denied">
                         <map:generate type="exception" label="content"/>
@@ -175,7 +175,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-                        <map:serialize status-code="403"/>                      
+                        <map:serialize type="xhtml-strict" status-code="403"/>                      
                     </map:when>
                     <map:when test="service-unavailable">
                         <map:generate type="exception" label="content"/>
@@ -188,7 +188,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-                        <map:serialize status-code="503"/>                      
+                        <map:serialize type="xhtml-strict" status-code="503"/>                      
                     </map:when>
                     <map:otherwise>                 
                         <map:generate type="exception" label="content"/>
@@ -201,7 +201,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-                        <map:serialize status-code="500"/>                      
+                        <map:serialize type="xhtml-strict" status-code="500"/>                      
                     </map:otherwise>
                 </map:select>
             </map:handle-errors> 
#P Ametys Runtime HEAD
Index: test/src/org/ametys/runtime/test/cocoon/XHTMLSerializerTestCase.java
===================================================================
--- test/src/org/ametys/runtime/test/cocoon/XHTMLSerializerTestCase.java	(revision 9193)
+++ test/src/org/ametys/runtime/test/cocoon/XHTMLSerializerTestCase.java	(working copy)
@@ -26,7 +26,8 @@
 
 import junit.framework.TestCase;
 
-import org.ametys.runtime.cocoon.XHTMLSerializer;
+import org.ametys.runtime.cocoon.serializers.xhtml.XHTMLSerializer;
+
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
 import org.apache.cocoon.xml.XMLConsumer;
Index: main/plugin-core/plugin.xml
===================================================================
--- main/plugin-core/plugin.xml	(revision 9193)
+++ main/plugin-core/plugin.xml	(working copy)
@@ -698,8 +698,8 @@
         <extension-point id="org.ametys.runtime.plugins.core.administrator.jvmstatus.monitoring.MonitoringExtensionPoint"
                          class="org.ametys.runtime.plugins.core.administrator.jvmstatus.monitoring.MonitoringExtensionPoint"/>
                          
-        <extension-point id="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint"
-                         class="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint"/>
+        <extension-point id="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint"
+                         class="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint"/>
                          
         <single-extension-point id="org.ametys.runtime.right.RightsManager"
                                 class="org.ametys.runtime.right.RightsManager"
@@ -740,6 +740,10 @@
         <single-extension-point id="org.ametys.runtime.upload.UploadManager"
                                 class="org.ametys.runtime.upload.UploadManager"
                                 default-extension-id="org.ametys.runtime.plugins.core.upload.FSUploadManager"/>
+
+<!--        <single-extension-point id="org.ametys.runtime.cocoon.serializers.xhtml.configurable.XHTMLConfigurableTransformerAndSerializer.serializer"-->
+<!--                                class="org.apache.cocoon.serialization.Serializer"-->
+<!--                                default-extension-id="xhtml-strict"/>-->
     </extension-points>
     
     <feature name="saxclienthelper">
@@ -771,40 +775,77 @@
 
     <feature name="xhtmlserializer-empty">
     	<extensions>
-    		<extension id="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint.empty" point="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint">
+    		<extension id="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint.empty" point="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint">
     			<namespace-allowed></namespace-allowed>
     		</extension>
     	</extensions>
     </feature>
     <feature name="xhtmlserializer-xhtml">
     	<extensions>
-    		<extension id="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint.xhtml" point="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint">
+    		<extension id="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint.xhtml" point="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint">
     			<namespace-allowed>http://www.w3.org/1999/xhtml</namespace-allowed>
     		</extension>
     	</extensions>
     </feature>
     <feature name="xhtmlserializer-xml">
     	<extensions>
-    		<extension id="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint.xml" point="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint">
+    		<extension id="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint.xml" point="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint">
     			<namespace-allowed>http://www.w3.org/XML/1998/namespace</namespace-allowed>
     		</extension>
     	</extensions>
     </feature>
     <feature name="xhtmlserializer-svg">
     	<extensions>
-    		<extension id="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint.svg" point="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint">
+    		<extension id="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint.svg" point="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint">
     			<namespace-allowed>http://www.w3.org/2000/svg</namespace-allowed>
     		</extension>
     	</extensions>
     </feature>
     <feature name="xhtmlserializer-mathml">
     	<extensions>
-    		<extension id="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint.mathml" point="org.ametys.runtime.cocoon.XHTMLSerializerExtensionPoint">
+    		<extension id="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint.mathml" point="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint">
     			<namespace-allowed>http://www.w3.org/1998/Math/MathML</namespace-allowed>
     		</extension>
     	</extensions>
     </feature>
     
+<!--    <feature name="xhtmlserializer-strict">-->
+<!--    	<extensions>-->
+<!--    		<extension id="xhtml-strict"-->
+<!--    				point="org.ametys.runtime.cocoon.serializers.xhtml.configurable.XHTMLConfigurableTransformerAndSerializer.serializer"-->
+<!--    				class="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializer">-->
+<!--                <encoding>UTF-8</encoding>-->
+<!--                <doctype-default>strict</doctype-default>-->
+<!--                <omit-xml-declaration>yes</omit-xml-declaration>-->
+<!--                <indent>false</indent>-->
+<!--    		</extension>-->
+<!--    	</extensions>-->
+<!--    </feature>-->
+<!--    <feature name="xhtmlserializer-transitionnal">-->
+<!--    	<extensions>-->
+<!--    		<extension id="xhtml-transitionnal"-->
+<!--    				point="org.ametys.runtime.cocoon.serializers.xhtml.configurable.XHTMLConfigurableTransformerAndSerializer.serializer"-->
+<!--    				class="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializer">-->
+<!--                <encoding>UTF-8</encoding>-->
+<!--                <doctype-default>loose</doctype-default>-->
+<!--                <omit-xml-declaration>yes</omit-xml-declaration>-->
+<!--                <indent>false</indent>-->
+<!--    		</extension>-->
+<!--    	</extensions>-->
+<!--    </feature>-->
+<!--    <feature name="xhtmlserializer-5">-->
+<!--    	<extensions>-->
+<!--    		<extension id="xhtml-5"-->
+<!--    				point="org.ametys.runtime.cocoon.serializers.xhtml.configurable.XHTMLConfigurableTransformerAndSerializer.serializer"-->
+<!--    				class="org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializer">-->
+<!--                <encoding>UTF-8</encoding>-->
+<!--                <doctype-default>html5</doctype-default>-->
+<!--                <omit-xml-declaration>yes</omit-xml-declaration>-->
+<!--                <indent>false</indent>-->
+<!--    		</extension>-->
+<!--    	</extensions>-->
+<!--    </feature>-->
+    
     <feature name="runtime.core">
         <!-- 
             This feature is a mandatory feature of the runtime defining basic tools
Index: main/plugin-core/sitemap.xmap
===================================================================
--- main/plugin-core/sitemap.xmap	(revision 9193)
+++ main/plugin-core/sitemap.xmap	(working copy)
@@ -161,7 +161,7 @@
 					<map:parameter name="locale" value="{locale:locale}"/>
 					<map:parameter name="plugin" value="{request-attr:pluginName}"/>
 				</map:transform>
-				<map:serialize/>
+				<map:serialize type="xhtml-strict"/>
 			</map:match>
 			
 			<map:match pattern="administrator/password/set">
@@ -356,7 +356,7 @@
                     <map:parameter name="workspaceName" value="{request-attr:workspaceName}"/>
                     <map:parameter name="workspaceURI" value="{request-attr:workspaceURI}"/>
                 </map:transform>
-               <map:serialize/>
+               <map:serialize type="xhtml-strict"/>
             </map:match>
 
 			<!-- Plugins individual frames -->
@@ -369,7 +369,7 @@
                     <map:parameter name="workspaceURI" value="{request-attr:workspaceURI}"/>
                     <map:parameter name="currentPluginName" value="{1}"/>
                 </map:transform>
-            	<map:serialize/>
+            	<map:serialize type="xhtml-strict"/>
             </map:match>
 			<!-- Plugins main frames -->
             <map:match pattern="administrator/plugins/doc/*.html">
@@ -381,7 +381,7 @@
                     <map:parameter name="workspaceURI" value="{request-attr:workspaceURI}"/>
                     <map:parameter name="zoom" value="{request-param:zoom}"/>
                 </map:transform>
-            	<map:serialize/>
+            	<map:serialize type="xhtml-strict"/>
             </map:match>
 
             <!-- +
@@ -400,7 +400,7 @@
                     <map:parameter name="workspaceName" value="{request-attr:workspaceName}"/>
                     <map:parameter name="workspaceURI" value="{request-attr:workspaceURI}"/>
                 </map:transform>
-                <map:serialize/>
+                <map:serialize type="xhtml-strict"/>
             </map:match>
             
             <map:match pattern="administrator/system/update">
@@ -434,7 +434,7 @@
                     <map:parameter name="locale" value="{locale:locale}"/>
                     <map:parameter name="plugin" value="{request-attr:pluginName}"/>
                 </map:transform>
-                <map:serialize/>
+                <map:serialize type="xhtml-strict"/>
             </map:match>
             
             <map:match pattern="users/search.xml">
@@ -501,7 +501,7 @@
                     <map:parameter name="locale" value="{locale:locale}"/>
                     <map:parameter name="plugin" value="{request-attr:pluginName}"/>
                 </map:transform>
-                <map:serialize/>
+                <map:serialize type="xhtml-strict"/>
             </map:match>
             
             <map:match pattern="users/view.html">
@@ -539,7 +539,7 @@
                     <map:parameter name="locale" value="{locale:locale}"/>
                     <map:parameter name="plugin" value="{request-attr:pluginName}"/>
                 </map:transform>
-                <map:serialize/>
+                <map:serialize type="xhtml-strict"/>
             </map:match>
             
             <map:match pattern="groups/selectgroup/search.xml">
@@ -738,7 +738,7 @@
                     <map:parameter name="contextPath" value="{request:contextPath}"/>
                     <map:parameter name="pluginName" value="{request-attr:pluginName}"/>
                 </map:transform>
-                <map:serialize/>
+                <map:serialize type="xhtml-strict"/>
             </map:match>
             
             <map:match pattern="rights/profile-assignment.xml">
Index: main/kernel/src/org/ametys/runtime/cocoon/XHTMLSerializerExtensionPoint.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/XHTMLSerializerExtensionPoint.java	(revision 9193)
+++ main/kernel/src/org/ametys/runtime/cocoon/XHTMLSerializerExtensionPoint.java	(working copy)
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2010 Anyware Services
+ *  Copyright 2011 Anyware Services
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,59 +16,12 @@
 
 package org.ametys.runtime.cocoon;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-
-import org.ametys.runtime.plugin.AbstractExtensionPoint;
-
 /**
- * This extension point allows to configure the xhtml serializer by adding new plugins
+ * The EP for XHTMLSerializer
+ * Do not use, use the parent class instead
  */
-public class XHTMLSerializerExtensionPoint extends AbstractExtensionPoint<String> implements LogEnabled
+@Deprecated
+public class XHTMLSerializerExtensionPoint extends org.ametys.runtime.cocoon.serializers.xhtml.enhanced.XHTMLEnhancedSerializerExtensionPoint
 {
-    /** The avalon role */
-    public static final String ROLE = XHTMLSerializerExtensionPoint.class.getName(); 
-    
-    private Logger _logger;
-    
-    private Set<String> _allowedNamespaces;
-    
-    @Override
-    public void enableLogging(Logger logger)
-    {
-        _logger = logger;
-    }
-    
-    @Override
-    public void addExtension(String pluginName, String featureName, Configuration configuration) throws ConfigurationException
-    {
-        String id = configuration.getAttribute("id");
-        String namespace = configuration.getChild("namespace-allowed").getValue("");
-        _extensions.put(id, namespace);
-        
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Adding namespace '" + namespace + "' from '" + pluginName + "/" + featureName + "/" + id + "'.");
-        }
-    }
-
-    @Override
-    public void initializeExtensions() throws Exception
-    {
-        _allowedNamespaces = new HashSet<String>(_extensions.values());
-    }
-    
-    /**
-     * Get the list of allowed namespace
-     * @return The non null list of namespaces
-     */
-    public Set<String> getAllowedNamespaces()
-    {
-        return _allowedNamespaces;
-    }
+    /* empty */
 }
Index: main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/enhanced/XHTMLEnhancedSerializerExtensionPoint.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/enhanced/XHTMLEnhancedSerializerExtensionPoint.java	(revision 0)
+++ main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/enhanced/XHTMLEnhancedSerializerExtensionPoint.java	(working copy)
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.ametys.runtime.cocoon;
+package org.ametys.runtime.cocoon.serializers.xhtml.enhanced;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -29,10 +29,10 @@
 /**
  * This extension point allows to configure the xhtml serializer by adding new plugins
  */
-public class XHTMLSerializerExtensionPoint extends AbstractExtensionPoint<String> implements LogEnabled
+public class XHTMLEnhancedSerializerExtensionPoint extends AbstractExtensionPoint<String> implements LogEnabled
 {
     /** The avalon role */
-    public static final String ROLE = XHTMLSerializerExtensionPoint.class.getName(); 
+    public static final String ROLE = XHTMLEnhancedSerializerExtensionPoint.class.getName(); 
     
     private Logger _logger;
     

Property changes on: main\kernel\src\org\ametys\runtime\cocoon\serializers\xhtml\enhanced\XHTMLEnhancedSerializerExtensionPoint.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Index: main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/enhanced/XHTMLEnhancedSerializer.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/enhanced/XHTMLEnhancedSerializer.java	(revision 0)
+++ main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/enhanced/XHTMLEnhancedSerializer.java	(revision 0)
@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2011 Anyware Services
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.ametys.runtime.cocoon.serializers.xhtml.enhanced;
+
+import java.util.HashSet;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+
+import org.ametys.runtime.cocoon.serializers.xhtml.XHTMLSerializer;
+
+/**
+ * The XHTML serializer where namespaces are configurable by extensions
+ */
+public class XHTMLEnhancedSerializer extends XHTMLSerializer implements Serviceable
+{
+    /** The XHTMLSerializerExtensionPoint instance */
+    protected XHTMLEnhancedSerializerExtensionPoint _xhtmlSerializerExtensionPoint;
+
+    @Override
+    public void service(ServiceManager manager) throws ServiceException
+    {
+        if (manager.hasService(XHTMLEnhancedSerializerExtensionPoint.ROLE))
+        {
+            _xhtmlSerializerExtensionPoint = (XHTMLEnhancedSerializerExtensionPoint) manager.lookup(XHTMLEnhancedSerializerExtensionPoint.ROLE);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.ametys.runtime.cocoon.serializers.xhtml.XHTMLSerializer#_configureNamespaceAllowed(org.apache.avalon.framework.configuration.Configuration)
+     */
+    @Override
+    protected void _configureNamespaceAllowed(Configuration conf)
+    {
+        // Namespaces allowed
+        Configuration[] namespacesAllowed = conf.getChildren("namespace-allowed");
+        
+        if (namespacesAllowed.length > 0)
+        {
+            _namespacesAllowed = new HashSet<String>();
+            for (Configuration namespaceAllowed : namespacesAllowed)
+            {
+                String namespace = namespaceAllowed.getValue("");
+                _namespacesAllowed.add(namespace.trim());
+            }
+        }
+        else if (_xhtmlSerializerExtensionPoint != null)
+        {
+            _namespacesAllowed = _xhtmlSerializerExtensionPoint.getAllowedNamespaces();
+        }
+        else
+        {
+            _namespacesAllowed = __NAMESPACES_ALLOWED;
+        }
+    }
+}
Index: main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLConfigurableTransformerAndSerializer.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLConfigurableTransformerAndSerializer.java	(revision 0)
+++ main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLConfigurableTransformerAndSerializer.java	(revision 0)
@@ -0,0 +1,244 @@
+/*
+ *  Copyright 2011 Anyware Services
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.ametys.runtime.cocoon.serializers.xhtml.configurable;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Set;
+
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.serialization.Serializer;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+
+
+/**
+ * This is a very special XHTML serializer. It is configurable as the XHTMLSerializer is and :
+ *
+ * - Allowed namespaces are configurable throught an extension point
+ * - Just in time transformers can be add throught an extension point
+ */
+public class XHTMLConfigurableTransformerAndSerializer implements Serializer, Serviceable, Recyclable
+{
+    /** The avalon role for the SEP serializer */
+    public static final String SERIALIZER_ROLE = XHTMLConfigurableTransformerAndSerializer.class.getName() + ".serializer";
+    
+    /** The service manager */
+    protected ServiceManager _manager;
+    
+    /** The content handler chain for enhancement purpose */
+    protected ContentHandler _contentHandler;
+    /** The lexical handler chain for enhancement purpose */
+    protected LexicalHandler _lexicalHandler;
+
+    /** The chosen serializer */
+    protected Serializer _serializer;
+    /** The EP for enhancement process */
+    protected XHTMLTransformerExtensionPoint _xhtmlTransformerExtensionPoint;
+    
+    /**
+     * Get the current serializer
+     * @return the serializer (can not be null)
+     * @throws IllegalStateException If the serializer is null
+     */
+    protected Serializer getSerializer()
+    {
+        if (_serializer == null)
+        {
+            throw new IllegalStateException("The XHTMLConfigurableTransformerAndSerializer can not be used because configuration is not loaded");
+        }
+        return _serializer;
+    }
+    
+    /* *********************************************** */
+    /*                  SERIALIZER                     */
+    /* *********************************************** */
+
+    @Override
+    public String getMimeType()
+    {
+        return getSerializer().getMimeType();
+    }
+    
+    public void setOutputStream(OutputStream out) throws IOException
+    {
+        
+        _contentHandler = getSerializer();
+        _lexicalHandler = getSerializer();
+        getSerializer().setOutputStream(out);
+        
+        if (_xhtmlTransformerExtensionPoint != null)
+        {
+            Set<String> ids = _xhtmlTransformerExtensionPoint.getExtensionsIds();
+            for (String id : ids)
+            {
+                XHTMLTransformer s = _xhtmlTransformerExtensionPoint.getExtension(id);
+                
+                s.setContentHandler(_contentHandler);
+                _contentHandler = s;
+                
+                s.setLexicalHandler(_lexicalHandler);
+                _lexicalHandler = s;
+            }
+        }
+    }
+    
+    @Override
+    public boolean shouldSetContentLength()
+    {
+        return getSerializer().shouldSetContentLength();
+    }
+    
+    /* *********************************************** */
+    /*                     OTHERS                      */
+    /* *********************************************** */
+    
+    @Override
+    public void service(ServiceManager manager) throws ServiceException
+    {
+        _manager = manager;
+        
+        if (manager.hasService(SERIALIZER_ROLE))
+        {
+            _serializer = (Serializer) _manager.lookup(SERIALIZER_ROLE);
+        }
+
+        if (manager.hasService(XHTMLTransformerExtensionPoint.ROLE))
+        {
+            _xhtmlTransformerExtensionPoint = (XHTMLTransformerExtensionPoint) manager.lookup(XHTMLTransformerExtensionPoint.ROLE);
+        }
+    }
+
+    @Override
+    public void recycle()
+    {
+        _contentHandler = null;
+        _lexicalHandler = null;
+    }
+
+    /* *********************************************** */
+    /*                  XMLPRODUCER                    */
+    /* *********************************************** */
+    
+    @Override
+    public void startDocument() throws SAXException
+    {
+        _contentHandler.startDocument();
+    }
+    @Override
+    public void endDocument() throws SAXException
+    {
+        _contentHandler.endDocument();
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException
+    {
+        _contentHandler.startElement(uri, localName, qName, atts);
+    }
+    @Override
+    public void endElement(String uri, String localName, String qName) throws SAXException
+    {
+        _contentHandler.endElement(uri, localName, qName);
+    }
+
+    @Override
+    public void characters(char[] ch, int start, int length) throws SAXException
+    {
+        _contentHandler.characters(ch, start, length);
+    }
+    @Override
+    public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException
+    {
+        _contentHandler.ignorableWhitespace(ch, start, length);
+    }
+
+    @Override
+    public void startPrefixMapping(String prefix, String uri) throws SAXException
+    {
+        _contentHandler.startPrefixMapping(prefix, uri);
+    }
+    @Override
+    public void endPrefixMapping(String prefix) throws SAXException
+    {
+        _contentHandler.endPrefixMapping(prefix);
+    }
+
+    @Override
+    public void processingInstruction(String target, String data) throws SAXException
+    {
+        _contentHandler.processingInstruction(target, data);
+    }
+
+    @Override
+    public void setDocumentLocator(Locator locator)
+    {
+        _contentHandler.setDocumentLocator(locator);
+    }
+
+    @Override
+    public void skippedEntity(String name) throws SAXException
+    {
+        _contentHandler.skippedEntity(name);
+    }
+
+    @Override
+    public void comment(char[] ch, int start, int length) throws SAXException
+    {
+        _lexicalHandler.comment(ch, start, length);
+    }
+
+    @Override
+    public void startCDATA() throws SAXException
+    {
+        _lexicalHandler.startCDATA();
+    }
+    @Override
+    public void endCDATA() throws SAXException
+    {
+        _lexicalHandler.endCDATA();
+    }
+
+    @Override
+    public void startDTD(String name, String publicId, String systemId) throws SAXException
+    {
+        _lexicalHandler.startDTD(name, publicId, systemId);
+    }
+    @Override
+    public void endDTD() throws SAXException
+    {
+        _lexicalHandler.endDTD();
+    }
+
+    @Override
+    public void startEntity(String name) throws SAXException
+    {
+        _lexicalHandler.startEntity(name);
+    }
+    @Override
+    public void endEntity(String name) throws SAXException
+    {
+        _lexicalHandler.endEntity(name);
+    }
+
+}
Index: main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLTransformer.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLTransformer.java	(revision 0)
+++ main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLTransformer.java	(revision 0)
@@ -0,0 +1,173 @@
+/*
+ *  Copyright 2011 Anyware Services
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.ametys.runtime.cocoon.serializers.xhtml.configurable;
+
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * Inherit this class to create a enhancer for the EnhancendXHTMLSerializer
+ */
+public abstract class XHTMLTransformer extends AbstractLogEnabled implements ContentHandler, LexicalHandler, Serviceable, Contextualizable
+{
+    /** The content handler where to write */
+    protected ContentHandler _contentHandler;
+    /** The lexical handler where to write */
+    protected LexicalHandler _lexicalHandler;
+    /** The avalon service manager */
+    protected ServiceManager _manager;
+    /** The avalon context */
+    protected Context _context;
+    
+    @Override
+    public void contextualize(Context context) throws ContextException
+    {
+        _context = context;
+    }
+    
+    @Override
+    public void service(ServiceManager manager) throws ServiceException
+    {
+        _manager = manager;
+    }
+    
+    /**
+     * Set the target content handler
+     * @param contentHandler the target content handler
+     */
+    public void setContentHandler(ContentHandler contentHandler)
+    {
+        _contentHandler = contentHandler;
+    }
+    
+    /**
+     * Set the target lexical handler
+     * @param lexicalHandler the target lexical handler
+     */
+    public void setLexicalHandler(LexicalHandler lexicalHandler)
+    {
+        _lexicalHandler = lexicalHandler;
+    }
+    @Override
+    public void startDocument() throws SAXException
+    {
+        _contentHandler.startDocument();
+    }
+    @Override
+    public void endDocument() throws SAXException
+    {
+        _contentHandler.endDocument();
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException
+    {
+        _contentHandler.startElement(uri, localName, qName, atts);
+    }
+    @Override
+    public void endElement(String uri, String localName, String qName) throws SAXException
+    {
+        _contentHandler.endElement(uri, localName, qName);
+    }
+    
+    @Override
+    public void characters(char[] ch, int start, int length) throws SAXException
+    {
+        _contentHandler.characters(ch, start, length);
+    }
+    @Override
+    public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException
+    {
+        _contentHandler.ignorableWhitespace(ch, start, length);
+    }
+    
+    @Override
+    public void processingInstruction(String target, String data) throws SAXException
+    {
+        _contentHandler.processingInstruction(target, data);
+    }
+    @Override
+    public void setDocumentLocator(Locator locator)
+    {
+        _contentHandler.setDocumentLocator(locator);
+    }
+    @Override
+    public void skippedEntity(String name) throws SAXException
+    {
+        _contentHandler.skippedEntity(name);
+    }
+    
+    @Override
+    public void startPrefixMapping(String prefix, String uri) throws SAXException
+    {
+        _contentHandler.startPrefixMapping(prefix, uri);
+    }
+    @Override
+    public void endPrefixMapping(String prefix) throws SAXException
+    {
+        _contentHandler.endPrefixMapping(prefix);
+    }
+    
+    @Override
+    public void startEntity(String name) throws SAXException
+    {
+        _lexicalHandler.startEntity(name);
+    }
+    @Override
+    public void endEntity(String name) throws SAXException
+    {
+        _lexicalHandler.endEntity(name);
+    }
+
+    @Override
+    public void startCDATA() throws SAXException
+    {
+        _lexicalHandler.startCDATA();
+    }
+    @Override
+    public void endCDATA() throws SAXException
+    {
+        _lexicalHandler.endCDATA();
+    }
+
+    @Override
+    public void startDTD(String name, String publicId, String systemId) throws SAXException
+    {
+        _lexicalHandler.startDTD(name, publicId, systemId);
+    }
+    @Override
+    public void endDTD() throws SAXException
+    {
+        _lexicalHandler.endCDATA();
+    }
+
+    @Override
+    public void comment(char[] ch, int start, int length) throws SAXException
+    {
+        _lexicalHandler.comment(ch, start, length);
+    }
+}
Index: main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLTransformerExtensionPoint.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLTransformerExtensionPoint.java	(revision 0)
+++ main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/configurable/XHTMLTransformerExtensionPoint.java	(revision 0)
@@ -0,0 +1,29 @@
+/*
+ *  Copyright 2011 Anyware Services
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.ametys.runtime.cocoon.serializers.xhtml.configurable;
+
+import org.ametys.runtime.plugin.component.AbstractThreadSafeComponentExtensionPoint;
+
+/**
+ * This extension point have the enhancers for the EnhancedXHTMLSerializer
+ */
+public class XHTMLTransformerExtensionPoint extends AbstractThreadSafeComponentExtensionPoint<XHTMLTransformer>
+{
+    /** The avalon role */
+    public static final String ROLE = XHTMLTransformerExtensionPoint.class.getName();
+
+}
Index: main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/XHTMLSerializer.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/XHTMLSerializer.java	(revision 0)
+++ main/kernel/src/org/ametys/runtime/cocoon/serializers/xhtml/XHTMLSerializer.java	(working copy)
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.ametys.runtime.cocoon;
+package org.ametys.runtime.cocoon.serializers.xhtml;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -25,13 +25,12 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.components.serializers.util.DocType;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
+
 /**
  * Inherits from cocoon's serializers block XHTMLSerializer.<p>
  * The following configuration can be used:
@@ -72,65 +71,64 @@
  *              <code>javax.xml.transform.*-output-escaping processing</code>.
  * @see Result
  */
-public class XHTMLSerializer extends org.apache.cocoon.components.serializers.XHTMLSerializer implements LogEnabled, Serviceable
+public class XHTMLSerializer extends org.apache.cocoon.components.serializers.XHTMLSerializer implements LogEnabled
 {   
+    /** A representation of the XHTML 1.0 strict document type. */
+    public static final DocType XHTML5_DOCTYPE_STRICT = new DocType(
+            "html", "",
+            "");
+
     /** List of the tags to collapse. */
-    private static final Set<String> __NAMESPACES_ALLOWED = new HashSet<String>(Arrays.asList(
+    protected static final Set<String> __NAMESPACES_ALLOWED = new HashSet<String>(Arrays.asList(
         new String[] {"", "http://www.w3.org/XML/1998/namespace", XHTML1_NAMESPACE, "http://www.w3.org/2000/svg",
                       "http://www.w3.org/1998/Math/MathML"}));
-    
     /** List of the tags to collapse. */
-    private static final Set<String> __COLLAPSE_TAGS = new HashSet<String>(Arrays.asList(
+    protected static final Set<String> __COLLAPSE_TAGS = new HashSet<String>(Arrays.asList(
         new String[] {"input", "img", "meta", "link", "hr", "br"}));
 
     /** Head tag. */
-    private static final String __HEAD_TAG = "head";
+    protected static final String __HEAD_TAG = "head";
     /** Meta tag. */
-    private static final String __META_TAG = "meta";
+    protected static final String __META_TAG = "meta";
     /** Meta HTTP equiv attribute name. */
-    private static final String __META_HTTP_EQUIV_ATTR = "http-equiv";
+    protected static final String __META_HTTP_EQUIV_ATTR = "http-equiv";
     /** Meta HTTP equiv attribute value for content type. */
-    private static final String __META_HTTP_EQUIV_CTYPE_VALUE = "Content-Type";
+    protected static final String __META_HTTP_EQUIV_CTYPE_VALUE = "Content-Type";
     /** Meta content attribute name. */
-    private static final String __META_CONTENT_ATTR = "content";
+    protected static final String __META_CONTENT_ATTR = "content";
     /** Script tag. */
-    private static final String __SCRIPT_TAG = "script";
+    protected static final String __SCRIPT_TAG = "script";
     /** Style tag. */
-    private static final String __STYLE_TAG = "style";
+    protected static final String __STYLE_TAG = "style";
     
-    /** The XHTMLSerializerExtensionPoint instance */
-    protected XHTMLSerializerExtensionPoint _xhtmlSerializerExtensionPoint;
-
-    /** Buffer to store script tag content. */
-    private StringBuilder _buffer;
-
     /** Buffer to store tag to collapse. */
-    private Set<String> _tagsToCollapse;
-    
+    protected Set<String> _tagsToCollapse;
     /** Namespaces allowed. */
-    private Set<String> _namespacesAllowed;
-    
+    protected Set<String> _namespacesAllowed;
     /** Namespaces prefixe filtered. */
-    private Set<String> _namespacesPrefixFiltered;
+    protected Set<String> _namespacesPrefixFiltered;
+    /** Define whether to put XML declaration in the head of the document. */
+    protected boolean _omitXmlDeclaration;
     
+    /** Buffer to store script tag content. */
+    protected StringBuilder _buffer;
+
     /** Inside filtered tag: greater than 0 if we are inside a filtered tag. */
-    private int _insideFilteredTag;
+    protected int _insideFilteredTag;
 
     /** Inline resource context: greater than 0 if we are inside a style or a script tag. */
-    private int _insideInlineResourceTag;
-    private int _tagsInsideInlineResourceTag;
+    protected int _insideInlineResourceTag;
+    /** Counter for tags inside a resource */
+    protected int _tagsInsideInlineResourceTag;
 
     /**
      * Flag for disabling output escaping states encountered with
      * <code>javax.xml.transform.*-output-escaping</code> processing instructions.
      */
-    private boolean _disableOutputEscaping;
-
-    /** Define whether to put XML declaration in the head of the document. */
-    private boolean _omitXmlDeclaration;
+    protected boolean _disableOutputEscaping;
 
     /** Meta http-equiv="Content-Type" context. True if we are inside a meta "content-type" tag.*/
-    private boolean _isMetaContentType;
+    protected boolean _isMetaContentType;
     
     private Logger _logger;
 
@@ -140,40 +138,44 @@
         _logger = logger;
     }
     
-    @Override
-    public void service(ServiceManager manager) throws ServiceException
-    {
-        if (manager.hasService(XHTMLSerializerExtensionPoint.ROLE))
-        {
-            _xhtmlSerializerExtensionPoint = (XHTMLSerializerExtensionPoint) manager.lookup(XHTMLSerializerExtensionPoint.ROLE);
-        }
-    }
     
     @Override
     public void configure(Configuration conf) throws ConfigurationException
     {
         super.configure(conf);
         
-        String omitXmlDeclaration = conf.getChild("omit-xml-declaration").getValue(null);
-        // Default to yes (omit).
-        this._omitXmlDeclaration = !"no".equals(omitXmlDeclaration);
+        _configureXMLOmitDeclaration(conf);
         
-        // Tags to collapse
-        String tagsToCollapse = conf.getChild("tags-to-collapse").getValue(null);
+        _configureTagsToCollapse(conf);
         
-        if (tagsToCollapse != null)
+        _configureNamespaceAllowed(conf);
+        
+        _configureDoctype(conf);
+    }
+
+    /**
+     * Configuration of the doctype
+     * @param conf The full configuration
+     */
+    protected void _configureDoctype(Configuration conf)
+    {
+        String doctypeDefault = conf.getChild("doctype-default").getValue(null);
+        if ("html5".equalsIgnoreCase(doctypeDefault)) 
         {
-            _tagsToCollapse = new HashSet<String>();
-            for (String tag : tagsToCollapse.split(","))
-            {
-                _tagsToCollapse.add(tag.trim());
-            }
+            this.doctype_default = XHTML5_DOCTYPE_STRICT;
         }
         else
         {
-            _tagsToCollapse = __COLLAPSE_TAGS;
+            // done by super.configure
         }
-        
+    }
+    
+    /**
+     * Configuration the allowed namespaces
+     * @param conf The full configuration
+     */
+    protected void _configureNamespaceAllowed(Configuration conf)
+    {
         // Namespaces allowed
         Configuration[] namespacesAllowed = conf.getChildren("namespace-allowed");
         
@@ -186,15 +188,47 @@
                 _namespacesAllowed.add(namespace.trim());
             }
         }
-        else if (_xhtmlSerializerExtensionPoint != null)
+        else
+        {
+            _namespacesAllowed = __NAMESPACES_ALLOWED;
+        }
+    }
+
+
+    /**
+     * Configure the tags to collapse
+     * @param conf The full configuration
+     */
+    protected void _configureTagsToCollapse(Configuration conf)
+    {
+        // Tags to collapse
+        String tagsToCollapse = conf.getChild("tags-to-collapse").getValue(null);
+        
+        if (tagsToCollapse != null)
         {
-            _namespacesAllowed = _xhtmlSerializerExtensionPoint.getAllowedNamespaces();
+            _tagsToCollapse = new HashSet<String>();
+            for (String tag : tagsToCollapse.split(","))
+            {
+                _tagsToCollapse.add(tag.trim());
+            }
         }
         else
         {
-            _namespacesAllowed = __NAMESPACES_ALLOWED;
+            _tagsToCollapse = __COLLAPSE_TAGS;
         }
     }
+
+
+    /**
+     * Configure the XMLOmit declaration
+     * @param conf The full configuration
+     */
+    protected void _configureXMLOmitDeclaration(Configuration conf)
+    {
+        String omitXmlDeclaration = conf.getChild("omit-xml-declaration").getValue(null);
+        // Default to yes (omit).
+        this._omitXmlDeclaration = !"no".equals(omitXmlDeclaration);
+    }
     
     @Override
     public void startPrefixMapping(String prefix, String uri) throws SAXException

Property changes on: main\kernel\src\org\ametys\runtime\cocoon\serializers\xhtml\XHTMLSerializer.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Index: main/kernel/src/org/ametys/runtime/cocoon/XHTMLSerializer.java
===================================================================
--- main/kernel/src/org/ametys/runtime/cocoon/XHTMLSerializer.java	(revision 9193)
+++ main/kernel/src/org/ametys/runtime/cocoon/XHTMLSerializer.java	(working copy)
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2009 Anyware Services
+ *  Copyright 2011 Anyware Services
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -13,495 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.ametys.runtime.cocoon;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.transform.Result;
 
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
+package org.ametys.runtime.cocoon;
 
 /**
- * Inherits from cocoon's serializers block XHTMLSerializer.<p>
- * The following configuration can be used:
- * <pre>
- * &lt;omit-xml-declaration&gt;yes|no&lt;/omit-xml-declaration&gt;
- * &lt;tags-to-collapse&gt;input,meta&lt;/tags-to-collapse&gt;
- * &lt;namespace-allowed&gt;&lt;/namespace-allowed&gt;
- * &lt;namespace-allowed&gt;http://www.w3.org/XML/1998/namespace&lt;/namespace-allowed&gt;
- * &lt;namespace-allowed&gt;http://www.w3.org/1999/xhtml&lt;/namespace-allowed&gt;
- * </pre>
- * Empty tags are not collapsed except the ones configured with
- * <code>tags-to-collapse</code>.<br>
- * If there is no such configuration, default tags to collaspe are:
- * <ul>
- *   <li>input</li>
- *   <li>img</li>
- *   <li>meta</li>
- *   <li>link</li>
- *   <li>hr</li>
- *   <li>br</li>
- * </ul>
- * Namespace tags and attributes are filtered to product valid XHTML.
- * This is configureable using <code>namespace-allowed</code>, by default
- * the only following namespaces are allowed:
- * <ul>
- *   <li>"" (empty namespace)</li>
- *   <li>"http://www.w3.org/XML/1998/namespace"</li>
- *   <li>"http://www.w3.org/1999/xhtml"</li>
- *   <li>"http://www.w3.org/2000/svg"</li>
- *   <li>"http://www.w3.org/1998/Math/MathML"</li>
- * </ul>
- * Content of <code>script</code> tags will be exported in a single comment.<p>
- * <code>omit-xml-declaration</code> is set to <code>yes</code> by default for
- * compatibility purpose (IE 6).
- * If <code>omit-xml-declaration</code> is set to <code>no</code>,
- * <code>Content-Type</code> meta tag will be dropped if present.<br>
- * @since 1.1.5 this serializer is JAXP compliant with the processing instruction
- *              <code>javax.xml.transform.*-output-escaping processing</code>.
- * @see Result
+ * The default XHTMLSerializer
+ * Do not use, use the parent class instead
  */
-public class XHTMLSerializer extends org.apache.cocoon.components.serializers.XHTMLSerializer implements LogEnabled, Serviceable
-{   
-    /** List of the tags to collapse. */
-    private static final Set<String> __NAMESPACES_ALLOWED = new HashSet<String>(Arrays.asList(
-        new String[] {"", "http://www.w3.org/XML/1998/namespace", XHTML1_NAMESPACE, "http://www.w3.org/2000/svg",
-                      "http://www.w3.org/1998/Math/MathML"}));
-    
-    /** List of the tags to collapse. */
-    private static final Set<String> __COLLAPSE_TAGS = new HashSet<String>(Arrays.asList(
-        new String[] {"input", "img", "meta", "link", "hr", "br"}));
-
-    /** Head tag. */
-    private static final String __HEAD_TAG = "head";
-    /** Meta tag. */
-    private static final String __META_TAG = "meta";
-    /** Meta HTTP equiv attribute name. */
-    private static final String __META_HTTP_EQUIV_ATTR = "http-equiv";
-    /** Meta HTTP equiv attribute value for content type. */
-    private static final String __META_HTTP_EQUIV_CTYPE_VALUE = "Content-Type";
-    /** Meta content attribute name. */
-    private static final String __META_CONTENT_ATTR = "content";
-    /** Script tag. */
-    private static final String __SCRIPT_TAG = "script";
-    /** Style tag. */
-    private static final String __STYLE_TAG = "style";
-    
-    /** The XHTMLSerializerExtensionPoint instance */
-    protected XHTMLSerializerExtensionPoint _xhtmlSerializerExtensionPoint;
-
-    /** Buffer to store script tag content. */
-    private StringBuilder _buffer;
-
-    /** Buffer to store tag to collapse. */
-    private Set<String> _tagsToCollapse;
-    
-    /** Namespaces allowed. */
-    private Set<String> _namespacesAllowed;
-    
-    /** Namespaces prefixe filtered. */
-    private Set<String> _namespacesPrefixFiltered;
-    
-    /** Inside filtered tag: greater than 0 if we are inside a filtered tag. */
-    private int _insideFilteredTag;
-
-    /** Inline resource context: greater than 0 if we are inside a style or a script tag. */
-    private int _insideInlineResourceTag;
-    private int _tagsInsideInlineResourceTag;
-
-    /**
-     * Flag for disabling output escaping states encountered with
-     * <code>javax.xml.transform.*-output-escaping</code> processing instructions.
-     */
-    private boolean _disableOutputEscaping;
-
-    /** Define whether to put XML declaration in the head of the document. */
-    private boolean _omitXmlDeclaration;
-
-    /** Meta http-equiv="Content-Type" context. True if we are inside a meta "content-type" tag.*/
-    private boolean _isMetaContentType;
-    
-    private Logger _logger;
-
-    @Override
-    public void enableLogging(Logger logger)
-    {
-        _logger = logger;
-    }
-    
-    @Override
-    public void service(ServiceManager manager) throws ServiceException
-    {
-        if (manager.hasService(XHTMLSerializerExtensionPoint.ROLE))
-        {
-            _xhtmlSerializerExtensionPoint = (XHTMLSerializerExtensionPoint) manager.lookup(XHTMLSerializerExtensionPoint.ROLE);
-        }
-    }
-    
-    @Override
-    public void configure(Configuration conf) throws ConfigurationException
-    {
-        super.configure(conf);
-        
-        String omitXmlDeclaration = conf.getChild("omit-xml-declaration").getValue(null);
-        // Default to yes (omit).
-        this._omitXmlDeclaration = !"no".equals(omitXmlDeclaration);
-        
-        // Tags to collapse
-        String tagsToCollapse = conf.getChild("tags-to-collapse").getValue(null);
-        
-        if (tagsToCollapse != null)
-        {
-            _tagsToCollapse = new HashSet<String>();
-            for (String tag : tagsToCollapse.split(","))
-            {
-                _tagsToCollapse.add(tag.trim());
-            }
-        }
-        else
-        {
-            _tagsToCollapse = __COLLAPSE_TAGS;
-        }
-        
-        // Namespaces allowed
-        Configuration[] namespacesAllowed = conf.getChildren("namespace-allowed");
-        
-        if (namespacesAllowed.length > 0)
-        {
-            _namespacesAllowed = new HashSet<String>();
-            for (Configuration namespaceAllowed : namespacesAllowed)
-            {
-                String namespace = namespaceAllowed.getValue("");
-                _namespacesAllowed.add(namespace.trim());
-            }
-        }
-        else if (_xhtmlSerializerExtensionPoint != null)
-        {
-            _namespacesAllowed = _xhtmlSerializerExtensionPoint.getAllowedNamespaces();
-        }
-        else
-        {
-            _namespacesAllowed = __NAMESPACES_ALLOWED;
-        }
-    }
-    
-    @Override
-    public void startPrefixMapping(String prefix, String uri) throws SAXException
-    {
-        if (_namespacesAllowed.contains(uri))
-        {
-            super.startPrefixMapping(prefix, uri);
-        }
-        else
-        {
-            _namespacesPrefixFiltered.add(prefix);
-        }
-    }
-    
-    @Override
-    public void startElement(String nsuri, String local, String qual, Attributes attributes) throws SAXException
-    {
-        if  (_insideInlineResourceTag > 0)
-        {
-            if (_logger.isWarnEnabled())
-            {
-                _logger.warn("Tags are forbidden inside a <script> or <style> tag : <" + local + ">");
-            }
-            
-            _tagsInsideInlineResourceTag++;
-        }
-        else if (_namespacesAllowed.contains(nsuri))
-        {
-            if (_insideFilteredTag == 0)
-            {
-                super.startElement(nsuri, local, qual, _filterAttributes(attributes));
-            }
-        }
-        else
-        {
-            // Ignore nested content as the namespace is filtered
-            _insideFilteredTag++;
-        }
-    }
-
-    private Attributes _filterAttributes(Attributes attributes)
-    {
-        AttributesImpl attributesFiltered = new AttributesImpl();
-        
-        for (int i = 0; i < attributes.getLength(); i++)
-        {
-            String uri = attributes.getURI(i);
-            
-            // Filter attribute with not allowed namespace
-            if (_namespacesAllowed.contains(uri))
-            {
-                String qName = attributes.getQName(i);
-                
-                // Filter attribute xmlns and xmlns:xxx
-                if (!qName.equals("xmlns") && !qName.startsWith("xmlns:"))
-                {
-                    attributesFiltered.addAttribute(uri, attributes.getLocalName(i), qName,
-                                                    attributes.getType(i), attributes.getValue(i));
-                }
-            }
-        }
-
-        return attributesFiltered;
-    }
-
-    @Override
-    public void startElementImpl(String uri, String local, String qual, String[][] lNamespaces, String[][] attributes) throws SAXException
-    {
-        if (local.equalsIgnoreCase(__SCRIPT_TAG) || local.equalsIgnoreCase(__STYLE_TAG))
-        {
-            _insideInlineResourceTag++;
-        }
-
-        _isMetaContentType = isMetaContentType(local, attributes);
-
-        // Always ignore the content-type meta tag because we do not want
-        // it in non omit mode and because we create it in omit mode (see below)
-        if (!_isMetaContentType)
-        {
-            super.startElementImpl(uri, local, qual, lNamespaces, attributes);
-        }
-        
-        // Create our own content-type meta tag in omit mode
-        if (_omitXmlDeclaration && local.equalsIgnoreCase(__HEAD_TAG))
-        {
-            // Create our own meta content type element as Xalan creates one but
-            // places it in the last children (after an potential title)
-            String qua = namespaces.qualify(XHTML1_NAMESPACE, __META_TAG, __META_TAG);
-            String[][] attrs = new String[2][ATTRIBUTE_LENGTH];
-
-            attrs[0][ATTRIBUTE_NSURI] = "";
-            attrs[0][ATTRIBUTE_LOCAL] = __META_HTTP_EQUIV_ATTR;
-            attrs[0][ATTRIBUTE_QNAME] = __META_HTTP_EQUIV_ATTR;
-            attrs[0][ATTRIBUTE_VALUE] = __META_HTTP_EQUIV_CTYPE_VALUE;
-            attrs[1][ATTRIBUTE_NSURI] = "";
-            attrs[1][ATTRIBUTE_LOCAL] = __META_CONTENT_ATTR;
-            attrs[1][ATTRIBUTE_QNAME] = __META_CONTENT_ATTR;
-            attrs[1][ATTRIBUTE_VALUE] = this.getMimeType();
-
-            super.startElementImpl(XHTML1_NAMESPACE, __META_TAG, qua, new String[0][0], attrs);
-            super.endElementImpl(XHTML1_NAMESPACE, __META_TAG, qua);
-        }
-    }
-    
-    @Override
-    public void characters(char[] ch, int start, int length) throws SAXException
-    {
-        if (_insideFilteredTag == 0)
-        {
-            if (_disableOutputEscaping)
-            {
-                // Close current element if necessary
-                closeElement(false);
-                // Let content pass through unchanged
-                write(ch, start, length);
-            }
-            else
-            {
-                super.characters(ch, start, length);
-            }
-        }
-    }
-
-    @Override
-    public void charactersImpl(char[] data, int start, int length) throws SAXException
-    {
-        if (_insideInlineResourceTag > 0)
-        {
-            _buffer.append(data, start, length);
-        }
-        else
-        {
-            super.charactersImpl(data, start, length);
-        }
-    }
-    
-    @Override
-    public void ignorableWhitespace(char[] data, int start, int length) throws SAXException
-    {
-        if (_insideFilteredTag == 0)
-        {
-            super.ignorableWhitespace(data, start, length);
-        }
-    }
-
-    @Override
-    public void comment(char[] data, int start, int length) throws SAXException
-    {
-        if (_insideFilteredTag == 0)
-        {
-            if (_insideInlineResourceTag > 0)
-            {
-                _buffer.append(data, start, length);
-            }
-            else
-            {
-                super.comment(data, start, length);
-            }
-        }
-    }
-    
-    @Override
-    public void processingInstruction(String target, String data) throws SAXException
-    {
-        if (_insideFilteredTag == 0)
-        {
-            if (Result.PI_DISABLE_OUTPUT_ESCAPING.equals(target))
-            {
-                // Start unescaping
-                _disableOutputEscaping = true;
-            }
-            else if (Result.PI_ENABLE_OUTPUT_ESCAPING.equals(target))
-            {
-                // Stop unescapping
-                _disableOutputEscaping = false;
-            }
-            else
-            {
-                super.processingInstruction(target, data);
-            }
-        }
-    }
-    
-    @Override
-    public void endElement(String nsuri, String local, String qual) throws SAXException
-    {
-        if (_tagsInsideInlineResourceTag > 0)
-        {
-            _tagsInsideInlineResourceTag--;
-        }
-        else if (_namespacesAllowed.contains(nsuri))
-        {
-            if (_insideFilteredTag == 0)
-            {
-                super.endElement(nsuri, local, qual);
-            }
-        }
-        else
-        {
-            // Finish to ignore parsed nested content as the namespace is filtered
-            _insideFilteredTag--;
-        }
-    }
-
-    @Override
-    public void endElementImpl(String uri, String local, String qual) throws SAXException
-    {
-        String namespaceUri = uri;
-        if (uri.length() == 0)
-        {
-            namespaceUri = XHTML1_NAMESPACE;
-        }
-
-        if (local.equalsIgnoreCase(__SCRIPT_TAG) || local.equalsIgnoreCase(__STYLE_TAG))
-        {
-            _insideInlineResourceTag--;
-            if (_buffer.length() > 0)
-            {
-                char[] content = new char[_buffer.length() + 2];
-                content[0] = '\n';
-                content[content.length - 1] = '\n';
-                _buffer.getChars(0, _buffer.length(), content, 1);
-                _buffer.setLength(0);
-                super.comment(content, 0, content.length);
-            }
-        }
-
-        if (XHTML1_NAMESPACE.equals(namespaceUri))
-        {
-            // If the element is not in the list of the tags to collapse, close it without collapsing
-            if (!__COLLAPSE_TAGS.contains(local))
-            {
-                this.closeElement(false);
-            }
-        }
-        
-        // Ignore the content-type meta tag, see startElementImpl
-        if (!_isMetaContentType)
-        {
-            super.endElementImpl(namespaceUri, local, qual);
-        }
-        else
-        {
-            _isMetaContentType = false;
-        }
-    }
-    
-    @Override
-    public void endPrefixMapping(String prefix) throws SAXException
-    {
-        if (!_namespacesPrefixFiltered.contains(prefix))
-        {
-            super.endPrefixMapping(prefix);
-        }
-    }
-
-    private boolean isMetaContentType(String local, String[][] attributes)
-    {
-        if (local.equalsIgnoreCase(__META_TAG))
-        {
-            for (String[] attr : attributes)
-            {
-                if (attr[ATTRIBUTE_LOCAL].equalsIgnoreCase(__META_HTTP_EQUIV_ATTR)
-                        && attr[ATTRIBUTE_VALUE].equalsIgnoreCase(__META_HTTP_EQUIV_CTYPE_VALUE))
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    
-    @Override
-    public void recycle()
-    {
-        super.recycle();
-        
-        if (_buffer == null)
-        {
-            _buffer = new StringBuilder(512);
-        }
-        else
-        {
-            if (_buffer.capacity() >  100 * 1024)
-            {
-                // Garbage collect previous buffer is it exceed 100 Kb
-                _buffer = new StringBuilder(512);
-            }
-            else
-            {
-                // Clear buffer but keep capacity
-                _buffer.setLength(0);
-            }
-        }
-        
-        // Clear parsing state aware attributes
-        if (_namespacesPrefixFiltered == null)
-        {
-            _namespacesPrefixFiltered = new HashSet<String>();
-        }
-        else
-        {
-            _namespacesPrefixFiltered.clear();
-        }
-        _insideFilteredTag = 0;
-        _insideInlineResourceTag = 0;
-        _disableOutputEscaping = false;
-        _isMetaContentType = false;
-    }
+@Deprecated
+public class XHTMLSerializer extends org.ametys.runtime.cocoon.serializers.xhtml.XHTMLSerializer
+{
+    /* empty */
 }
Index: main/kernel/sitemap.xmap
===================================================================
--- main/kernel/sitemap.xmap	(revision 9193)
+++ main/kernel/sitemap.xmap	(working copy)
@@ -52,13 +52,30 @@
 			<map:reader name="json" src="org.ametys.runtime.cocoon.JSonReader" logger="org.ametys.runtime.kernel.sitemap.reader.json"/>
 		</map:readers>
     
-		<map:serializers default="xhtml">
-			 <map:serializer name="xhtml" src="org.ametys.runtime.cocoon.XHTMLSerializer" mime-type="text/html; charset=UTF-8" logger="sitemap.serializer.html" pool-max="32">
+		<map:serializers default="xhtml-strict">
+			 <!-- DEPRECATED xhtml has to be removed and replaced by xhtml-strict
+			      then xhtml-configurable could become xhtml 
+			      -->
+			 <map:serializer name="xhtml" src="org.ametys.runtime.cocoon.serializers.xhtml.XHTMLSerializer" mime-type="text/html; charset=UTF-8" logger="sitemap.serializer.html" pool-max="32">
+                <encoding>UTF-8</encoding>
+                <doctype-default>strict</doctype-default>
+                <omit-xml-declaration>yes</omit-xml-declaration>
+                <indent>false</indent>
+            </map:serializer>
+			 <map:serializer name="xhtml-strict" src="org.ametys.runtime.cocoon.serializers.xhtml.XHTMLSerializer" mime-type="text/html; charset=UTF-8" logger="sitemap.serializer.html" pool-max="32">
                 <encoding>UTF-8</encoding>
                 <doctype-default>strict</doctype-default>
                 <omit-xml-declaration>yes</omit-xml-declaration>
                 <indent>false</indent>
             </map:serializer>
+			 <map:serializer name="xhtml-configurable" src="org.ametys.runtime.cocoon.serializers.xhtml.XHTMLSerializer" mime-type="text/html; charset=UTF-8" logger="sitemap.serializer.html" pool-max="32">
+                <encoding>UTF-8</encoding>
+                <doctype-default>strict</doctype-default>
+                <omit-xml-declaration>yes</omit-xml-declaration>
+                <indent>false</indent>
+            </map:serializer>
+
+<!--			 <map:serializer name="xhtml-configurable" src="org.ametys.runtime.cocoon.XHTMLConfigurableSerializer" mime-type="text/html; charset=UTF-8" logger="sitemap.serializer.html" pool-max="32"/>-->
             
 			<map:serializer logger="org.ametys.runtime.kernel.sitemap.serializer.xml" mime-type="text/xml" name="xml" pool-grow="4" pool-max="32" pool-min="16" src="org.apache.cocoon.serialization.XMLSerializer">
 				<encoding>UTF-8</encoding>
@@ -212,7 +229,7 @@
 			          		<map:transform type="i18n">
 			          			<map:parameter name="locale" value="{locale:locale}"/>
 			          		</map:transform>
-			          		<map:serialize status-code="404"/>
+			          		<map:serialize status-code="404" type="xhtml-strict"/>
 		          		</map:act>
 					</map:when>
 					<map:otherwise>
@@ -227,7 +244,7 @@
 			          		<map:transform type="i18n">
 			          			<map:parameter name="locale" value="{locale:locale}"/>
 			          		</map:transform>
-			          		<map:serialize status-code="500"/>
+			          		<map:serialize status-code="500" type="xhtml-strict"/>
 		          		</map:act>
 					</map:otherwise>
 				</map:select>
Index: main/workspace-admin/sitemap.xmap
===================================================================
--- main/workspace-admin/sitemap.xmap	(revision 9193)
+++ main/workspace-admin/sitemap.xmap	(working copy)
@@ -107,7 +107,7 @@
 					<map:parameter name="locale" value="{locale:locale}"/>
                     <map:parameter name="workspace" value="{request-attr:workspaceName}"/>
 				</map:transform>
-				<map:serialize/>
+				<map:serialize type="xhtml-strict"/>
 			</map:match>
 			
 			<!-- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*- -->
@@ -133,7 +133,7 @@
 					<map:parameter name="locale" value="{locale:locale}"/>
                     <map:parameter name="workspace" value="{request-attr:workspaceName}"/>
 				</map:transform>
-				<map:serialize/>
+				<map:serialize type="xhtml-strict"/>
 			</map:match>
 			
 			<!-- ******* -->
@@ -174,7 +174,7 @@
 					<map:parameter name="locale" value="{locale:locale}"/>
 					<map:parameter name="plugin" value="{1}"/>
 				</map:transform>
-				<map:serialize/>
+				<map:serialize type="xhtml-strict"/>
 			</map:match>
 			
 			<map:handle-errors>
@@ -190,7 +190,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="404"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="404"/>		          		
 					</map:when>
 					<map:when test="authorization-required">
 						<map:act type="set-authorization-header"/>
@@ -204,7 +204,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="401"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="401"/>		          		
 					</map:when>
 					<map:when test="access-denied">
 		        		<map:generate type="exception" label="content"/>
@@ -217,7 +217,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="403"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="403"/>		          		
 					</map:when>
 					<map:otherwise>					
 		        		<map:generate type="exception" label="content"/>
@@ -230,7 +230,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="500"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="500"/>		          		
 					</map:otherwise>
 				</map:select>
 			</map:handle-errors>
#P Ametys Plugin Web HEAD
Index: main/workspace-web/stylesheets/page.xsl
===================================================================
--- main/workspace-web/stylesheets/page.xsl	(revision 9193)
+++ main/workspace-web/stylesheets/page.xsl	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+  <!--
    Copyright 2010 Anyware Services
 
    Licensed under the Apache License, Version 2.0 (the "License");
Index: main/workspace-web/sitemap.xmap
===================================================================
--- main/workspace-web/sitemap.xmap	(revision 9193)
+++ main/workspace-web/sitemap.xmap	(working copy)
@@ -167,7 +167,7 @@
                 <map:transform type="i18n">
                     <map:parameter name="locale" value="{locale:locale}"/>
                 </map:transform>
-                 <map:serialize type="xhtml"/>
+                 <map:serialize type="xhtml-strict"/>
             </map:match>
             
             <map:match pattern="*/index.html">
@@ -192,7 +192,7 @@
 	                <map:transform type="i18n">
 	                    <map:parameter name="locale" value="{locale:locale}"/>
 	                </map:transform>
-	                <map:serialize type="xhtml"/>
+	                <map:serialize type="xhtml-strict"/>
                 </map:act>
                 <map:redirect-to uri="../index.html"/>
             </map:match>  
@@ -264,7 +264,7 @@
 	    						<map:parameter name="site" value="{../site}"/>
 	    	                    <map:parameter name="skin" value="{../skin}"/>
 	                        </map:transform>
-	                         <map:serialize type="xhtml"/>
+	                         <map:serialize type="xhtml-configurable"/>
 	                     </map:act>
                      </map:act>
                 </map:act>
@@ -297,7 +297,7 @@
 	    						<map:parameter name="site" value="{../site}"/>
 	    	                    <map:parameter name="skin" value="{../skin}"/>
 	                        </map:transform>
-	                        <map:serialize type="xhtml"/>
+	                        <map:serialize type="xhtml-configurable"/>
 	                    </map:act>
 	                </map:act>
                 </map:act>
@@ -345,7 +345,7 @@
 				<map:transform type="i18n">
 					<map:parameter name="locale" value="{locale:locale}"/>
 				</map:transform>
-				<map:serialize type="xhtml"/>
+				<map:serialize type="xhtml-configurable"/>
 			</map:match>
 			
 			<!-- <site>/_content/<contentName> -->
@@ -375,7 +375,7 @@
 	    						<map:parameter name="site" value="{../site}"/>
 	    	                    <map:parameter name="skin" value="{../skin}"/>
 	                        </map:transform>
-	                        <map:serialize type="xhtml"/>
+	                        <map:serialize type="xhtml-configurable"/>
 	                    </map:act>
 	                </map:act>
                 </map:act>
@@ -410,7 +410,7 @@
 	    						<map:parameter name="site" value="{../site}"/>
 	    	                    <map:parameter name="skin" value="{../skin}"/>
 	                        </map:transform>
-	                        <map:serialize type="xhtml"/>
+	                        <map:serialize type="xhtml-configurable"/>
 	                    </map:act>
 	            	</map:act>
                 </map:act>
@@ -822,7 +822,7 @@
 				<map:transform type="i18n">
 					<map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
 				</map:transform>
-				<map:serialize type="xhtml"/>
+				<map:serialize type="xhtml-configurable"/>
 			</map:match>
 			
 			
@@ -840,7 +840,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="404"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="404"/>		          		
 					</map:when>
 					<map:when test="authorization-required">
 						<map:act type="set-authorization-header"/>
@@ -854,7 +854,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="401"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="401"/>		          		
 					</map:when>
 					<map:when test="access-denied">
 		        		<map:generate type="exception" label="content"/>
@@ -867,7 +867,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="403"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="403"/>		          		
 					</map:when>
 					<map:otherwise>					
 		        		<map:generate type="exception" label="content"/>
@@ -880,7 +880,7 @@
                         <map:transform type="i18n">
                             <map:parameter name="locale" value="{locale:locale}"/>
                         </map:transform>
-		          		<map:serialize status-code="500"/>		          		
+		          		<map:serialize type="xhtml-strict" status-code="500"/>		          		
 					</map:otherwise>
 				</map:select>
 			</map:handle-errors> 
Index: main/plugin-web/sitemap.xmap
===================================================================
--- main/plugin-web/sitemap.xmap	(revision 9193)
+++ main/plugin-web/sitemap.xmap	(working copy)
@@ -842,7 +842,7 @@
                         <map:parameter name="server" value="{server}"/>
                         <map:parameter name="complete-url" value="{complete-url}"/>
                     </map:transform>
-                    <map:serialize type="xhtml"/>
+                    <map:serialize type="xhtml-configurable"/>
                 </map:act>
                 <!-- When the requested URL is not on the same server, output an error page.
 -->
@@ -855,7 +855,7 @@
                     <map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
                     <map:parameter name="default-catalogue-id" value="plugin.{request-attr:pluginName}"/>
                 </map:transform>
-                <map:serialize type="xhtml"/>
+                <map:serialize type="xhtml-configurable"/>
             </map:match>
                         
 			<!-- +
@@ -933,7 +933,7 @@
 					<map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
  				 	<map:parameter name="plugin" value="{request-attr:pluginName}"/>
 				</map:transform>
-				<map:serialize type="xhtml"/>
+				<map:serialize type="xhtml-configurable"/>
 			</map:match>
 			
             <!-- +
@@ -958,7 +958,7 @@
                     <map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
                     <map:parameter name="plugin" value="{request-attr:pluginName}"/>
                 </map:transform>
-                <map:serialize type="xhtml"/>
+                <map:serialize type="xhtml-configurable"/>
             </map:match>
             
 			<!-- +
@@ -991,7 +991,7 @@
 					<map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
  				 	<map:parameter name="plugin" value="{request-attr:pluginName}"/>
 				</map:transform>
-				<map:serialize type="xhtml"/>
+				<map:serialize type="xhtml-configurable"/>
 			</map:match>
 			
 			<map:match pattern="service/search/auto-completion/*/*.xml">
@@ -1018,7 +1018,7 @@
 					<map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
  				 	<map:parameter name="plugin" value="{request-attr:pluginName}"/>
 				</map:transform>
-				<map:serialize type="xhtml"/>
+				<map:serialize type="xhtml-configurable"/>
 			</map:match>
 			
 			<!-- +
@@ -1050,7 +1050,7 @@
 					<map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
  				 	<map:parameter name="plugin" value="{request-attr:pluginName}"/>
 				</map:transform>
-				<map:serialize type="xhtml"/>
+				<map:serialize type="xhtml-configurable"/>
 			</map:match>
 			
             <!-- +
@@ -1083,7 +1083,7 @@
                         <map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
                         <map:parameter name="plugin" value="{request-attr:pluginName}"/>
                     </map:transform>
-                    <map:serialize type="xhtml"/>
+                    <map:serialize type="xhtml-configurable"/>
                 </map:act>
             </map:match>
             
@@ -1247,7 +1247,7 @@
                         <map:parameter name="locale" value="{request-attr:sitemapLanguage}"/>
                         <map:parameter name="plugin" value="{pluginName}"/>
                     </map:transform>
-                    <map:serialize type="xhtml"/>
+                    <map:serialize type="xhtml-configurable"/>
                 </map:act>
             </map:match>