cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: rev 36099 - in cocoon/trunk: . lib src/blocks/taglib/java/org/apache/cocoon/jxpath
Date Mon, 09 Aug 2004 09:43:32 GMT
Author: antonio
Date: Mon Aug  9 02:43:31 2004
New Revision: 36099

Modified:
   cocoon/trunk/lib/jars.xml
   cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java
   cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java
   cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java
   cocoon/trunk/status.xml
Log:
Update commons-jxpath to 1.2

Modified: cocoon/trunk/lib/jars.xml
==============================================================================
--- cocoon/trunk/lib/jars.xml	(original)
+++ cocoon/trunk/lib/jars.xml	Mon Aug  9 02:43:31 2004
@@ -16,7 +16,7 @@
 -->
 
 <!--+
-    | CVS $Id: jars.xml,v 1.241 2004/07/11 23:45:08 antonio Exp $
+    | CVS $Id$
     |
     | Add an entry for each jar file used by Cocoon, following the other entries.
     | Please ensure that you use a version number or datestamp in the jar filename.
@@ -680,7 +680,7 @@
     <title>Jakarta Commons JXPath</title>
     <description>XPath interpreter. Work with JavaBeans and DOM nodes</description>
     <used-by>Flow, JXPath logicsheet</used-by>
-    <lib>core/commons-jxpath-20030909.jar</lib>
+    <lib>core/commons-jxpath-1.2.jar</lib>
     <homepage>http://jakarta.apache.org/commons/jxpath/</homepage>
   </file>
 

Modified: cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java
==============================================================================
--- cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java
(original)
+++ cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java
Mon Aug  9 02:43:31 2004
@@ -19,21 +19,21 @@
 import java.util.Enumeration;
 
 import org.apache.cocoon.environment.Context;
+import org.apache.commons.collections.EnumerationUtils;
 import org.apache.commons.jxpath.DynamicPropertyHandler;
-import org.apache.commons.jxpath.servlet.Util;
 
 /**
  * Implementation of the DynamicPropertyHandler interface that provides
  * access to attributes of a Cocoon Context.
  *
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * @version CVS $Id: CocoonContextHandler.java,v 1.3 2004/03/05 13:02:24 bdelacretaz Exp
$
+ * @version CVS $Id$
  */
 public class CocoonContextHandler implements DynamicPropertyHandler {
 
     public String[] getPropertyNames(Object context){
         Enumeration e = ((Context)context).getAttributeNames();
-        return Util.toStrings(e);
+        return (String [])EnumerationUtils.toList(e).toArray();
     }
 
     public Object getProperty(Object context, String property){

Modified: cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java
==============================================================================
--- cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java
(original)
+++ cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java
Mon Aug  9 02:43:31 2004
@@ -19,21 +19,21 @@
 import java.util.Enumeration;
 
 import org.apache.cocoon.environment.Request;
+import org.apache.commons.collections.EnumerationUtils;
 import org.apache.commons.jxpath.DynamicPropertyHandler;
-import org.apache.commons.jxpath.servlet.Util;
 
 /**
  * Implementation of the DynamicPropertyHandler interface that provides
  * access to attributes of a Cocoon Request.
  *
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * @version CVS $Id: CocoonRequestHandler.java,v 1.3 2004/03/05 13:02:24 bdelacretaz Exp
$
+ * @version CVS $Id$
  */
 public class CocoonRequestHandler implements DynamicPropertyHandler {
 
     public String[] getPropertyNames(Object request){
         Enumeration e = ((Request)request).getAttributeNames();
-        return Util.toStrings(e);
+        return (String [])EnumerationUtils.toList(e).toArray();
     }
 
     public Object getProperty(Object request, String property){

Modified: cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java
==============================================================================
--- cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java
(original)
+++ cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java
Mon Aug  9 02:43:31 2004
@@ -19,21 +19,21 @@
 import java.util.Enumeration;
 
 import org.apache.cocoon.environment.Session;
+import org.apache.commons.collections.EnumerationUtils;
 import org.apache.commons.jxpath.DynamicPropertyHandler;
-import org.apache.commons.jxpath.servlet.Util;
 
 /**
  * Implementation of the DynamicPropertyHandler interface that provides
  * access to attributes of a Cocoon Session.
  *
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * @version CVS $Id: CocoonSessionHandler.java,v 1.3 2004/03/05 13:02:24 bdelacretaz Exp
$
+ * @version CVS $Id$
  */
 public class CocoonSessionHandler implements DynamicPropertyHandler {
 
     public String[] getPropertyNames(Object session){
         Enumeration e = ((Session)session).getAttributeNames();
-        return Util.toStrings(e);
+        return (String [])EnumerationUtils.toList(e).toArray();
     }
 
     public Object getProperty(Object session, String property){

Modified: cocoon/trunk/status.xml
==============================================================================
--- cocoon/trunk/status.xml	(original)
+++ cocoon/trunk/status.xml	Mon Aug  9 02:43:31 2004
@@ -205,7 +205,7 @@
   <changes>
   <release version="@version@" date="@date@">
   <action dev="AG" type="update">
-     Update ant to 1.6.2.
+     Update ant to 1.6.2, commons-jxpath to 1.2.
    </action>
    <action dev="CZ" type="fix">
      Mail block: The mail transformer ignored configured toAddresses from a pipeline parameter.
This is fixed now.

Mime
View raw message