Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 95763 invoked from network); 15 Mar 2007 20:30:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Mar 2007 20:30:27 -0000 Received: (qmail 98921 invoked by uid 500); 15 Mar 2007 20:30:35 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 98606 invoked by uid 500); 15 Mar 2007 20:30:34 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 98525 invoked by uid 99); 15 Mar 2007 20:30:33 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2007 13:30:33 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2007 13:30:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D139C1A983A; Thu, 15 Mar 2007 13:30:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 15 Mar 2007 20:30:04 -0000 To: cvs@cocoon.apache.org From: antonio@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070315203004.D139C1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 ? "" : 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 ? "" : sourceName, // sourceName + DomHelper.getLineLocation(element), // lineNo + null // securityDomain + ); } finally { Context.exit(); }