reinhard | 1 Sep 16:43 2008
Picon

svn commit: r690980 - /cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java

Author: reinhard
Date: Mon Sep  1 07:43:38 2008
New Revision: 690980

URL: http://svn.apache.org/viewvc?rev=690980&view=rev
Log:
add timestamp to exception report

Modified:
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java?rev=690980&r1=690979&r2=690980&view=diff
==============================================================================
---
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java (original)
+++
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java
Mon Sep  1 07:43:38 2008
 <at>  <at>  -18,6 +18,9  <at>  <at> 

 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
 import java.util.Map;

 import org.apache.cocoon.corona.pipeline.component.Starter;
 <at>  <at>  -30,12 +33,16  <at>  <at> 
(Continue reading)

thorsten | 2 Sep 13:17 2008
Picon

svn commit: r691199 - in /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon: components/pipeline/impl/ environment/commandline/

Author: thorsten
Date: Tue Sep  2 04:17:55 2008
New Revision: 691199

URL: http://svn.apache.org/viewvc?rev=691199&view=rev
Log:
COCOON-2241 - The commandline is not working since cocoon-1985. In COCOON-1985 it was introduced a lock to
prevent problems in concurrent situations. This code change was not tested with the CLI mode of cocoon
since the cli environment does not store the http-requested object. The introduced solution looks
wheter the http-request object is null if so we will test whether we are in cli mode and lock this object instead.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java?rev=691199&r1=691198&r2=691199&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
Tue Sep  2 04:17:55 2008
 <at>  <at>  -36,6 +36,8  <at>  <at> 
 import org.apache.cocoon.caching.ComponentCacheKey;
 import org.apache.cocoon.caching.PipelineCacheKey;
 import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.ObjectModelHelper;
(Continue reading)

jeremy | 3 Sep 15:43 2008
Picon

svn commit: r691610 - in /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http: HttpEnvironment.java HttpRequest.java

Author: jeremy
Date: Wed Sep  3 06:43:02 2008
New Revision: 691610

URL: http://svn.apache.org/viewvc?rev=691610&view=rev
Log:
changes to the way Cocoon handles request decoding, uses encoding info from the request if available

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpRequest.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java?rev=691610&r1=691609&r2=691610&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
Wed Sep  3 06:43:02 2008
 <at>  <at>  -75,8 +75,14  <at>  <at> 
         super(uri, null, root, null);

         this.request = new HttpRequest(req, this);
-        this.request.setCharacterEncoding(defaultFormEncoding);
-        this.request.setContainerEncoding(containerEncoding);
+
+        if (req.getCharacterEncoding() == null) { // use the value from web.xml
+            this.request.setContainerEncoding(containerEncoding != null ? containerEncoding : "ISO-8859-1");
+        } else { // use what we have been given
(Continue reading)

jeremy | 3 Sep 15:46 2008
Picon

svn commit: r691611 - /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml

Author: jeremy
Date: Wed Sep  3 06:46:03 2008
New Revision: 691611

URL: http://svn.apache.org/viewvc?rev=691611&view=rev
Log:
changes to the way Cocoon handles request decoding, setting the default form encoding to UTF-8

Modified:
    cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml?rev=691611&r1=691610&r2=691611&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml Wed Sep  3 06:46:03 2008
 <at>  <at>  -379,7 +379,7  <at>  <at> 
     -->
     <init-param>
       <param-name>form-encoding</param-name>
-      <param-value>ISO-8859-1</param-value>
+      <param-value>UTF-8</param-value>
     </init-param>

     <!--

jeremy | 3 Sep 16:27 2008
Picon

svn commit: r691624 - in /cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional: icu4j-2.8.jar icu4j-3_8_1.jar

Author: jeremy
Date: Wed Sep  3 07:27:45 2008
New Revision: 691624

URL: http://svn.apache.org/viewvc?rev=691624&view=rev
Log:
upgrading to the version of icu4j that uses the same l10n data as dojo 1.1.1

Added:
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/icu4j-3_8_1.jar   (with props)
Removed:
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/icu4j-2.8.jar

Added: cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/icu4j-3_8_1.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/icu4j-3_8_1.jar?rev=691624&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/optional/icu4j-3_8_1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

jeremy | 3 Sep 17:45 2008
Picon

svn commit: r691640 - /cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml

Author: jeremy
Date: Wed Sep  3 08:45:54 2008
New Revision: 691640

URL: http://svn.apache.org/viewvc?rev=691640&view=rev
Log:
switching to new version of icu4j

Modified:
    cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml?rev=691640&r1=691639&r2=691640&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/lib/jars.xml Wed Sep  3 08:45:54 2008
 <at>  <at>  -491,7 +491,7  <at>  <at> 
     provides robust and full-featured Unicode services on a wide variety 
     of platforms. </description>
     <used-by>DELI (deli block)</used-by>
-    <lib>optional/icu4j-2.8.jar</lib>
+    <lib>optional/icu4j-3_8_1.jar</lib>
     <homepage>http://www-306.ibm.com/software/globalization/icu/</homepage>
   </file>

joerg | 4 Sep 23:47 2008
Picon

svn commit: r692265 - /cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java

Author: joerg
Date: Thu Sep  4 14:47:05 2008
New Revision: 692265

URL: http://svn.apache.org/viewvc?rev=692265&view=rev
Log:
Fix ConcurrentModificationException (again) introduced with refactoring synchronization

Modified:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?rev=692265&r1=692264&r2=692265&view=diff
==============================================================================
---
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original)
+++
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Thu Sep  4 14:47:05 2008
 <at>  <at>  -67,7 +67,7  <at>  <at> 
  * this setting for web applications. Set "session-bound-continuations"
  * configuration option to true to activate this mode.</li>
  * </ul>
- * 
+ *
  *  <at> since March 19, 2002
  *  <at> see ContinuationsManager
  *  <at> version $Id$
 <at>  <at>  -118,7 +118,7  <at>  <at> 
     }
(Continue reading)

joerg | 4 Sep 23:47 2008
Picon

svn commit: r692266 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java

Author: joerg
Date: Thu Sep  4 14:47:42 2008
New Revision: 692266

URL: http://svn.apache.org/viewvc?rev=692266&view=rev
Log:
Fix ConcurrentModificationException (again) introduced with refactoring synchronization

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?rev=692266&r1=692265&r2=692266&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Thu Sep  4 14:47:42 2008
 <at>  <at>  -72,7 +72,7  <at>  <at> 
  * this setting for web applications. Set "session-bound-continuations"
  * configuration option to true to activate this mode.</li>
  * </ul>
- * 
+ *
  *  <at> author <a href="mailto:ovidiu <at> cup.hp.com">Ovidiu Predescu </a>
  *  <at> author <a href="mailto:Michael.Melhem <at> managesoft.com">Michael Melhem </a>
  *  <at> since March 19, 2002
 <at>  <at>  -83,7 +83,7  <at>  <at> 
         extends AbstractLogEnabled
(Continue reading)

vgritsenko | 8 Sep 13:40 2008
Picon

svn commit: r693058 - /cocoon/trunk/parent/pom.xml

Author: vgritsenko
Date: Mon Sep  8 04:40:04 2008
New Revision: 693058

URL: http://svn.apache.org/viewvc?rev=693058&view=rev
Log:
spelling

Modified:
    cocoon/trunk/parent/pom.xml

Modified: cocoon/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/parent/pom.xml?rev=693058&r1=693057&r2=693058&view=diff
==============================================================================
--- cocoon/trunk/parent/pom.xml (original)
+++ cocoon/trunk/parent/pom.xml Mon Sep  8 04:40:04 2008
 <at>  <at>  -835,8 +835,8  <at>  <at> 
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
         <role>ASF member</role>
-        <role>Emertius PMC member</role>
-        <role>Emertius Committer</role>
+        <role>Emeritus PMC member</role>
+        <role>Emeritus Committer</role>
       </roles>
       <timezone>+1</timezone>
     </developer>
 <at>  <at>  -859,8 +859,8  <at>  <at> 
       <organizationUrl>http://www.apache.org</organizationUrl>
       <roles>
(Continue reading)

joerg | 9 Sep 19:56 2008
Picon

svn commit: r693528 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java status.xml

Author: joerg
Date: Tue Sep  9 10:56:09 2008
New Revision: 693528

URL: http://svn.apache.org/viewvc?rev=693528&view=rev
Log:
COCOON-2243: Handle case in ApplicationUtil.isUserInRole(..) when User is null.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java?rev=693528&r1=693527&r2=693528&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java
Tue Sep  9 10:56:09 2008
 <at>  <at>  -88,7 +88,10  <at>  <at> 
      *  <at> return This returns true, if the user has the role; otherwise false is returned.
      */
     public static boolean isUserInRole(final User user, final String role, final Map objectModel) {
-        boolean result = user.isUserInRole(role);
+        boolean result = false;
+        if (user != null) {
+            result = user.isUserInRole(role);
+        }
         if ( !result ) {
(Continue reading)


Gmane