commit 8baff7bed6023ed36fc6533d50d03fdc8a28efe8
author Michael Semb Wever <mck@apache.org> Mon May 20 15:58:07 2013 +0000
committer Michael Semb Wever <mck@apache.org> Mon May 20 15:58:07 2013 +0000
tree dff363d5cd702afb4fa1586c3736b2803d1a33ce
parent 074031ba0bdba2b09165e89a4b20be44cd2007af

upgrade to spring-3.2.0.RELEASE


git-svn-id: https://svn.apache.org/repos/asf/tiles/request/branches/TREQ_1_0_X@1484508 13f79535-47bb-0310-9956-ffa450edef68

tiles-request-portlet-wildcard/pom.xml

diff --git a/tiles-request-portlet-wildcard/pom.xml b/tiles-request-portlet-wildcard/pom.xml
index 02453e5..0cf2584 100644
--- a/tiles-request-portlet-wildcard/pom.xml
+++ b/tiles-request-portlet-wildcard/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc-portlet</artifactId>
-        <version>3.2.0.RC2</version>
+        <version>3.2.0.RELEASE</version>
         <exclusions>
             <exclusion>
                 <groupId>org.springframework</groupId>

tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java

diff --git a/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java b/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
index 1bf84f5..c2aa148 100644
--- a/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
+++ b/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
@@ -102,13 +102,13 @@
                 .anyTimes();
         File dir = new File(".");
         EasyMock.expect(portletContext.getResource("/WEB-INF/")).andReturn(
-                dir.toURI().toURL());
+                dir.toURI().toURL()).anyTimes();
         URL pomUrl = new URL("file://tiles/pom.xml");
         EasyMock.expect(portletContext.getResource("/WEB-INF/pom.xml"))
-                .andReturn(pomUrl);
+                .andReturn(pomUrl).anyTimes();
         Set<String> elementSet = new HashSet<String>();
         elementSet.add("/WEB-INF/pom.xml");
-        EasyMock.expect(portletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet);
+        EasyMock.expect(portletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet).anyTimes();
         EasyMock.replay(portletContext);
 
         assertEquals(new URLApplicationResource(u.toExternalForm(), u), context.getResource("/" + url));