You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2007/03/15 21:30:04 UTC
svn commit: r518747 - in /cocoon:
branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
Author: antonio
Date: Thu Mar 15 13:30:03 2007
New Revision: 518747
URL: http://svn.apache.org/viewvc?view=rev&rev=518747
Log:
Add helper comments to enable rhino 1.5r4 as a workaround for COCOON-1579.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java?view=diff&rev=518747&r1=518746&r2=518747
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java Thu Mar 15 13:30:03 2007
@@ -326,6 +326,8 @@
*/
public Object jsFunction_getComponent(String id)
throws Exception {
+ // To use rhino1.5r4-continuations-R26.jar as a workaround for COCOON-1579: Uncomment the next line and comment the original return.
+ // return getServiceManager().lookup(id);
return org.mozilla.javascript.Context.javaToJS(getServiceManager().lookup(id), getParentScope());
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java?view=diff&rev=518747&r1=518746&r2=518747
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java Thu Mar 15 13:30:03 2007
@@ -60,10 +60,15 @@
Context ctx = Context.enter();
Script script;
try {
- script = ctx.compileReader(new StringReader(jsText), // in
- sourceName == null ? "<unknown>" : sourceName, // sourceName
- DomHelper.getLineLocation(element), // lineNo
- null); // securityDomain
+
+ script = ctx.compileReader(
+ // To use rhino1.5r4-continuations-R26.jar as a workaround for COCOON-1579: Uncomment the next line.
+ // getRootScope(null), //scope
+ new StringReader(jsText), // in
+ sourceName == null ? "<unknown>" : sourceName, // sourceName
+ DomHelper.getLineLocation(element), // lineNo
+ null // securityDomain
+ );
} finally {
Context.exit();
}