diff options
author | Claude Brisson <cbrisson@apache.org> | 2019-03-10 12:19:04 +0000 |
---|---|---|
committer | Claude Brisson <cbrisson@apache.org> | 2019-03-10 12:19:04 +0000 |
commit | 239daa98f886c06f704162894c3d0fa64f9f802a (patch) | |
tree | 38283e55292bcbfd78607fc282811f2f3e7e1a46 /velocity-engine-core/src/main/java/org/apache/velocity/runtime | |
parent | f31d3d3f1e419db9f7400b0f1e3d7844f5493693 (diff) | |
download | apache-velocity-engine-239daa98f886c06f704162894c3d0fa64f9f802a.tar.gz |
[engine][VELOCITY-909] Deprecate directive.include.output_error_start and directive.include.output_error_end (if/how errors are displayed is not the concern of the engine, which should throw in all cases)
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/branches/VELOCITY-909@1855146 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/main/java/org/apache/velocity/runtime')
-rw-r--r-- | velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java | 2 | ||||
-rw-r--r-- | velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java index 28682cd6..274d5158 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java @@ -88,12 +88,14 @@ public interface RuntimeConstants extends DeprecatedRuntimeConstants /** * Starting tag for error messages triggered by passing a parameter not allowed in the #include directive. Only string literals, * and references are allowed. + * @deprecated if/how errors are displayed is not the concern of the engine, which should throw in all cases */ String ERRORMSG_START = "directive.include.output_error_start"; /** * Ending tag for error messages triggered by passing a parameter not allowed in the #include directive. Only string literals, * and references are allowed. + * @deprecated if/how errors are displayed is not the concern of the engine, which should throw in all cases */ String ERRORMSG_END = "directive.include.output_error_end"; diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java index 86f62639..dd9c8a8a 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java @@ -287,6 +287,7 @@ public class Include extends InputBase * @param writer * @param msg * @throws IOException + * @deprecated if/how errors are displayed is not the concern of the engine, which should throw in all cases */ private void outputErrorToStream( Writer writer, String msg ) throws IOException |