struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [4/9] struts git commit: Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into ww-3940
Date Thu, 03 Mar 2016 16:39:06 GMT
Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into
ww-3940

Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8d6c3b6b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8d6c3b6b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8d6c3b6b

Branch: refs/heads/master
Commit: 8d6c3b6b8bb5cfe48ea6496ba9f65ced5815f863
Parents: 8391071 aa24c1b
Author: Victor Sosa <victornsosa@gmail.com>
Authored: Wed Jan 20 17:43:43 2016 -0400
Committer: Victor Sosa <victornsosa@gmail.com>
Committed: Wed Jan 20 18:51:49 2016 -0400

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 .../sitemesh/VelocityDecoratorServlet.java      | 53 +++++++++++++-------
 2 files changed, 35 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/8d6c3b6b/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index bcebcd9,bcebcd9..2aa4207
--- a/.gitignore
+++ b/.gitignore
@@@ -69,3 -69,3 +69,4 @@@ bundles/targe
  plugins/target
  target
  plugins/testng/test-output
++/bin/

http://git-wip-us.apache.org/repos/asf/struts/blob/8d6c3b6b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
----------------------------------------------------------------------
diff --cc plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
index bcbfb72,bcbfb72..e832b2f
--- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
+++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
@@@ -28,6 -28,6 +28,9 @@@ package org.apache.struts2.sitemesh
  import com.opensymphony.module.sitemesh.*;
  import com.opensymphony.module.sitemesh.util.OutputConverter;
  import com.opensymphony.xwork2.ActionContext;
++
++import org.apache.logging.log4j.LogManager;
++import org.apache.logging.log4j.Logger;
  import org.apache.struts2.ServletActionContext;
  import org.apache.struts2.StrutsStatics;
  import org.apache.struts2.dispatcher.Dispatcher;
@@@ -36,12 -36,12 +39,15 @@@ import org.apache.struts2.views.velocit
  import org.apache.velocity.Template;
  import org.apache.velocity.context.Context;
  import org.apache.velocity.runtime.RuntimeConstants;
--import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
++import org.apache.velocity.tools.view.VelocityView;
++import org.apache.velocity.tools.view.VelocityViewServlet;
  
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
++
++import java.io.IOException;
  import java.io.StringWriter;
  
  /**
@@@ -53,6 -53,6 +59,10 @@@
   */
  public class VelocityDecoratorServlet extends VelocityViewServlet {
  
++    private static final Logger LOG = LogManager.getLogger(VelocityDecoratorServlet.class);
++            
++    private static final long serialVersionUID = -6731485159371716918L;
++    
      protected VelocityManager velocityManager;
      protected String defaultContentType;
  
@@@ -78,17 -78,17 +88,18 @@@
          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();
  
++        
          // we can get these now that velocity is initialized
--        defaultContentType = getVelocityProperty(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
++        defaultContentType = getVelocityProperty(VelocityView.CONTENT_TYPE_KEY, VelocityView.DEFAULT_CONTENT_TYPE);
  
--        String encoding = getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, DEFAULT_OUTPUT_ENCODING);
++        String encoding = getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, VelocityView.DEFAULT_OUTPUT_ENCODING);
  
          // For non Latin-1 encodings, ensure that the charset is
          // included in the Content-Type header.
--        if (!DEFAULT_OUTPUT_ENCODING.equalsIgnoreCase(encoding)) {
++        if (!VelocityView.DEFAULT_OUTPUT_ENCODING.equalsIgnoreCase(encoding)) {
              int index = defaultContentType.lastIndexOf("charset");
              if (index < 0) {
                  // the charset specifier is not yet present in header.
@@@ -96,14 -96,14 +107,14 @@@
                  defaultContentType += "; charset=" + encoding;
              } else {
                  // The user may have configuration issues.
--                getVelocityEngine().warn("VelocityViewServlet: Charset was already " + "specified
in the Content-Type property.  " + "Output encoding property will be ignored.");
++                getVelocityView().getVelocityEngine().getLog().warn("VelocityViewServlet:
Charset was already " + "specified in the Content-Type property.  " + "Output encoding property
will be ignored.");
              }
          }
  
--        getVelocityEngine().info("VelocityViewServlet: Default content-type is: " + defaultContentType);
++        getVelocityView().getVelocityEngine().getLog().info("VelocityViewServlet: Default
content-type is: " + defaultContentType);
      }
  
--    public Template handleRequest(HttpServletRequest request, HttpServletResponse response,
Context context) throws Exception {
++    public Template handleRequest(HttpServletRequest request, HttpServletResponse response,
Context context) {
          HTMLPage htmlPage = (HTMLPage) request.getAttribute(RequestConstants.PAGE);
          String template;
  
@@@ -119,16 -119,16 +130,20 @@@
              context.put("head", "<!-- head -->");
              template = request.getServletPath();
          } else {
--            context.put("title", OutputConverter.convert(htmlPage.getTitle()));
--            {
--                StringWriter buffer = new StringWriter();
--                htmlPage.writeBody(OutputConverter.getWriter(buffer));
--                context.put("body", buffer.toString());
--            }
--            {
--                StringWriter buffer = new StringWriter();
--                htmlPage.writeHead(OutputConverter.getWriter(buffer));
--                context.put("head", buffer.toString());
++            try {
++                context.put("title", OutputConverter.convert(htmlPage.getTitle()));
++                {
++                    StringWriter buffer = new StringWriter();
++                    htmlPage.writeBody(OutputConverter.getWriter(buffer));
++                    context.put("body", buffer.toString());
++                }
++                {
++                    StringWriter buffer = new StringWriter();
++                    htmlPage.writeHead(OutputConverter.getWriter(buffer));
++                    context.put("head", buffer.toString());
++                }
++            } catch (IOException e) {
++                LOG.error("IOException handle request template", e);
              }
              context.put("page", htmlPage);
              DecoratorMapper decoratorMapper = getDecoratorMapper();


Mime
View raw message