You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by victorsosa <gi...@git.apache.org> on 2016/01/20 22:34:10 UTC

[GitHub] struts pull request: WW-3940 Upgrade to Velocity Tools 2.0

GitHub user victorsosa opened a pull request:

    https://github.com/apache/struts/pull/84

    WW-3940 Upgrade to Velocity Tools 2.0

    JWebUnit upgrade to 3.3 too

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/victorsosa/struts ww-3940

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/struts/pull/84.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #84
    
----
commit aa24c1b6aad358e1b9dee05800597f2860b2faae
Author: Victor Sosa <vi...@gmail.com>
Date:   2016-01-20T21:32:12Z

    WW-3940 Upgrade to Velocity Tools 2.0
    
    JWebUnit upgrade to 3.3 too

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


[GitHub] struts pull request: WW-3940 Upgrade to Velocity Tools 2.0

Posted by victorsosa <gi...@git.apache.org>.
Github user victorsosa commented on a diff in the pull request:

    https://github.com/apache/struts/pull/84#discussion_r50339318
  
    --- Diff: plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java ---
    @@ -78,17 +88,18 @@ public void init(ServletConfig config) throws ServletException {
             velocityManager.init(config.getServletContext());
     
             // do whatever we have to do to init Velocity
    -        setVelocityEngine(velocityManager.getVelocityEngine());
    -        toolboxManager = velocityManager.getToolboxManager();
    +        getVelocityView().setVelocityEngine(velocityManager.getVelocityEngine());
    +        //getVelocityView().getToolboxFactory(). toolboxManager = velocityManager.getToolboxManager();
    --- End diff --
    
    WARN: I didn't find a way to translate this line to the new API, but the ALL test are passing


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


[GitHub] struts pull request: WW-3940 Upgrade to Velocity Tools 2.0

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/struts/pull/84


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org