Author: apetrelli
Date: Fri Jul 20 02:39:26 2007
New Revision: 557941
URL: http://svn.apache.org/viewvc?view=rev&rev=557941
Log:
STR-3074
Now the Struts 1 - Tiles 2 plugin depends on Tiles 2.0.4.
Modified:
struts/struts1/trunk/tiles2/pom.xml
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
Modified: struts/struts1/trunk/tiles2/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?view=diff&rev=557941&r1=557940&r2=557941
==============================================================================
--- struts/struts1/trunk/tiles2/pom.xml (original)
+++ struts/struts1/trunk/tiles2/pom.xml Fri Jul 20 02:39:26 2007
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java?view=diff&rev=557941&r1=557940&r2=557941
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
Fri Jul 20 02:39:26 2007
@@ -45,7 +45,6 @@
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.context.ChainedTilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.UrlDefinitionsFactory;
import org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory;
@@ -53,6 +52,7 @@
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
import
org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer.KeyExtractor;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
/**
* Tiles Plugin used to initialize Tiles.
@@ -275,7 +275,7 @@
String configProcessorClassname = ctrlConfig.getProcessorClass();
// Check if specified classname exist
- Class configProcessorClass;
+ Class<?> configProcessorClass;
try {
configProcessorClass =
RequestUtils.applicationClass(configProcessorClassname);
@@ -304,7 +304,7 @@
}
// Check if specified request processor is compatible with Tiles.
- Class tilesProcessorClass = TilesRequestProcessor.class;
+ Class<?> tilesProcessorClass = TilesRequestProcessor.class;
if (!tilesProcessorClass.isAssignableFrom(configProcessorClass)) {
// Not compatible
String msg =
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java?view=diff&rev=557941&r1=557940&r2=557941
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
Fri Jul 20 02:39:26 2007
@@ -23,10 +23,10 @@
import org.apache.struts.action.Action;
import org.apache.tiles.AttributeContext;
-import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesRequestContext;
+import org.apache.tiles.preparer.PreparerException;
import org.apache.tiles.preparer.ViewPreparerSupport;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
/**
* Struts wrapper implementation of Controller. This implementation wraps an
@@ -49,14 +49,19 @@
}
public void execute(TilesRequestContext tilesContext,
- AttributeContext attributeContext) throws Exception {
+ AttributeContext attributeContext) throws PreparerException {
if (tilesContext instanceof ServletTilesRequestContext) {
ServletTilesRequestContext servletTilesContext =
(ServletTilesRequestContext) tilesContext;
- this.action.execute(null, null, servletTilesContext.getRequest(),
- servletTilesContext.getResponse());
+ try {
+ this.action.execute(null, null,
servletTilesContext.getRequest(),
+ servletTilesContext.getResponse());
+ } catch (Exception e) {
+ throw new PreparerException(
+ "The enclosed action threw an exception", e);
+ }
} else {
- throw new TilesException("Not using a ServletTilesRequestContext");
+ throw new PreparerException("Not using a
ServletTilesRequestContext");
}
}
}
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java?view=diff&rev=557941&r1=557940&r2=557941
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
Fri Jul 20 02:39:26 2007
@@ -21,6 +21,8 @@
*/
package org.apache.struts.tiles2.preparer;
+import java.io.IOException;
+
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -28,8 +30,9 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesRequestContext;
+import org.apache.tiles.preparer.PreparerException;
import org.apache.tiles.preparer.ViewPreparer;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
/**
* @version $Rev$ $Date$
@@ -43,7 +46,7 @@
}
public void execute(TilesRequestContext tilesContext,
- AttributeContext attributeContext) throws Exception {
+ AttributeContext attributeContext) throws PreparerException {
if (tilesContext instanceof ServletTilesRequestContext) {
ServletTilesRequestContext servletTilesContext =
@@ -53,13 +56,21 @@
RequestDispatcher rd = request.getSession().getServletContext()
.getRequestDispatcher(url);
if (rd == null) {
- throw new ServletException(
+ throw new PreparerException(
"Controller can't find url '" + url + "'.");
}
- rd.include(request, response);
+ try {
+ rd.include(request, response);
+ } catch (ServletException e) {
+ throw new PreparerException(
+ "The request dispatcher threw an exception", e);
+ } catch (IOException e) {
+ throw new PreparerException(
+ "The request dispatcher threw an I/O exception", e);
+ }
} else {
- throw new ServletException("Cannot dispatch url '" + url
+ throw new PreparerException("Cannot dispatch url '" + url
+ "' since this preparer has not been called under a
servlet environment");
}
}
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java?view=diff&rev=557941&r1=557940&r2=557941
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
Fri Jul 20 02:39:26 2007
@@ -63,6 +63,7 @@
*
* @param plugInConfigObject The plugin config object to use.
*/
+ @SuppressWarnings("unchecked")
public PlugInConfigContextAdapter(PlugInConfig plugInConfigObject,
ServletContext servletContext) {
this.plugInConfigObject = plugInConfigObject;
@@ -96,6 +97,7 @@
*
* @return The names of all initialization parameters.
*/
+ @SuppressWarnings("unchecked")
public Enumeration getInitParameterNames() {
return new IteratorEnumeration(parameterNames.iterator());
}
@@ -118,6 +120,7 @@
return rootContext.getMimeType(string);
}
+ @SuppressWarnings("unchecked")
public Set getResourcePaths(String string) {
return rootContext.getResourcePaths(string);
}
@@ -138,14 +141,17 @@
return rootContext.getNamedDispatcher(string);
}
+ @SuppressWarnings("deprecation")
public Servlet getServlet(String string) throws ServletException {
return rootContext.getServlet(string);
}
+ @SuppressWarnings({ "deprecation", "unchecked" })
public Enumeration getServlets() {
return rootContext.getServlets();
}
+ @SuppressWarnings({ "deprecation", "unchecked" })
public Enumeration getServletNames() {
return rootContext.getServletNames();
}
@@ -154,6 +160,7 @@
rootContext.log(string);
}
+ @SuppressWarnings("deprecation")
public void log(Exception exception, String string) {
rootContext.log(exception, string);
}
@@ -174,6 +181,7 @@
return rootContext.getAttribute(string);
}
+ @SuppressWarnings("unchecked")
public Enumeration getAttributeNames() {
return rootContext.getAttributeNames();
}
