Author: cbrisson
Date: Thu Apr 18 15:13:41 2019
New Revision: 1857760
URL: http://svn.apache.org/viewvc?rev=1857760&view=rev
Log:
[tools/model] Let VelocityView load model velocity properties if present
Modified:
velocity/tools/branches/model/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Modified:
velocity/tools/branches/model/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1857760&r1=1857759&r2=1857760&view=diff
==============================================================================
---
velocity/tools/branches/model/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
(original)
+++
velocity/tools/branches/model/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Thu Apr 18 15:13:41 2019
@@ -341,6 +341,13 @@ public class VelocityView extends ViewTo
Properties defaultProperties = getProperties(DEFAULT_PROPERTIES_PATH,
true);
velocity.setProperties(defaultProperties);
+ // load model properties, if present in the classpath
+ Properties modelProperties = getProperties(MODEL_PROPERTIES_PATH,
false);
+ if (modelProperties != null)
+ {
+ velocity.setProperties(modelProperties);
+ }
+
// check for application-wide user props in the context init params
String appPropsPath = servletContext.getInitParameter(PROPERTIES_KEY);
if (appPropsPath != null)
