[CONF] Confluence Changes in the last 24 hours

2006-11-01 Thread confluence 
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa
|
|-Pages Added or Edited in This Space
 |-- Index was last edited by craigrussell (09:45 AM).
 |   http://cwiki.apache.org/confluence/display/openjpa/Index

Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX
|
|-Pages Added or Edited in This Space
 |-- Bundle Plugin for Maven (BND) was created by [EMAIL PROTECTED] (12:58 AM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/Bundle+Plugin+for+Maven+%28BND%29
 |-- iPOJO Tutorial (0.7) was created by clement.escoffier (12:09 AM).
 |   http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Tutorial+%280.7%29
 |-- Configuration Handler was last edited by clement.escoffier (12:35 AM).
 |   http://cwiki.apache.org/confluence/display/FELIX/Configuration+Handler
 |-- iPOJO was last edited by clement.escoffier (12:12 AM).
 |   http://cwiki.apache.org/confluence/display/FELIX/iPOJO

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid
|
|-Pages Added or Edited in This Space
 |-- M1 Release was last edited by rajith (03:14 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/M1+Release
 |-- Release Plans was last edited by mmccorma (07:47 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/Release+Plans
 |-- Qpid Java Documentation was last edited by mmccorma (05:49 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Documentation

Apache Directory Server v1.1 Documentation (DIRxSRVx11) 
http://cwiki.apache.org/confluence/display/DIRxSRVx11
|
|-Pages Added or Edited in This Space
 |-- Mitosis Development Guide was last edited by elecharny (03:51 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSRVx11/Mitosis+Development+Guide

Apache Geronimo v1.1 (GMOxDOC11) 
http://cwiki.apache.org/confluence/display/GMOxDOC11
|
|-Pages Added or Edited in This Space
 |-- geronimo-web.xml was last edited by [EMAIL PROTECTED] (11:39 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC11/geronimo-web.xml
 |-- JBoss to Geronimo - JDBC Migration was last edited by [EMAIL PROTECTED] 
(10:29 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+JDBC+Migration
 |-- DB Pool Testing sample application was last edited by hcunico (11:15 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/DB+Pool+Testing+sample+application
 |-- Simple database access sample application was last edited by hcunico 
(10:55 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/Simple+database+access+sample+application
 |-- Migrating to Apache Geronimo was last edited by hcunico (06:02 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/Migrating+to+Apache+Geronimo
 |-- JBoss to Geronimo - EJB-Session Beans Migration was created by [EMAIL 
PROTECTED] (03:40 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+EJB-Session+Beans+Migration
 |-- JBoss to Geronimo - Servlets and JSPs Migration was last edited by hcunico 
(06:00 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+Servlets+and+JSPs+Migration
 |-- Apache Geronimo v1.1 - User's Guide was last edited by [EMAIL PROTECTED] 
(05:57 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/Apache+Geronimo+v1.1+-+User%27s+Guide
 |-- geronimo-application.xsd was created by [EMAIL PROTECTED] (02:59 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/geronimo-application.xsd
 |-- Deployment plans was last edited by [EMAIL PROTECTED] (02:56 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC11/Deployment+plans

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- How can we test applications? was created by husted (06:52 PM).
 |   http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=28862
 |-- FAQs was last edited by husted (06:50 PM).
 |   http://cwiki.apache.org/confluence/display/WW/FAQs

Apache Directory Server v1.0 Documentation (DIRxSRVx10) 
http://cwiki.apache.org/confluence/display/DIRxSRVx10
|
|-Pages Added or Edited in This Space
 |-- Custom Schema was last edited by elecharny (01:46 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxSRVx10/Custom+Schema

Apache Geronimo v1.0 (GMOxDOC10) 
http://cwiki.apache.org/confluence/display/GMOxDOC10
|
|-Pages Added or Edited in This Space
 |-- JBoss to Geronimo - Servlets and JSPs Migration was last edited by hcunico 
(05:58 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC10/JBoss+to+Geronimo+-+Servlets+and+JSPs+Migration

Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET
|
|-Pages Added or Edited in This Space
 |--

svn commit: r469836 - in /struts/struts1/trunk/apps: blank/pom.xml cookbook/pom.xml el-example/pom.xml examples/pom.xml faces-example1/pom.xml faces-example2/pom.xml mailreader/pom.xml scripting-mailr

2006-11-01 Thread jmitchell 
Author: jmitchell
Date: Wed Nov  1 01:32:43 2006
New Revision: 469836

URL: http://svn.apache.org/viewvc?view=rev&rev=469836
Log:
fix pom scm locations

Modified:
struts/struts1/trunk/apps/blank/pom.xml
struts/struts1/trunk/apps/cookbook/pom.xml
struts/struts1/trunk/apps/el-example/pom.xml
struts/struts1/trunk/apps/examples/pom.xml
struts/struts1/trunk/apps/faces-example1/pom.xml
struts/struts1/trunk/apps/faces-example2/pom.xml
struts/struts1/trunk/apps/mailreader/pom.xml
struts/struts1/trunk/apps/scripting-mailreader/pom.xml

Modified: struts/struts1/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/blank/pom.xml?view=diff&rev=469836&r1=469835&r2=469836
==
--- struts/struts1/trunk/apps/blank/pom.xml (original)
+++ struts/struts1/trunk/apps/blank/pom.xml Wed Nov  1 01:32:43 2006
@@ -34,6 +34,12 @@
war
Struts Apps - Blank

+
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/blank/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk/apps/blank/
+
http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/blank/
+
+

   
  ${pom.groupId}

Modified: struts/struts1/trunk/apps/cookbook/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/pom.xml?view=diff&rev=469836&r1=469835&r2=469836
==
--- struts/struts1/trunk/apps/cookbook/pom.xml (original)
+++ struts/struts1/trunk/apps/cookbook/pom.xml Wed Nov  1 01:32:43 2006
@@ -34,6 +34,12 @@
war
Struts Apps - Cookbook

+
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/cookbook/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk/apps/cookbook/
+
http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/cookbook/
+
+

   
  ${pom.groupId}

Modified: struts/struts1/trunk/apps/el-example/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/pom.xml?view=diff&rev=469836&r1=469835&r2=469836
==
--- struts/struts1/trunk/apps/el-example/pom.xml (original)
+++ struts/struts1/trunk/apps/el-example/pom.xml Wed Nov  1 01:32:43 2006
@@ -34,6 +34,12 @@
war
Struts Apps - Struts EL Exercise

+
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/el-example/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk/apps/el-example/
+
http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/el-example/
+
+

   
  ${pom.groupId}

Modified: struts/struts1/trunk/apps/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/pom.xml?view=diff&rev=469836&r1=469835&r2=469836
==
--- struts/struts1/trunk/apps/examples/pom.xml (original)
+++ struts/struts1/trunk/apps/examples/pom.xml Wed Nov  1 01:32:43 2006
@@ -34,6 +34,12 @@
war
Struts Apps - Examples

+
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/examples/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk/apps/examples/
+
http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/examples/
+
+

   
  ${pom.groupId}

Modified: struts/struts1/trunk/apps/faces-example1/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/pom.xml?view=diff&rev=469836&r1=469835&r2=469836
==
--- struts/struts1/trunk/apps/faces-example1/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example1/pom.xml Wed Nov  1 01:32:43 2006
@@ -34,6 +34,12 @@
war
Struts Apps - Faces Example 1

+
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/faces-example1/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk/apps/faces-example1/
+
http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/faces-example1/
+
+

   
  ${pom.groupId}

Modified: struts/struts1/trunk/apps/faces-example2/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/pom.xml?view=diff&rev=469836&r1=469835&r2=469836
==
--- struts/struts1/trunk/apps/faces-example2/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example2/pom.xml Wed Nov  1 01:32:43 2006
@@ -34,6 +34,12 @@
war
Struts Apps - Faces Example 2

+
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk/apps/faces-example2/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk/apps/faces-example2/
+

svn commit: r469838 - /struts/struts1/trunk/mailreader-dao/pom.xml

2006-11-01 Thread jmitchell 
Author: jmitchell
Date: Wed Nov  1 01:39:26 2006
New Revision: 469838

URL: http://svn.apache.org/viewvc?view=rev&rev=469838
Log:
fix pom scm locations

Modified:
struts/struts1/trunk/mailreader-dao/pom.xml

Modified: struts/struts1/trunk/mailreader-dao/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/pom.xml?view=diff&rev=469838&r1=469837&r2=469838
==
--- struts/struts1/trunk/mailreader-dao/pom.xml (original)
+++ struts/struts1/trunk/mailreader-dao/pom.xml Wed Nov  1 01:39:26 2006
@@ -36,6 +36,12 @@
Struts Mailreader DAO
http://struts.apache.org
 
+
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts1/trunk/mailreader-dao/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts1/trunk/mailreader-dao/
+
http://svn.apache.org/repos/asf/struts/struts1/trunk/mailreader-dao/
+
+

svn commit: r469920 - in /struts/sandbox/trunk/tiles/tiles-core/src: main/java/org/apache/tiles/preparer/ test/java/org/apache/tiles/preparer/

2006-11-01 Thread ddewolf 
Author: ddewolf
Date: Wed Nov  1 06:36:33 2006
New Revision: 469920

URL: http://svn.apache.org/viewvc?view=rev&rev=469920
Log:
Modeling PreparerFactory similarly to DefinitionsFactory.  Providing identical 
extention points.

Added:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
   (with props)

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/NoSuchPreparerException.java
   (with props)

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerException.java
   (with props)

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java
   (with props)

struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/

struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java
   (with props)

Added: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java?view=auto&rev=469920
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
 (added)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
 Wed Nov  1 06:36:33 2006
@@ -0,0 +1,95 @@
+/*
+ * $Id$
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.tiles.preparer;
+
+import org.apache.tiles.ViewPreparer;
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.util.RequestUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Default implementation of the [EMAIL PROTECTED] PreparerFactory}.
+ * This factory provides no contextual configuration.  It
+ * simply instantiates the named preparer and returns it.
+ */
+public class BasicPreparerFactory implements PreparerFactory {
+
+private static final Log LOG =
+LogFactory.getLog(BasicPreparerFactory.class);
+
+private Map preparers;
+
+public BasicPreparerFactory() {
+this.preparers = new HashMap();
+}
+
+
+/**
+ * Create a new instance of the named preparer.  This factory
+ * expects all names to be qualified class names.
+ *
+ * @param name the named preparer
+ * @param context
+ * @return
+ * @throws NoSuchPreparerException
+ */
+public ViewPreparer getPreparer(String name, TilesRequestContext context)
+throws NoSuchPreparerException {
+
+if (!preparers.containsKey(name)) {
+preparers.put(name, createPreparer(name));
+}
+
+return preparers.get(name);
+}
+
+private ViewPreparer createPreparer(String name) throws 
NoSuchPreparerException {
+
+if (LOG.isDebugEnabled()) {
+LOG.debug("Creating ViewPreparer '" + name + "' . . .");
+}
+
+try {
+Class requestedClass = RequestUtils.applicationClass(name);
+Object instance = requestedClass.newInstance();
+LOG.debug("ViewPreparer created successfully");
+return (ViewPreparer) instance;
+
+} catch (java.lang.ClassNotFoundException ex) {
+throw new NoSuchPreparerException(
+"Error - Class not found :" + ex.getMessage(), ex);
+
+} catch (java.lang.IllegalAccessException ex) {
+throw new NoSuchPreparerException(
+"Error - Illegal class access :" + ex.getMessage(), ex);
+
+} catch (java.lang.ClassCastException ex) {
+throw new NoSuchPreparerException(
+"ViewPreparer of class '" + name
+ + "' should implements 'ViewPreparer' or extends 'Action'");
+} catch (InstantiationException e) {
+throw new NoSuchPreparerException(
+"Error - Unable to instantiate ViewPreparer '"
++ name + "'. Does it have a default constructor?", e);
+}
+}
+}

Propchange: 
struts/sandbox/trunk/tiles/tiles-core/src/

svn commit: r469932 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp: ./ JspTilesRequestContext.java

2006-11-01 Thread ddewolf 
Author: ddewolf
Date: Wed Nov  1 07:31:06 2006
New Revision: 469932

URL: http://svn.apache.org/viewvc?view=rev&rev=469932
Log:
Adding Jsp PageContext based implementation of the RequestContext interface. 
This will be useful when migrating the tags to use the container.

Added:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
   (with props)

Added: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java?view=auto&rev=469932
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
 (added)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
 Wed Nov  1 07:31:06 2006
@@ -0,0 +1,116 @@
+/*
+ * $Id$
+ *
+ * Copyright 1999-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.tiles.context.jsp;
+
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.TilesException;
+import org.apache.tiles.context.servlet.ServletTilesRequestContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.jsp.PageContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.io.IOException;
+
+/**
+ * Context implementation used for executing tiles within a
+ * jsp tag library.
+ *
+ */
+public class JspTilesRequestContext extends ServletTilesRequestContext
+implements TilesRequestContext {
+
+private static final Log LOG =
+LogFactory.getLog(JspTilesRequestContext.class);
+
+/**
+ * JSP 2.0 include method to use which supports configurable flushing.
+ */
+private static Method include = null;
+
+/**
+ * Initialize the include variable with the
+ * JSP 2.0 method if available.
+ */
+static {
+try {
+// get version of include method with flush argument
+Class[] args = new Class[]{String.class, boolean.class};
+include = PageContext.class.getMethod("include", args);
+} catch (NoSuchMethodException e) {
+LOG.debug("Could not find JSP 2.0 include method.  Using old one 
that doesn't support " +
+"configurable flushing.", e);
+}
+}
+
+private PageContext pageContext;
+
+public JspTilesRequestContext(ServletContext context, PageContext 
pageContext) {
+super(context,
+  (HttpServletRequest)pageContext.getRequest(),
+  (HttpServletResponse)pageContext.getResponse());
+this.pageContext = pageContext;
+}
+
+
+
+public void include(String path) throws TilesException {
+try {
+include(path, false);
+} catch (IOException e) {
+throw new TilesException(e);
+} catch (ServletException e) {
+throw new TilesException(e);
+}
+}
+
+ /**
+ * Do an include of specified page using PageContext.include().
+ * 
+ * This method is used by the Tiles package when an include is required.
+ * The Tiles package can use indifferently any form of this method.
+ *
+ * @param path   Uri or Definition name to forward.
+ * @param flush If the writer should be flushed before the include
+ * @throws javax.servlet.ServletException - Thrown by call to 
pageContext.include()
+ * @throws java.io.IOException  - Thrown by call to 
pageContext.include()
+ */
+public void include(String path, boolean flush) throws IOException, 
ServletException {
+
+try {
+// perform include with new JSP 2.0 method that supports flushing
+if (include != null) {
+include.invoke(pageContext, path, flush);
+return;
+}
+} catch (IllegalAccessException e) {
+LOG.debug("Could not find

svn commit: r469969 - in /struts/struts2/trunk/apps/showcase/src/main: java/org/apache/struts2/showcase/DateAction.java resources/struts.xml

2006-11-01 Thread tmjee 
Author: tmjee
Date: Wed Nov  1 08:28:52 2006
New Revision: 469969

URL: http://svn.apache.org/viewvc?view=rev&rev=469969
Log:
WW-1486 
   - showcase throws exception when validation error occurred, due to no 
"input" result for DateAction.
   - changed DateAction method from "execute" to "browse" so it would be 
escaped from validation


Modified:

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml

Modified: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java?view=diff&rev=469969&r1=469968&r2=469969
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
 (original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
 Wed Nov  1 08:28:52 2006
@@ -82,9 +82,8 @@
 }
 
 /**
- * @see com.opensymphony.xwork2.ActionSupport#execute()
  */
-public String execute() throws Exception {
+public String browse() throws Exception {
 Calendar cal = GregorianCalendar.getInstance();
 now = cal.getTime();
 cal.roll(Calendar.DATE, -1);

Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?view=diff&rev=469969&r1=469968&r2=469969
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Wed Nov  1 
08:28:52 2006
@@ -59,7 +59,7 @@
 viewSource.jsp
 
 
-
+
 /date.jsp

svn commit: r469983 - in /struts/struts2/trunk/apps/showcase/src/main: resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml resources/struts-fileupload.xml webapp/fileuploa

2006-11-01 Thread tmjee 
Author: tmjee
Date: Wed Nov  1 08:58:20 2006
New Revision: 469983

URL: http://svn.apache.org/viewvc?view=rev&rev=469983
Log:
WW-1487
 - Updated fileupload showcase example in Struts2 that validate if the file 
uploaded is not empty


Added:

struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/fileupload/upload.jsp

Added: 
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml?view=auto&rev=469983
==
--- 
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
 (added)
+++ 
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
 Wed Nov  1 08:58:20 2006
@@ -0,0 +1,19 @@
+
+http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+
+
+   
+   
+   
+   File cannot be empty
+   
+   
+   
+   
+   Caption cannot be empty
+   
+   
+  
+   
\ No newline at end of file

Modified: 
struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml?view=diff&rev=469983&r1=469982&r2=469983
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml 
Wed Nov  1 08:58:20 2006
@@ -12,6 +12,7 @@

 
 
+   upload.jsp
upload-success.jsp



Modified: 
struts/struts2/trunk/apps/showcase/src/main/webapp/fileupload/upload.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/fileupload/upload.jsp?view=diff&rev=469983&r1=469982&r2=469983
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/fileupload/upload.jsp 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/fileupload/upload.jsp 
Wed Nov  1 08:58:20 2006
@@ -11,6 +11,8 @@
 
 Fileupload sample
 
+   
+

svn commit: r469987 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp: JspTilesRequestContext.java JspUtil.java

2006-11-01 Thread ddewolf 
Author: ddewolf
Date: Wed Nov  1 09:16:58 2006
New Revision: 469987

URL: http://svn.apache.org/viewvc?view=rev&rev=469987
Log:
Extracting jsp helper method so that it can be used within the tags as well.

Added:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
   (with props)
Modified:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java?view=diff&rev=469987&r1=469986&r2=469987
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
 Wed Nov  1 09:16:58 2006
@@ -43,25 +43,7 @@
 private static final Log LOG =
 LogFactory.getLog(JspTilesRequestContext.class);
 
-/**
- * JSP 2.0 include method to use which supports configurable flushing.
- */
-private static Method include = null;
 
-/**
- * Initialize the include variable with the
- * JSP 2.0 method if available.
- */
-static {
-try {
-// get version of include method with flush argument
-Class[] args = new Class[]{String.class, boolean.class};
-include = PageContext.class.getMethod("include", args);
-} catch (NoSuchMethodException e) {
-LOG.debug("Could not find JSP 2.0 include method.  Using old one 
that doesn't support " +
-"configurable flushing.", e);
-}
-}
 
 private PageContext pageContext;
 
@@ -96,20 +78,7 @@
  * @throws java.io.IOException  - Thrown by call to 
pageContext.include()
  */
 public void include(String path, boolean flush) throws IOException, 
ServletException {
-
-try {
-// perform include with new JSP 2.0 method that supports flushing
-if (include != null) {
-include.invoke(pageContext, path, flush);
-return;
-}
-} catch (IllegalAccessException e) {
-LOG.debug("Could not find JSP 2.0 include method.  Using old 
one.", e);
-} catch (InvocationTargetException e) {
-LOG.debug("Unable to execute JSP 2.0 include method.  Trying old 
one.", e);
-}
-
-pageContext.include(path);
+ JspUtil.doInclude(pageContext, path, flush);
 }
 
 

Added: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java?view=auto&rev=469987
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
 (added)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
 Wed Nov  1 09:16:58 2006
@@ -0,0 +1,76 @@
+/*
+ * $Id$
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.tiles.context.jsp;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.jsp.PageContext;
+import javax.servlet.ServletException;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.io.IOException;
+
+/**
+ * Utility class for working within a Jsp environment.
+ */
+public class JspUtil {
+
+private static final Log LOG =
+   LogFactory.getLog(JspUtil.class);
+
+/**
+ * JSP 2.0 include method to use which supports configurable flushing.
+ */
+private static Method include = null;
+
+/**
+ * Initialize the include variable with the
+ * JSP 2.0 method if available.
+ */
+static {
+try {
+// get version of include method with flush argument
+Class[] args = new Class[]{String.class, boolean.class};
+include = PageContext.class.getMethod("include", args);
+} catch (No

svn commit: r469990 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context: BasicTilesContextFactory.java TilesContextFactory.java

2006-11-01 Thread ddewolf 
Author: ddewolf
Date: Wed Nov  1 09:21:11 2006
New Revision: 469990

URL: http://svn.apache.org/viewvc?view=rev&rev=469990
Log:
Adding new method to ContextFactory.  This will allow us to encapsulate some of 
the jsp specific processing within the container/context.

Modified:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java?view=diff&rev=469990&r1=469989&r2=469990
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
 Wed Nov  1 09:21:11 2006
@@ -19,6 +19,7 @@
 package org.apache.tiles.context;
 
 import javax.servlet.ServletContext;
+import javax.servlet.jsp.PageContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.portlet.PortletContext;
@@ -31,7 +32,7 @@
 import org.apache.tiles.context.portlet.PortletTilesRequestContext;
 import org.apache.tiles.context.servlet.ServletTilesApplicationContext;
 import org.apache.tiles.context.servlet.ServletTilesRequestContext;
-import org.apache.tiles.context.TilesContextFactory;
+import org.apache.tiles.context.jsp.JspTilesRequestContext;
 
 import java.util.Map;
 
@@ -79,5 +80,14 @@
 throw new IllegalArgumentException("Invalid context specified. "
 + context.getClass().getName());
 }
+}
+
+public TilesRequestContext createRequestContext(TilesApplicationContext 
context,
+PageContext pageContext) {
+if (context instanceof ServletTilesApplicationContext) {
+ServletTilesApplicationContext app = 
(ServletTilesApplicationContext)context;
+return new JspTilesRequestContext(app.getServletContext(), 
pageContext);
+}
+throw new IllegalArgumentException("The context/pageContext 
combination is not supported.");
 }
 }

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java?view=diff&rev=469990&r1=469989&r2=469990
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
 Wed Nov  1 09:21:11 2006
@@ -20,6 +20,7 @@
 import org.apache.tiles.TilesApplicationContext;
 import org.apache.tiles.TilesRequestContext;
 
+import javax.servlet.jsp.PageContext;
 import java.util.Map;
 
 /**
@@ -46,10 +47,20 @@
 /**
  * Create a TilesRequestContext for the given context,
  * request, and response.
- * @param context
- * @param request
- * @param response
+ * @param context the associated [EMAIL PROTECTED] TilesApplicationContext}
+ * @param request the associated request.  Typically a ServletRequest or 
PortletRequest.
+ * @param response the associated response.  Typically a ServletResponse 
or PortletResponse.
  * @return  TilesRequestContext
  */
-TilesRequestContext createRequestContext(TilesApplicationContext context, 
Object request, Object response);
+TilesRequestContext createRequestContext(TilesApplicationContext context,
+ Object request, Object response);
+
+/**
+ * Create a TilesRequestContext for the given tiles and page contexts.
+ * @param context
+ * @param pageContext
+ * @return
+ */
+TilesRequestContext createRequestContext(TilesApplicationContext context,
+ PageContext pageContext);
 }

svn commit: r470071 [2/2] - in /struts/sandbox/trunk/tiles: tiles-api/src/main/java/org/apache/tiles/ tiles-core/src/main/java/org/apache/tiles/ tiles-core/src/main/java/org/apache/tiles/definition/ t

2006-11-01 Thread ddewolf 
Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java?view=diff&rev=470071&r1=470070&r2=470071
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java
 Wed Nov  1 12:15:09 2006
@@ -22,11 +22,12 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Collections;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.apache.tiles.definition.UrlDefinitionsFactory;
-import org.apache.tiles.mock.MockComponentDefinitions;
 import org.apache.tiles.mock.MockPublicUrlDefinitionsFactory;
 import org.apache.tiles.mock.MockDefinitionsReader;
 import org.apache.tiles.mock.MockOnlyLocaleTilesContext;
@@ -34,11 +35,13 @@
 /**
  * Tests the UrlDefinitionsFactory component.
  *
- * @version $Rev$ $Date$ 
+ * @version $Rev$ $Date$
  */
 public class TestUrlDefinitionsFactory extends TestCase {
-
-/** Creates a new instance of TestUrlDefinitionsFactory */
+
+/**
+ * Creates a new instance of TestUrlDefinitionsFactory
+ */
 public TestUrlDefinitionsFactory(String name) {
 super(name);
 }
@@ -50,7 +53,7 @@
  */
 public static void main(String[] theArgs) {
 junit.textui.TestRunner.main(
-new String[] { TestUrlDefinitionsFactory.class.getName()});
+new String[]{TestUrlDefinitionsFactory.class.getName()});
 }
 
 /**
@@ -64,190 +67,143 @@
 /**
  * Tests the readDefinitions method under normal conditions.
  */
-public void testReadDefinitions() {
-try {
-DefinitionsFactory factory = new UrlDefinitionsFactory();
+public void testReadDefinitions() throws Exception {
+DefinitionsFactory factory = new UrlDefinitionsFactory();
 
-// Set up multiple data sources.
-URL url1 = this.getClass().getClassLoader().getResource(
-"org/apache/tiles/config/defs1.xml");
-assertNotNull("Could not load defs1 file.", url1);
-URL url2 = this.getClass().getClassLoader().getResource(
-"org/apache/tiles/config/defs2.xml");
-assertNotNull("Could not load defs2 file.", url2);
-URL url3 = this.getClass().getClassLoader().getResource(
-"org/apache/tiles/config/defs3.xml");
-assertNotNull("Could not load defs3 file.", url3);
-
-factory.init(null);
-factory.addSource(url1);
-factory.addSource(url2);
-factory.addSource(url3);
-
-// Parse files.
-ComponentDefinitions definitions = factory.readDefinitions();
-
-assertNotNull("test.def1 definition not found.", 
definitions.getDefinition("test.def1"));
-assertNotNull("test.def2 definition not found.", 
definitions.getDefinition("test.def1"));
-assertNotNull("test.def3 definition not found.", 
definitions.getDefinition("test.def1"));
-} catch (Exception e) {
-fail("Error running test: " + e);
-}
+// Set up multiple data sources.
+URL url1 = this.getClass().getClassLoader().getResource(
+"org/apache/tiles/config/defs1.xml");
+assertNotNull("Could not load defs1 file.", url1);
+URL url2 = this.getClass().getClassLoader().getResource(
+"org/apache/tiles/config/defs2.xml");
+assertNotNull("Could not load defs2 file.", url2);
+URL url3 = this.getClass().getClassLoader().getResource(
+"org/apache/tiles/config/defs3.xml");
+assertNotNull("Could not load defs3 file.", url3);
+
+factory.init(Collections.EMPTY_MAP);
+factory.addSource(url1);
+factory.addSource(url2);
+factory.addSource(url3);
+
+// Parse files.
+ComponentDefinitions definitions = factory.readDefinitions();
+
+assertNotNull("test.def1 definition not found.", 
definitions.getDefinition("test.def1"));
+assertNotNull("test.def2 definition not found.", 
definitions.getDefinition("test.def1"));
+assertNotNull("test.def3 definition not found.", 
definitions.getDefinition("test.def1"));
 }
-
+
 /**
  * Tests addSource with a bad source object type.
  */
-public void testBadSourceType() {
+public void testBadSourceType() throws Exception {
 try {
 DefinitionsFactory factory = new UrlDefinitionsFactory();
 
-factory.init(null);
+factory.init(Collections.EMPTY_MAP);
 fac

svn commit: r470075 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles: listener/TilesContainerListener.java servlet/TilesServlet.java

2006-11-01 Thread ddewolf 
Author: ddewolf
Date: Wed Nov  1 12:18:57 2006
New Revision: 470075

URL: http://svn.apache.org/viewvc?view=rev&rev=470075
Log:
Standardizing on commons-logging

Modified:

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java

struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java?view=diff&rev=470075&r1=470074&r2=470075
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
 Wed Nov  1 12:18:57 2006
@@ -32,7 +32,7 @@
 implements ServletContextListener {
 
 /**
- * Logger instance.
+ * Log instance.
  */
 protected static final Log LOG =
 LogFactory.getLog(TilesListener.class);

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java?view=diff&rev=470075&r1=470074&r2=470075
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
 Wed Nov  1 12:18:57 2006
@@ -25,12 +25,13 @@
 import javax.servlet.http.*;
 
 import java.util.HashMap;
-import java.util.logging.Logger;
 
 import org.apache.tiles.*;
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.context.TilesContextFactory;
 import org.apache.tiles.context.BasicTilesContextFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This is the entry point for Tiles. The TilesServlet initializes
@@ -117,8 +118,7 @@
 /**
  * The LOG for this class
  */
-protected static Logger logger = Logger.getLogger(TilesServlet.class.
-getName());
+protected static final Log LOG = LogFactory.getLog(TilesServlet.class);
 
 
 /**
@@ -163,7 +163,7 @@
 public void init(ServletConfig config)
 throws javax.servlet.ServletException {
 super.init(config);
-logger.info("Initializing TilesServlet");
+LOG.info("Initializing TilesServlet");
 configFiles = config.getInitParameter("definitions-config");
 
 try {
@@ -201,10 +201,10 @@
 
 try {
 if (configFiles != null) {
-logger.info("CONFIG FILES DEFINED IN WEB.XML");
+LOG.info("CONFIG FILES DEFINED IN WEB.XML");
 map.put(DEFAULT_CONFIG_FILE_PARAM, configFiles);
 } else {
-logger.info("CONFIG FILES WERE NOT DEFINED IN WEB.XML, " +
+LOG.info("CONFIG FILES WERE NOT DEFINED IN WEB.XML, " +
 "LOOKING FOR " + DEFAULT_CONFIG_FILE);
 map.put(DEFAULT_CONFIG_FILE_PARAM, DEFAULT_CONFIG_FILE);
 }
@@ -229,7 +229,7 @@
 private void initDefinitionsFactory(ServletContext servletContext,
 DefinitionsFactoryConfig factoryConfig)
 throws ServletException {
-logger.info("initializing definitions impl...");
+LOG.info("initializing definitions impl...");
 // Create configurable impl
 try {
 
@@ -252,9 +252,7 @@
  * @param ex An exception
  */
 private void saveExceptionMessage(ServletConfig config, Exception ex) {
-logger.warning("Caught exception when initializing definitions impl");
-logger.warning(ex.getMessage());
-logger.warning(ex.toString());
+LOG.warn("Caught exception when initializing definitions impl", ex);
 
//config.getServletContext().setAttribute(Globals.TILES_INIT_EXCEPTION, 
ex.getMessage());
 }

svn commit: r470163 - in /struts/struts1/trunk: apps/examples/src/main/webapp/WEB-INF/exercise/ apps/examples/src/main/webapp/exercise/ el/src/main/java/org/apache/strutsel/taglib/html/ el/src/main/re

2006-11-01 Thread niallp 
Author: niallp
Date: Wed Nov  1 17:25:34 2006
New Revision: 470163

URL: http://svn.apache.org/viewvc?view=rev&rev=470163
Log:
Fix for STR-2967 - Add "module" attribute to ImageTag - patch supplied by 
Michael Coram

- added to vanilla, nested and el taglibs
- added an example page in the examples webapp

Added:
struts/struts1/trunk/apps/examples/src/main/webapp/exercise/html-image.jsp  
 (with props)
Modified:

struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/exercise/struts-config.xml
struts/struts1/trunk/apps/examples/src/main/webapp/exercise/index.html

struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELImageTag.java

struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELImageTagBeanInfo.java
struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld

struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ImageTag.java
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld

struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-nested.tld

Modified: 
struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/exercise/struts-config.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/exercise/struts-config.xml?view=diff&rev=470163&r1=470162&r2=470163
==
--- 
struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/exercise/struts-config.xml
 (original)
+++ 
struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/exercise/struts-config.xml
 Wed Nov  1 17:25:34 2006
@@ -52,6 +52,8 @@
 
+
 
 http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/webapp/exercise/html-image.jsp?view=auto&rev=470163
==
--- struts/struts1/trunk/apps/examples/src/main/webapp/exercise/html-image.jsp 
(added)
+++ struts/struts1/trunk/apps/examples/src/main/webapp/exercise/html-image.jsp 
Wed Nov  1 17:25:34 2006
@@ -0,0 +1,47 @@
+<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
+
+  
+Test struts-html:image Tag
+  
+  
+
+  Test struts-html:image Tag
+
+Click on the powered by images below to submit 
the form:
+
+
+Last Submitted:
+
+<%= new java.util.Date() %>
+
+
+
+
+
+
+Standard image tag
+
+
+
+
+
+Struts image tag via page attribute
+
+
+
+
+
+Struts image tag via page attribute, current module
+
+
+
+ 
+ 
+Struts image tag via page attribute, default module
+
+
+
+ 
+
+  
+

Propchange: 
struts/struts1/trunk/apps/examples/src/main/webapp/exercise/html-image.jsp
--
svn:eol-style = native

Propchange: 
struts/struts1/trunk/apps/examples/src/main/webapp/exercise/html-image.jsp
--
svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts1/trunk/apps/examples/src/main/webapp/exercise/index.html
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/webapp/exercise/index.html?view=diff&rev=470163&r1=470162&r2=470163
==
--- struts/struts1/trunk/apps/examples/src/main/webapp/exercise/index.html 
(original)
+++ struts/struts1/trunk/apps/examples/src/main/webapp/exercise/index.html Wed 
Nov  1 17:25:34 2006
@@ -46,6 +46,8 @@
 
 
 
+
+
 
 
 

Modified: 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELImageTag.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELImageTag.java?view=diff&rev=470163&r1=470162&r2=470163
==
--- 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELImageTag.java
 (original)
+++ 
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELImageTag.java
 Wed Nov  1 17:25:34 2006
@@ -87,6 +87,12 @@
 private String localeExpr;
 
 /**
+ * Instance variable mapped to "module" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
+ */
+private String moduleExpr;
+
+/**
  * Instance variable mapped to "onblur" tag attribute. (Mapping set in
  * associated BeanInfo class.)
  */
@@ -309,6 +315,14 @@
 }
 
 /**
+ * Getter method for "module" tag attribute. (Mapping set

svn commit: r470176 - in /struts/maven/trunk: struts-archetype-blank/pom.xml struts2-archetype-blank/pom.xml struts2-archetype-starter/pom.xml

2006-11-01 Thread jmitchell 
Author: jmitchell
Date: Wed Nov  1 17:48:48 2006
New Revision: 470176

URL: http://svn.apache.org/viewvc?view=rev&rev=470176
Log:
fix pom scm locations

Modified:
struts/maven/trunk/struts-archetype-blank/pom.xml
struts/maven/trunk/struts2-archetype-blank/pom.xml
struts/maven/trunk/struts2-archetype-starter/pom.xml

Modified: struts/maven/trunk/struts-archetype-blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts-archetype-blank/pom.xml?view=diff&rev=470176&r1=470175&r2=470176
==
--- struts/maven/trunk/struts-archetype-blank/pom.xml (original)
+++ struts/maven/trunk/struts-archetype-blank/pom.xml Wed Nov  1 17:48:48 2006
@@ -14,4 +14,10 @@
jar
Struts Archetypes - Blank
 
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts-archetype-blank/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts-archetype-blank/
+   
http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/struts-archetype-blank/
+
+
 

Modified: struts/maven/trunk/struts2-archetype-blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/pom.xml?view=diff&rev=470176&r1=470175&r2=470176
==
--- struts/maven/trunk/struts2-archetype-blank/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-blank/pom.xml Wed Nov  1 17:48:48 2006
@@ -13,4 +13,10 @@
   maven-plugin
   Struts 2 Archetypes - Blank
 
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/
+   
http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/struts2-archetype-blank/
+
+
 

Modified: struts/maven/trunk/struts2-archetype-starter/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/pom.xml?view=diff&rev=470176&r1=470175&r2=470176
==
--- struts/maven/trunk/struts2-archetype-starter/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/pom.xml Wed Nov  1 17:48:48 
2006
@@ -13,4 +13,10 @@
   maven-plugin
   Struts 2 Archetypes - Starter
 
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-starter/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-starter/
+   
http://svn.apache.org/viewcvs.cgi/struts/maven/trunk/struts2-archetype-starter/
+
+

svn commit: r470179 - /struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java

2006-11-01 Thread jmitchell 
Author: jmitchell
Date: Wed Nov  1 17:50:34 2006
New Revision: 470179

URL: http://svn.apache.org/viewvc?view=rev&rev=470179
Log:
remove unused imports

Modified:
struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java

Modified: struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java?view=diff&rev=470179&r1=470178&r2=470179
==
--- struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java 
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java Wed 
Nov  1 17:50:34 2006
@@ -4,8 +4,6 @@
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 
 import java.util.Map;
-import java.util.Collection;
-import java.util.List;
 
 public class LoginTest extends ConfigTest {

svn commit: r470180 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: ActionContextCleanUp.java FilterDispatcher.java ServletActionRedirectResult.java

2006-11-01 Thread jmitchell 
Author: jmitchell
Date: Wed Nov  1 17:51:54 2006
New Revision: 470180

URL: http://svn.apache.org/viewvc?view=rev&rev=470180
Log:
fix a couple of typos, add a todo

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java?view=diff&rev=470180&r1=470179&r2=470180
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
 Wed Nov  1 17:51:54 2006
@@ -43,7 +43,7 @@
  * However, sometimes you may wish to access Struts features, including the
  * value stack, from within your SiteMesh decorators. Because [EMAIL 
PROTECTED] FilterDispatcher}
  * cleans up the [EMAIL PROTECTED] ActionContext}, your decorator won't have 
access to the
- * date you want.
+ * data you want.
  * 
  * 
  * By adding this filter, the [EMAIL PROTECTED] FilterDispatcher} will know to 
not clean up and

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?view=diff&rev=470180&r1=470179&r2=470180
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
 Wed Nov  1 17:51:54 2006
@@ -276,7 +276,7 @@
 }
 
 /**
- * Fins a static resource
+ * Finds a static resource
  * 
  * @param name The resource name
  * @param response The request

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?view=diff&rev=470180&r1=470179&r2=470180
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
 Wed Nov  1 17:51:54 2006
@@ -42,9 +42,9 @@
  * standard redirect result.
  *
  * 
- *
- * To pass parameters, the  ...  tag. The following 
parameters will not be
- * passable becuase they are part of the config param for this particular 
result.
+ * @TODO - the below sentence is confusing and seems to be contradictory -- 
FIX ME
+ * To pass parameters, use the  ...  tag. The 
following parameters will not be
+ * passed because they are part of the config param for this particular result.
  *
  * 
  * actionName
@@ -109,7 +109,7 @@
  *
  *   
  * generateReport
- *  /genReport
+ *  /genReport
  *  pie
  *  100
  *  100

svn commit: r470181 - /struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml

2006-11-01 Thread jmitchell 
Author: jmitchell
Date: Wed Nov  1 17:53:09 2006
New Revision: 470181

URL: http://svn.apache.org/viewvc?view=rev&rev=470181
Log:
formatting only

Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml

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=470181&r1=470180&r2=470181
==
--- 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 Wed Nov  
1 17:53:09 2006
@@ -1,9 +1,10 @@
 
-http://java.sun.com/xml/ns/j2ee"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
-   
+http://java.sun.com/xml/ns/j2ee"; 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
 
 Struts Showcase Application
-

 
 struts-cleanup
@@ -19,8 +20,6 @@
 sitemesh
 
com.opensymphony.module.sitemesh.filter.PageFilter
 
-   
-   
 
 
 struts-cleanup
@@ -36,7 +35,6 @@
 struts
 /*
 
-
 
 
 
org.springframework.web.context.ContextLoaderListener

svn commit: r470183 - in /struts/struts2/trunk: api/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ core/ plugins/config-browser/ plugins/jasperreports/ plugins/jfreechart/ plugins/jsf/ plu

2006-11-01 Thread jmitchell 
Author: jmitchell
Date: Wed Nov  1 17:54:41 2006
New Revision: 470183

URL: http://svn.apache.org/viewvc?view=rev&rev=470183
Log:
fix pom scm locations

Modified:
struts/struts2/trunk/api/pom.xml
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/config-browser/pom.xml
struts/struts2/trunk/plugins/jasperreports/pom.xml
struts/struts2/trunk/plugins/jfreechart/pom.xml
struts/struts2/trunk/plugins/jsf/pom.xml
struts/struts2/trunk/plugins/pell-multipart/pom.xml
struts/struts2/trunk/plugins/plexus/pom.xml
struts/struts2/trunk/plugins/quickstart/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/struts1/pom.xml
struts/struts2/trunk/plugins/tiles/pom.xml

Modified: struts/struts2/trunk/api/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?view=diff&rev=470183&r1=470182&r2=470183
==
--- struts/struts2/trunk/api/pom.xml (original)
+++ struts/struts2/trunk/api/pom.xml Wed Nov  1 17:54:41 2006
@@ -11,6 +11,13 @@
 struts2-api
 jar
 Struts 2 API
+
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/api/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/api/
+   http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/api/
+
+

 
javax.servlet

Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?view=diff&rev=470183&r1=470182&r2=470183
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Wed Nov  1 17:54:41 2006
@@ -11,6 +11,13 @@
 struts2-blank
 war
 Blank Webapp
+
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/
+
+
 
 
 

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?view=diff&rev=470183&r1=470182&r2=470183
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Wed Nov  1 17:54:41 2006
@@ -11,6 +11,13 @@
 struts2-mailreader
 war
 Starter Webapp
+
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/
+
+
 
 
 

Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?view=diff&rev=470183&r1=470182&r2=470183
==
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Wed Nov  1 17:54:41 2006
@@ -11,6 +11,13 @@
 struts2-portlet
 war
 Portlet Webapp
+
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/
+
+
 
 
 portlet-api

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=470183&r1=470182&r2=470183
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Wed Nov  1 17:54:41 2006
@@ -11,6 +11,14 @@
 struts2-showcase
 war
 Showcase Webapp
+
+
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/
+
+
+
 
 
 hostedqa

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=470183&r1=470182&r2=470183
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Nov  1 17:54:41 2006
@@ -12,

svn commit: r470185 [5/5] - in /struts/sandbox/trunk/tiles: tiles-api/src/main/java/org/apache/tiles/ tiles-core/src/main/java/org/apache/tiles/ tiles-core/src/main/java/org/apache/tiles/access/ tiles

2006-11-01 Thread ddewolf 
Copied: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java
 (from r470071, 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java)
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java&r2=470185
==
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java
 Wed Nov  1 18:03:00 2006
@@ -16,7 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.tiles;
+package org.apache.tiles.util;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.DefinitionsFactoryConfig;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.taglib.ComponentConstants;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
@@ -24,48 +32,49 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.tiles.taglib.ComponentConstants;
-
 /**
  * Utilities class for definitions impl.
  * Also define userDebugLevel property (TODO to be moved from this class ?).
+ *
  * @deprecated Use [EMAIL PROTECTED] 
TilesUtil#createDefinitionsFactory(DefinitionsFactoryConfig)}
  */
 public class DefinitionsUtil extends TilesUtil implements ComponentConstants {
 
-/** 
+/**
  * Global user defined debug level.
- * @deprecated This will be removed in a release after Struts 1.2. 
+ *
+ * @deprecated This will be removed in a release after Struts 1.2.
  */
 public static int userDebugLevel = 0;
 
-/** 
- * User Debug level. 
- * @deprecated This will be removed in a release after Struts 1.2. 
+/**
+ * User Debug level.
+ *
+ * @deprecated This will be removed in a release after Struts 1.2.
  */
 public static final int NO_DEBUG = 0;
 
-/** 
- * Name of init property carrying debug level. 
+/**
+ * Name of init property carrying debug level.
  */
 public static final String DEFINITIONS_CONFIG_USER_DEBUG_LEVEL =
 "definitions-debug";
 
-/** 
+/**
  * Name of init property carrying impl class name.
  */
 public static final String DEFINITIONS_FACTORY_CLASSNAME =
 "definitions-impl-class";
 
-/** 
+/**
  * Constant name used to store impl in context.
  */
 public static final String DEFINITIONS_FACTORY =
 "org.apache.tiles.DEFINITIONS_FACTORY";
 
-/** 
+/**
  * Constant name used to store definition in jsp context.
- * Used to pass definition from a Struts action to servlet forward. 
+ * Used to pass definition from a Struts action to servlet forward.
  */
 public static final String ACTION_DEFINITION =
 "org.apache.tiles.ACTION_DEFINITION";
@@ -74,9 +83,10 @@
  * Create Definition impl.
  * If a impl class name is provided, a impl of this class is created. 
Otherwise,
  * default impl is created.
- * @param classname Class name of the impl to create.
+ *
+ * @param classnameClass name of the impl to create.
  * @param tilesContext The current Tiles application context.
- * @param properties Map of name/property used to initialize impl 
configuration object.
+ * @param properties   Map of name/property used to initialize impl 
configuration object.
  * @return newly created impl.
  * @throws DefinitionsFactoryException If an error occur while 
initializing impl
  * @deprecated Use createDefinitionsFactory(ServletContext servletContext, 
ServletConfig servletConfig)
@@ -109,8 +119,9 @@
 
 /**
  * Create default Definition impl.
+ *
  * @param tilesContext The current Tiles application context.
- * @param properties Map of name/property used to initialize impl 
configuration object.
+ * @param properties   Map of name/property used to initialize impl 
configuration object.
  * @return newly created impl of type ConfigurableDefinitionsFactory.
  * @throws DefinitionsFactoryException If an error occur while 
initializing impl
  */
@@ -126,7 +137,7 @@
  * Create Definition impl.
  * Create configuration object from servlet web.xml file, then create
  * ConfigurableDefinitionsFactory and initialized it with object.
- * 
+ * 
  * Convenience method. Calls createDefinitionsFactory(ServletContext 
servl