svn commit: r1484508 - in /tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard: pom.xml src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java

[mck]

Author: mck
Date: Mon May 20 15:58:07 2013
New Revision: 1484508

URL: http://svn.apache.org/r1484508
Log:
upgrade to spring-3.2.0.RELEASE

Modified:
    tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml
    
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java

Modified: 
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml?rev=1484508&r1=1484507&r2=1484508&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml 
(original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml 
Mon May 20 15:58:07 2013
@@ -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>

Modified: 
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java?rev=1484508&r1=1484507&r2=1484508&view=diff
==============================================================================
--- 
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
 (original)
+++ 
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
 Mon May 20 15:58:07 2013
@@ -102,13 +102,13 @@ public class WildcardPortletApplicationC
                 .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));