You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/08/11 13:42:02 UTC
svn commit: rev 36217 - in cocoon/branches/BRANCH_2_1_X: . src/blocks/mail/samples/mail src/blocks/paranoid/java/org/apache/cocoon/servlet src/blocks/scratchpad/java/org/apache/cocoon/ant src/blocks/scratchpad/java/org/apache/cocoon/caching src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom src/blocks/taglib/java/org/apache/cocoon/jxpath src/blocks/taglib/java/org/apache/cocoon/transformation src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor src/blocks/woody/java/org/apache/cocoon/woody/transformation
Author: cziegeler
Date: Wed Aug 11 04:42:01 2004
New Revision: 36217
Modified:
cocoon/branches/BRANCH_2_1_X/KEYS
cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/caching/IdentifierCacheKey.java
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingDecimalConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingFloatConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java
Log:
Sync with 2.2
Modified: cocoon/branches/BRANCH_2_1_X/KEYS
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/KEYS (original)
+++ cocoon/branches/BRANCH_2_1_X/KEYS Wed Aug 11 04:42:01 2004
@@ -1,3 +1,16 @@
+(instructions copied from forrest's KEYS file)
+
+This file contains the PGP keys of various developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Users: pgp < KEYS
+Developers:
+ pgp -kxa <your name> and append it to this file.
+ (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+ (gpg --list-sigs <your name>
+ && gpg --armor --export <your name>) >> this file.
+
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: PGPfreeware 7.0.3 for non-commercial use <http://www.pgp.com>
@@ -153,4 +166,45 @@
P3RXhAIbDAAKCRATLknU5B7cfgWMAJ9w/IX0FwxyOhwCveM1PDrVWxT4dQCfaG22
PDGaBFWsUIyQDUGS56dkC0k=
=4pJn
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub 1024D/015AFC8A 2004-06-18 Bertrand Delacretaz <bd...@apache.org>
+sig 3 015AFC8A 2004-06-18 Bertrand Delacretaz <bd...@apache.org>
+uid Bertrand Delacretaz <bd...@codeconsult.ch>
+sig 3 015AFC8A 2004-06-18 Bertrand Delacretaz <bd...@apache.org>
+sub 2048g/AC136A02 2004-06-18
+sig 015AFC8A 2004-06-18 Bertrand Delacretaz <bd...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.4 (Darwin)
+
+mQGiBEDSjpsRBAC6qu/5vv5ETRaTEwrZI1gbepp2tNNBqIVfYEZlF8jnWhUk1sdm
++bvqNMPf1B+ZQqjmctLoa+OKVd4vQEgdxclUYCkjuk2iWRX/iRJ61Zm1myuaBfhN
+v0mRBduoSG+2+cIBq3ODQld/BPFotfL+giLdHF6SMjMl0BYcCOqZZGhhGwCg88wL
+wNpY/ZPBtiUXzozD0wCDs6MD/ApczG73dG9H3BCPmp7y41ZbYZHpxiS9Mz9mLJNk
+HMcx4iOzZnptX71UGG58nnBc+VDPooJdzzZywYhHhyz4uSrvMqS5DYquH5HEzMLE
+jKNf0EGay9SHbpbT808YJIKogLgUhuUXe/MrzOdhEEfj+c8Q0iLEmOnNYjFRvakV
+ei8gA/wKwnnQbQvgHyanZsus4WQRRRhbIZFM/qsmM4+McnI9TveDRYjoNwI5tbwY
+aKF+FS9XAbMTBfXZggdjlyYy7J8LZyfm/yyb7BBq6++Owpj3Y/6DPgg1jqJ9Lenc
+04uJATQiXNFS4k38eUtxWQ8lutc4W+3gy4M86mTFwfYVikRr7rQwQmVydHJhbmQg
+RGVsYWNyZXRheiA8YmRlbGFjcmV0YXpAY29kZWNvbnN1bHQuY2g+iF4EExECAB4F
+AkDSjpsCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQN/aP9QFa/Ip0DwCgyqeU
+b6ClVLmPOnsHeikXUeyuHOYAn2WW/Gq9kk5vOfJ2bv/lS5sH+lRgtCxCZXJ0cmFu
+ZCBEZWxhY3JldGF6IDxiZGVsYWNyZXRhekBhcGFjaGUub3JnPoheBBMRAgAeBQJA
+0o/yAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDf2j/UBWvyKoVIAoLZIjDpT
+DUQb99MWGAIhd5hKbwlGAJ9QG+DT2qEF1vtgOHucWg1ljhPpUbkCDQRA0o6rEAgA
+8P1i9oUjHzQVfneNgWA3QTuWwbfmd6OKgPR7FHkmPpZBOCmNby65lB9St1aQxtp9
+jBm2TjyO8JDbJzL1K2TYXRI6iE1lh2btoCng7v6jr8lXyJkYtVB4IZe9l5mnslSR
+a17asd+8aJSqY4vz+vVP9cng2SXpxWAaEjrwujyuPYqy9aUtY/L9eQNuA+nKcvFl
+iwCHJhfUqMYaKd7IUoz5fP4XPki5kuLvb0VTvBcq7aqmr9SMxjhkUI0ijaGGk72t
+KdgHKarsAcl5/BZioRtxiAlM8VLz+tycxcxb12e+SLb3BE+Grg6KSqK3PuhHnsf7
+7rFwEFuuvtZabIIYq7l6YwADBgf9H47O3taUb9VFmiV7D6j7Yjcxka2qbtu7NIdG
+XwGlbLts6zoCzoOwFaPbw9Ieo3Uscw5jnmb+wkaZXkz5UrCjObsHaW0V/rm2XVvj
+dginu8IDClmwK1q8ifYY4oc671Prm/B1ms1Rqmm/duVFzSSncUK5YsiC2QJ29f+c
+JU5Prbq+LaHipHoVPg59fm3hxMza1mtbeFyIIyISBPawEAD4tu0SARsAcvNEKkAu
+r6Cr/BZ1C2MPkc51kJVBf0EHO+7bpoJmDeG9ZZ3lnfKo1ciTnXbOvAO7z/AO0i4G
+4tJPxFro065inGT1GMwxEWyY+fYHiVlc7RCB2WBGa347FKe5PohJBBgRAgAJBQJA
+0o6rAhsMAAoJEDf2j/UBWvyKRWsAoMxSxAZfW7xkuy5Szp3zCwV0XCq4AJwMkBVz
+cq5NWtNY2fQF2m3CfZAq8g==
+=9k02
-----END PGP PUBLIC KEY BLOCK-----
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap Wed Aug 11 04:42:01 2004
@@ -16,7 +16,7 @@
-->
<!--
- Version <![CDATA[ $Id: sitemap.xmap,v 1.3 2004/03/11 16:25:48 stephan Exp $ ]]>
+ Version <![CDATA[ $Id$ ]]>
Cocoon Webmail sitemap definition
-->
@@ -27,7 +27,6 @@
<map:components>
-
<!-- ===== selectors =====
-->
<map:selectors default="parameter">
@@ -39,6 +38,9 @@
logger="sitemap.selector.request-attribute">
<parameter-name>cmd</parameter-name>
</map:selector>
+ <map:selector name="resource-exists" src="org.apache.cocoon.selection.ResourceExistsSelector"
+ logger="sitemap.selector.request-exists">
+ </map:selector>
</map:selectors>
<!-- ===== actions =====
@@ -122,16 +124,25 @@
<!-- mail/ handling, mail/ URI denotes pages of Cocoon Webmail,
presenting javamail objects
-->
- <map:pipeline internal-only="true">
+ <map:pipeline>
<map:match pattern="page-mail/*-head-col-1">
- <map:act type="resource-exists" src="docs/head-col-1/{1}.xsp">
+ <map:select type="resource-exists">
+ <map:when test="docs/head-col-1/{1}.xsp">
<map:call resource="load-xsp-page">
<map:parameter name="sect" value="head-col-1"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-xsp-page">
+ <map:parameter name="sect" value="head-col-1"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="page-mail/mail-mid-col-1">
@@ -141,13 +152,22 @@
</map:match>
<map:match pattern="page-mail/*-mid-col-1">
- <map:act type="resource-exists" src="docs/mid-col-1/{1}.xsp">
+ <map:select type="resource-exists">
+ <map:when test="docs/mid-col-1/{1}.xsp">
+ <map:call resource="load-xsp-page">
+ <map:parameter name="sect" value="mid-col-1"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
<map:call resource="load-xsp-page">
<map:parameter name="sect" value="mid-col-1"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="page-mail/mail-mid-col-2">
@@ -188,63 +208,108 @@
</map:match>
<map:match pattern="page-mail/*-mid-col-2">
- <map:act type="resource-exists" src="docs/mid-col-2/{1}.xsp">
+ <map:select type="resource-exists">
+ <map:when test="docs/mid-col-2/{1}.xsp">
<map:call resource="load-xsp-page">
<map:parameter name="sect" value="mid-col-2"/>
- <map:parameter name="page" value="{../1}"/>
+ <map:parameter name="page" value="{1}"/>
<map:parameter name="resource-exists" value="{resource-exists}"/>
</map:call>
- </map:act>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-xsp-page">
+ <map:parameter name="sect" value="mid-col-2"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="page-mail/*-mid-col-3">
- <map:act type="resource-exists" src="docs/mid-col-3/{1}.xml">
+ <map:select type="resource-exists">
+ <map:when test="docs/mid-col-3/{1}.xml">
<map:call resource="load-page">
<map:parameter name="sect" value="mid-col-3"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-xsp-page">
+ <map:parameter name="sect" value="mid-col-3"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
</map:pipeline>
<!-- general page section handling
-->
- <map:pipeline internal-only="true">
+ <map:pipeline>
<!-- pipeline matching a section of a page
-->
<!-- matched by simple URI *.html, eg. index.html becomes page-index-top-col-1
and mail/*.html, eg. mail/logout.html becomes page-mail/logout-top-col-1
-->
- <map:match pattern="page-**-top-col-1">
- <map:act type="resource-exists" src="docs/top-col-1/{1}.xml">
+ <map:match pattern="page-*-top-col-1">
+ <map:select type="resource-exists">
+ <map:when test="docs/top-col-1/{1}.xml">
<map:call resource="load-page">
<map:parameter name="sect" value="top-col-1"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="top-col-1"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="page-*-head-col-1">
- <map:act type="resource-exists" src="docs/head-col-1/{1}.xml">
+ <map:select type="resource-exists">
+ <map:when test="docs/head-col-1/{1}.xml">
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="head-col-1"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
<map:call resource="load-page">
<map:parameter name="sect" value="head-col-1"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="page-*-mid-col-1">
- <map:act type="resource-exists" src="docs/mid-col-1/{1}.xml">
+ <map:select type="resource-exists">
+ <map:when test="docs/mid-col-1/{1}.xml">
<map:call resource="load-page">
<map:parameter name="sect" value="mid-col-1"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="mid-col-1"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="page-*-mid-col-2">
@@ -253,25 +318,43 @@
</map:match>
<map:match pattern="page-*-mid-col-3">
- <map:act type="resource-exists" src="docs/mid-col-3/{1}.xml">
+ <map:select type="resource-exists">
+ <map:when test="docs/mid-col-3/{1}.xml">
<map:call resource="load-page">
<map:parameter name="sect" value="mid-col-3"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="mid-col-3"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
<!-- bottom-col matches mail/*, too
-->
- <map:match pattern="page-**-bottom-col-1">
- <map:act type="resource-exists" src="docs/bottom-col-1/{1}.xml">
+ <map:match pattern="page-*-bottom-col-1">
+ <map:select type="resource-exists">
+ <map:when test="docs/bottom-col-1/{1}.xml">
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="bottom-col-1"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
<map:call resource="load-page">
<map:parameter name="sect" value="bottom-col-1"/>
- <map:parameter name="page" value="{../1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
- </map:act>
+ </map:otherwise>
+ </map:select>
</map:match>
</map:pipeline>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java Wed Aug 11 04:42:01 2004
@@ -55,7 +55,7 @@
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id: ParanoidCocoonServlet.java,v 1.3 2004/03/05 13:02:02 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class ParanoidCocoonServlet extends HttpServlet {
@@ -187,9 +187,14 @@
throws ServletException {
final List urlList = new ArrayList();
- log("Adding classpath from " + externalClasspath);
+ File file = new File(externalClasspath);
+ if (!file.isAbsolute()) {
+ file = new File(contextDir,externalClasspath);
+ }
+
+ log("Adding classpath from " + file);
try {
- FileReader fileReader = new FileReader(externalClasspath);
+ FileReader fileReader = new FileReader(file);
LineNumberReader lineReader = new LineNumberReader(fileReader);
String line;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java Wed Aug 11 04:42:01 2004
@@ -62,7 +62,7 @@
* Ant task for running Cocoon.
*
* @author huber@apache.org
- * @version CVS $Id: CocoonTask.java,v 1.8 2004/04/17 11:32:24 antonio Exp $
+ * @version CVS $Id$
*/
public class CocoonTask extends Task {
@@ -330,7 +330,7 @@
// AntClassLoader
// CocoonTask was already loaded via an AntClassLoader by Ant
//
- AntClassLoader antClassLoader = new AntClassLoader(this.project, this.cocoonClasspath, false);
+ AntClassLoader antClassLoader = new AntClassLoader(this.getProject(), this.cocoonClasspath, false);
log("Using Class Loader having classpath " + String.valueOf(this.cocoonClasspath), Project.MSG_INFO);
classLoader = antClassLoader;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/caching/IdentifierCacheKey.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/caching/IdentifierCacheKey.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/caching/IdentifierCacheKey.java Wed Aug 11 04:42:01 2004
@@ -24,7 +24,7 @@
* for an internal pipeline call.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: IdentifierCacheKey.java,v 1.1 2004/04/15 08:05:55 cziegeler Exp $
+ * @version CVS $Id$
* @since 2.1.1
*/
public class IdentifierCacheKey
@@ -78,7 +78,7 @@
public String toString() {
if (this.toString == null) {
StringBuffer buffer = new StringBuffer();
- buffer.append("SCK:");
+ buffer.append("IK:");
buffer.append(this.cacheKey);
this.toString = buffer.toString();
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java Wed Aug 11 04:42:01 2004
@@ -85,7 +85,7 @@
* @author <a href="mailto:coliver@apache.org">Christopher Oliver</a>
* @author <a href="mailto:reinhard@apache.org">Reinhard P�tz</a>
* @since 2.1
- * @version CVS $Id: AO_FOM_JavaScriptInterpreter.java,v 1.9 2004/03/05 10:07:25 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class AO_FOM_JavaScriptInterpreter extends AbstractInterpreter
implements Serviceable, Configurable, Initializable
@@ -294,7 +294,6 @@
* org.apache.cocoon.environment.Environment#getURIPrefix} method,
* can have a scope associated with it.
*
- * @param environment an <code>Environment</code> value
* @return a <code>Scriptable</code> value
*/
private Scriptable getSessionScope()
@@ -330,7 +329,6 @@
* prefix of the current sitemap, as returned by the {@link
* org.apache.cocoon.environment.Environment#getURIPrefix} method.
*
- * @param environment an <code>Environment</code> value
* @param scope a <code>Scriptable</code> value
*/
private Scriptable setSessionScope(Scriptable scope)
@@ -422,7 +420,6 @@
* newly create Scriptable object in the user's session, where it
* will be retrieved from at the next invocation of {@link #callFunction}.</p>
*
- * @param environment an <code>Environment</code> value
* @exception Exception if an error occurs
*/
private void setupContext(Redirector redirector,
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonContextHandler.java Wed Aug 11 04:42:01 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/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonRequestHandler.java Wed Aug 11 04:42:01 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/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/jxpath/CocoonSessionHandler.java Wed Aug 11 04:42:01 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/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java Wed Aug 11 04:42:01 2004
@@ -28,6 +28,7 @@
import org.apache.commons.collections.map.StaticBucketMap;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -52,7 +53,7 @@
* Transformer which implements the dynamic Tag functionalty.
*
* @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * @version CVS $Id: TagTransformer.java,v 1.6 2004/03/05 13:02:25 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class TagTransformer
extends AbstractXMLProducer
@@ -194,7 +195,7 @@
Tag tag = (Tag) tagStack.pop();
if (tag != null) {
- ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
+ ComponentSelector tagSelector = (ComponentSelector)tagSelectorStack.pop();
try {
if (saxFragment != null) {
//start Iteration
@@ -315,7 +316,7 @@
Tag tag = (Tag) tagStack.pop();
if (tag == null)
continue;
- ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
+ ComponentSelector tagSelector = (ComponentSelector)tagSelectorStack.pop();
tagSelector.release(tag);
tagNamespaceSelector.release(tagSelector);
@@ -424,10 +425,10 @@
Tag tag = null;
if (namespaceURI != null && namespaceURI.length() > 0) {
- ServiceSelector tagSelector = null;
+ ComponentSelector tagSelector = null;
Transformer tagTransformer = null;
try {
- tagSelector = (ServiceSelector) tagNamespaceSelector.select(namespaceURI);
+ tagSelector = (ComponentSelector) tagNamespaceSelector.select(namespaceURI);
tagSelectorStack.push(tagSelector);
// namespace matches tag library, lookup tag now.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingDecimalConvertor.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingDecimalConvertor.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingDecimalConvertor.java Wed Aug 11 04:42:01 2004
@@ -41,7 +41,7 @@
* java.text.DecimalFormat or com.ibm.icu.text.DecimalFormat. The com.ibm version will automatically
* be used if it is present on the classpath, otherwise the java.text version will be used.
*
- * @version CVS $Id: FormattingDecimalConvertor.java,v 1.6 2004/03/09 13:54:15 reinhard Exp $
+ * @version CVS $Id$
*/
public class FormattingDecimalConvertor implements Convertor {
private int variant;
@@ -66,25 +66,28 @@
public Object convertFromString(String value, Locale locale, Convertor.FormatCache formatCache) {
DecimalFormat decimalFormat = getDecimalFormat(locale, formatCache);
+ Number decimalValue;
try {
- Number decimalValue = decimalFormat.parse(value);
- if (decimalValue instanceof BigDecimal)
- ;
- else if (decimalValue instanceof Integer)
+ decimalValue = decimalFormat.parse(value);
+ } catch (ParseException e) {
+ return null;
+ }
+
+ if (decimalValue instanceof BigDecimal) {
+ // no need for conversion
+ } else if (decimalValue instanceof Integer) {
decimalValue = new BigDecimal(decimalValue .intValue());
- else if (decimalValue instanceof Long)
+ } else if (decimalValue instanceof Long) {
decimalValue = new BigDecimal(decimalValue.longValue());
- else if (decimalValue instanceof Double)
+ } else if (decimalValue instanceof Double) {
decimalValue = new BigDecimal(decimalValue.doubleValue());
- else if (decimalValue instanceof BigInteger)
+ } else if (decimalValue instanceof BigInteger) {
decimalValue = new BigDecimal((BigInteger)decimalValue);
- else
+ } else {
return null;
+ }
return decimalValue;
- } catch (ParseException e) {
- return null;
- }
}
public String convertToString(Object value, Locale locale, Convertor.FormatCache formatCache) {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingFloatConvertor.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingFloatConvertor.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor/FormattingFloatConvertor.java Wed Aug 11 04:42:01 2004
@@ -38,7 +38,7 @@
* java.text.DecimalFormat or com.ibm.icu.text.DecimalFormat. The com.ibm version will automatically
* be used if it is present on the classpath, otherwise the java.text version will be used.
*
- * @version CVS $Id: FormattingFloatConvertor.java,v 1.4 2004/03/09 13:54:15 reinhard Exp $
+ * @version CVS $Id$
*/
public class FormattingFloatConvertor implements Convertor {
private int variant;
@@ -63,25 +63,28 @@
public Object convertFromString(String value, Locale locale, Convertor.FormatCache formatCache) {
DecimalFormat decimalFormat = getDecimalFormat(locale, formatCache);
+ Number decimalValue;
try {
- Number decimalValue = decimalFormat.parse(value);
- if (decimalValue instanceof BigDecimal)
- ;
- else if (decimalValue instanceof Integer)
+ decimalValue = decimalFormat.parse(value);
+ } catch (ParseException e) {
+ return null;
+ }
+
+ if (decimalValue instanceof BigDecimal) {
+ // no need for conversion
+ } else if (decimalValue instanceof Integer) {
decimalValue = new BigDecimal(decimalValue .intValue());
- else if (decimalValue instanceof Long)
+ } else if (decimalValue instanceof Long) {
decimalValue = new BigDecimal(decimalValue.longValue());
- else if (decimalValue instanceof Double)
+ } else if (decimalValue instanceof Double) {
decimalValue = new BigDecimal(decimalValue.doubleValue());
- else if (decimalValue instanceof BigInteger)
+ } else if (decimalValue instanceof BigInteger) {
decimalValue = new BigDecimal((BigInteger)decimalValue);
- else
+ } else {
return null;
+ }
return decimalValue;
- } catch (ParseException e) {
- return null;
- }
}
public String convertToString(Object value, Locale locale, Convertor.FormatCache formatCache) {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java Wed Aug 11 04:42:01 2004
@@ -65,7 +65,7 @@
* Form location attribute on <code>wt:form-template</code> element, containing
* JXPath expression which should result in Form object.
*
- * @see WoodyPipelineConfig#findForm
+ * @see WoodyPipelineConfig#findForm(String)
*/
private static final String LOCATION = "location";