You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/02/05 09:18:01 UTC
[cayenne] branch master updated: Update Velocity properties' names,
old are deprecated
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 9d38f7d Update Velocity properties' names, old are deprecated
9d38f7d is described below
commit 9d38f7d862f74c76f5d58618ab1595d2ddfb69d3
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Feb 5 12:17:47 2020 +0300
Update Velocity properties' names, old are deprecated
---
.../main/java/org/apache/cayenne/gen/ClassGenerationAction.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index 89f7660..85cade1 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -299,12 +299,11 @@ public class ClassGenerationAction {
Template template = templateCache.get(templateName);
if (template == null) {
-
Properties props = new Properties();
- props.put("resource.loader", "cayenne");
- props.put("cayenne.resource.loader.class", ClassGeneratorResourceLoader.class.getName());
- props.put("cayenne.resource.loader.cache", "false");
+ props.put("resource.loaders", "cayenne");
+ props.put("resource.loader.cayenne.class", ClassGeneratorResourceLoader.class.getName());
+ props.put("resource.loader.cayenne.cache", "false");
VelocityEngine velocityEngine = new VelocityEngine();
velocityEngine.init(props);