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 }; </script> 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