Author: apetrelli
Date: Mon Sep 28 17:11:21 2009
New Revision: 819649
URL: http://svn.apache.org/viewvc?rev=819649&view=rev
Log:
Merge from trunk to TILES_2_1_X branch.
TILES-468
Changed the class of the causes.
TILES-469
Checking if a class of the porlet API is present. If not, this problem is
trapped and the PortletTilesRequestContextFactory ignored.
Added:
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/NotAvailableFeatureException.java
- copied unchanged from r819641,
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/NotAvailableFeatureException.java
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/NotAPortletEnvironmentException.java
- copied unchanged from r819641,
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/NotAPortletEnvironmentException.java
Modified:
tiles/framework/branches/TILES_2_1_X/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/TilesException.java
tiles/framework/branches/TILES_2_1_X/tiles-core/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java
(props changed)
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java
tiles/framework/branches/TILES_2_1_X/tiles-test/ (props changed)
Propchange: tiles/framework/branches/TILES_2_1_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 17:11:21 2009
@@ -1 +1 @@
-/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357
+/tiles/framework/trunk:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357,819630,819641
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/TilesException.java
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/TilesException.java?rev=819649&r1=819648&r2=819649&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/TilesException.java
(original)
+++
tiles/framework/branches/TILES_2_1_X/tiles-api/src/main/java/org/apache/tiles/TilesException.java
Mon Sep 28 17:11:21 2009
@@ -52,9 +52,9 @@
* one, and its message will become the default message for
* the TilesException.</p>
*
- * @param e The exception to be wrapped.
+ * @param e The cause to be wrapped.
*/
- public TilesException(Exception e) {
+ public TilesException(Throwable e) {
super(e);
}
@@ -66,9 +66,9 @@
* one, but the new exception will have its own message.</p>
*
* @param message The detail message.
- * @param e The exception to be wrapped.
+ * @param e The cause to be wrapped.
*/
- public TilesException(String message, Exception e) {
+ public TilesException(String message, Throwable e) {
super(message, e);
}
}
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 17:11:21 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653,798944,814331,814761
+/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653,798944,814331,814761,819630,819641
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=819649&r1=819648&r2=819649&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
(original)
+++
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
Mon Sep 28 17:11:21 2009
@@ -175,6 +175,11 @@
if (log.isDebugEnabled()) {
log.debug("Cannot find class '" + className + "', ignoring
problem", e);
}
+ } catch (NotAvailableFeatureException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("Not available feature exception during
instantiation of class '"
+ + className + "', ignoring problem", e);
+ }
} catch (InstantiationException e) {
throw new TilesContainerFactoryException(
"Cannot instantiate '" + className + "'", e);
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 17:11:21 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib:749981,761052,761061,772781,785782,788065-789653,798944*,814331*,814761*,817357*
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib:749981,761052,761061,772781,785782,788065-789653,798944*,814331*,814761*,817357*,819630*,819641*
Propchange:
tiles/framework/branches/TILES_2_1_X/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 17:11:21 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357
+/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ImportAttributeTagTest.java:749981,761052,761061,772781,785782,788065-789653,798944,814331,814761,817357,819630,819641
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java?rev=819649&r1=819648&r2=819649&view=diff
==============================================================================
---
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java
(original)
+++
tiles/framework/branches/TILES_2_1_X/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java
Mon Sep 28 17:11:21 2009
@@ -21,14 +21,17 @@
package org.apache.tiles.portlet.context;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.TilesRequestContextFactory;
+import java.util.Map;
import javax.portlet.PortletContext;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
-import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.context.TilesRequestContextFactory;
/**
* Creates an instance of the appropriate {...@link TilesRequestContext}
@@ -41,6 +44,11 @@
TilesRequestContextFactory {
/**
+ * The logging object.
+ */
+ private Log logger = LogFactory.getLog(getClass());
+
+ /**
* The site of the request object array in case there is a request, a
* response and a portlet context.
*
@@ -48,6 +56,23 @@
*/
private static final int REQUEST_OBJECTS_LENGTH = 3;
+ /**
+ * Constructor. To see if a portlet context is available, simply accesses a
+ * portlet class.
+ */
+ public PortletTilesRequestContextFactory() {
+ try {
+ if (logger.isDebugEnabled()) {
+ logger.debug("The portlet environment is available, "
+ + "since the class " + PortletRequest.class
+ + "is present");
+ }
+ } catch (NoClassDefFoundError e) {
+ throw new NotAPortletEnvironmentException(
+ "Cannot access portlet classes", e);
+ }
+ }
+
/** {...@inheritdoc} */
public void init(Map<String, String> configParameters) {
}
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 17:11:21 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331,814761,817357
+/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331,814761,817357,819630,819641
