antonio | 1 May 2005 13:16
Picon
Favicon

svn commit: r165482 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/TraxTransformer.java

Author: antonio
Date: Sun May  1 04:16:31 2005
New Revision: 165482

URL: http://svn.apache.org/viewcvs?rev=165482&view=rev
Log:
Use BooleanUtils, use regexp for checking valid XSLT parameter names, fix docs.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/TraxTransformer.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/TraxTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/TraxTransformer.java?rev=165482&r1=165481&r2=165482&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/TraxTransformer.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Sun May  1 04:16:31 2005
 <at>  <at>  -48,12 +48,14  <at>  <at> 
 import org.apache.cocoon.environment.Session;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.commons.lang.BooleanUtils;

 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.xml.xslt.XSLTProcessor;
 import org.apache.excalibur.xml.xslt.XSLTProcessorException;
(Continue reading)

antonio | 1 May 2005 15:07
Picon
Favicon

svn commit: r165499 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java

Author: antonio
Date: Sun May  1 06:07:24 2005
New Revision: 165499

URL: http://svn.apache.org/viewcvs?rev=165499&view=rev
Log:
Use StopWatch

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=165499&r1=165498&r2=165499&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java Sun
May  1 06:07:24 2005
 <at>  <at>  -52,6 +52,7  <at>  <at> 

 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang.time.StopWatch;
 import org.apache.excalibur.instrument.InstrumentManager;
 import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
 import org.apache.log.ContextMap;
 <at>  <at>  -1030,8 +1031,9  <at>  <at> 
             }
         }

-        // remember when we started (used for timing the processing)
(Continue reading)

antonio | 1 May 2005 15:19
Picon
Favicon

svn commit: r165501 - /cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java

Author: antonio
Date: Sun May  1 06:19:00 2005
New Revision: 165501

URL: http://svn.apache.org/viewcvs?rev=165501&view=rev
Log:
Use StopWatch

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=165501&r1=165500&r2=165501&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Sun May  1 06:19:00 2005
 <at>  <at>  -61,6 +61,7  <at>  <at> 
 import org.apache.cocoon.util.IOUtils;
 import org.apache.cocoon.util.log.CocoonLogFormatter;
 import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang.time.StopWatch;
 import org.apache.log.ContextMap;
 import org.apache.log.LogTarget;
 import org.apache.log.output.ServletOutputLogTarget;
 <at>  <at>  -276,8 +277,9  <at>  <at> 
             }
         }

-        // remember when we started (used for timing the processing)
-        long start = System.currentTimeMillis();
(Continue reading)

antonio | 1 May 2005 15:31
Picon
Favicon

svn commit: r165502 - /cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java

Author: antonio
Date: Sun May  1 06:31:10 2005
New Revision: 165502

URL: http://svn.apache.org/viewcvs?rev=165502&view=rev
Log:
Use BooleanUtils, use regexp for checking valid XSLT parameter names, fix docs.

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java?rev=165502&r1=165501&r2=165502&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java Sun May  1
06:31:10 2005
 <at>  <at>  -48,12 +48,14  <at>  <at> 
 import org.apache.cocoon.environment.Session;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.commons.lang.BooleanUtils;

 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.xml.xslt.XSLTProcessor;
 import org.apache.excalibur.xml.xslt.XSLTProcessorException;
+import org.apache.regexp.RE;

(Continue reading)

antonio | 1 May 2005 17:36
Picon
Favicon

svn commit: r165516 - /cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java

Author: antonio
Date: Sun May  1 08:36:38 2005
New Revision: 165516

URL: http://svn.apache.org/viewcvs?rev=165516&view=rev
Log:
Use global NL

Modified:
    cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java?rev=165516&r1=165515&r2=165516&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java
Sun May  1 08:36:38 2005
 <at>  <at>  -72,13 +72,13  <at>  <at> 
     }

     public void testTypicalUsage() throws Exception {
-        String mime_types="# MIME type mappings"+NL+
-            "text/plain  txt text "+NL+
-            "text/html   html htm"+NL+
-            "   "+NL+
-            "text/xml    xml"+NL+
-            "text/css    css"+NL+
-            "text/javascript		js "+NL+
(Continue reading)

antonio | 1 May 2005 17:39
Picon
Favicon

svn commit: r165517 - /cocoon/trunk/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java

Author: antonio
Date: Sun May  1 08:39:38 2005
New Revision: 165517

URL: http://svn.apache.org/viewcvs?rev=165517&view=rev
Log:
Merging from 2.1

Modified:
    cocoon/trunk/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java

Modified: cocoon/trunk/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java?rev=165517&r1=165516&r2=165517&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java Sun May  1 08:39:38 2005
 <at>  <at>  -29,16 +29,15  <at>  <at> 
  * Specifically, code for testing the parsing of mime.types files.
  *
  *  <at> author <a href="mailto:jefft <at> apache.org">Jeff Turner</a>
- *  <at> version CVS $Id: MIMEUtilsTestCase.java,v 1.4 2004/07/11 23:02:54 antonio Exp $
+ *  <at> version CVS $Id$
  */
 public class MIMEUtilsTestCase extends TestCase
 {
-
     final String NL = SystemUtils.LINE_SEPARATOR;
     Map mimeMap;
     Map extMap;
-    final String M2E = "MIME to extension mappings";
(Continue reading)

antonio | 1 May 2005 18:39
Picon
Favicon

svn commit: r165522 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java

Author: antonio
Date: Sun May  1 09:39:11 2005
New Revision: 165522

URL: http://svn.apache.org/viewcvs?rev=165522&view=rev
Log:
Use SystemUtils to detect java 1.4 or higher

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java?rev=165522&r1=165521&r2=165522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ImageReader.java Sun May  1
09:39:11 2005
 <at>  <at>  -31,7 +31,7  <at>  <at> 
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.environment.SourceResolver;
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.xml.sax.SAXException;

 import com.sun.image.codec.jpeg.ImageFormatException;
 <at>  <at>  -94,6 +94,9  <at>  <at> 
     private static final boolean ENLARGE_DEFAULT = true;
     private static final boolean FIT_DEFAULT = false;

(Continue reading)

antonio | 1 May 2005 18:42
Picon
Favicon

svn commit: r165523 - /cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java

Author: antonio
Date: Sun May  1 09:42:58 2005
New Revision: 165523

URL: http://svn.apache.org/viewcvs?rev=165523&view=rev
Log:
Use SystemUtils to detect java 1.4 or higher

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java?rev=165523&r1=165522&r2=165523&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/reading/ImageReader.java Sun May  1 09:42:58 2005
 <at>  <at>  -31,6 +31,7  <at>  <at> 
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.environment.SourceResolver;
+import org.apache.commons.lang.SystemUtils;
 import org.xml.sax.SAXException;

 import com.sun.image.codec.jpeg.ImageFormatException;
 <at>  <at>  -93,6 +94,9  <at>  <at> 
     private static final boolean ENLARGE_DEFAULT = true;
     private static final boolean FIT_DEFAULT = false;

+    /* See http://developer.java.sun.com/developer/bugParade/bugs/4502892.html */
+    private static final boolean JVMBugFixed = SystemUtils.isJavaVersionAtLeast(1.4f);
(Continue reading)

antonio | 1 May 2005 18:55
Picon
Favicon

svn commit: r165524 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java

Author: antonio
Date: Sun May  1 09:55:08 2005
New Revision: 165524

URL: http://svn.apache.org/viewcvs?rev=165524&view=rev
Log:
Use SystemUtils

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java?rev=165524&r1=165523&r2=165524&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
Sun May  1 09:55:08 2005
 <at>  <at>  -24,6 +24,7  <at>  <at> 
 import org.apache.cocoon.components.treeprocessor.InvokeContext;
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
 import org.apache.cocoon.environment.Environment;
+import org.apache.commons.lang.SystemUtils;

 /**
  * Handles &lt;map:handle-errors&gt;
 <at>  <at>  -94,14 +95,13  <at>  <at> 
                     env.getObjectModel().remove(Constants.NOTIFYING_OBJECT);
                     throw new ProcessingException(
(Continue reading)

antonio | 1 May 2005 19:10
Picon
Favicon

svn commit: r165525 - /cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java

Author: antonio
Date: Sun May  1 10:10:25 2005
New Revision: 165525

URL: http://svn.apache.org/viewcvs?rev=165525&view=rev
Log:
Use SystemUtils (merge from 2.1)

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java?rev=165525&r1=165524&r2=165525&view=diff
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java (original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
Sun May  1 10:10:25 2005
 <at>  <at>  -24,6 +24,7  <at>  <at> 
 import org.apache.cocoon.components.treeprocessor.InvokeContext;
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
 import org.apache.cocoon.environment.Environment;
+import org.apache.commons.lang.SystemUtils;

 /**
  * Handles &lt;map:handle-errors&gt;
 <at>  <at>  -94,32 +95,31  <at>  <at> 
                     env.getObjectModel().remove(Constants.NOTIFYING_OBJECT);
                     throw new ProcessingException(
(Continue reading)


Gmane