You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/04/24 12:24:34 UTC
svn commit: r531864 - in /tiles/framework/trunk:
tiles-api/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/context/
tiles-core/src/main/java/org/apache/tiles/context/portlet/ tiles-co...
Author: apetrelli
Date: Tue Apr 24 03:24:30 2007
New Revision: 531864
URL: http://svn.apache.org/viewvc?view=rev&rev=531864
Log:
TILES-153
Refactored the tiles-core module main to be more coherent.
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/
- copied from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesContextFactory.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/package.html
- copied unchanged from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/package.html
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesFilter.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesListener.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesServlet.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/package.html
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/AttributeContextMutator.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
- copied, changed from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/package.html
- copied unchanged from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/package.html
Removed:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/package.html
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/package.html
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/AttributeContextMutator.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/package.html
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/package.html
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/servlet/ServletContextAdapterTest.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/package.html
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html Tue Apr 24 03:24:30 2007
@@ -281,7 +281,7 @@
<pre>
<servlet>
<servlet-name>action</servlet-name>
- <servlet-class>org.apache.tiles.servlet.TilesServlet</servlet-class>
+ <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
<!-- Tiles Servlet parameter
Specify configuration file names. There can be several comma
separated file names
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java Tue Apr 24 03:24:30 2007
@@ -45,8 +45,8 @@
* The default class names to instantiate that compose the chain..
*/
public static final String[] DEFAULT_FACTORY_CLASS_NAMES = {
- "org.apache.tiles.context.servlet.ServletTilesContextFactory",
- "org.apache.tiles.context.portlet.PortletTilesContextFactory",
+ "org.apache.tiles.servlet.context.ServletTilesContextFactory",
+ "org.apache.tiles.portlet.context.PortletTilesContextFactory",
"org.apache.tiles.jsp.context.JspTilesContextFactory" };
/**
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/package.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/package.html?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/package.html (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/package.html Tue Apr 24 03:24:30 2007
@@ -281,7 +281,7 @@
<pre>
<servlet>
<servlet-name>action</servlet-name>
- <servlet-class>org.apache.tiles.servlet.TilesServlet</servlet-class>
+ <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
<!-- Tiles Servlet parameter
Specify configuration file names. There can be several comma
separated file names
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import java.util.ArrayList;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import java.util.ArrayList;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import java.util.ArrayList;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import javax.portlet.PortletRequest;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import java.util.ArrayList;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import java.util.ArrayList;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java Tue Apr 24 03:24:30 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesContextFactory;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java?view=diff&rev=531864&r1=531853&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.portlet;
+package org.apache.tiles.portlet.context;
import java.io.IOException;
import java.util.Collections;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import java.util.ArrayList;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import java.util.ArrayList;
import java.util.Collection;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import org.apache.tiles.context.MapEntry;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import java.util.ArrayList;
import java.util.Collection;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import java.util.ArrayList;
import java.util.Collection;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import org.apache.tiles.context.MapEntry;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import java.util.ArrayList;
import java.util.Collection;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import java.util.ArrayList;
import java.util.Collection;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesContextFactory.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesContextFactory.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesContextFactory.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesContextFactory.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesContextFactory.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesContextFactory.java Tue Apr 24 03:24:30 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesContextFactory;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.context.servlet;
+package org.apache.tiles.servlet.context;
import java.io.IOException;
import java.util.Locale;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesFilter.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesFilter.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesFilter.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesFilter.java Tue Apr 24 03:24:30 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.filter;
+package org.apache.tiles.web.startup;
import java.io.IOException;
import java.util.Enumeration;
@@ -36,7 +36,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.definition.util.DefinitionsFactoryUtil;
-import org.apache.tiles.servlet.TilesServlet;
/**
* Processes Reloadable Tiles Definitions.
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesListener.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesListener.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesListener.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesListener.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.listener;
+package org.apache.tiles.web.startup;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesServlet.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesServlet.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesServlet.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/TilesServlet.java Tue Apr 24 03:24:30 2007
@@ -18,9 +18,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet;
+package org.apache.tiles.web.startup;
-import org.apache.tiles.listener.TilesListener;
+import org.apache.tiles.web.util.ServletContextAdapter;
import javax.servlet.http.HttpServlet;
import javax.servlet.ServletContextEvent;
@@ -30,7 +30,7 @@
* Initialization Servlet. Provided for backwards compatibility.
* The prefered method of initialization is to use the TilesListener.
*
- * @see org.apache.tiles.listener.TilesListener
+ * @see org.apache.tiles.web.startup.TilesListener
* @version $Rev$ $Date$
*/
public class TilesServlet extends HttpServlet {
Added: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/package.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/package.html?view=auto&rev=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/package.html (added)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/startup/package.html Tue Apr 24 03:24:30 2007
@@ -0,0 +1,30 @@
+<!--
+/*
+ * $Id: package.html 527870 2007-04-12 10:19:41Z apetrelli $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<html>
+<head>
+ <title>Start-up classes in a web application environment</title>
+</head>
+<body>
+Classes to start the Tiles engine up in a web environment.
+</body>
+</html>
\ No newline at end of file
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/AttributeContextMutator.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/AttributeContextMutator.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/AttributeContextMutator.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.web;
+package org.apache.tiles.web.util;
import org.apache.tiles.AttributeContext;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.servlet;
+package org.apache.tiles.web.util;
import java.io.InputStream;
import java.net.MalformedURLException;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.web;
+package org.apache.tiles.web.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java (from r531853, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java?view=diff&rev=531864&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java&r1=531853&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java Tue Apr 24 03:24:30 2007
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.web;
+package org.apache.tiles.web.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java Tue Apr 24 03:24:30 2007
@@ -29,6 +29,7 @@
import org.apache.shale.test.mock.MockServletContext;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import junit.framework.TestCase;
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/servlet/ServletContextAdapterTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/servlet/ServletContextAdapterTest.java?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/servlet/ServletContextAdapterTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/servlet/ServletContextAdapterTest.java Tue Apr 24 03:24:30 2007
@@ -26,6 +26,7 @@
import org.apache.shale.test.mock.MockServletConfig;
import org.apache.shale.test.mock.MockServletContext;
+import org.apache.tiles.web.util.ServletContextAdapter;
import junit.framework.TestCase;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java Tue Apr 24 03:24:30 2007
@@ -24,7 +24,7 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
import javax.servlet.ServletContext;
import javax.servlet.jsp.PageContext;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java Tue Apr 24 03:24:30 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesRequestContext;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -76,7 +76,7 @@
*
* @param path The path to dispatch to.
* @throws IOException If something goes wrong during dispatching.
- * @see org.apache.tiles.context.servlet.ServletTilesRequestContext#dispatch(java.lang.String)
+ * @see org.apache.tiles.servlet.context.ServletTilesRequestContext#dispatch(java.lang.String)
*/
public void dispatch(String path) throws IOException {
include(path);
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/package.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/package.html?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/package.html (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/package.html Tue Apr 24 03:24:30 2007
@@ -281,7 +281,7 @@
<pre>
<servlet>
<servlet-name>action</servlet-name>
- <servlet-class>org.apache.tiles.servlet.TilesServlet</servlet-class>
+ <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
<!-- Tiles Servlet parameter
Specify configuration file names. There can be several comma
separated file names
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml?view=diff&rev=531864&r1=531863&r2=531864
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml Tue Apr 24 03:24:30 2007
@@ -42,7 +42,7 @@
<filter>
<filter-name>Tiles Decoration Filter</filter-name>
- <filter-class>org.apache.tiles.web.TilesDecorationFilter</filter-class>
+ <filter-class>org.apache.tiles.web.util.TilesDecorationFilter</filter-class>
<init-param>
<param-name>definition</param-name>
<param-value>test.definition</param-value>
@@ -62,7 +62,7 @@
<!-- Standard Action Servlet Configuration -->
<servlet>
<servlet-name>tiles</servlet-name>
- <servlet-class>org.apache.tiles.servlet.TilesServlet</servlet-class>
+ <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
<init-param>
<param-name>definitions-config</param-name>
<param-value>/WEB-INF/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml</param-value>
@@ -72,7 +72,7 @@
<servlet>
<servlet-name>Tiles Dispatch Servlet</servlet-name>
- <servlet-class>org.apache.tiles.web.TilesDispatchServlet</servlet-class>
+ <servlet-class>org.apache.tiles.web.util.TilesDispatchServlet</servlet-class>
</servlet>
<!-- Standard Action Servlet Configuration -->