You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/03/03 17:39:04 UTC
[2/9] struts git commit: WW-3940 Upgrade to Velocity Tools 2.0
WW-3940 Upgrade to Velocity Tools 2.0
JWebUnit upgrade to 3.3 too
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/83910714
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/83910714
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/83910714
Branch: refs/heads/master
Commit: 83910714e874aebea10806d6a4c65bdd51d65d2d
Parents: c167d6c
Author: Victor Sosa <vi...@gmail.com>
Authored: Wed Jan 20 17:32:12 2016 -0400
Committer: Victor Sosa <vi...@gmail.com>
Committed: Wed Jan 20 17:42:54 2016 -0400
----------------------------------------------------------------------
apps/portlet/pom.xml | 2 +-
.../java/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index cbaf4a8..388b9c4 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -155,7 +155,7 @@
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
<artifactId>jwebunit-htmlunit-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
----------------------------------------------------------------------
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 13f172f..4f63080 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;
http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
----------------------------------------------------------------------
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 99583de..8daadf9 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";
http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
----------------------------------------------------------------------
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 6e1db53..70b6073 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;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java
----------------------------------------------------------------------
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 0a945ec..18806cc 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();
http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 08c94b4..1d8e279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,14 +515,14 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.4</version>
+ <version>1.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>1.3</version>
+ <version>2.0</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>