Author: ghuber
Date: Sat Apr 6 18:38:01 2013
New Revision: 1465287
URL: http://svn.apache.org/r1465287
Log:
Revert to correct version of tiles. ****** This will require clearing out the
compiled jsps from the work directory. ******
Modified:
roller/trunk/pom.xml
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1465287&r1=1465286&r2=1465287&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sat Apr 6 18:38:01 2013
@@ -285,19 +285,19 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>2.1.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
- <version>2.1.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
- <version>2.1.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml?rev=1465287&r1=1465286&r2=1465287&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/web.xml Sat Apr 6
18:38:01 2013
@@ -204,9 +204,9 @@
<listener>
<listener-class>org.apache.roller.weblogger.ui.core.RollerContext</listener-class>
</listener>
-
+
<listener>
-
<listener-class>org.apache.tiles.web.startup.TilesListener</listener-class>
+
<listener-class>org.apache.struts2.tiles.StrutsTilesListener</listener-class>
</listener>
