cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1329268 [3/4] - in /cocoon/site/site/2.2: ./ css/ images/ js/
Date Mon, 23 Apr 2012 14:59:39 GMT
Modified: cocoon/site/site/2.2/1366_1_1.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/1366_1_1.html?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/1366_1_1.html (original)
+++ cocoon/site/site/2.2/1366_1_1.html Mon Apr 23 14:59:38 2012
@@ -29,17 +29,13 @@
   <head>
     <title>      Cocoon 2.2 Site - How to configure consistent encoding in Cocoon
   </title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
+    <link rel="stylesheet" href="./css/apache-cocoon-thien-maven-skin.min.css" />
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <script src="./js/getBlank.js" language="javascript" type="text/javascript"></script>
-          <meta name="author" content="The Cocoon Community" />
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <script src="./js/apache-cocoon-thien-maven-skin.min.js" language="javascript" type="text/javascript"></script>
+          <meta name="author" content="Apache Cocoon Documentation Team" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body>
+  <body onload="javascript:prettyPrint();">
     <div id="breadtrail">
        <p><a href="http://www.apache.org">Apache</a> &raquo; <a href="../">Cocoon</a> &raquo;</p>
     </div>
@@ -74,7 +70,7 @@
                 <li><a href="../2.2/core-modules/">Core <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/blocks/">Blocks <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/maven-plugins/">Maven Plugins <span class="pl-version-small">2.2</span></a></li>
-                <li><strong><a href="..//3.0/">Cocoon 3.0 <span class="pl-version-small">[alpha]</span></a></em></strong></li>            
+                <li><strong><a href="..//3.0/">Cocoon 3.0</a></em></strong></li>
                 <li><strong><a href="../subprojects/">Subprojects</a></strong></li>
               </ul>
                     </div>
@@ -89,7 +85,7 @@
             <ul>
                   
     <li >
-              <a href="1327_1_1.html">Overview</a>
+              <a href="index.html">Overview</a>
         </li>
                   
     <li >
@@ -99,10 +95,6 @@
     <li >
               <a href="1420_1_1.html">New in 2.2</a>
         </li>
-                  
-    <li >
-              <a href="1454_1_1.html">Test2</a>
-        </li>
               </ul>
     </li>
       <li>
@@ -150,22 +142,38 @@
     </li>
       </ul>
        <div class="main">
+         <!-- Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you 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. -->
          <div id="contentBody"><div id="bodyText"><h1 class="docTitle">How to configure consistent encoding in Cocoon</h1><p>The best for internationalization, ie. support of umlauts, special
 characters, non-english languages, is to handle everything in UTF-8, because
-this is probably the most intelligent encoding available out there.</p><div class="note"><div><strong>Note: </strong>If you need another encoding, simply replace all occurrences of
+this is probably the most intelligent encoding available out there.</p><div class="note"><div><b>Note: </b>If you need another encoding, simply replace all occurrences of
 UTF-8 with that one, but note that this guide was only tested with UTF-8, other
 encodings might not be supported at all places.</div></div><p>The following how-to covers the typical steps to achieve a consistent
 encoding throughout a Cocoon application. Some <a href="#theory">Background
-information</a> can be found at the end of this page.</p><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">1. Sending all pages in UTF-8</h1><p>You need to configure Cocoon's serializers to UTF-8. The XML serializer
-(<tt>&lt;serialize type=&quot;xml&quot; /&gt;</tt>) and the HTML serializer
-(<tt>&lt;serialize type=&quot;html&quot; /&gt;</tt>) need to be configured. To support all
+information</a> can be found at the end of this page.</p><h1>1. Sending all pages in UTF-8</h1><p>You need to configure Cocoon's serializers to UTF-8. The XML serializer
+(<tt>&lt;serialize&#xa0;type=&quot;xml&quot;&#xa0;/&gt;</tt>) and the HTML serializer
+(<tt>&lt;serialize&#xa0;type=&quot;html&quot;&#xa0;/&gt;</tt>) need to be configured. To support all
 browsers, you must state the encoding to be used for the body and also include a
 meta tag in the html:
-<tt>&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot;&gt;</tt>.
+<tt>&lt;meta&#xa0;http-equiv=&quot;Content-Type&quot;&#xa0;content=&quot;text/html;&#xa0;charset=UTF-8&quot;&gt;</tt>.
 This is very important, since the browser will then send form requests encoded
 in UTF-8 (and browsers normaly don't mention the encoding in the request, so you
 have to assume they are doing it right). Here is the configuration for the
-serializer components for your sitemaps that will do that:</p><pre>&lt;serializer name=&quot;xml&quot; mime-type=&quot;text/xml&quot;
+serializer components for your sitemaps that will do that:</p><div><pre>&lt;serializer name=&quot;xml&quot; mime-type=&quot;text/xml&quot;
   src=&quot;org.apache.cocoon.serialization.XMLSerializer&quot;&gt;
   &lt;encoding&gt;UTF-8&lt;/encoding&gt;
 &lt;/serializer&gt;
@@ -178,14 +186,14 @@ serializer components for your sitemaps 
   &lt;doctype-public&gt;-//W3C//DTD HTML 4.01 Transitional//EN&lt;/doctype-public&gt;
   &lt;doctype-system&gt;http://www.w3.org/TR/html4/loose.dtd&lt;/doctype-system&gt;
 &lt;/serializer&gt;
-</pre><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">2. AJAX Requests with CForms/Dojo</h1><p>If you use CForms with ajax enabled, Cocoon will make use of dojo.io.bind()
+</pre></div><h1>2. AJAX Requests with CForms/Dojo</h1><p>If you use CForms with ajax enabled, Cocoon will make use of dojo.io.bind()
 under the hood, which creates XMLHttpRequests that POST the form data to the
 server. Here Dojo decides the encoding by default, which does not match the
 browser's behaviour of using the charset defined in the META tag. But you can
 easily tell Dojo which formatting to use for all dojo.io.bind() calls, just
-include that in the top of your HTML pages, before dojo.js is included:</p><pre>&lt;script&gt;djConfig = { bindEncoding: &quot;utf-8&quot; };&lt;/script&gt;
-</pre><p>You might already have other djConfig options, then simply add the
-<tt>bindEncoding</tt> property to the hash map.</p><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">3. Decoding incoming requests: Servlet Container</h1><p>When the browser sends stuff to your server, eg. form data, the
+include that in the top of your HTML pages, before dojo.js is included:</p><div><pre>&lt;script&gt;djConfig = { bindEncoding: &quot;utf-8&quot; };&lt;/script&gt;
+</pre></div><p>You might already have other djConfig options, then simply add the
+<tt>bindEncoding</tt> property to the hash map.</p><h1>3. Decoding incoming requests: Servlet Container</h1><p>When the browser sends stuff to your server, eg. form data, the
 <tt>ServletRequest</tt> will be created by your servlet container, which needs
 to decode the parameters correctly into Java Strings. If there is the encoding
 specified in the HTTP request header, he will use that, but unfortunately this
@@ -198,11 +206,11 @@ UTF-8 by default). So to make sure UTF-8
 have to tell your servlet that encoding explicitly. This is done by calling
 <tt>ServletRequest.setCharacterEncoding()</tt>. To do that for all your
 requests, you can use a servlet filter like this one:
-<a href="http://wiki.apache.org/cocoon/SetCharacterEncodingFilter">SetCharacterEncodingFilter</a>.
+<a class="externalLink" href="http://wiki.apache.org/cocoon/SetCharacterEncodingFilter">SetCharacterEncodingFilter</a>.
 Put this into one of your Cocoon blocks under
 <tt>src/main/java/my/package/filters/SetCharacterEncodingFilter</tt> so that the
 class will be in a jar that lands in <tt>WEB-INF/lib</tt> and thus being
-availble for use in the web.xml configuration.</p><p>Then you add the filter to the web.xml:</p><pre>&lt;filter&gt;
+availble for use in the web.xml configuration.</p><p>Then you add the filter to the web.xml:</p><div><pre>&lt;filter&gt;
   &lt;filter-name&gt;Set Character Encoding&lt;/filter-name&gt;
   &lt;filter-class&gt;my.package.filters.SetCharacterEncodingFilter&lt;/filter-class&gt;
   &lt;init-param&gt;
@@ -225,50 +233,50 @@ availble for use in the web.xml configur
   &lt;servlet-name&gt;CocoonBlocksDispatcherServlet&lt;/servlet-name&gt;
 &lt;/filter-mapping&gt;
 
-</pre><p>Since the filter element was added in the servlet 2.3 specification, you need
+</pre></div><p>Since the filter element was added in the servlet 2.3 specification, you need
 at least 2.3 in your web.xml, but using the current 2.4 version is better, it's
-the standard for Cocoon webapplications. For 2.4 you use a XSD schema:</p><pre>&lt;web-app version=&quot;2.4&quot;
+the standard for Cocoon webapplications. For 2.4 you use a XSD schema:</p><div><pre>&lt;web-app version=&quot;2.4&quot;
          xmlns=&quot;http://java.sun.com/xml/ns/j2ee&quot;
          xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
          xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd&quot;&gt;
-</pre><p>For 2.3 you need to modify the DOCTYPE declaration in the web.xml:</p><pre>&lt;!DOCTYPE web-app
+</pre></div><p>For 2.3 you need to modify the DOCTYPE declaration in the web.xml:</p><div><pre>&lt;!DOCTYPE web-app
     PUBLIC &quot;-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN&quot;
     &quot;http://java.sun.com/dtd/web-app_2_3.dtd&quot;&gt;
-</pre><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">4. Setting Cocoon's encoding (especially CForms)</h1><p>To tell Cocoon to use UTF-8 internally, you have to set 2 properties:</p><pre>org.apache.cocoon.containerencoding=utf-8
+</pre></div><h1>4. Setting Cocoon's encoding (especially CForms)</h1><p>To tell Cocoon to use UTF-8 internally, you have to set 2 properties:</p><div><pre>org.apache.cocoon.containerencoding=utf-8
 org.apache.cocoon.formencoding=utf-8
-</pre><p>They need to be in some <tt>*.properties</tt> file under
+</pre></div><p>They need to be in some <tt>*.properties</tt> file under
 <tt>META-INF/cocoon/properties</tt> in one of your blocks. Note that the
 containerencoding must be the same as the one you specified in the
-SetCharacterEncodingFilter. But here we are using UTF-8 everywhere anyway.</p><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">5. XML Files</h1><p>This is normally not a problem, since the standard encoding for XML files is
+SetCharacterEncodingFilter. But here we are using UTF-8 everywhere anyway.</p><h1>5. XML Files</h1><p>This is normally not a problem, since the standard encoding for XML files is
 UTF-8. However, they should always start with the following instruction, which
 should force your XML Editor to save them in UTF-8 (it looks like most of them
-do that, so there should not be a problem here).</p><pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-</pre><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">6. Special Transformers</h1><p>The standard XSLT Transformers and others are working on SAX events, which
+do that, so there should not be a problem here).</p><div><pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+</pre></div><h1>6. Special Transformers</h1><p>The standard XSLT Transformers and others are working on SAX events, which
 are not serialized, thus encoding is not a problem. But there are some special
 transformers that pass stuff on to another library that does include
 serialization and might need a hint to use the correct encoding. One problem is
 for example the NekoHTMLTransformer:
-<a href="https://issues.apache.org/jira/browse/COCOON-2063">https://issues.apache.org/jira/browse/COCOON-2063</a>.
+<a class="externalLink" href="https://issues.apache.org/jira/browse/COCOON-2063">https://issues.apache.org/jira/browse/COCOON-2063</a>.
 </p><p>If you think there might be a transformer doing things wrong in your
 pipeline, add a <tt>TeeTransformer</tt> between each step, outputting the XML
 between the transformers into temp1.xml, temp2.xml and so on to look for the
-place where your umlaute and special characters are messed up.</p><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">7. Your own XML serializing Sources</h1><p>If you have your own Source implementation that needs to serialize XML, make
+place where your umlaute and special characters are messed up.</p><h1>7. Your own XML serializing Sources</h1><p>If you have your own Source implementation that needs to serialize XML, make
 sure it will do that in UTF-8 as well. A good idea is to use Cocoon's XML
 serializer, since we already configured that one to UTF-8 above. Sample code
 that does that is here:
-<a href="http://wiki.apache.org/cocoon/UseCocoonXMLSerializerCode">UseCocoonXMLSerializerCode</a>
-</p><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Further information</h1><h2 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Browser encoding basics</h2><h3 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Getting pages</h3><p>If your Cocoon application needs to read request parameters that could
-contain <em>special</em> characters, i.e. characters outside of the first 128
+<a class="externalLink" href="http://wiki.apache.org/cocoon/UseCocoonXMLSerializerCode">UseCocoonXMLSerializerCode</a>
+</p><h1>Further information</h1><div class="section" style="background:none;padding:0;"><h2 style="background:none;padding:0;">Browser encoding basics<a name="Browser_encoding_basics"></a></h2></div><div class="section"><h3>Getting pages<a name="Getting_pages"></a></h3><p>If your Cocoon application needs to read request parameters that could
+contain <i>special</i> characters, i.e. characters outside of the first 128
 ASCII characters, you'll need to pay attention to what encoding is used.</p><p>Normally a browser will send data to the server using the same encoding as
 the page containing the submitted form (or whatever). So if the pages are
 serialized using UTF-8, the browser will submit form data using UTF-8. The user
 can change the encoding, but it's quite safe to assume he/she won't do that
 (have you ever done it?).</p><p>The browser will either read the encoding from either the &lt;meta&gt; tag
-inside the HTML &lt;head&gt;:</p><pre>&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot;&gt;
-</pre><p>or from the HTTP Header Content-Type:</p><pre>Content-Type: text/html; charset=UTF-8
-</pre><p>One has to include both to support all browsers. This will be done by the
+inside the HTML &lt;head&gt;:</p><div><pre>&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot;&gt;
+</pre></div><p>or from the HTTP Header Content-Type:</p><div><pre>Content-Type: text/html; charset=UTF-8
+</pre></div><p>One has to include both to support all browsers. This will be done by the
 HTML serializer if you configure it with the parameters mime-type and encoding,
-as stated above.</p><h3 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Sending form data</h3><p>By default, if the browser doesn't explicitely mention the encoding, a
+as stated above.</p></div><div class="section"><h3>Sending form data<a name="Sending_form_data"></a></h3><p>By default, if the browser doesn't explicitely mention the encoding, a
 servlet container will decode request parameters using the ISO-8859-1 encoding
 (independent of the platform on which the container is running). So in the above
 case where UTF-8 was used when serializing, we would be facing problems. An
@@ -277,71 +285,75 @@ handy mvn jetty:run to run your Cocoon a
 default. It does not adhere to the servlet container standard here.</p><p>You either have to configure your container with the default encoding you
 want (e.g. UTF-8), if that is possible, or you must use a servlet-filter
 solution like the
-<a href="http://wiki.apache.org/cocoon/SetCharacterEncodingFilter">SetCharacterEncodingFilter</a>.
+<a class="externalLink" href="http://wiki.apache.org/cocoon/SetCharacterEncodingFilter">SetCharacterEncodingFilter</a>.
 Using a servlet filter also has the advantage that it will work for any servlet.
 Suppose your webapp consists of multiple servlets, with Cocoon being only one of
 them. Sometimes the processing could start in another servlet (which sets the
 character encoding correctly) and then be forwarded to Cocoon, while other times
 the processing could start immediately in the Cocoon servlet. It would then be
 impossible to know in Cocoon whether the request parameter encoding needs to be
-corrected or not (see below).</p><h2 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Request parameter decoding in Cocoon</h2><h3 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Fixing a wrong servlet container</h3><p>If you are not able to set the default encoding for your servlet container to
+corrected or not (see below).</p></div><div class="section" style="background:none;padding:0;"><h2 style="background:none;padding:0;">Request parameter decoding in Cocoon<a name="Request_parameter_decoding_in_Cocoon"></a></h2></div><div class="section"><h3>Fixing a wrong servlet container<a name="Fixing_a_wrong_servlet_container"></a></h3><p>If you are not able to set the default encoding for your servlet container to
 what you actually want, it is possible to configure Cocoon to re-decode
 parameters properly. Suppose the servlet container has ISO-8859-1 default
 encoding set, but the requests from the browser are actually encoded in UTF-8.
-Then you can configure Cocoon with these properties:</p><pre>org.apache.cocoon.containerencoding=iso-8859-1
+Then you can configure Cocoon with these properties:</p><div><pre>org.apache.cocoon.containerencoding=iso-8859-1
 org.apache.cocoon.formencoding=utf-8
-</pre><p>For Java-insiders: what Cocoon actually does internally is apply the
+</pre></div><p>For Java-insiders: what Cocoon actually does internally is apply the
 following trick to get a parameter correctly decoded: suppose &quot;value&quot; is a
-string containing a request parameter, then Cocoon will do:</p><pre>value = new String(value.getBytes(&quot;ISO-8859-1&quot;), &quot;UTF-8&quot;);
-</pre><p>So it recodes the incorrectly decoded string back to bytes and decodes it
+string containing a request parameter, then Cocoon will do:</p><div><pre>value = new String(value.getBytes(&quot;ISO-8859-1&quot;), &quot;UTF-8&quot;);
+</pre></div><p>So it recodes the incorrectly decoded string back to bytes and decodes it
 using the correct encoding. The first (ISO-8859-1 in the example) is the
 containerencoding, the second one the formencoding.</p><p>Not that this only works for core Cocoon concepts, eg. sitemaps, CForms and
 others accessing the request parameters. There are other components, eg. the
 JSPGenerator, that access the original HttpServletRequest object and thus do not
 get the correctly re-decoded parameter values (that is, if for example the JSP
 page itself would read request parameters). The only working solution seems to
-be the servlet-filter here.</p><h3 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Locally overriding the form-encoding</h3><p>Cocoon is ideally suited for publishing to different kinds of devices, and it
+be the servlet-filter here.</p></div><div class="section"><h3>Locally overriding the form-encoding<a name="Locally_overriding_the_form-encoding"></a></h3><p>Cocoon is ideally suited for publishing to different kinds of devices, and it
 may well be possible that for certain devices, it is required to use different
 encodings. In this case, you can redefine the form-encoding for specific
 pipelines using the SetCharacterEncodingAction.</p><p>To use it, first of all make sure the action is declared in the map:actions
-element of the sitemap:</p><pre>&lt;map:action name=&quot;set-encoding&quot; src=&quot;org.apache.cocoon.acting.SetCharacterEncodingAction&quot;/&gt;
-</pre><p>and then call the action at the required location as follows:</p><pre>&lt;map:act type=&quot;set-encoding&quot;&gt;
+element of the sitemap:</p><div><pre>&lt;map:action name=&quot;set-encoding&quot; src=&quot;org.apache.cocoon.acting.SetCharacterEncodingAction&quot;/&gt;
+</pre></div><p>and then call the action at the required location as follows:</p><div><pre>&lt;map:act type=&quot;set-encoding&quot;&gt;
   &lt;map:parameter name=&quot;form-encoding&quot; value=&quot;some-other-encoding&quot;/&gt;
 &lt;/map:act&gt;
-</pre><h2 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Operating System Preliminaries</h2><p>Not having influence on request parameter decoding, but sometimes making
+</pre></div></div><div class="section" style="background:none;padding:0;"><h2 style="background:none;padding:0;">Operating System Preliminaries<a name="Operating_System_Preliminaries"></a></h2></div><p>Not having influence on request parameter decoding, but sometimes making
 trouble with text files, database communication, etc. are operating system
 language settings. Working with non-english characters may pose problems, as the
 JVM seems to detect the system language. If, e.g., german umlauts should be
 correctly processed with Cocoon on Linux, it is required to set the LANG
-environment variable to de like this:</p><p><tt>export LANG=de</tt></p><p>That's one of several ways of setting the JVM locale, see also
-<a href="http://wiki.apache.org/cocoon/SettingTheJvmLocale">SettingTheJvmLocale</a>.
-</p><h2 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">More readings</h2><ul>
+environment variable to de like this:</p><p><tt>export&#xa0;LANG=de</tt></p><p>That's one of several ways of setting the JVM locale, see also
+<a class="externalLink" href="http://wiki.apache.org/cocoon/SettingTheJvmLocale">SettingTheJvmLocale</a>.
+</p><div class="section" style="background:none;padding:0;"><h2 style="background:none;padding:0;">More readings<a name="More_readings"></a></h2></div><ul>
 <li>
 
-<a href="http://marc.theaimsgroup.com/?t=106760662600010&r=1&w=2">Cocoon's
+<a class="externalLink" href="http://marc.theaimsgroup.com/?t=106760662600010&amp;r=1&amp;w=2">Cocoon's
 defaults form-encoding and seerialize-encoding</a>
-<a href="http://wiki.apache.org/cocoon/MarcPortier">MarcPortier</a> proposal to
+<a class="externalLink" href="http://wiki.apache.org/cocoon/MarcPortier">MarcPortier</a> proposal to
 remove inconsitencies in the way Cocoon handles the encoding of serialized text
 and request-parameter decoding.
-<a href="http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=106772461923197&w=2">This</a>
+<a class="externalLink" href="http://marc.theaimsgroup.com/?l=xml-cocoon-dev&amp;m=106772461923197&amp;w=2">This</a>
 is a good summary of the thread.
 </li>
 <li>Cocoon does not support the HTTP request header
-<a href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-accept-charset">Accept-Charset</a>,
+<a class="externalLink" href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-accept-charset">Accept-Charset</a>,
 where the browser specifies a list of encodings it can handle. Maybe this might
 be useful to implement.</li>
-</ul></div><div class="editUrl"><div><em>Errors and Improvements?</em> If you see any errors or potential improvements in this document please help
-        us: <a href="http://cocoon.zones.apache.org/daisy/cdocs/1366?branch=1&language=1">View, Edit or comment</a> on the latest development version (registration required).
-      </div></div></div>
+</ul></div></div>
+       
        </div>
     </div>
 
     <!-- end of content -->
     <div id="footer">
-      <p>&#169;  
-          1999-2008
+      <p>Copyright &copy;  
+          1999-2012
     
           The Apache Software Foundation
+      All Rights Reserved.</p>
+
+      <p>
+      Apache Cocoon, Apache, the Apache feather logo, and the Apache Cocoon project logos are trademarks of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
       </p>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

Modified: cocoon/site/site/2.2/1402_1_1.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/1402_1_1.html?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/1402_1_1.html (original)
+++ cocoon/site/site/2.2/1402_1_1.html Mon Apr 23 14:59:38 2012
@@ -27,19 +27,15 @@
 
 <html>
   <head>
-    <title>      Cocoon 2.2 Site - 
+    <title>      Cocoon 2.2 Site -
   </title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
+    <link rel="stylesheet" href="./css/apache-cocoon-thien-maven-skin.min.css" />
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <script src="./js/getBlank.js" language="javascript" type="text/javascript"></script>
-          <meta name="author" content="The Cocoon Community" />
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <script src="./js/apache-cocoon-thien-maven-skin.min.js" language="javascript" type="text/javascript"></script>
+          <meta name="author" content="Apache Cocoon Documentation Team" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body>
+  <body onload="javascript:prettyPrint();">
     <div id="breadtrail">
        <p><a href="http://www.apache.org">Apache</a> &raquo; <a href="../">Cocoon</a> &raquo;</p>
     </div>
@@ -74,7 +70,7 @@
                 <li><a href="../2.2/core-modules/">Core <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/blocks/">Blocks <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/maven-plugins/">Maven Plugins <span class="pl-version-small">2.2</span></a></li>
-                <li><strong><a href="..//3.0/">Cocoon 3.0 <span class="pl-version-small">[alpha]</span></a></em></strong></li>            
+                <li><strong><a href="..//3.0/">Cocoon 3.0</a></em></strong></li>
                 <li><strong><a href="../subprojects/">Subprojects</a></strong></li>
               </ul>
                     </div>
@@ -89,7 +85,7 @@
             <ul>
                   
     <li >
-              <a href="1327_1_1.html">Overview</a>
+              <a href="index.html">Overview</a>
         </li>
                   
     <li >
@@ -99,10 +95,6 @@
     <li >
               <a href="1420_1_1.html">New in 2.2</a>
         </li>
-                  
-    <li >
-              <a href="1454_1_1.html">Test2</a>
-        </li>
               </ul>
     </li>
       <li>
@@ -150,18 +142,38 @@
     </li>
       </ul>
        <div class="main">
-         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">2.1 to 2.2 migration</h1><p>TODO</p></div><div class="editUrl"><div><em>Errors and Improvements?</em> If you see any errors or potential improvements in this document please help
-        us: <a href="http://cocoon.zones.apache.org/daisy/cdocs/1402?branch=1&language=1">View, Edit or comment</a> on the latest development version (registration required).
-      </div></div></div>
+         <!-- Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you 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. -->
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">2.1 to 2.2 migration</h1><p>TODO</p></div></div>
+       
        </div>
     </div>
 
     <!-- end of content -->
     <div id="footer">
-      <p>&#169;  
-          1999-2008
+      <p>Copyright &copy;  
+          1999-2012
     
           The Apache Software Foundation
+      All Rights Reserved.</p>
+
+      <p>
+      Apache Cocoon, Apache, the Apache feather logo, and the Apache Cocoon project logos are trademarks of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
       </p>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

Modified: cocoon/site/site/2.2/1420_1_1.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/1420_1_1.html?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/1420_1_1.html (original)
+++ cocoon/site/site/2.2/1420_1_1.html Mon Apr 23 14:59:38 2012
@@ -29,17 +29,13 @@
   <head>
     <title>      Cocoon 2.2 Site - New in 2.2
   </title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
+    <link rel="stylesheet" href="./css/apache-cocoon-thien-maven-skin.min.css" />
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <script src="./js/getBlank.js" language="javascript" type="text/javascript"></script>
-          <meta name="author" content="The Cocoon Community" />
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <script src="./js/apache-cocoon-thien-maven-skin.min.js" language="javascript" type="text/javascript"></script>
+          <meta name="author" content="Apache Cocoon Documentation Team" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body>
+  <body onload="javascript:prettyPrint();">
     <div id="breadtrail">
        <p><a href="http://www.apache.org">Apache</a> &raquo; <a href="../">Cocoon</a> &raquo;</p>
     </div>
@@ -74,7 +70,7 @@
                 <li><a href="../2.2/core-modules/">Core <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/blocks/">Blocks <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/maven-plugins/">Maven Plugins <span class="pl-version-small">2.2</span></a></li>
-                <li><strong><a href="..//3.0/">Cocoon 3.0 <span class="pl-version-small">[alpha]</span></a></em></strong></li>            
+                <li><strong><a href="..//3.0/">Cocoon 3.0</a></em></strong></li>
                 <li><strong><a href="../subprojects/">Subprojects</a></strong></li>
               </ul>
                     </div>
@@ -89,7 +85,7 @@
             <ul>
                   
     <li >
-              <a href="1327_1_1.html">Overview</a>
+              <a href="index.html">Overview</a>
         </li>
                   
     <li >
@@ -99,10 +95,6 @@
     <li >
               <strong>New in 2.2</strong>
         </li>
-                  
-    <li >
-              <a href="1454_1_1.html">Test2</a>
-        </li>
               </ul>
     </li>
       <li>
@@ -150,9 +142,25 @@
     </li>
       </ul>
        <div class="main">
+         <!-- Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you 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. -->
          <div id="contentBody"><div id="bodyText"><h1 class="docTitle">New in 2.2</h1><p>While developing Cocoon 2.2 the main goal was simplicity, modularity and
 consistent configuration. This page is a summary of all the new features and
-improvements.</p><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">General</h1><ul>
+improvements.</p><h1>General</h1><ul>
 <li>Cocoon 2.2 doesn't use an Avalon-based component manager any more but uses
 Spring 2 instead.</li>
 <li>Cocoon components (sitemap components as well as general components) can be
@@ -167,9 +175,9 @@ contracts.</li>
 <li>An optional additional validation of sitemaps based on an XML schema
 definition is configureable.</li>
 <li>Cocoon 2.2 uses Comons Logging instead of Avalon Logkit as logging interface
-and Log4j as logging implementation. (<em>Also see the 'Incompatibles changes'
-section of this document.</em>)</li>
-</ul><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Modularity</h1><ul>
+and Log4j as logging implementation. (<i>Also see the 'Incompatibles changes'
+section of this document.</i>)</li>
+</ul><h1>Modularity</h1><ul>
 <li>In order to make Cocoon applications more modular, the
 Servlet-Service-Framework was introduced. The Servlet-Service-Framework is a
 general-purpose framework that makes it possible to establish contracts between
@@ -179,7 +187,7 @@ services.</li>
 <li>The Servlet-Service-Framework has no dependency on the 'traditional' Cocoon
 (sitemap/pipeline machinery) and can be used together with any
 JavaServlet-compatible web application.</li>
-</ul><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Configuration and Deployment</h1><ul>
+</ul><h1>Configuration and Deployment</h1><ul>
 <li>Cocoon 2.1 was configured at build time. This means that you have to build
 Cocoon 2.1 yourself in order to get the Cocoon that you need for your
 application. There was no simple upgrade path from one minor/patch release to
@@ -199,8 +207,8 @@ properties for different environments (e
 as default implementation.</li>
 <li>The number of dependencies of a minimal Cocoon application (sitemaps,
 pipelines, XML templates) was reduced and together they amount to less than
-10MB  (incl. Xalan and Xerces libs!).</li>
-</ul><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Tools</h1><ul>
+10MB&#xa0; (incl. Xalan and Xerces libs!).</li>
+</ul><h1>Tools</h1><ul>
 <li>The Cocoon Maven 2 plugin makes is very easy to use Cocoon together with
 Maven 2 as build system. The main features are</li>
 <ul>
@@ -214,41 +222,45 @@ destination web application.</li>
 </ul>
 
 <li>Schema files for sitemaps.</li>
-</ul><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Deprecation</h1><ul>
+</ul><h1>Deprecation</h1><ul>
 <li>Avalon-style component configurations</li>
-</ul><div class="fixme"><div><strong>Fixme: </strong>Deprecation is subject of an ongoing dicussion.</div></div><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Migrating 2.1 components</h1>When you have avalon based components that you want to use with the new
+</ul><div class="fixme"><div><b>Fixme: </b>Deprecation is subject of an ongoing dicussion.</div></div><h1>Migrating 2.1 components</h1>When you have avalon based components that you want to use with the new
 spring configuration system make sure you are configure them right. Avalon based
 components were implementing an interface to e.g. be Threadsafe. In Spring you
 will need to configure the scope (default is singletone). If you see a lot of
 NPE in concurrency tests then you would need to use the prototype scope as shown
-below.<pre></pre><pre>&lt;beans&gt;
+below.<div><pre></pre></div><div><pre>&lt;beans&gt;
   &lt;bean id=&quot;dispatcher&quot; scope=&quot;prototype&quot;
     name=&quot;org.apache.cocoon.transformation.Transformer/dispatcher&quot;
     class=&quot;org.apache.forrest.dispatcher.transformation.DispatcherTransformer&quot;&gt;
     &lt;property name=&quot;manager&quot; ref=&quot;org.apache.avalon.framework.service.ServiceManager&quot;/&gt;
   &lt;/bean&gt;
-&lt;/beans&gt;</pre><pre></pre><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Incompatible changes</h1><ul>
+&lt;/beans&gt;</pre></div><div><pre></pre></div><h1>Incompatible changes</h1><ul>
 <li>All Cocoon components don't implement the Avalon Logkit logging interfaces
-(<tt><a href="http://excalibur.apache.org/apidocs/org/apache/avalon/framework/logger/Logger.html">org.apache.avalon.framework.logger.Logger</a></tt>
+(<tt><a class="externalLink" href="http://excalibur.apache.org/apidocs/org/apache/avalon/framework/logger/Logger.html">org.apache.avalon.framework.logger.Logger</a></tt>
 ) anymore but Commons logging instead. This change also makes it possible to
 configure components via Spring configuration files. If you extend one of those
 components (e.g.
-<a href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/transformation/AbstractSAXTransformer.html">AbstractSAXTransformer</a>),
+<a class="externalLink" href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/transformation/AbstractSAXTransformer.html">AbstractSAXTransformer</a>),
 you have to change the logger implementation and to recompile your classes. We
 are sorry but there is no backwards compatible way in doing this move from
 Avalon Logkit to Commons Logging.</li>
-</ul></div><div class="editUrl"><div><em>Errors and Improvements?</em> If you see any errors or potential improvements in this document please help
-        us: <a href="http://cocoon.zones.apache.org/daisy/cdocs/1420?branch=1&language=1">View, Edit or comment</a> on the latest development version (registration required).
-      </div></div></div>
+</ul></div></div>
+       
        </div>
     </div>
 
     <!-- end of content -->
     <div id="footer">
-      <p>&#169;  
-          1999-2008
+      <p>Copyright &copy;  
+          1999-2012
     
           The Apache Software Foundation
+      All Rights Reserved.</p>
+
+      <p>
+      Apache Cocoon, Apache, the Apache feather logo, and the Apache Cocoon project logos are trademarks of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
       </p>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

Modified: cocoon/site/site/2.2/1447_1_1.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/1447_1_1.html?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/1447_1_1.html (original)
+++ cocoon/site/site/2.2/1447_1_1.html Mon Apr 23 14:59:38 2012
@@ -29,17 +29,13 @@
   <head>
     <title>      Cocoon 2.2 Site - Download
   </title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
+    <link rel="stylesheet" href="./css/apache-cocoon-thien-maven-skin.min.css" />
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <script src="./js/getBlank.js" language="javascript" type="text/javascript"></script>
-          <meta name="author" content="The Cocoon Community" />
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <script src="./js/apache-cocoon-thien-maven-skin.min.js" language="javascript" type="text/javascript"></script>
+          <meta name="author" content="Apache Cocoon Documentation Team" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body>
+  <body onload="javascript:prettyPrint();">
     <div id="breadtrail">
        <p><a href="http://www.apache.org">Apache</a> &raquo; <a href="../">Cocoon</a> &raquo;</p>
     </div>
@@ -74,7 +70,7 @@
                 <li><a href="../2.2/core-modules/">Core <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/blocks/">Blocks <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/maven-plugins/">Maven Plugins <span class="pl-version-small">2.2</span></a></li>
-                <li><strong><a href="..//3.0/">Cocoon 3.0 <span class="pl-version-small">[alpha]</span></a></em></strong></li>            
+                <li><strong><a href="..//3.0/">Cocoon 3.0</a></em></strong></li>
                 <li><strong><a href="../subprojects/">Subprojects</a></strong></li>
               </ul>
                     </div>
@@ -89,7 +85,7 @@
             <ul>
                   
     <li >
-              <a href="1327_1_1.html">Overview</a>
+              <a href="index.html">Overview</a>
         </li>
                   
     <li >
@@ -99,10 +95,6 @@
     <li >
               <a href="1420_1_1.html">New in 2.2</a>
         </li>
-                  
-    <li >
-              <a href="1454_1_1.html">Test2</a>
-        </li>
               </ul>
     </li>
       <li>
@@ -150,21 +142,41 @@
     </li>
       </ul>
        <div class="main">
-         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Download</h1><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Cocoon 2.2 Core</h1><p>The current version of Cocoon 2.2  can be found at our central
-<a href="../1284_1_1.html">download page</a>.</p><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Cocoon Blocks</h1><p>The download pages for each released block can be found as part of the block
+         <!-- Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you 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. -->
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Download</h1><h1>Cocoon 2.2 Core</h1><p>The current version of Cocoon 2.2&#xa0; can be found at our central
+<a href="../1284_1_1.html">download page</a>.</p><h1>Cocoon Blocks</h1><p>The download pages for each released block can be found as part of the block
 specific documentations. In order to get an overview of what blocks are
-available, use the <a href="../2.2/blocks/1204_1_1.html">list of blocks</a>.</p></div><div class="editUrl"><div><em>Errors and Improvements?</em> If you see any errors or potential improvements in this document please help
-        us: <a href="http://cocoon.zones.apache.org/daisy/cdocs/1447?branch=1&language=1">View, Edit or comment</a> on the latest development version (registration required).
-      </div></div></div>
+available, use the <a href="../2.2/blocks/1204_1_1.html">list of blocks</a>.</p></div></div>
+       
        </div>
     </div>
 
     <!-- end of content -->
     <div id="footer">
-      <p>&#169;  
-          1999-2008
+      <p>Copyright &copy;  
+          1999-2012
     
           The Apache Software Foundation
+      All Rights Reserved.</p>
+
+      <p>
+      Apache Cocoon, Apache, the Apache feather logo, and the Apache Cocoon project logos are trademarks of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
       </p>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

Modified: cocoon/site/site/2.2/1448_1_1.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/1448_1_1.html?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/1448_1_1.html (original)
+++ cocoon/site/site/2.2/1448_1_1.html Mon Apr 23 14:59:38 2012
@@ -29,17 +29,13 @@
   <head>
     <title>      Cocoon 2.2 Site - Screencasts
   </title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
+    <link rel="stylesheet" href="./css/apache-cocoon-thien-maven-skin.min.css" />
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <script src="./js/getBlank.js" language="javascript" type="text/javascript"></script>
-          <meta name="author" content="The Cocoon Community" />
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <script src="./js/apache-cocoon-thien-maven-skin.min.js" language="javascript" type="text/javascript"></script>
+          <meta name="author" content="Apache Cocoon Documentation Team" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body>
+  <body onload="javascript:prettyPrint();">
     <div id="breadtrail">
        <p><a href="http://www.apache.org">Apache</a> &raquo; <a href="../">Cocoon</a> &raquo;</p>
     </div>
@@ -74,7 +70,7 @@
                 <li><a href="../2.2/core-modules/">Core <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/blocks/">Blocks <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/maven-plugins/">Maven Plugins <span class="pl-version-small">2.2</span></a></li>
-                <li><strong><a href="..//3.0/">Cocoon 3.0 <span class="pl-version-small">[alpha]</span></a></em></strong></li>            
+                <li><strong><a href="..//3.0/">Cocoon 3.0</a></em></strong></li>
                 <li><strong><a href="../subprojects/">Subprojects</a></strong></li>
               </ul>
                     </div>
@@ -89,7 +85,7 @@
             <ul>
                   
     <li >
-              <a href="1327_1_1.html">Overview</a>
+              <a href="index.html">Overview</a>
         </li>
                   
     <li >
@@ -99,10 +95,6 @@
     <li >
               <a href="1420_1_1.html">New in 2.2</a>
         </li>
-                  
-    <li >
-              <a href="1454_1_1.html">Test2</a>
-        </li>
               </ul>
     </li>
       <li>
@@ -150,24 +142,44 @@
     </li>
       </ul>
        <div class="main">
-         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Screencasts</h1><h1 xmlns:ns="http://outerx.org/daisy/1.0" xmlns:p="http://outerx.org/daisy/1.0#publisher">Cocoon reloading class Maven plug-in - rapid development</h1><p>The following screencast demonstrates how Rapid Application (Block more
+         <!-- Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you 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. -->
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Screencasts</h1><h1>Cocoon reloading class Maven plug-in - rapid development</h1><p>The following screencast demonstrates how Rapid Application (Block more
 precisely) Development is achieved with <a href="../2.2/maven-plugins/maven-plugin/1.0/1295_1_1.html">Maven's RCL</a>
 (AKA Cocoon) plug-in.</p><p>Some initial steps leading to creation of a basic block are taken from
 &quot;<a href="1159_1_1.html">Your first Cocoon application using Maven 2</a>&quot; tutorial.
-</p><div class="note"><div><strong>Note: </strong>During the screencast old version (1.0.0-RC2) of archetype is
+</p><div class="note"><div><b>Note: </b>During the screencast old version (1.0.0-RC2) of archetype is
 being used for initial block creation. You should use always use the latest
-available version which can be checked <a href="../2.2/maven-plugins/1208_1_1.html">here</a>.</div></div><div class="includedDoc"><object Height="725" Width="1008" type="application/x-shockwave-flash" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,19,0"><param name="movie" value="flash/1452_1_1.swf"></param><param name="Play" value="true"></param><param name="Loop" value="false"></param><param name="Autoplay" value="false"></param><param name="Autostart" value="false"></param><embed src="flash/1452_1_1.swf" Height="725" Width="1008" Play="true" Loop="false" Autoplay="false" Autostart="false"></embed></object><br></br></div></div><div class="editUrl"><div><em>Errors and Improvements?</em> If you see any errors or potential improvements in this document please help
-        us: <a href="http://cocoon.zones.apache.org/daisy/cdocs/1448?branch=1&language=1">View, Edit or comment</a> on the latest development version (registration required).
-      </div></div></div>
+available version which can be checked <a href="../2.2/maven-plugins/1208_1_1.html">here</a>.</div></div><div class="includedDoc"><object height="725" width="1008" type="application/x-shockwave-flash" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,19,0"><param name="movie" value="flash/1452_1_1.swf"></param><param name="Play" value="true"></param><param name="Loop" value="false"></param><param name="Autoplay" value="false"></param><param name="Autostart" value="false"></param></object><br /></div></div></div>
+       
        </div>
     </div>
 
     <!-- end of content -->
     <div id="footer">
-      <p>&#169;  
-          1999-2008
+      <p>Copyright &copy;  
+          1999-2012
     
           The Apache Software Foundation
+      All Rights Reserved.</p>
+
+      <p>
+      Apache Cocoon, Apache, the Apache feather logo, and the Apache Cocoon project logos are trademarks of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
       </p>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

Modified: cocoon/site/site/2.2/1454_1_1.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/1454_1_1.html?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/1454_1_1.html (original)
+++ cocoon/site/site/2.2/1454_1_1.html Mon Apr 23 14:59:38 2012
@@ -29,17 +29,13 @@
   <head>
     <title>      Cocoon 2.2 Site - Test2
   </title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
+    <link rel="stylesheet" href="./css/apache-cocoon-thien-maven-skin.min.css" />
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <script src="./js/getBlank.js" language="javascript" type="text/javascript"></script>
-          <meta name="author" content="The Cocoon Community" />
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <script src="./js/apache-cocoon-thien-maven-skin.min.js" language="javascript" type="text/javascript"></script>
+          <meta name="author" content="Apache Cocoon Documentation Team" />
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body>
+  <body onload="javascript:prettyPrint();">
     <div id="breadtrail">
        <p><a href="http://www.apache.org">Apache</a> &raquo; <a href="../">Cocoon</a> &raquo;</p>
     </div>
@@ -74,7 +70,7 @@
                 <li><a href="../2.2/core-modules/">Core <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/blocks/">Blocks <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/maven-plugins/">Maven Plugins <span class="pl-version-small">2.2</span></a></li>
-                <li><strong><a href="..//3.0/">Cocoon 3.0 <span class="pl-version-small">[alpha]</span></a></em></strong></li>            
+                <li><strong><a href="..//3.0/">Cocoon 3.0</a></em></strong></li>
                 <li><strong><a href="../subprojects/">Subprojects</a></strong></li>
               </ul>
                     </div>
@@ -89,7 +85,7 @@
             <ul>
                   
     <li >
-              <a href="1327_1_1.html">Overview</a>
+              <a href="index.html">Overview</a>
         </li>
                   
     <li >
@@ -99,10 +95,6 @@
     <li >
               <a href="1420_1_1.html">New in 2.2</a>
         </li>
-                  
-    <li >
-              <strong>Test2</strong>
-        </li>
               </ul>
     </li>
       <li>
@@ -150,20 +142,38 @@
     </li>
       </ul>
        <div class="main">
-         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Test2</h1><p>Test2</p><div class="includedDoc"><div id="contentBody"><div id="bodyText"><h1 class="docTitle">Test1</h1><p>This document has been created for testing purposes only!</p></div><div class="editUrl"><div><em>Errors and Improvements?</em> If you see any errors or potential improvements in this document please help
-        us: <a href="http://cocoon.zones.apache.org/daisy/cdocs/1454?branch=1&language=1">View, Edit or comment</a> on the latest development version (registration required).
-      </div></div></div></div></div><div class="editUrl"><div><em>Errors and Improvements?</em> If you see any errors or potential improvements in this document please help
-        us: <a href="http://cocoon.zones.apache.org/daisy/cdocs/1454?branch=1&language=1">View, Edit or comment</a> on the latest development version (registration required).
-      </div></div></div>
+         <!-- Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you 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. -->
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Test2</h1><p>Test2</p><div class="includedDoc"><div id="contentBody"><div id="bodyText"><h1 class="docTitle">Test1</h1><p>This document has been created for testing purposes only!</p></div></div></div></div></div>
+       
        </div>
     </div>
 
     <!-- end of content -->
     <div id="footer">
-      <p>&#169;  
-          1999-2008
+      <p>Copyright &copy;  
+          1999-2012
     
           The Apache Software Foundation
+      All Rights Reserved.</p>
+
+      <p>
+      Apache Cocoon, Apache, the Apache feather logo, and the Apache Cocoon project logos are trademarks of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
       </p>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

Added: cocoon/site/site/2.2/css/apache-cocoon-thien-maven-skin.min.css
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/css/apache-cocoon-thien-maven-skin.min.css?rev=1329268&view=auto
==============================================================================
--- cocoon/site/site/2.2/css/apache-cocoon-thien-maven-skin.min.css (added)
+++ cocoon/site/site/2.2/css/apache-cocoon-thien-maven-skin.min.css Mon Apr 23 14:59:38 2012
@@ -0,0 +1 @@
+body{margin:0;padding:0}#content div.main{margin:0 20px 0 185px}.section{margin:0 20px 0 0;padding:0}.section .section{margin:0}img{border:0}acronym{cursor:help;border-bottom:1px dotted #0086b3}select,input{color:#626262}code{border:1px solid #aaa;background:#efefef;font-size:110%;padding:10px}li code,td code{border:0;font-size:110%;background:transparent;padding:0}#legend li.externalLink{background:url(../images/external.png) left top no-repeat;padding-left:18px}a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover{background:url(../images/external.png) right center no-repeat;padding-right:18px}#legend li.newWindow{background:url(../images/newwindow.png) left top no-repeat;padding-left:18px}a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover{background:url(../images/newwindow.png) right center no-repeat;padding-right:18px}p{margin:.4em 0 .5em 0;line-height:1.35em}table.bodyTable th{background:#
 0086b3;color:#fff}table.bodyTable tr.b{background:#cce7f0}.subsectionTitle{font-size:13px;font-weight:bold;color:#666}.pl-version-small{font-size:70%}.errormark,.warningmark,.donemark,.infomark{margin:10px 0;padding:0 0 0 45px;border:1px solid #9bcd52}.errormark{background:url(../images/errors.gif) no-repeat 10px 7px}.warningmark{background:url(../images/warning.gif) no-repeat 10px 7px}.donemark{background:url(../images/icon_success_sml.gif) no-repeat 10px 7px}.infomark{background:url(../images/note.gif) no-repeat 10px 7px}.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{col
 or:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0;padding-left:15px}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}body{font-family:Arial,Helvetica,sans-serif;font-size:.8em;color:#4c4c4c}a:link,a:visited{color:#0086b3}a:hover{text-decoration:none}h1{margin:25px 0 15px 0;padding:0 0 5px 17px;background:url(../images/h1-image.gif) no-repeat left 4px;font-size:130%;color:#0086b3;border-bottom:1px solid #0086b3}h1.docTitle{margin:0 0 10px 0;padding:0 0 5px 0;font-size:150%;background:0}h2{font-size:120%}h3,h4,h5{font-size:100%;font-weight:bold}ul{margin:5px 0 10px 0;padding:0 0 0 20px;list-style:none}li{padding-left:15px;padding-bottom:3px}ul li{background:url(../images/list.gif) no-repeat left 3px}ol li{padding-left:5px}tt{font-size:130%}pre{border:1px solid #aaa;background:#efefef;font-size:110%;padding:10px}table{margin:0 0 10px 0;width:99.5%;border:1px solid #cce7f0}table th,table td{padding:4px}thead{background:#0086b3;color
 :#fff}tbody{background:#e5f3f7}table .alt{background:#cce7f0}#breadtrail{background:#2698be url(../images/breadtrail-bg.gif) repeat-x bottom left}#breadtrail p{margin:0;padding:2px 0 5px 20px;color:#fff}#breadtrail a{color:#fff;text-decoration:none}#breadtrail a:hover{text-decoration:underline}#top{background:url(../images/top-background.jpg) repeat-x}#header{height:129px;background:url(../images/logo-background.jpg) no-repeat}.projectlogo{float:left}.logoImage{margin:30px 0 0 34px}.grouplogo{margin:10px 10px 0 0;float:right}.grouptitle{margin:0;padding-bottom:5px;background:url(../images/group-title-line.gif) repeat-x bottom}.grouptitle a:link,.grouptitle a:visited{color:#545454;text-decoration:none}.searchbox{margin:3px 0;padding:0}.searchbox input{padding:3px;font-size:11px;border:1px solid #626262;color:#626262}.searchbox .searchboxsubmit{background:#626262;border:0;color:#fff}#projectBar{margin-bottom:10px;height:25px;border-top:1px solid #f2f2f2;border-bottom:1px solid
  #f2f2f2}#projectBar .projectTitle{margin:0;padding:6px 0 0 5px;background:0;border:0;float:left;font-size:100%;color:#0086b3}.projectTitle a{text-decoration:none}.projectTitle a:hover{text-decoration:underline}#projectBar .projectList{margin:5px 15px 0 0;padding:0;list-style:none;float:right}#projectBar .projectList li{padding:0 8px;background:0;float:left;border-right:1px solid #f2f2f2}#projectBar .projectList a{color:#acacac;text-decoration:none}#projectBar .projectList a:hover{text-decoration:underline}.projectList img{padding-top:2px}.cocoonHome{margin:0;padding:4px 0 0 10px;float:left}.projectBarClear{height:1%;clear:both}#menu{margin:0;padding:0;width:170px;list-style:none;font-weight:bold;float:left}#menu li{margin-left:10px;padding:3px 5px 3px 10px;background:url(../images/menu-title.gif) no-repeat left 8px;color:#7c7c7c}#menu li ul{margin:0;padding:0;list-style:none;font-weight:normal}#menu li ul li{margin:0;padding:3px 0 0 10px;background:url(../images/menu-list.g
 if) no-repeat left 7px;border-bottom:1px solid #ebebeb}#menu li ul .menuCollapse{background:url(../images/menu-collapse.gif) no-repeat left 7px}#menu li ul li a{color:#7c7c7c;text-decoration:none}#menu li ul li a:hover{text-decoration:underline}#menu .menuVersions{color:#2e93b5}#contentBody{margin:0 20px 0 0;padding:0}#contentBody.withSidebar{margin-right:190px}.includedDoc #contentBody{margin:0}.includedDoc h1.docTitle{margin:0;padding:0 0 0 17px;background:url(../images/h1-image.gif) no-repeat bottom left;font-size:130%;color:#0086b3;border-bottom:1px solid #0086b3}.includedDoc .editUrl{display:none}#intro{width:180px;float:right;background:#ebebeb}#intro div{margin:2px;border:1px solid #fff}#intro h2{color:#0086b3}#intro p,#intro h2{margin:8px}#getting{margin:0;padding:0;display:inline-block;width:100%}/*\*/* html #getting{height:1%;width:auto}#getting{display:table}/**/#getting div{margin:0 5px 5px 0;padding:0;width:150px;height:16em;background:#9bcd52 url(../images/gett
 ing-bottom.gif) no-repeat bottom;border:0;float:left}#getting div div{margin:0;height:auto;padding:10px 0 0 10px;background:url(../images/getting-top.gif) no-repeat}#getting h2{margin:0 10px;padding:4px 0;font-size:120%;color:#fff;border-bottom:1px solid #fff}#getting ul{margin:0 10px 10px 10px;padding:0;color:#fff;list-style:none}#getting ul li{padding:2px 0 2px 7px;background:url(../images/getting-list.gif) no-repeat left 6px}#getting ul li a{color:#fff}#getting ul li a:hover{text-decoration:none}#getting #gettingDownload{background:#2e93b5 url(../images/download-bottom.gif) no-repeat bottom left}#gettingDownload .downloadVersion{margin:0;height:auto;padding:83px 0 25px 0;background:url(../images/download-bg.jpg) no-repeat;font-size:120%;font-weight:bold;text-align:center}#getting .moreDownload{height:auto;width:auto;margin:0;padding:0 10px;background:#2e93b5;color:#fff}#getting .moreDownload a{color:#fff}.news{margin:10px 0 0 0;padding:0}.news dt{margin-bottom:5px;font-we
 ight:bold;font-size:110%}.news dd{margin:0;padding:0}.news .newsMeta{margin:5px 0 15px 0;padding-left:8px;background:url(../images/news-meta.gif) no-repeat left 4px;font-size:90%;color:#959595}.errors,.fixme,.warning,.note{margin:10px 0;padding:0 0 0 45px;border:1px solid #9bcd52}.errors div,.fixme div,.warning div,.note div{margin:5px;padding:8px 0}.errors{background:url(../images/errors.gif) no-repeat 10px 7px}.fixme{background:url(../images/fixme.gif) no-repeat 10px 7px}.warning{background:url(../images/warning.gif) no-repeat 10px 7px}.note{background:url(../images/note.gif) no-repeat 10px 7px}.editUrl{margin-top:1em;padding:0 0 0 45px;background:url(../images/errors.gif) no-repeat 10px 7px;border:1px solid #9bcd52}.editUrl div{margin:5px;padding:8px 0}#footer{border-top:1px solid #f2f2f2;text-align:center;clear:both}
\ No newline at end of file

Propchange: cocoon/site/site/2.2/css/apache-cocoon-thien-maven-skin.min.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Modified: cocoon/site/site/2.2/css/site.css
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/css/site.css?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/css/site.css (original)
+++ cocoon/site/site/2.2/css/site.css Mon Apr 23 14:59:38 2012
@@ -1,497 +1 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-body {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 0.8em;
-    color: #4c4c4c;
-}
-
-a:link, a:visited {
-    color: #0086b3;
-}
-
-a:hover {
-    text-decoration: none;
-}
-
-h1 {
-    margin: 25px 0 15px 0;
-    padding: 0 0 5px 17px;
-    background: url(../images/h1-image.gif) no-repeat left 4px;
-    font-size: 130%;
-    color: #0086b3;
-    border-bottom: 1px solid #0086b3;
-}
-
-h1.docTitle {
-    margin: 0 0 10px 0;
-    padding: 0 0 5px 0;
-    font-size: 150%;
-    background: none;
-}
-
-h2 {
-    font-size: 120%;
-}
-
-h3, h4, h5 {
-    font-size: 100%;
-    font-weight: bold;
-}
-
-ul {
-    margin: 5px 0 10px 0;
-    padding: 0 0 0 20px;
-    list-style: none;
-}
-
-li {
-    padding-left: 15px;
-    padding-bottom: 3px;
-}
-
-ul li {
-    background: url(../images/list.gif) no-repeat left 3px;
-}
-
-ol li {
-    padding-left: 5px;
-}
-
-tt {
-    font-size: 130%;
-}
-
-pre {
-    border: 1px solid #aaaaaa;
-    background: #efefef;
-    font-size: 110%;
-    padding: 10px;
-}
-
-table {
-    margin: 0 0 10px 0;
-    width: 99.5%;
-    border: 1px solid #cce7f0;
-}
-
-table th, table td {
-    padding: 4px;
-}
-
-thead {
-    background: #0086b3;
-    color: #fff;
-}
-
-tbody {
-    background: #e5f3f7;
-}
-
-table .alt {
-    background: #cce7f0;
-} /* Header part
- --------------------------------------*/
-#breadtrail {
-    background: #2698be url(../images/breadtrail-bg.gif) repeat-x bottom left;
-}
-
-#breadtrail p {
-    margin: 0;
-    padding: 2px 0 5px 20px;
-    color: #fff;
-}
-
-#breadtrail a {
-    color: #fff;
-    text-decoration: none;
-}
-
-#breadtrail a:hover {
-    text-decoration: underline;
-}
-
-#top {
-    background: url(../images/top-background.jpg) repeat-x;
-}
-
-#header {
-    height: 129px;
-    background: url(../images/logo-background.jpg) no-repeat;
-}
-
-.projectlogo {
-    float: left;
-}
-
-.logoImage {
-    margin: 30px 0 0 34px;
-}
-
-.grouplogo {
-    margin: 10px 10px 0 0;
-    float: right;
-}
-
-.grouptitle {
-    margin: 0;
-    padding-bottom: 5px;
-    background: url(../images/group-title-line.gif) repeat-x bottom;
-}
-
-.grouptitle a:link, .grouptitle a:visited {
-    color: #545454;
-    text-decoration: none;
-}
-
-.searchbox {
-    margin: 3px 0;
-    padding: 0;
-}
-
-.searchbox input {
-    padding: 3px;
-    font-size: 11px;
-    border: 1px solid #626262;
-    color: #626262;
-}
-
-.searchbox .searchboxsubmit {
-    background: #626262;
-    border: none;
-    color: #fff;
-}
-
-#projectBar {
-    margin-bottom: 10px;
-    height: 25px;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-}
-
-#projectBar .projectTitle {
-    margin: 0;
-    padding: 6px 0 0 5px;
-    background: none;
-    border: none;
-    float: left;
-    font-size: 100%;
-    color: #0086b3;
-}
-
-.projectTitle a {
-    text-decoration: none;
-}
-
-.projectTitle a:hover {
-    text-decoration: underline;
-}
-
-#projectBar .projectList {
-    margin: 5px 15px 0 0;
-    padding: 0;
-    list-style: none;
-    float: right;
-}
-
-#projectBar .projectList li {
-    padding: 0 8px;
-    background: none;
-    float: left;
-    border-right: 1px solid #f2f2f2;
-}
-
-#projectBar .projectList a {
-    color: #acacac;
-    text-decoration: none;
-}
-
-#projectBar .projectList a:hover {
-    text-decoration: underline;
-}
-
-.projectList img {
-    padding-top: 2px;
-}
-
-.cocoonHome {
-    margin: 0;
-    padding: 4px 0 0 10px;
-    float: left;
-}
-
-.projectBarClear {
-    height: 1%;
-    clear: both;
-}
-/* Menu
- --------------------------------------*/
-#menu {
-    margin: 0;
-    padding: 0;
-    width: 170px;
-    list-style: none;
-    font-weight: bold;
-    float: left;
-}
-
-#menu li {
-    margin-left: 10px;
-    padding: 3px 5px 3px 10px;
-    background: url(../images/menu-title.gif) no-repeat left 8px;
-    color: #7c7c7c;
-}
-
-#menu li ul {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    font-weight: normal;
-}
-
-#menu li ul li {
-    margin: 0;
-    padding: 3px 0 0 10px;
-    background: url(../images/menu-list.gif) no-repeat left 7px;
-    border-bottom: 1px solid #ebebeb;
-}
-
-#menu li ul .menuCollapse {
-    background: url(../images/menu-collapse.gif) no-repeat left 7px;
-}
-
-#menu li ul li a {
-    color: #7c7c7c;
-    text-decoration: none;
-}
-
-#menu li ul li a:hover {
-    text-decoration: underline;
-}
-
-#menu .menuVersions {
-    color: #2e93b5;
-}
-/* Content
- --------------------------------------*/
-#contentBody {
-    margin: 0 20px 0 0px;
-    padding: 0;
-}
-
-#contentBody.withSidebar {
-    margin-right: 190px;
-}
-/* IncludedDocs should not add the default margin and padding
- */
-.includedDoc #contentBody {
-    margin: 0;
-}
-
-.includedDoc h1.docTitle {
-    margin: 0;
-    padding: 0 0 0 17px;
-    background: url(../images/h1-image.gif) no-repeat bottom left;
-    font-size: 130%;
-    color: #0086b3;
-    border-bottom: 1px solid #0086b3;
-}
-/* hide the link to Daisy for included documents */
-.includedDoc .editUrl {
-    display: none;
-}
-/* Intro on home page
- --------------------------------------*/
-#intro {
-    width: 180px;
-    float: right;
-    background: #ebebeb;
-}
-
-#intro div {
-    margin: 2px;
-    border: 1px solid #fff;
-}
-
-#intro h2 {
-    color: #0086b3;
-}
-
-#intro p, #intro h2 {
-    margin: 8px;
-}
-/* Green + blue getting boxes on
- * home page
- --------------------------------------*/
-#getting {
-    margin: 0;
-    padding: 0;
-    display: inline-block;
-    width: 100%;
-} /* Hide from IE-mac \*/
-* html #getting {
-    height: 1%;
-    width: auto;
-}
-
-#getting {
-    display: table;
-} /* End hide from IE-mac */
-#getting div {
-    margin: 0 5px 5px 0;
-    padding: 0;
-    width: 150px;
-    height: 16em;
-    background: #9bcd52 url(../images/getting-bottom.gif) no-repeat bottom;
-    border: none;
-    float: left;
-}
-
-#getting div div {
-    margin: 0;
-    height: auto;
-    padding: 10px 0 0 10px;
-    background: url(../images/getting-top.gif) no-repeat;
-}
-
-#getting h2 {
-    margin: 0 10px;
-    padding: 4px 0;
-    font-size: 120%;
-    color: #fff;
-    border-bottom: 1px solid #fff;
-}
-
-#getting ul {
-    margin: 0 10px 10px 10px;
-    padding: 0;
-    color: #fff;
-    list-style: none;
-}
-
-#getting ul li {
-    padding: 2px 0 2px 7px;
-    background: url(../images/getting-list.gif) no-repeat left 6px;
-}
-
-#getting ul li a {
-    color: #fff;
-}
-
-#getting ul li a:hover {
-    text-decoration: none;
-}
-
-#getting #gettingDownload {
-    background: #2e93b5 url(../images/download-bottom.gif) no-repeat bottom left;
-}
-
-#gettingDownload .downloadVersion {
-    margin: 0;
-    height: auto;
-    padding: 83px 0 25px 0;
-    background: url(../images/download-bg.jpg) no-repeat;
-    font-size: 120%;
-    font-weight: bold;
-    text-align: center;
-}
-
-#getting .moreDownload {
-    height: auto;
-    width: auto;
-    margin: 0;
-    padding: 0 10px;
-    background: #2e93b5;
-    color: #fff;
-}
-
-#getting .moreDownload a {
-    color: #fff;
-} /* News section
- --------------------------------------*/
-.news {
-    margin: 10px 0 0 0;
-    padding: 0;
-}
-
-.news dt {
-    margin-bottom: 5px;
-    font-weight: bold;
-    font-size: 110%;
-}
-
-.news dd {
-    margin: 0;
-    padding: 0;
-}
-
-.news .newsMeta {
-    margin: 5px 0 15px 0;
-    padding-left: 8px;
-    background: url(../images/news-meta.gif) no-repeat left 4px;
-    font-size: 90%;
-    color: #959595;
-}
-
-.errors, .fixme, .warning, .note {
-    margin: 10px 0;
-    padding: 0 0 0 45px;
-    border: 1px solid #9bcd52;
-}
-
-.errors div, .fixme div, .warning div, .note div {
-    margin: 5px;
-    padding: 8px 0;
-}
-
-.errors {
-    background: url(../images/errors.gif) no-repeat 10px 7px;
-}
-
-.fixme {
-    background: url(../images/fixme.gif) no-repeat 10px 7px;
-}
-
-.warning {
-    background: url(../images/warning.gif) no-repeat 10px 7px;
-}
-
-.note {
-    background: url(../images/note.gif) no-repeat 10px 7px;
-}
-/* Bottom link to Daisy page
- --------------------------------------*/
-.editUrl {
-    margin-top: 1em;
-    padding: 0 0 0 45px;
-    background: url(../images/errors.gif) no-repeat 10px 7px;
-    border: 1px solid #9bcd52;
-}
-
-.editUrl div {
-    margin: 5px;
-    padding: 8px 0;
-}
-/* Footer
- --------------------------------------*/
-#footer {
-    border-top: 1px solid #f2f2f2;
-    text-align: center;
-    clear: both;
-}
\ No newline at end of file
+/* You can override this file with your own styles */
\ No newline at end of file

Modified: cocoon/site/site/2.2/dependencies.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/dependencies.html?rev=1329268&r1=1329267&r2=1329268&view=diff
==============================================================================
--- cocoon/site/site/2.2/dependencies.html (original)
+++ cocoon/site/site/2.2/dependencies.html Mon Apr 23 14:59:38 2012
@@ -27,18 +27,14 @@
 
 <html>
   <head>
-    <title>      Cocoon 2.2 Site - Project Dependencies
+    <title>      Project Dependencies
   </title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
+    <link rel="stylesheet" href="./css/apache-cocoon-thien-maven-skin.min.css" />
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <script src="./js/getBlank.js" language="javascript" type="text/javascript"></script>
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <script src="./js/apache-cocoon-thien-maven-skin.min.js" language="javascript" type="text/javascript"></script>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body>
+  <body onload="javascript:prettyPrint();">
     <div id="breadtrail">
        <p><a href="http://www.apache.org">Apache</a> &raquo; <a href="../">Cocoon</a> &raquo;</p>
     </div>
@@ -52,12 +48,12 @@
           <div class="grouplogo">
              <p class="grouptitle"><a href="../">The Apache Cocoon Project</a><img
                src="images/apache-logo.jpg" alt="Cocoon Project Logo" /></p>
-                            <form class="searchbox" action="http://www.google.com/search" method="get">
-                 <input value="cocoon.apache.org" name="sitesearch" type="hidden" />
-                 <input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google" />&nbsp;
-                 <input class="searchboxsubmit" name="Search" value="Search" type="submit" />
-               </form>
-                      </div>
+             <form class="searchbox" action="http://www.google.com/search" method="get">
+               <input value="cocoon.apache.org" name="sitesearch" type="hidden" />
+               <input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google" />&nbsp;
+               <input class="searchboxsubmit" name="Search" value="Search" type="submit" />
+             </form>
+         </div>
          </div>
          <div id="projectBar">
            <p class="cocoonHome"><a href="./index.html"><img
@@ -73,9 +69,10 @@
                 <li><a href="../2.2/core-modules/">Core <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/blocks/">Blocks <span class="pl-version-small">2.2</span></a></li>
                 <li><a href="../2.2/maven-plugins/">Maven Plugins <span class="pl-version-small">2.2</span></a></li>
+                <li><strong><a href="..//3.0/">Cocoon 3.0</a></em></strong></li>
                 <li><strong><a href="../subprojects/">Subprojects</a></strong></li>
               </ul>
-                     </div>
+                    </div>
          <div class="projectBarClear"><!-- --></div>
       </div>
     <!-- end of top -->
@@ -87,7 +84,7 @@
             <ul>
                   
     <li >
-              <a href="1327_1_1.html">Overview</a>
+              <a href="index.html">Overview</a>
         </li>
                   
     <li >
@@ -97,10 +94,6 @@
     <li >
               <a href="1420_1_1.html">New in 2.2</a>
         </li>
-                  
-    <li >
-              <a href="1454_1_1.html">Test2</a>
-        </li>
               </ul>
     </li>
       <li>
@@ -147,15 +140,22 @@
               </ul>
     </li>
       </ul>
-         <div class="section"><h2>Project Dependencies</h2><p>There are no dependencies for this project. It is a standalone application that does not depend on any other project.</p></div>
+       <div class="main">
+         <a name="Project_Dependencies"></a><div class="section"><h2>Project Dependencies<a name="Project_Dependencies"></a></h2><p>There are no dependencies for this project. It is a standalone application that does not depend on any other project.</p></div>
+       </div>
     </div>
 
     <!-- end of content -->
     <div id="footer">
-      <p>&#169;  
-          1999-2008
+      <p>Copyright &copy;  
+          1999-2012
     
           The Apache Software Foundation
+      All Rights Reserved.</p>
+
+      <p>
+      Apache Cocoon, Apache, the Apache feather logo, and the Apache Cocoon project logos are trademarks of The Apache Software Foundation.
+      All other marks mentioned may be trademarks or registered trademarks of their respective owners.
       </p>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">

Added: cocoon/site/site/2.2/dependency-management.html
URL: http://svn.apache.org/viewvc/cocoon/site/site/2.2/dependency-management.html?rev=1329268&view=auto
==============================================================================
    (empty)

Propchange: cocoon/site/site/2.2/dependency-management.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/site/site/2.2/dependency-management.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/site/site/2.2/dependency-management.html
------------------------------------------------------------------------------
    svn:mime-type = text/html



Mime
View raw message