svn commit: r833856 - in /tiles/sandbox/trunk/tiles3: tiles-core/src/main/java/org/apache/tiles/util/ tiles-core/src/test/java/org/apache/tiles/util/ tiles-portlet/src/main/java/org/apache/tiles/portlet/context/ tiles-servlet/src/main/java/org/apache/t...

[apetrelli]

Author: apetrelli
Date: Sun Nov  8 11:11:59 2009
New Revision: 833856

URL: http://svn.apache.org/viewvc?rev=833856&view=rev
Log:
TILESSB-10
Removed TilesIOException, added in Tiles 2.x because in a constructor of 
IOException that accepts the cause was only present in Java 6.

Removed:
    
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/TilesIOException.java
    
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/util/TilesIOExceptionTest.java
Modified:
    
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java

Modified: 
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java?rev=833856&r1=833855&r2=833856&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
 Sun Nov  8 11:11:59 2009
@@ -39,7 +39,6 @@
 import org.apache.tiles.context.TilesApplicationContextWrapper;
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.Request;
-import org.apache.tiles.util.TilesIOException;
 
 /**
  * Portlet-based TilesApplicationContext implementation.
@@ -269,9 +268,8 @@
                 rd.include((RenderRequest) request,
                     (RenderResponse) response);
             } catch (PortletException e) {
-                throw new TilesIOException(
-                        "PortletException while including path '" + path + 
"'.",
-                        e);
+                               throw new IOException("PortletException while 
including path '"
+                                               + path + "'.", e);
             }
         }
     }

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java?rev=833856&r1=833855&r2=833856&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
 Sun Nov  8 11:11:59 2009
@@ -35,7 +35,6 @@
 import org.apache.tiles.impl.NoSuchContainerException;
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.Request;
-import org.apache.tiles.util.TilesIOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -238,9 +237,9 @@
         if (rootCause != null) {
             // Replace the ServletException with an IOException, with the root
             // cause of the first as the cause of the latter.
-            retValue = new TilesIOException(message, rootCause);
+            retValue = new IOException(message, rootCause);
         } else {
-            retValue = new TilesIOException(message, ex);
+            retValue = new IOException(message, ex);
         }
 
         return retValue;