Return-Path: 
 <cvs-return-28007-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 87809 invoked from network); 10 Aug 2006 17:05:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 10 Aug 2006 17:05:00 -0000
Received: (qmail 46624 invoked by uid 500); 10 Aug 2006 17:05:00 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 46486 invoked by uid 500); 10 Aug 2006 17:04:59 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 46475 invoked by uid 99); 10 Aug 2006 17:04:59 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 10:04:59 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 10:04:59 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 121211A981A; Thu, 10 Aug 2006 10:04:33 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r430438 -
 /cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml
Date: Thu, 10 Aug 2006 17:04:32 -0000
To: cvs@cocoon.apache.org
From: antonio@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060810170433.121211A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: antonio
Date: Thu Aug 10 10:04:32 2006
New Revision: 430438

URL: http://svn.apache.org/viewvc?rev=430438&view=rev
Log:
COCOON-1758: Fixing my bad committed patch for solving this issue. I forgot to revert some test changes. Thanks to Simone Gianni for discovering the error.

Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml?rev=430438&r1=430437&r2=430438&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/generation/jx-macros.xml Thu Aug 10 10:04:32 2006
@@ -27,7 +27,7 @@
         ft:form
     -->
     <jx:macro name="form" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
-      <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale')}"/>
+      <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale','')}"/>
       <jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request,$localeSitemapParameter)}"/>
       <jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters['attribute-name'])}"/>
       <jx:if test="${cformsHelper.isVisible(form)}">
@@ -43,7 +43,7 @@
         ft:form-template: preferred syntax is now "ft:form" (we know we're in a template)
     -->
     <jx:macro name="form-template" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
-      <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale')}"/>
+      <jx:set var="localeSitemapParameter" value="${cocoon.parameters.getParameter('locale', '')}"/>
       <jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request,$localeSitemapParameter)}"/>
       <jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters['attribute-name'])}"/>
       <jx:if test="${cformsHelper.isVisible(form)}">