struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gred...@apache.org
Subject svn commit: r434059 - in /struts/sandbox/trunk/tiles: tiles-core/src/main/java/org/apache/tiles/servlet/ tiles-core/src/main/java/org/apache/tiles/servlets/ tiles-core/src/test/java/org/apache/tiles/ tiles-test/src/main/webapp/WEB-INF/
Date Wed, 23 Aug 2006 15:02:42 GMT
Author: greddin
Date: Wed Aug 23 08:02:41 2006
New Revision: 434059

URL: http://svn.apache.org/viewvc?rev=434059&view=rev
Log:
SB-36.  TilesServlet was not being initialized in web.xml.

I added TilesServlet to web.xml.  Also, I renamed the package name
for TilesServlet from o.a.t.servlets to o.a.t.servlet to match the
pattern of the filter and listener packages.  Finally, I added a 
tiles-defs.xml file to WEB-INF so the servlet init would work 
correctly.  


Added:
    struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/
      - copied from r434043, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlets/
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml   (with props)
Removed:
    struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlets/
Modified:
    struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
    struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml

Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java?rev=434059&r1=434043&r2=434059&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
(original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
Wed Aug 23 08:02:41 2006
@@ -16,7 +16,7 @@
  * $Id$
  */
 
-package org.apache.tiles.servlets;
+package org.apache.tiles.servlet;
 
 import java.util.Enumeration;
 import java.util.Iterator;

Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java?rev=434059&r1=434058&r2=434059&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
(original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
Wed Aug 23 08:02:41 2006
@@ -27,7 +27,7 @@
 
 import org.apache.tiles.mock.MockComponentDefinitions;
 import org.apache.tiles.mock.MockDefinitionsReader;
-import org.apache.tiles.servlets.TilesServlet;
+import org.apache.tiles.servlet.TilesServlet;
 
 /**
  * Verifies the functionality of the TilesServlet

Added: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?rev=434059&view=auto
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml (added)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Wed Aug 23
08:02:41 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+ <!DOCTYPE tiles-definitions PUBLIC
+       "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
+       "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
+
+<!-- Definitions for Tiles documentation   -->
+
+<tiles-definitions>
+
+  <!-- =======================================================  -->
+  <!-- Master definition  									-->
+  <!-- =======================================================  -->
+
+  <!-- Doc index page description  -->
+  <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+	  <put name="title"  value="Tiles Library Documentation" />
+	  <put name="header" value="/common/header.jsp" />
+	  <put name="menu"   value="doc.menu.main" />
+	  <put name="footer" value="/common/footer.jsp" />
+	  <put name="body"   value="doc.portal.body" />
+  </definition>
+
+</tiles-definitions>

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=434059&r1=434058&r2=434059&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/web.xml Wed Aug 23 08:02:41
2006
@@ -8,23 +8,15 @@
   <display-name>Tiles 2 Test Application</display-name>
   
   <!-- Standard Action Servlet Configuration -->
-<!--
   <servlet>
     <servlet-name>tiles</servlet-name>
     <servlet-class>org.apache.tiles.servlet.TilesServlet</servlet-class>
     <init-param>
-      <param-name>config</param-name>
-      <param-value>/WEB-INF/struts-config.xml</param-value>
+      <param-name>definitions-config</param-name>
+      <param-value>/WEB-INF/tiles-defs.xml</param-value>
     </init-param>
     <load-on-startup>2</load-on-startup>
  </servlet>
-
-
-  <servlet-mapping>
-    <servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
-  </servlet-mapping>
--->
 
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>



Mime
View raw message