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:19:08 UTC

[velocity-engine] branch master updated (a44cdd1 -> 2a349be)

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 a44cdd1  [engine] Upgrade several versions
     add 35e9229  Initial commit for spring-velocity-support
     add c96dbe6  Add readme to spring-velocity-support
     new 2a349be  Merge branch 'spring-velocity-support'

The 1 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:
 README.md                                          |   3 +-
 pom.xml                                            |   1 +
 spring-velocity-support/README.md                  |  22 ++
 .../pom.xml                                        |  25 +-
 .../velocity/spring/SpringResourceLoader.java      | 140 +++++++++
 .../velocity/spring/VelocityEngineFactory.java     | 337 +++++++++++++++++++++
 .../velocity/spring/VelocityEngineFactoryBean.java |  79 +++++
 .../velocity/spring/VelocityEngineUtils.java       | 112 +++++++
 .../test/VelocityEngineFactoryBeanTests.java       |  75 +++++
 .../spring/test/VelocityEngineFactoryTests.java    |  70 +++++
 .../src/test/resources/simple.vm                   |   1 +
 .../src/test/resources/velocity.properties         |   4 +-
 12 files changed, 864 insertions(+), 5 deletions(-)
 create mode 100644 spring-velocity-support/README.md
 copy {velocity-engine-scripting => spring-velocity-support}/pom.xml (77%)
 create mode 100644 spring-velocity-support/src/main/java/org/apache/velocity/spring/SpringResourceLoader.java
 create mode 100644 spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactory.java
 create mode 100644 spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineFactoryBean.java
 create mode 100644 spring-velocity-support/src/main/java/org/apache/velocity/spring/VelocityEngineUtils.java
 create mode 100644 spring-velocity-support/src/test/java/org/apache/velocity/spring/test/VelocityEngineFactoryBeanTests.java
 create mode 100644 spring-velocity-support/src/test/java/org/apache/velocity/spring/test/VelocityEngineFactoryTests.java
 create mode 100644 spring-velocity-support/src/test/resources/simple.vm
 copy {velocity-engine-scripting => spring-velocity-support}/src/test/resources/velocity.properties (95%)


[velocity-engine] 01/01: Merge branch 'spring-velocity-support'

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 2a349befce4ece2b869236148676f2ff736a454d
Merge: a44cdd1 c96dbe6
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Thu Feb 25 14:18:44 2021 +0100

    Merge branch 'spring-velocity-support'

 README.md                                          |   3 +-
 pom.xml                                            |   1 +
 spring-velocity-support/README.md                  |  22 ++
 spring-velocity-support/pom.xml                    | 106 +++++++
 .../velocity/spring/SpringResourceLoader.java      | 140 +++++++++
 .../velocity/spring/VelocityEngineFactory.java     | 337 +++++++++++++++++++++
 .../velocity/spring/VelocityEngineFactoryBean.java |  79 +++++
 .../velocity/spring/VelocityEngineUtils.java       | 112 +++++++
 .../test/VelocityEngineFactoryBeanTests.java       |  75 +++++
 .../spring/test/VelocityEngineFactoryTests.java    |  70 +++++
 .../src/test/resources/simple.vm                   |   1 +
 .../src/test/resources/velocity.properties         |  19 ++
 12 files changed, 964 insertions(+), 1 deletion(-)