Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 71706 invoked from network); 11 Mar 2007 19:01:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Mar 2007 19:01:02 -0000 Received: (qmail 71472 invoked by uid 500); 11 Mar 2007 19:01:09 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 71429 invoked by uid 500); 11 Mar 2007 19:01:09 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 71420 invoked by uid 99); 11 Mar 2007 19:01:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Mar 2007 12:01:09 -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; Sun, 11 Mar 2007 11:01:00 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id EC0AB1A9838; Sun, 11 Mar 2007 12:00:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r516988 - in /struts/struts2/trunk/plugins/dojo/src: main/resources/template/ajax/a-close.ftl test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt test/resources/struts.properties Date: Sun, 11 Mar 2007 19:00:39 -0000 To: commits@struts.apache.org From: mrdon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070311190039.EC0AB1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrdon Date: Sun Mar 11 12:00:38 2007 New Revision: 516988 URL: http://svn.apache.org/viewvc?view=rev&rev=516988 Log: Fixed dojo tests WW-1715 Added: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/a-close.ftl - copied unchanged from r516968, struts/struts2/trunk/core/src/main/resources/template/simple/a-close.ftl struts/struts2/trunk/plugins/dojo/src/test/resources/struts.properties Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt?view=diff&rev=516988&r1=516987&r2=516988 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt (original) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt Sun Mar 11 12:00:38 2007 @@ -3,7 +3,7 @@ djConfig={ baseRelativePath: "/struts/dojo", isDebug: false, - bindEncoding: "UTF-8", + bindEncoding: "ISO-8859-1", debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes }; Added: struts/struts2/trunk/plugins/dojo/src/test/resources/struts.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/struts.properties?view=auto&rev=516988 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/struts.properties (added) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/struts.properties Sun Mar 11 12:00:38 2007 @@ -0,0 +1,18 @@ +struts.i18n.encoding=ISO-8859-1 +struts.locale=de_DE +struts.multipart.saveDir=\temp +struts.multipart.maxSize=12345 + +### Load custom property files (does not override struts.properties!) +struts.custom.properties=test,org/apache/struts2/othertest + +# added the MockTag to the path of Tags that the TagDirective will search through +struts.velocity.tag.path = org.apache.struts2.views.velocity.ui, org.displaytag.tags + +struts.ui.templateDir = template + +### Load custom default resource bundles +struts.custom.i18n.resources=testmessages,testmessages2 + +### XSLT Cache +struts.xslt.nocache = true