You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2013/05/20 17:48:25 UTC
svn commit: r1484506 - in /tiles/request/trunk: ./
tiles-request-portlet-wildcard/
tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/
tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wil...
Author: mck
Date: Mon May 20 15:48:25 2013
New Revision: 1484506
URL: http://svn.apache.org/r1484506
Log:
upgrade to spring-3.2.0.RELEASE
Modified:
tiles/request/trunk/pom.xml
tiles/request/trunk/tiles-request-portlet-wildcard/pom.xml
tiles/request/trunk/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
tiles/request/trunk/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java
Modified: tiles/request/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/request/trunk/pom.xml?rev=1484506&r1=1484505&r2=1484506&view=diff
==============================================================================
--- tiles/request/trunk/pom.xml (original)
+++ tiles/request/trunk/pom.xml Mon May 20 15:48:25 2013
@@ -216,7 +216,7 @@ under the License.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.2.0.RC2</version>
+ <version>3.2.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: tiles/request/trunk/tiles-request-portlet-wildcard/pom.xml
URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-portlet-wildcard/pom.xml?rev=1484506&r1=1484505&r2=1484506&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-portlet-wildcard/pom.xml (original)
+++ tiles/request/trunk/tiles-request-portlet-wildcard/pom.xml Mon May 20 15:48:25 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/trunk/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java?rev=1484506&r1=1484505&r2=1484506&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java (original)
+++ tiles/request/trunk/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java Mon May 20 15:48:25 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));
Modified: tiles/request/trunk/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java
URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java?rev=1484506&r1=1484505&r2=1484506&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java (original)
+++ tiles/request/trunk/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java Mon May 20 15:48:25 2013
@@ -97,13 +97,13 @@ public class WildcardServletApplicationC
.anyTimes();
File dir = new File(".");
EasyMock.expect(servletContext.getResource("/WEB-INF/")).andReturn(
- dir.toURI().toURL());
+ dir.toURI().toURL()).anyTimes();
URL pomUrl = new URL("file://tiles/pom.xml");
EasyMock.expect(servletContext.getResource("/WEB-INF/pom.xml"))
- .andReturn(pomUrl);
+ .andReturn(pomUrl).anyTimes();
Set<String> elementSet = new HashSet<String>();
elementSet.add("/WEB-INF/pom.xml");
- EasyMock.expect(servletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet);
+ EasyMock.expect(servletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet).anyTimes();
EasyMock.replay(servletContext);
assertEquals(new URLApplicationResource(u.toExternalForm(), u), context.getResource(url));