[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- XFire Migration Guide was last edited by njiang (07:29 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/XFire+Migration+Guide |-- How do I develop a client? was last edited by jeff.yu (01:07 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=59871 |-- HTTP Binding was last edited by jeff.yu (12:03 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/HTTP+Binding Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Mapping Java Beans to LDAP ObjectClasses was last edited by akarasulu (02:51 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Mapping+Java+Beans+to+LDAP+ObjectClasses |-- Mapping Primitive Lists was created by akarasulu (02:11 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Mapping+Primitive+Lists Apache Geronimo v2.0 (GMOxDOC20) http://cwiki.apache.org/confluence/display/GMOxDOC20 | |-Pages Added or Edited in This Space |-- Web application security sample was last edited by [EMAIL PROTECTED] (11:50 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Web+application+security+sample Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- SNAPSHOT dependencies that need to be released for Geronimo 2.0 was last edited by mcconne (03:35 PM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/SNAPSHOT+dependencies+that+need+to+be+released+for+Geronimo+2.0 Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Articles About Tuscany was last edited by slaws (11:10 PM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Articles+About+Tuscany |-- DAS Release & Feature History was created by [EMAIL PROTECTED] (10:33 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=62018 |-- DAS Java Project was last edited by [EMAIL PROTECTED] (10:32 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/DAS+Java+Project |-- Website was created by [EMAIL PROTECTED] (10:28 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Website |-- Tuscany cwiki & Website Structure was last edited by [EMAIL PROTECTED] (10:26 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=57514 Apache CXF (CXF) http://cwiki.apache.org/confluence/display/CXF | |-Pages Added or Edited in This Space |-- Setting up Eclipse was last edited by jeff.yu (12:28 AM). | http://cwiki.apache.org/confluence/display/CXF/Setting+up+Eclipse Apache Ode (ODExSITE) http://cwiki.apache.org/confluence/display/ODExSITE | |-Pages Added or Edited in This Space |-- Contributors was last edited by vanto (01:38 AM). | http://cwiki.apache.org/confluence/display/ODExSITE/Contributors Apache MINA (MINA) http://cwiki.apache.org/confluence/display/MINA | |-Pages Added or Edited in This Space |-- Site Template was last edited by trustin (11:58 PM). | http://cwiki.apache.org/confluence/display/MINA/Site+Template |-- Documentation was last edited by trustin (10:41 PM). | http://cwiki.apache.org/confluence/display/MINA/Documentation |-- Quick Start Guide was last edited by trustin (10:39 PM). | http://cwiki.apache.org/confluence/display/MINA/Quick+Start+Guide |-- Index was last edited by trustin (10:34 PM). | http://cwiki.apache.org/confluence/display/MINA/Index |-- Mailing Lists was last edited by trustin (10:18 PM). | http://cwiki.apache.org/confluence/display/MINA/Mailing+Lists |-- Contact was last edited by trustin (10:08 PM). | http://cwiki.apache.org/confluence/display/MINA/Contact |-- Road Map was last edited by trustin (10:08 PM). | http://cwiki.apache.org/confluence/display/MINA/Road+Map |-- Downloads was last edited by trustin (07:15 PM). | http://cwiki.apache.org/confluence/display/MINA/Downloads Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SDO Java was last edited by haleh (03:45 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SDO+Java |-- SCA Java was last edited by haleh (03:09 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java |-- SCA Overview was last edited by haleh (02:54 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Overview Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |--
svn commit: r557933 - in /struts/struts1/trunk/tiles2/src: main/java/org/apache/struts/tiles2/TilesPlugin.java test/java/org/apache/struts/tiles2/TestTilesPlugin.java
Author: apetrelli
Date: Fri Jul 20 02:15:51 2007
New Revision: 557933
URL: http://svn.apache.org/viewvc?view=rev&rev=557933
Log:
STR-3073
Now the Tiles 2 plugin fails in case of multiple conflicting configuration.
STR-3075
Clean up of TilesPlugin JUnit test.
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
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=557933&r1=557932&r2=557933
==
---
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:15:51 2007
@@ -189,6 +189,17 @@
container);
}
if (container instanceof
KeyedDefinitionsFactoryTilesContainer) {
+ KeyedDefinitionsFactoryTilesContainer keyedContainer =
+ (KeyedDefinitionsFactoryTilesContainer)
container;
+ // If we have a definition factory for the current
module prefix
+ // then we are trying to re-initialize the same module,
and it is
+ // wrong!
+if (keyedContainer.getProperDefinitionsFactory(moduleConfig
+ .getPrefix()) != null) {
+ throw new ServletException("Tiles definitions
factory for module '"
+
+ moduleConfig.getPrefix()
+
+ "' has already been configured");
+ }
if (factory instanceof
KeyedDefinitionsFactoryTilesContainerFactory) {
DefinitionsFactory defsFactory =
((KeyedDefinitionsFactoryTilesContainerFactory)
factory)
@@ -205,8 +216,7 @@
initParameters.put(BasicTilesContainer
.DEFINITIONS_CONFIG, param);
}
-((KeyedDefinitionsFactoryTilesContainer) container)
-
.setDefinitionsFactory(moduleConfig.getPrefix(),
+
keyedContainer.setDefinitionsFactory(moduleConfig.getPrefix(),
defsFactory, initParameters);
} else {
log.warn("The created factory is not instance of "
@@ -221,6 +231,10 @@
} else {
factory = TilesContainerFactory
.getFactory(currentPlugInConfigContextAdapter);
+if
(TilesAccess.getContainer(currentPlugInConfigContextAdapter) != null) {
+throw new ServletException(
+"Tiles container has already been configured");
+}
container = factory.createContainer(
currentPlugInConfigContextAdapter);
TilesAccess.setContainer(currentPlugInConfigContextAdapter,
Modified:
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java?view=diff&rev=557933&r1=557932&r2=557933
==
---
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
Fri Jul 20 02:15:51 2007
@@ -21,12 +21,16 @@
package org.apache.struts.tiles2;
+import java.lang.reflect.InvocationTargetException;
+
import javax.servlet.ServletException;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.Globals;
import org.apache.struts.action.PlugIn;
import org.apache.struts.config.ModuleConfig;
@@ -41,125 +45,102 @@
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
+/**
+ * Tests the Tiles plugin.
+ *
+ * @version $Rev$ $Date$
+ */
public class TestTilesPlugin extends TestMockBase {
+/**
+ * The first module to configure.
+ */
+protected ModuleConfig module1;
- protected ModuleConfig module1;
- protected ModuleConfig module2;
- protected Mock
svn commit: r557941 - in /struts/struts1/trunk/tiles2: ./ src/main/java/org/apache/struts/tiles2/ src/main/java/org/apache/struts/tiles2/preparer/ src/main/java/org/apache/struts/tiles2/util/
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 @@
org.apache.tiles
tiles-core
- 2.0.3
+ 2.0.4
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(),
+servlet
svn commit: r557999 - /struts/struts2/trunk/core/pom.xml
Author: jholmes Date: Fri Jul 20 07:02:29 2007 New Revision: 557999 URL: http://svn.apache.org/viewvc?view=rev&rev=557999 Log: Update Struts 2.1 to use FreeMarker 2.3.9. Modified: struts/struts2/trunk/core/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=557999&r1=557998&r2=557999 == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Fri Jul 20 07:02:29 2007 @@ -262,9 +262,9 @@ -freemarker +org.freemarker freemarker -2.3.8 +2.3.9
Issues Closed: week of 2007-07-20
Struts2 - Friday, July 20, 2007 28 closed in last 7 days [WW-1717] ParametersInterceptor - logging values that could not be applied to action properties James Holmes - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-1717 [WW-1933] HTTP Status 404 - result 'null' not found Unassigned - Bug - [2.0.9] http://issues.apache.org/struts/browse/WW-1933 [WW-1944] Unable to load bean org.apache.struts2.dispatcher.multipart.MultiPartRequest (jakarta) Don Brown - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-1944 [WW-1815] Custom parameter name prefixes for the ActionMapper Don Brown - New Feature - [2.1.0] http://issues.apache.org/struts/browse/WW-1815 [WW-2020] bug in struts.xml of the portlet demo (bad result URL) James Holmes - Bug - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-2020 [WW-1645] Move Portlet Support to a Plugin Nils-Helge Garli - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-1645 [WW-2031] Update struts-2.0.dtd for empty interceptor stack James Holmes - Bug - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-2031 [WW-1851] Struts 2.0 DTD missing "default-class-ref" element James Holmes - Bug - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-1851 [WW-2035] Change ConfigurationManager to not overwrite exception stacktraces James Holmes - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2035 [WW-2039] XSLTResult excludingPattern functionality is not implemented Unassigned - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-2039 [WW-1618] ww:doubleselect javascript uses name instead of id, resulting in array names that don't work James Holmes - Bug - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-1618 [WW-1854] XSLTResult excludingPattern Property is Missing James Holmes - Bug - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-1854 [WW-2011] Struts result are not parsed by default James Holmes - Bug - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-2011 [WW-2018] bad class name in struts.xml (springaction) makes the portlet demo not loading James Holmes - Bug - [] http://issues.apache.org/struts/browse/WW-2018 [WW-1850] struts-default package in struts-default.xml should be abstract James Holmes - Improvement - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-1850 [WW-2030] User input is evaluated as an OGNL expression Rainer Hermanns - Bug - [2.0.9] http://issues.apache.org/struts/browse/WW-2030 [WW-1959] Unused code easy to remove on StrutsRequestWrapper Don Brown - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-1959 [WW-1970] Error Message: Filter [struts2]: could not be initialized Don Brown - Bug - [] http://issues.apache.org/struts/browse/WW-1970 [WW-1703] NullPointer in SiteGraph James Holmes - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-1703 [WW-1956] Struts Layout Pagination Issue Unassigned - Bug - [] http://issues.apache.org/struts/browse/WW-1956 [WW-1887] struts template/simple/select.ftl error/fix James Holmes - Bug - [2.0.9, 2.1.0] http://issues.apache.org/struts/browse/WW-1887 [WW-1587] Maven build should produce -sources and -javadoc jars for the repository Don Brown - Improvement - [2.0.3] http://issues.apache.org/struts/browse/WW-1587 [WW-1926] Unexpected Exception catched: Error setting expression... Don Brown - Bug - [2.0.8] http://issues.apache.org/struts/browse/WW-1926 [WW-1647] Allow struts.custom.i18n.resources property to be defined outside of struts.properties Unassigned - Improvement - [2.1.x] http://issues.apache.org/struts/browse/WW-1647 [WW-1921] attribute disabled of tag not working Unassigned - Bug - [2.0.9] http://issues.apache.org/struts/browse/WW-1921 [WW-1807] FreemarkerResult location masking Don Brown - Task - [2.1.0] http://issues.apache.org/struts/browse/WW-1807 [WW-2037] add a clearErrors() and clearMessages() method to ActionSupport James Holmes - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2037 [WW-1954] has no effect James Holmes - Bug - [] http://issues.apache.org/struts/browse/WW-1954
svn commit: r558080 - /struts/struts2/trunk/core/pom.xml
Author: jholmes Date: Fri Jul 20 11:24:59 2007 New Revision: 558080 URL: http://svn.apache.org/viewvc?view=rev&rev=558080 Log: Update FreeMarker dependency to 2.3.10. Modified: struts/struts2/trunk/core/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=558080&r1=558079&r2=558080 == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Fri Jul 20 11:24:59 2007 @@ -264,7 +264,7 @@ org.freemarker freemarker -2.3.9 +2.3.10
svn commit: r558101 - in /struts/struts2/trunk/apps/showcase/src/main: resources/struts-tiles.xml webapp/WEB-INF/tiles.xml webapp/WEB-INF/web.xml webapp/tiles/body.jsp webapp/tiles/layout.ftl webapp/t
Author: apetrelli Date: Fri Jul 20 12:32:02 2007 New Revision: 558101 URL: http://svn.apache.org/viewvc?view=rev&rev=558101 Log: WW-1724 Added code to Struts 2 showcase to show that the content type is present even with a FreeMarker result, i.e. with a FreeMarker layout page. Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl (with props) Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml?view=diff&rev=558101&r1=558100&r2=558101 == --- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tiles.xml Fri Jul 20 12:32:02 2007 @@ -17,6 +17,10 @@ showcase.freemarker + +showcase.freemarkerLayout + + /tiles/layout.jsp /tiles/layout.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml?view=diff&rev=558101&r1=558100&r2=558101 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/tiles.xml Fri Jul 20 12:32:02 2007 @@ -39,4 +39,10 @@ + + + + + + Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558101&r1=558100&r2=558101 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Fri Jul 20 12:32:02 2007 @@ -80,6 +80,12 @@ javax.faces.webapp.FacesServlet 1 + + JspSupportServlet + org.apache.struts2.views.JspSupportServlet + 1 + + Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp?view=diff&rev=558101&r1=558100&r2=558101 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp Fri Jul 20 12:32:02 2007 @@ -10,6 +10,9 @@ View FreeMarker Example + +View Example with a FreeMarker Layout + Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl?view=auto&rev=558101 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl (added) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl Fri Jul 20 12:32:02 2007 @@ -0,0 +1,12 @@ +<#assign tiles=JspTaglibs["http://tiles.apache.org/tags-tiles";]> +<@tiles.importAttribute name="title" scope="request"/> + +<@tiles.getAsString name="title"/> + +<@tiles.insertAttribute name="header"/> + +<@tiles.insertAttribute name="body"/> + + Notice that this is a layout made in FreeMarker + + Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl -- svn:eol-style = native Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl -- svn:keywords = Id Author Date Rev Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp?view=diff&rev=558101&r1=558100&r2=558101 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp Fri Jul 20
svn commit: r558248 - in /struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles: DefinitionsFactoryException.java FactoryNotFoundException.java TilesException.java TilesPlugin.java taglib/I
Author: pbenedict
Date: Fri Jul 20 22:41:49 2007
New Revision: 558248
URL: http://svn.apache.org/viewvc?view=rev&rev=558248
Log:
STR-2437: Add root cause to TilesException
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/InsertTag.java
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/xmlDefinition/I18nFactorySet.java
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java?view=diff&rev=558248&r1=558247&r2=558248
==
---
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java
(original)
+++
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java
Fri Jul 20 22:41:49 2007
@@ -34,7 +34,6 @@
public DefinitionsFactoryException()
{
super();
-this.exception = null;
}
/**
@@ -44,80 +43,28 @@
public DefinitionsFactoryException(String message)
{
super(message);
-this.exception = null;
}
/**
* Create a new DefinitionsFactoryException wrapping an
existing exception.
*
-* The existing exception will be embedded in the new
-* one and its message will become the default message for
-* the DefinitionsFactoryException.
-*
* @param e The exception to be wrapped.
*/
public DefinitionsFactoryException(Exception e)
{
super();
-this.exception = e;
}
/**
* Create a new DefinitionsFactoryException from an existing
exception.
*
-* The existing exception will be embedded in the new
-* one, but the new exception will have its own message.
-*
* @param message The detail message.
-* @param e The exception to be wrapped.
+* @param e The root cause exception
*/
public DefinitionsFactoryException(String message, Exception e)
{
-super(message);
-this.exception = e;
+super(message, e);
}
-
-
- /**
-* Return a detail message for this exception.
-*
-* If there is a embedded exception, and if the
DefinitionsFactoryException
-* has no detail message of its own, this method will return
-* the detail message from the embedded exception.
-*
-* @return The error or warning message.
-*/
- public String getMessage ()
- {
-String message = super.getMessage ();
-
-if (message == null && exception != null) {
- return exception.getMessage();
-} else {
- return message;
-}
- }
-
-
- /**
-* Return the embedded exception, if any.
-* @return The embedded exception, or null if there is none.
-*/
- public Exception getException ()
- {
-return exception;
- }
-
- //
- // Internal state.
- //
-
-
- /**
- * Any "wrapped" exception will be exposed when this is serialized.
- * @serial
- */
- private Exception exception;
}
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java?view=diff&rev=558248&r1=558247&r2=558248
==
---
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java
(original)
+++
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java
Fri Jul 20 22:41:49 2007
@@ -42,4 +42,14 @@
{
super(msg);
}
+
+/**
+ * Constructor.
+ *
+ * @param msg Message.
+ * @param e the root cause exception
+ */
+public FactoryNotFoundException(String msg, Exception e) {
+super(msg, e);
+}
}
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java?view=diff&rev=558248&r1=558247&r2=558248
==
---
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java
(original)
+++
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java
Fri
svn commit: r558251 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts: action/DynaActionForm.java action/DynaActionFormClass.java chain/commands/ExceptionCatcher.java chain/commands/gene
Author: pbenedict
Date: Fri Jul 20 22:59:55 2007
New Revision: 558251
URL: http://svn.apache.org/viewvc?view=rev&rev=558251
Log:
STR-2437: Add root cause to exceptions
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java?view=diff&rev=558251&r1=558250&r2=558251
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionForm.java
Fri Jul 20 22:59:55 2007
@@ -485,7 +485,7 @@
try {
((List) prop).set(index, value);
} catch (ClassCastException e) {
-throw new ConversionException(e.getMessage());
+throw new ConversionException(e.getMessage(), e);
}
} else {
throw new IllegalArgumentException("Non-indexed property for '"
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java?view=diff&rev=558251&r1=558250&r2=558251
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
Fri Jul 20 22:59:55 2007
@@ -252,7 +252,7 @@
} catch (Throwable t) {
throw new IllegalArgumentException(
"Cannot instantiate ActionFormBean class '" + config.getType()
-+ "': " + t);
++ "'", t);
}
if (!DynaActionForm.class.isAssignableFrom(beanClass)) {
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java?view=diff&rev=558251&r1=558250&r2=558251
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
Fri Jul 20 22:59:55 2007
@@ -164,7 +164,7 @@
} catch (Exception e) {
LOG.warn("Exception from exceptionCommand '" + exceptionCommand
+ "'", e);
-throw new IllegalStateException("Exception chain threw exception");
+throw new IllegalStateException("Exception chain threw exception",
e);
}
return (true);
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java?view=diff&rev=558251&r1=558250&r2=558251
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
Fri Jul 20 22:59:55 2007
@@ -252,7 +252,7 @@
context = (ActionContextBase) ctx;
} catch (ClassCastException e) {
throw new IllegalStateException("ActionContext [" + ctx + "]"
-+ " must be subclass of ActionContextBase");
++ " must be subclass of ActionContextBase", e);
}
ActionForm form =
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java?view=diff&rev=558251&r1=558250&r2=558251
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
Fri Jul 20 22:59:55 2007
@@ -583,18 +583,15 @@
svn commit: r558254 - in /struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions: ActionDispatcher.java EventActionDispatcher.java
Author: pbenedict Date: Fri Jul 20 23:13:44 2007 New Revision: 558254 URL: http://svn.apache.org/viewvc?view=rev&rev=558254 Log: STR-2437: Add root cause to ServletException Modified: struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/ActionDispatcher.java struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/EventActionDispatcher.java Modified: struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/ActionDispatcher.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/ActionDispatcher.java?view=diff&rev=558254&r1=558253&r2=558254 == --- struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/ActionDispatcher.java (original) +++ struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/ActionDispatcher.java Fri Jul 20 23:13:44 2007 @@ -255,7 +255,7 @@ log.error(message); -throw new ServletException(message); +throw new ServletException(message, e); } return dispatchMethod(mapping, form, request, response, name, method); Modified: struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/EventActionDispatcher.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/EventActionDispatcher.java?view=diff&rev=558254&r1=558253&r2=558254 == --- struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/EventActionDispatcher.java (original) +++ struts/struts1/trunk/extras/src/main/java/org/apache/struts/actions/EventActionDispatcher.java Fri Jul 20 23:13:44 2007 @@ -151,7 +151,7 @@ LOG.error(message + " " + mapping.getParameter()); -throw new ServletException(message); +throw new ServletException(message, e); } return dispatchMethod(mapping, form, request, response, name, method);
svn commit: r558255 - /struts/struts1/trunk/scripting/src/main/java/org/apache/struts/scripting/ScriptAction.java
Author: pbenedict
Date: Fri Jul 20 23:15:48 2007
New Revision: 558255
URL: http://svn.apache.org/viewvc?view=rev&rev=558255
Log:
STR-2437: Add root cause to Exception
Modified:
struts/struts1/trunk/scripting/src/main/java/org/apache/struts/scripting/ScriptAction.java
Modified:
struts/struts1/trunk/scripting/src/main/java/org/apache/struts/scripting/ScriptAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/src/main/java/org/apache/struts/scripting/ScriptAction.java?view=diff&rev=558255&r1=558254&r2=558255
==
---
struts/struts1/trunk/scripting/src/main/java/org/apache/struts/scripting/ScriptAction.java
(original)
+++
struts/struts1/trunk/scripting/src/main/java/org/apache/struts/scripting/ScriptAction.java
Fri Jul 20 23:15:48 2007
@@ -202,7 +202,7 @@
scriptName = parseScriptName(mapping.getParameter(), bsfManager);
} catch (Exception ex) {
LOG.error("Unable to parse " + mapping.getParameter(), ex);
-throw new Exception("Unable to parse " + mapping.getParameter());
+throw new Exception("Unable to parse " + mapping.getParameter(),
ex);
}
if (scriptName == null) {
LOG.error("No script specified in the parameter attribute");
