From 56daf5ce75f0464c7bdbc908daf22fe5b0276f75 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Sun, 11 Mar 2007 19:00:38 +0000
Subject: [PATCH] Fixed dojo tests WW-1715

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@516988 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/template/ajax/a-close.ftl   |  1 +
 .../dojo/views/jsp/ui/HeadTagTest-1.txt        |  2 +-
 .../dojo/src/test/resources/struts.properties  | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 plugins/dojo/src/main/resources/template/ajax/a-close.ftl
 create mode 100644 plugins/dojo/src/test/resources/struts.properties

diff --git a/plugins/dojo/src/main/resources/template/ajax/a-close.ftl b/plugins/dojo/src/main/resources/template/ajax/a-close.ftl
new file mode 100644
index 000000000..937be0854
--- /dev/null
+++ b/plugins/dojo/src/main/resources/template/ajax/a-close.ftl
@@ -0,0 +1 @@
+</a>
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
index 92cd28bf2..d24b6e1c6 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
@@ -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>
diff --git a/plugins/dojo/src/test/resources/struts.properties b/plugins/dojo/src/test/resources/struts.properties
new file mode 100644
index 000000000..5766ea515
--- /dev/null
+++ b/plugins/dojo/src/test/resources/struts.properties
@@ -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