From aa24c1b6aad358e1b9dee05800597f2860b2faae Mon Sep 17 00:00:00 2001 From: Victor Sosa Date: Wed, 20 Jan 2016 17:32:12 -0400 Subject: [PATCH 1/3] WW-3940 Upgrade to Velocity Tools 2.0 JWebUnit upgrade to 3.3 too --- apps/portlet/pom.xml | 2 +- .../org/apache/struts2/portlet/test/BasePortletTest.java | 6 ++++-- .../org/apache/struts2/portlet/test/Struts2PortletTest.java | 2 ++ .../struts2/components/template/VelocityTemplateEngine.java | 2 +- pom.xml | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index cbaf4a816..388b9c4d2 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -155,7 +155,7 @@ net.sourceforge.jwebunit jwebunit-htmlunit-plugin - 1.4.1 + 3.3 test diff --git a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java index 13f172f1d..4f63080b6 100644 --- a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java +++ b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java @@ -1,14 +1,16 @@ package org.apache.struts2.portlet.test; -import net.sourceforge.jwebunit.junit.WebTestCase; +import static net.sourceforge.jwebunit.junit.JWebUnit.*; import org.apache.pluto.core.PortletServlet; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.ServletHolder; import org.mortbay.jetty.webapp.WebAppContext; +import junit.framework.TestCase; + import java.io.File; -public abstract class BasePortletTest extends WebTestCase { +public abstract class BasePortletTest extends TestCase { protected Server server; diff --git a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java index 99583deea..8daadf9f0 100644 --- a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java +++ b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java @@ -1,5 +1,7 @@ package org.apache.struts2.portlet.test; +import static net.sourceforge.jwebunit.junit.JWebUnit.*; + public class Struts2PortletTest extends BasePortletTest { private final static String PORTLET_NAME = "StrutsPortlet"; diff --git a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java index 6e1db531e..70b6073ec 100644 --- a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java @@ -74,7 +74,7 @@ public class VelocityTemplateEngine extends BaseTemplateEngine { // try to load, and if it works, stop at the first one template = velocityEngine.getTemplate(templateName); break; - } catch (IOException e) { + } catch (Exception e) { if (exception == null) { exception = e; } diff --git a/pom.xml b/pom.xml index 08c94b43a..1d8e27950 100644 --- a/pom.xml +++ b/pom.xml @@ -515,14 +515,14 @@ org.apache.velocity velocity - 1.6.4 + 1.7 true org.apache.velocity velocity-tools - 1.3 + 2.0 javax.servlet From 83910714e874aebea10806d6a4c65bdd51d65d2d Mon Sep 17 00:00:00 2001 From: Victor Sosa Date: Wed, 20 Jan 2016 17:32:12 -0400 Subject: [PATCH 2/3] WW-3940 Upgrade to Velocity Tools 2.0 JWebUnit upgrade to 3.3 too --- apps/portlet/pom.xml | 2 +- .../org/apache/struts2/portlet/test/BasePortletTest.java | 6 ++++-- .../org/apache/struts2/portlet/test/Struts2PortletTest.java | 2 ++ .../struts2/components/template/VelocityTemplateEngine.java | 2 +- .../java/org/apache/struts2/result/VelocityResultTest.java | 4 ++-- pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index cbaf4a816..388b9c4d2 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -155,7 +155,7 @@ net.sourceforge.jwebunit jwebunit-htmlunit-plugin - 1.4.1 + 3.3 test diff --git a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java index 13f172f1d..4f63080b6 100644 --- a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java +++ b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java @@ -1,14 +1,16 @@ package org.apache.struts2.portlet.test; -import net.sourceforge.jwebunit.junit.WebTestCase; +import static net.sourceforge.jwebunit.junit.JWebUnit.*; import org.apache.pluto.core.PortletServlet; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.ServletHolder; import org.mortbay.jetty.webapp.WebAppContext; +import junit.framework.TestCase; + import java.io.File; -public abstract class BasePortletTest extends WebTestCase { +public abstract class BasePortletTest extends TestCase { protected Server server; diff --git a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java index 99583deea..8daadf9f0 100644 --- a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java +++ b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java @@ -1,5 +1,7 @@ package org.apache.struts2.portlet.test; +import static net.sourceforge.jwebunit.junit.JWebUnit.*; + public class Struts2PortletTest extends BasePortletTest { private final static String PORTLET_NAME = "StrutsPortlet"; diff --git a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java index 6e1db531e..70b6073ec 100644 --- a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java @@ -74,7 +74,7 @@ public class VelocityTemplateEngine extends BaseTemplateEngine { // try to load, and if it works, stop at the first one template = velocityEngine.getTemplate(templateName); break; - } catch (IOException e) { + } catch (Exception e) { if (exception == null) { exception = e; } diff --git a/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java b/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java index 0a945ec76..18806ccab 100644 --- a/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java @@ -134,13 +134,13 @@ public class VelocityResultTest extends StrutsInternalTestCase { class TestVelocityEngine extends VelocityEngine { public String templateName; - public Template getTemplate(String templateName) throws ResourceNotFoundException, ParseErrorException, Exception { + public Template getTemplate(String templateName) throws ResourceNotFoundException, ParseErrorException { this.templateName = templateName; return new Template(); } - public Template getTemplate(String templateName, String charSet) throws ResourceNotFoundException, ParseErrorException, Exception { + public Template getTemplate(String templateName, String charSet) throws ResourceNotFoundException, ParseErrorException { this.templateName = templateName; return new Template(); diff --git a/pom.xml b/pom.xml index 08c94b43a..1d8e27950 100644 --- a/pom.xml +++ b/pom.xml @@ -515,14 +515,14 @@ org.apache.velocity velocity - 1.6.4 + 1.7 true org.apache.velocity velocity-tools - 1.3 + 2.0 javax.servlet From 09d1954b0c6781a3c40cd3ce2bf8df2bdef7b98d Mon Sep 17 00:00:00 2001 From: victor sosa Date: Wed, 20 Jan 2016 21:09:37 -0400 Subject: [PATCH 3/3] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2aa420793..bcebcd990 100644 --- a/.gitignore +++ b/.gitignore @@ -69,4 +69,3 @@ bundles/target plugins/target target plugins/testng/test-output -/bin/