You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/09/13 09:49:24 UTC
[23/36] incubator-freemarker git commit: FREEMARKER-55: unit test
template code
FREEMARKER-55: unit test template code
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d5c31a1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d5c31a1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d5c31a1b
Branch: refs/heads/3
Commit: d5c31a1b4e5753e7dbbeb1b1971c3b9bcf5643e4
Parents: 96c038d
Author: Woonsan Ko <wo...@apache.org>
Authored: Mon Sep 11 23:24:37 2017 -0400
Committer: Woonsan Ko <wo...@apache.org>
Committed: Mon Sep 11 23:24:37 2017 -0400
----------------------------------------------------------------------
.../spring/example/mvc/users/UsersMessages.properties | 7 +++++++
.../freemarker/spring/model/MessageFunctionTest-context.xml | 2 +-
.../apache/freemarker/spring/model/UsersMessages.properties | 7 -------
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d5c31a1b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
new file mode 100644
index 0000000..ade76f4
--- /dev/null
+++ b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
@@ -0,0 +1,7 @@
+user.form.message=Edit info for {0} {1} <{2}>
+user.id=ID
+user.password=Password
+user.email=E-Mail
+user.firstName=First name
+user.lastName=Last name
+user.birthDate=Birth Date
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d5c31a1b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/MessageFunctionTest-context.xml
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/MessageFunctionTest-context.xml b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/MessageFunctionTest-context.xml
index f68f584..862de44 100644
--- a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/MessageFunctionTest-context.xml
+++ b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/MessageFunctionTest-context.xml
@@ -26,7 +26,7 @@
<context:component-scan base-package="org.apache.freemarker.spring.example.mvc.users" />
<bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
- <property name="basename" value="classpath:org.apache.freemarker.spring.model.UserMessages" />
+ <property name="basename" value="classpath:org.apache.freemarker.spring.example.mvc.users.UserMessages" />
</bean>
<bean id="configuration" class="org.apache.freemarker.spring.ConfigurationFactoryBean">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d5c31a1b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/UsersMessages.properties
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/UsersMessages.properties b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/UsersMessages.properties
deleted file mode 100644
index ade76f4..0000000
--- a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/model/UsersMessages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-user.form.message=Edit info for {0} {1} <{2}>
-user.id=ID
-user.password=Password
-user.email=E-Mail
-user.firstName=First name
-user.lastName=Last name
-user.birthDate=Birth Date