From yfarmer@example.org Mon Mar 08 18:06:38 2010
Return-Path: <yfarmer@example.org>
Delivered-To: yfarmer@example.org
Received: (qmail 15720 invoked from network); 8 Mar 2010 18:06:38 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 8 Mar 2010 18:06:38 -0000
Received: (qmail 43527 invoked by uid 500); 8 Mar 2010 18:06:14 -0000
Delivered-To: yfarmer@example.org
Received: (qmail 43258 invoked by uid 500); 8 Mar 2010 18:06:13 -0000
Mailing-List: contact yfarmer@example.org; run by ezmlm
Precedence: bulk
Reply-To: yfarmer@example.org
list-help: <mailto:yfarmer@example.org>
list-unsubscribe: <mailto:yfarmer@example.org>
List-Post: <mailto:yfarmer@example.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list yfarmer@example.org
Received: (qmail 43039 invoked by uid 99); 8 Mar 2010 18:06:13 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Mar 2010 18:06:13 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Mar 2010 18:06:10 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D6B32238897A; Mon,  8 Mar 2010 18:05:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r920425 - in /cocoon/cocoon3/trunk:
 cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/
 cocoon-sample/src/main/resources/COB-INF/
 cocoon-sample/src/main/resources/COB-INF/sax-pipeline/
Date: Mon, 08 Mar 2010 18:05:47 -0000
To: yfarmer@example.org
From: yfarmer@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <yfarmer@example.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: reinhard
Date: Mon Mar  8 18:05:47 2010
New Revision: 920425

URL: http://svn.apache.org/viewvc?rev=920425&view=rev
Log:
COCOON3-53
provide a test case for the caching problem (however, the testcase doesn't fail)

Added:
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml   (with props)
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml   (with props)
Modified:
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java?rev=920425&r1=920424&r2=920425&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java Mon Mar  8 18:05:47 2010
@@ -26,17 +26,18 @@
 public class CachingOfPipelinesTest extends CocoonHtmlUnitTestCase {
 
     /**
-     * A non-caching pipeline mustn't produce the same result twice.
+     * Test if different matches in the same &lt;map:pipeline&gt;, produce different results.
      */
-    public void testNonCachingPipeline() throws Exception {
-        this.loadResponse("caching-pipeline/off");
+    public void testCachingOfDifferentPipelines() throws Exception {
+        this.loadResponse("sax-pipeline/simple-1");
         String content1 = this.response.getContentAsString();
         assertNotNull(content1);
 
-        this.loadResponse("caching-pipeline/off");
+        this.loadResponse("sax-pipeline/simple-2");
         String content2 = this.response.getContentAsString();
         assertNotNull(content2);
-        assertFalse("The response has to change with every request.", content1.equals(content2));
+
+        assertFalse(content1.equals(content2));
     }
 
     /**
@@ -59,9 +60,33 @@
     }
 
     /**
-     * This caching pipeline returns the same result for 2 seconds (see the 'expires' parameter in the sitemap). After
-     * 2.1 it produces a different result because the first result generated has become invalid in the meantime and the
-     * refresh is being performed in the same thread.
+     * This async-caching pipeline returns the same result for 2 seconds (see the 'expires'
+     * parameter in the sitemap). After 2.1 seconds it still produces the same result but because
+     * the cache key of this pipeline has changed, a separate thread is started that refreshs the
+     * cache.
+     * 
+     * After waiting for another second, a fresh result is returned.
+     */
+    public void testExpiresAsyncCaching() throws Exception {
+        this.loadResponse("/expires/async-caching-pipeline/on");
+        String content1 = this.response.getContentAsString();
+
+        Thread.sleep(2100);
+        this.loadResponse("/expires/async-caching-pipeline/on");
+        String content2 = this.response.getContentAsString();
+        assertEquals("The response has to be the same as before.", content1, content2);
+
+        Thread.sleep(500);
+        this.loadResponse("/expires/async-caching-pipeline/on");
+        String content3 = this.response.getContentAsString();
+        assertFalse("The response mustn't be the same as before.", content3.equals(content2));
+
+    }
+
+    /**
+     * This caching pipeline returns the same result for 2 seconds (see the 'expires' parameter in
+     * the sitemap). After 2.1 it produces a different result because the first result generated has
+     * become invalid in the meantime and the refresh is being performed in the same thread.
      * 
      * @see {@link #testExpiresAsyncCaching()}
      */
@@ -84,25 +109,16 @@
     }
 
     /**
-     * This async-caching pipeline returns the same result for 2 seconds (see the 'expires' parameter in the sitemap).
-     * After 2.1 seconds it still produces the same result but because the cache key of this pipeline has changed, a
-     * separate thread is started that refreshs the cache.
-     * 
-     * After waiting for another second, a fresh result is returned.
+     * A non-caching pipeline mustn't produce the same result twice.
      */
-    public void testExpiresAsyncCaching() throws Exception {
-        this.loadResponse("/expires/async-caching-pipeline/on");
+    public void testNonCachingPipeline() throws Exception {
+        this.loadResponse("caching-pipeline/off");
         String content1 = this.response.getContentAsString();
+        assertNotNull(content1);
 
-        Thread.sleep(2100);
-        this.loadResponse("/expires/async-caching-pipeline/on");
+        this.loadResponse("caching-pipeline/off");
         String content2 = this.response.getContentAsString();
-        assertEquals("The response has to be the same as before.", content1, content2);
-
-        Thread.sleep(500);
-        this.loadResponse("/expires/async-caching-pipeline/on");
-        String content3 = this.response.getContentAsString();
-        assertFalse("The response mustn't be the same as before.", content3.equals(content2));
-
+        assertNotNull(content2);
+        assertFalse("The response has to change with every request.", content1.equals(content2));
     }
 }

Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml?rev=920425&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml Mon Mar  8 18:05:47 2010
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<simple>simple-text-1</simple>

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml?rev=920425&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml Mon Mar  8 18:05:47 2010
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<simple>simple-text-2</simple>

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap?rev=920425&r1=920424&r2=920425&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap Mon Mar  8 18:05:47 2010
@@ -47,6 +47,14 @@
         </map:transform>
         <map:serialize />
       </map:match>
+      <map:match equals="sax-pipeline/simple-1">
+        <map:generate src="sax-pipeline/simple-1.xml" />
+        <map:serialize />
+      </map:match>
+      <map:match equals="sax-pipeline/simple-2">
+        <map:generate src="sax-pipeline/simple-2.xml" />
+        <map:serialize />
+      </map:match>
       <map:match pattern="sax-pipeline/simple-xhtml">
         <map:generate src="sax-pipeline/simple.xml" />
         <map:transform src="sax-pipeline/simple.xslt">
@@ -79,7 +87,7 @@
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
-    
+
     <map:pipeline type="async-caching" jmx-group-name="async-caching">
       <map:match pattern="async-caching-pipeline/on">
         <map:generate type="timestamp-caching" />
@@ -93,27 +101,27 @@
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
-    
+
     <map:pipeline expires="2" expires-cache-key="some-key">
       <map:match pattern="expires/caching-pipeline/on">
         <map:generate type="timestamp-noncaching" />
         <map:serialize type="xml" />
       </map:match>
-    </map:pipeline>    
-    
+    </map:pipeline>
+
     <map:pipeline expires="2">
       <map:match pattern="expires/caching-pipeline/invalid">
         <map:generate type="timestamp-noncaching" />
         <map:serialize type="xml" />
       </map:match>
-    </map:pipeline>    
-    
+    </map:pipeline>
+
     <map:pipeline type="async-caching" expires="2" expires-cache-key="some-other-key">
       <map:match pattern="expires/async-caching-pipeline/on">
         <map:generate type="timestamp-noncaching" />
         <map:serialize type="xml" />
       </map:match>
-    </map:pipeline>    
+    </map:pipeline>
 
     <!-- ~~~~~~~~~~~~~~~~ servlet service framework ~~~~~~~~~~~~~~~ -->
     <map:pipeline jmx-group-name="servlet-service">
@@ -126,14 +134,14 @@
       </map:match>
       <map:match pattern="ssf/service-consumer">
         <map:generate type="service-consumer" />
-        <map:serialize type="xml" />      
+        <map:serialize type="xml" />
       </map:match>
       <map:match pattern="ssf/transformer-pipeline">
         <map:generate type="service-consumer" />
         <map:transform src="sax-pipeline/simple.xslt">
           <map:parameter name="myParam" value="transformer-pipeline" />
         </map:transform>
-        <map:serialize type="xml" />      
+        <map:serialize type="xml" />
       </map:match>
       <map:match pattern="ssf/serializer-pipeline">
         <map:generate type="service-consumer" />
@@ -190,8 +198,8 @@
         </map:match>
       </map:match>
     </map:pipeline>
-    
-    <!-- ~~~~~~~~~~~~~~~~ advanced matching (when/otherwise) ~~~~~~~~~~~~~~~ -->    
+
+    <!-- ~~~~~~~~~~~~~~~~ advanced matching (when/otherwise) ~~~~~~~~~~~~~~~ -->
     <map:pipeline>
       <map:match pattern="advanced-matching">
         <map:select value="{jexl:cocoon.request.myparam}">
@@ -221,7 +229,7 @@
             <map:transform src="sax-pipeline/simple.xslt">
               <map:parameter name="myParam" value="otherwise" />
             </map:transform>
-            <map:serialize />          
+            <map:serialize />
           </map:otherwise>
         </map:select>
       </map:match>
@@ -236,17 +244,17 @@
           <map:otherwise>
             <map:transform src="sax-pipeline/simple.xslt">
               <map:parameter name="myParam" value="otherwise" />
-            </map:transform>          
+            </map:transform>
           </map:otherwise>
         </map:select>
         <map:serialize />
-      </map:match>      
+      </map:match>
       <map:match wildcard="advanced-matching-3">
         <map:generate src="sax-pipeline/simple.xml" />
         <map:match value="{jexl:cocoon.request.myparam}" equals="1">
           <map:transform src="sax-pipeline/simple.xslt">
             <map:parameter name="myParam" value="1" />
-          </map:transform>        
+          </map:transform>
         </map:match>
         <map:match value="{jexl:cocoon.request.yourparam}" equals="2">
           <map:transform src="sax-pipeline/add-paragraph.xslt">
@@ -254,12 +262,12 @@
           </map:transform>
         </map:match>
         <map:serialize />
-      </map:match>      
+      </map:match>
       <map:match wildcard="advanced-matching-4">
         <map:generate src="sax-pipeline/simple.xml" />
         <map:transform src="sax-pipeline/simple.xslt">
           <map:parameter name="myParam" value="1" />
-        </map:transform>            
+        </map:transform>
         <map:match value="{jexl:cocoon.request.param_a}" equals="1">
           <map:select value="{jexl:cocoon.request.param_b}">
             <map:when equals="1">
@@ -270,21 +278,21 @@
                 <map:transform src="sax-pipeline/add-paragraph.xslt">
                   <map:parameter name="text" value="3"/>
                 </map:transform>
-                <map:select value="{jexl:cocoon.request.param_d}">   
-                  <map:when equals="1">                
+                <map:select value="{jexl:cocoon.request.param_d}">
+                  <map:when equals="1">
                     <map:transform src="sax-pipeline/add-paragraph.xslt">
                       <map:parameter name="text" value="4"/>
-                    </map:transform>                
+                    </map:transform>
                   </map:when>
-                </map:select>             
+                </map:select>
               </map:match>
             </map:when>
             <map:otherwise>
               <map:transform src="sax-pipeline/add-paragraph.xslt">
                 <map:parameter name="text" value="5"/>
-              </map:transform>               
+              </map:transform>
             </map:otherwise>
-          </map:select>    
+          </map:select>
         </map:match>
         <map:match value="{jexl:cocoon.request.param_e}" equals="1">
           <map:transform src="sax-pipeline/add-paragraph.xslt">
@@ -296,19 +304,19 @@
           <map:otherwise>
             <map:transform src="sax-pipeline/add-paragraph.xslt">
               <map:parameter name="text" value="7"/>
-            </map:transform>               
+            </map:transform>
           </map:otherwise>
         </map:select>
         <map:select value="{jexl:cocoon.request.param_g}">
           <map:when regexp="(?!1\b)\b.+\b">
             <map:transform src="sax-pipeline/add-paragraph.xslt">
               <map:parameter name="text" value="8"/>
-            </map:transform>             
+            </map:transform>
           </map:when>
         </map:select>
         <map:serialize />
-      </map:match>     
-      
+      </map:match>
+
       <!-- named matcher -->
       <map:match wildcard="named-matcher/{a}" name="m1">
         <map:match value="{jexl:cocoon.request.param_a}" equals="1">
@@ -318,11 +326,11 @@
               <map:parameter name="myParam" value="{map:m1/a}" />
             </map:transform>
             <map:serialize />
-          </map:match>        
+          </map:match>
         </map:match>
       </map:match>
-      
-      <!-- deep relative matcher --> 
+
+      <!-- deep relative matcher -->
       <map:match wildcard="deep-relative-matcher/{a}">
         <map:match value="{jexl:cocoon.request.param_a}" equals="1">
           <map:match value="{jexl:cocoon.request.param_b}" equals="1">
@@ -331,10 +339,10 @@
               <map:parameter name="myParam" value="{map:../../a}" />
             </map:transform>
             <map:serialize />
-          </map:match>        
+          </map:match>
         </map:match>
-      </map:match>      
-    </map:pipeline>    
+      </map:match>
+    </map:pipeline>
 
     <!-- ~~~~~~~~~~~~~~~~ aggregation ~~~~~~~~~~~~~~~ -->
     <map:pipeline>
@@ -363,7 +371,7 @@
     </map:pipeline>
 
     <!-- ~~~~~~~~~~~~~~~~ matcher: parameter passing ~~~~~~~~~~~~~~~ -->
-    <!--  
+    <!--
     <map:pipeline>
       <map:match pattern="parameter-passing/failing">
         <map:match type="parameter-passing">
@@ -441,7 +449,7 @@
         <map:serialize type="xhtml" status-code="501" />
       </map:handle-errors>
     </map:pipeline>
-    
+
     <!-- FOP -->
     <map:pipeline>
       <map:match equals="fop/test.pdf">
@@ -466,37 +474,37 @@
           <map:parameter name="myParam" value="2" />
         </map:transform>
         <map:serialize type="exhtml" doctype-default="strict" />
-      </map:match>    
+      </map:match>
       <map:match equals="serializers/ehtml">
         <map:generate src="sax-pipeline/simple.xml" />
         <map:transform src="sax-pipeline/simple.xslt">
           <map:parameter name="myParam" value="2" />
         </map:transform>
         <map:serialize type="ehtml" encoding="iso-8859-1"/>
-      </map:match>    
+      </map:match>
     </map:pipeline>
-    
+
     <!-- Cocoon Wicket integration -->
     <map:pipeline type="noncaching">
       <map:match wildcard="wicket/**">
         <map:read type="wicket" base-path="/wicket" />
       </map:match>
     </map:pipeline>
- 
+
     <!-- Global error handling -->
     <map:handle-errors>
       <map:select value="{jexl:cocoon.exception.class.name}">
         <map:when contains="NoMatchingPipelineException">
           <map:generate src="error-handling/404.xml" />
-          <map:serialize type="xhtml" status-code="404" />        
+          <map:serialize type="xhtml" status-code="404" />
         </map:when>
         <map:when ends-with="CustomException">
           <map:generate src="error-handling/500.xml" />
           <map:serialize type="xhtml" status-code="500" />
-        </map:when>        
+        </map:when>
         <map:otherwise>
           <map:generate type="exception" />
-          <map:serialize type="xml" status-code="500" />        
+          <map:serialize type="xml" status-code="500" />
         </map:otherwise>
       </map:select>
       <!--



From yfarmer@example.org Tue Mar 09 09:13:05 2010
Return-Path: <yfarmer@example.org>
Delivered-To: yfarmer@example.org
Received: (qmail 51215 invoked from network); 9 Mar 2010 09:13:04 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 9 Mar 2010 09:13:04 -0000
Received: (qmail 76292 invoked by uid 500); 9 Mar 2010 09:12:38 -0000
Delivered-To: yfarmer@example.org
Received: (qmail 76185 invoked by uid 500); 9 Mar 2010 09:12:37 -0000
Mailing-List: contact yfarmer@example.org; run by ezmlm
Precedence: bulk
Reply-To: yfarmer@example.org
list-help: <mailto:yfarmer@example.org>
list-unsubscribe: <mailto:yfarmer@example.org>
List-Post: <mailto:yfarmer@example.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list yfarmer@example.org
Received: (qmail 76177 invoked by uid 99); 9 Mar 2010 09:12:36 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 09:12:36 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 09:12:34 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B35C023888CE; Tue,  9 Mar 2010 09:12:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r920746 - in /cocoon/cocoon3/trunk: cocoon-monitoring/pom.xml
 cocoon-profiling/pom.xml cocoon-sample/pom.xml parent/pom.xml
Date: Tue, 09 Mar 2010 09:12:12 -0000
To: yfarmer@example.org
From: yfarmer@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <yfarmer@example.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: reinhard
Date: Tue Mar  9 09:12:10 2010
New Revision: 920746

URL: http://svn.apache.org/viewvc?rev=920746&view=rev
Log:
COCOON3-49 remove duplicate dependencies or deprecated properties

Modified:
    cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml
    cocoon/cocoon3/trunk/cocoon-profiling/pom.xml
    cocoon/cocoon3/trunk/cocoon-sample/pom.xml
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml?rev=920746&r1=920745&r2=920746&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-monitoring/pom.xml Tue Mar  9 09:12:10 2010
@@ -64,14 +64,6 @@
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon.pipeline</groupId>
-      <artifactId>cocoon-pipeline</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
     </dependency>

Modified: cocoon/cocoon3/trunk/cocoon-profiling/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/pom.xml?rev=920746&r1=920745&r2=920746&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/pom.xml Tue Mar  9 09:12:10 2010
@@ -112,7 +112,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=920746&r1=920745&r2=920746&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Tue Mar  9 09:12:10 2010
@@ -153,7 +153,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=920746&r1=920745&r2=920746&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Tue Mar  9 09:12:10 2010
@@ -188,7 +188,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-jnet</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>



From yfarmer@example.org Wed Mar 24 18:53:21 2010
Return-Path: <yfarmer@example.org>
Delivered-To: yfarmer@example.org
Received: (qmail 78499 invoked from network); 24 Mar 2010 18:53:21 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 24 Mar 2010 18:53:21 -0000
Received: (qmail 95400 invoked by uid 500); 24 Mar 2010 18:53:21 -0000
Delivered-To: yfarmer@example.org
Received: (qmail 95295 invoked by uid 500); 24 Mar 2010 18:53:20 -0000
Mailing-List: contact yfarmer@example.org; run by ezmlm
Precedence: bulk
Reply-To: yfarmer@example.org
list-help: <mailto:yfarmer@example.org>
list-unsubscribe: <mailto:yfarmer@example.org>
List-Post: <mailto:yfarmer@example.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list yfarmer@example.org
Received: (qmail 95287 invoked by uid 99); 24 Mar 2010 18:53:20 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 18:53:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 18:53:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 41CFF23888E7; Wed, 24 Mar 2010 18:52:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r927151 - in /cocoon/cocoon3/trunk:
 cocoon-docs/src/changes/changes.xml parent/pom.xml
Date: Wed, 24 Mar 2010 18:52:56 -0000
To: yfarmer@example.org
From: yfarmer@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <yfarmer@example.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: reinhard
Date: Wed Mar 24 18:52:55 2010
New Revision: 927151

URL: http://svn.apache.org/viewvc?rev=927151&view=rev
Log:
Upgrade to Spring 3.0.1.RELEASE

Modified:
    cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml?rev=927151&r1=927150&r2=927151&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml Wed Mar 24 18:52:55 2010
@@ -43,6 +43,10 @@
         controller provides  a cache key after the setup, this is returned by the SpringControllerComponent
         and the pipeline that embeds the controllers becomes cacheable.
       </action>
+
+      <action dev="reinhard" type="update">
+        [all] Upgrade all modules that have a dependency on Spring version 3.0.1.RELEASE
+      </action>
     </release>
     <release version="3.0.0-alpha-2" date="2010-01-07" description="released">
       <action dev="cziegeler" type="add" issue="COCOON3-14">

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=927151&r1=927150&r2=927151&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Wed Mar 24 18:52:55 2010
@@ -211,37 +211,37 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.1.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.1.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.1.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context-support</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.1.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-dao</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.1.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.1.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>2.5.6</version>
+        <version>3.0.1.RELEASE</version>
       </dependency>
       <dependency>
       <groupId>org.springframework</groupId>



From yfarmer@example.org Wed Mar 24 21:13:40 2010
Return-Path: <yfarmer@example.org>
Delivered-To: yfarmer@example.org
Received: (qmail 97197 invoked from network); 24 Mar 2010 21:13:39 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 24 Mar 2010 21:13:39 -0000
Received: (qmail 19297 invoked by uid 500); 24 Mar 2010 21:13:39 -0000
Delivered-To: yfarmer@example.org
Received: (qmail 19239 invoked by uid 500); 24 Mar 2010 21:13:39 -0000
Mailing-List: contact yfarmer@example.org; run by ezmlm
Precedence: bulk
Reply-To: yfarmer@example.org
list-help: <mailto:yfarmer@example.org>
list-unsubscribe: <mailto:yfarmer@example.org>
List-Post: <mailto:yfarmer@example.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list yfarmer@example.org
Received: (qmail 19232 invoked by uid 99); 24 Mar 2010 21:13:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 21:13:39 +0000
X-ASF-Spam-Status: No, hits=-1001.3 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 21:13:38 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1CDF92388900; Wed, 24 Mar 2010 21:13:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r927180 - in /cocoon/trunk/tools: cocoon-maven-plugin/
 cocoon-rcl/cocoon-rcl-spring-reloader/
 cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/
 cocoon-rcl/cocoon-rcl-webapp-wrapper/
Date: Wed, 24 Mar 2010 21:13:17 -0000
To: yfarmer@example.org
From: yfarmer@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <yfarmer@example.org>

Author: reinhard
Date: Wed Mar 24 21:13:17 2010
New Revision: 927180

URL: http://svn.apache.org/viewvc?rev=927180&view=rev
Log:
Cocoon Maven plugin:
* upgrade to Spring 3.0.1.RELEASE
* use servlet-api 2.5

Modified:
    cocoon/trunk/tools/cocoon-maven-plugin/pom.xml
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/pom.xml
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml

Modified: cocoon/trunk/tools/cocoon-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-plugin/pom.xml?rev=927180&r1=927179&r2=927180&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-plugin/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-maven-plugin/pom.xml Wed Mar 24 21:13:17 2010
@@ -92,6 +92,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+	  <version>2.5</version>
       <scope>compile</scope>
     </dependency>
     <!-- test libs -->

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/pom.xml?rev=927180&r1=927179&r2=927180&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/pom.xml Wed Mar 24 21:13:17 2010
@@ -63,31 +63,37 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+	  <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
+      <version>3.0.1.RELEASE</version>	  
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
+	  <version>3.0.1.RELEASE</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
+	  <version>3.0.1.RELEASE</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
+	  <version>3.0.1.RELEASE</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
+	  <version>3.0.1.RELEASE</version>
       <scope>provided</scope>
     </dependency>
     <!--  test dependencies  -->

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java?rev=927180&r1=927179&r2=927180&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java Wed Mar 24 21:13:17 2010
@@ -17,6 +17,7 @@
 package org.apache.cocoon.tools.rcl.springreloader;
 
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.util.Locale;
 import java.util.Map;
 
@@ -55,8 +56,7 @@ public class SynchronizedConfigureableWe
 
     public SynchronizedConfigureableWebApplicationContext() throws BeansException {
         try {
-            appContext = (ConfigurableWebApplicationContext)
-                    BeanUtils.instantiateClass(XmlWebApplicationContext.class);
+            appContext = BeanUtils.instantiateClass(XmlWebApplicationContext.class);
         } catch (BeanInstantiationException e) {
             throw new RuntimeException("Can't create Spring application context.", e);
         }
@@ -65,8 +65,7 @@ public class SynchronizedConfigureableWe
     public synchronized void reload() {
         ConfigurableWebApplicationContext newAppContext = null;
         try {
-            newAppContext = (ConfigurableWebApplicationContext)
-                BeanUtils.instantiateClass(XmlWebApplicationContext.class);
+            newAppContext = BeanUtils.instantiateClass(XmlWebApplicationContext.class);
         } catch (BeanInstantiationException e) {
             throw new RuntimeException("Can't create Spring application context.", e);
         }
@@ -97,7 +96,7 @@ public class SynchronizedConfigureableWe
         return appContext.getAutowireCapableBeanFactory();
     }
 
-    public synchronized Object getBean(String arg0, Class arg1) throws BeansException {
+    public <T> T getBean(String arg0, Class<T> arg1) throws BeansException {
         return appContext.getBean(arg0, arg1);
     }
 
@@ -105,11 +104,8 @@ public class SynchronizedConfigureableWe
         return appContext.getBean(arg0);
     }
 
-    // Make the class compilable with Spring 2.1
-    // FIXME: delegate to appContext, when updating to Spring 2.1
-    public Object getBean(String arg0, Object[] arg1) throws BeansException {
-        throw new UnsupportedOperationException();
-        //return appContext.getBean(arg0, arg1);
+    public Object getBean(String arg0, Object... arg1) throws BeansException {
+        return appContext.getBean(arg0, arg1);
     }
 
     public synchronized int getBeanDefinitionCount() {
@@ -128,11 +124,11 @@ public class SynchronizedConfigureableWe
         return appContext.getBeanNamesForType(arg0);
     }
 
-    public synchronized Map getBeansOfType(Class arg0, boolean arg1, boolean arg2) throws BeansException {
+    public <T> Map<String, T> getBeansOfType(Class<T> arg0, boolean arg1, boolean arg2) throws BeansException {
         return appContext.getBeansOfType(arg0, arg1, arg2);
     }
 
-    public synchronized Map getBeansOfType(Class arg0) throws BeansException {
+    public <T> Map<String, T> getBeansOfType(Class<T> arg0) throws BeansException {
         return appContext.getBeansOfType(arg0);
     }
 
@@ -281,4 +277,20 @@ public class SynchronizedConfigureableWe
     public String getId() {
         return appContext.getId();
     }
+
+    public <A extends Annotation> A findAnnotationOnBean(String arg0, Class<A> arg1) {
+        return appContext.findAnnotationOnBean(arg0, arg1);
+    }
+
+    public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> arg0) throws BeansException {
+        return appContext.getBeansWithAnnotation(arg0);
+    }
+
+    public void setId(String arg0) {
+        appContext.setId(arg0);
+    }
+
+    public <T> T getBean(Class<T> requiredType) throws BeansException {
+        return appContext.getBean(requiredType);
+    }
 }
\ No newline at end of file

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml?rev=927180&r1=927179&r2=927180&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/pom.xml Wed Mar 24 21:13:17 2010
@@ -59,31 +59,37 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+	  <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
+	  <version>3.0.1.RELEASE</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
+	  <version>3.0.1.RELEASE</version>	  
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
+	  <version>3.0.1.RELEASE</version>	  
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
+	  <version>3.0.1.RELEASE</version>	  
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
+	  <version>3.0.1.RELEASE</version>	  
       <scope>provided</scope>
     </dependency>
     <!--  test dependencies  -->



From yfarmer@example.org Mon Mar 29 16:55:05 2010
Return-Path: <yfarmer@example.org>
Delivered-To: yfarmer@example.org
Received: (qmail 46690 invoked from network); 29 Mar 2010 16:55:05 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 29 Mar 2010 16:55:05 -0000
Received: (qmail 685 invoked by uid 500); 29 Mar 2010 16:55:05 -0000
Delivered-To: yfarmer@example.org
Received: (qmail 569 invoked by uid 500); 29 Mar 2010 16:55:05 -0000
Mailing-List: contact yfarmer@example.org; run by ezmlm
Precedence: bulk
Reply-To: yfarmer@example.org
list-help: <mailto:yfarmer@example.org>
list-unsubscribe: <mailto:yfarmer@example.org>
List-Post: <mailto:yfarmer@example.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list yfarmer@example.org
Received: (qmail 562 invoked by uid 99); 29 Mar 2010 16:55:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Mar 2010 16:55:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Mar 2010 16:55:02 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E50C02388903; Mon, 29 Mar 2010 16:54:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r928834 - in /cocoon/branches/BRANCH_2_1_X:
 src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
 status.xml
Date: Mon, 29 Mar 2010 16:54:40 -0000
To: yfarmer@example.org
From: yfarmer@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <yfarmer@example.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sylvain
Date: Mon Mar 29 16:54:40 2010
New Revision: 928834

URL: http://svn.apache.org/viewvc?rev=928834&view=rev
Log:
COCOON-2286: [serializer] fix loading issue when there are spaces in the file path. Thanks to Cedric Damioli

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java?rev=928834&r1=928833&r2=928834&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java Mon Mar 29 16:54:40 2010
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.zip.ZipEntry;
@@ -126,6 +127,9 @@ public final class CharsetFactory {
             String mtch = file.substring(file.indexOf('!'));
             file = file.substring(5, file.indexOf('!'));
             mtch = mtch.substring(2, mtch.lastIndexOf('/') + 1) + "cs_";
+            
+            // COCOON-2286 allow special characters in path (mainly spaces)
+            file = URLDecoder.decode(file, "UTF-8");
     
             ZipFile zip = new ZipFile(file);
             Enumeration enumeration = zip.entries();

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=928834&r1=928833&r2=928834&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Mar 29 16:54:40 2010
@@ -187,6 +187,9 @@
     <action dev="all" type="update">
       Starting with 2.1.12 the minimum required Java version will be 1.4.2.
     </action>
+    <action dev="SW" type="fix" fixes-bug="COCOON-2286" due-to="Cédric Damioli" due-to-email="yfarmer@example.org">
+      Serializer block: charset data won't load if there's a space in the path to the jar file (e.g "C:\Program Files\MyApp\...")
+    </action>
     <action dev="JSJ" type="fix" fixes-bug="COCOON-2257">
       JCR block: Missing modCount attribute in JCR sample content.
     </action>




{'source': 'Apache Software Foundation Public Mail Archives'}