You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2021/02/25 13:34:38 UTC
[velocity-engine] branch master updated (2a349be -> c0e3cc7)
This is an automated email from the ASF dual-hosted git repository.
cbrisson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git.
from 2a349be Merge branch 'spring-velocity-support'
new c894ed1 Fix readme
new c0e3cc7 Replace reference to obsolete spring classes with links to javadoc
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
spring-velocity-support/README.md | 2 +-
.../src/main/java/org/apache/velocity/spring/VelocityEngineFactory.java | 2 +-
.../main/java/org/apache/velocity/spring/VelocityEngineFactoryBean.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[velocity-engine] 02/02: Replace reference to obsolete spring
classes with links to javadoc
Posted by cb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cbrisson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit c0e3cc71f82fee3c4a1ebcffc398c70aef0f1dfa
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Thu Feb 25 14:34:12 2021 +0100
Replace reference to obsolete spring classes with links to javadoc
---
.../src/main/java/org/apache/velocity/spring/VelocityEngineFactory.java | 2 +-
.../main/java/org/apache/velocity/spring/VelocityEngineFactoryBean.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactory.java b/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactory.java
index 6b3ee25..378b7e0 100644
--- a/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactory.java
+++ b/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactory.java
@@ -63,7 +63,7 @@ import org.springframework.util.StringUtils;
* @see #setResourceLoaderPath
* @see #createVelocityEngine
* @see VelocityEngineFactoryBean
- * @see org.springframework.web.servlet.view.velocity.VelocityConfigurer
+ * @see <a href="https://docs.spring.io/spring-framework/docs/4.3.29.RELEASE/javadoc-api/org/springframework/web/servlet/view/velocity/VelocityConfigurer.html">org.springframework.web.servlet.view.velocity.VelocityConfigurer</a>
* @see org.apache.velocity.app.VelocityEngine
*/
public class VelocityEngineFactory {
diff --git a/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactoryBean.java b/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactoryBean.java
index 7705aab..78299ab 100644
--- a/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactoryBean.java
+++ b/spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactoryBean.java
@@ -47,7 +47,7 @@ import org.springframework.context.ResourceLoaderAware;
* @see #setConfigLocation
* @see #setVelocityProperties
* @see #setResourceLoaderPath
- * @see org.springframework.web.servlet.view.velocity.VelocityConfigurer
+ * @see <a href="https://docs.spring.io/spring-framework/docs/4.3.29.RELEASE/javadoc-api/org/springframework/web/servlet/view/velocity/VelocityConfigurer.html">org.springframework.web.servlet.view.velocity.VelocityConfigurer</a>
*/
public class VelocityEngineFactoryBean extends VelocityEngineFactory
implements FactoryBean<VelocityEngine>, InitializingBean, ResourceLoaderAware {
[velocity-engine] 01/02: Fix readme
Posted by cb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cbrisson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit c894ed10425b0c187e129ea9ca277f47fe02d276
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Thu Feb 25 14:25:25 2021 +0100
Fix readme
---
spring-velocity-support/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-velocity-support/README.md b/spring-velocity-support/README.md
index f7507ae..c31ab24 100644
--- a/spring-velocity-support/README.md
+++ b/spring-velocity-support/README.md
@@ -2,7 +2,7 @@ Title: Apache Velocity Spring Support
# Apache Velocity Spring Support
-This module is an adaptation of the engine support initially hosted by the Spring project in its 3.x versions.
+This module is an adaptation of the engine support initially hosted by the Spring project in its 4.x versions.
Example configuration: