displaytag-cvs — CVS Commits

[displaytag-cvs] SF.net SVN: displaytag:[1228] trunk/displaytag/src/test/java/org/displaytag /jsptests/Displ080Test.java

[<fg...@us...>]

Revision: 1228
          http://sourceforge.net/p/displaytag/code/1228
Author:   fgiust
Date:     2014-08-17 20:31:59 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
better test

Modified Paths:
--------------
    trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ080Test.java

Modified: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ080Test.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ080Test.java	2014-08-17 19:47:09 UTC (rev 1227)
+++ trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ080Test.java	2014-08-17 20:31:59 UTC (rev 1228)
@@ -21,6 +21,7 @@
  */
 package org.displaytag.jsptests;
 
+import org.apache.commons.lang3.StringUtils;
 import org.displaytag.tags.TableTagParameters;
 import org.displaytag.test.DisplaytagCase;
 import org.displaytag.util.ParamEncoder;
@@ -77,10 +78,12 @@
         {
             log.debug(response.getText());
         }
+        log.warn(response.getText());
 
-        // note: getCellAsText returns the unescaped value, but we know it's good because an unescaped string would have
-        // been simply "&"
-        Assert.assertEquals("Wrong column content.", "<strong>&</strong>", tables[0].getCellAsText(1, 0));
+        // note: getCellAsText returns the unescaped value
+        String escapedtext = StringUtils.substringBetween(response.getText(), "<td>", "</td>");
+
+        Assert.assertEquals("Wrong column content.", "&lt;strong&gt;&amp;&lt;/strong&gt;", escapedtext);
     }
 
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1227] trunk

[<fg...@us...>]

Revision: 1227
          http://sourceforge.net/p/displaytag/code/1227
Author:   fgiust
Date:     2014-08-17 19:47:09 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-511 Added new i18N adapter for Struts 2 org.displaytag.localization.I18nStruts2Adapter

Modified Paths:
--------------
    trunk/displaytag/pom.xml
    trunk/src/site/changes/changes.xml

Added Paths:
-----------
    trunk/displaytag/src/main/java/org/displaytag/localization/I18nStruts2Adapter.java

Modified: trunk/displaytag/pom.xml
===================================================================
--- trunk/displaytag/pom.xml	2014-08-17 19:33:07 UTC (rev 1226)
+++ trunk/displaytag/pom.xml	2014-08-17 19:47:09 UTC (rev 1227)
@@ -147,6 +147,12 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-core</artifactId>
+      <version>2.3.16.3</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <version>3.2.10.RELEASE</version>

Added: trunk/displaytag/src/main/java/org/displaytag/localization/I18nStruts2Adapter.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/localization/I18nStruts2Adapter.java	                        (rev 0)
+++ trunk/displaytag/src/main/java/org/displaytag/localization/I18nStruts2Adapter.java	2014-08-17 19:47:09 UTC (rev 1227)
@@ -0,0 +1,129 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.localization;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.TextProvider;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.views.jsp.TagUtils;
+import org.displaytag.Messages;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.Tag;
+import java.util.Iterator;
+import java.util.Locale;
+
+
+/**
+ * Resolve i18n resources in Struts 2
+ * @author <a:href="mailto:sno...@wa...">mailto:sno...@wa...</>
+ * @version $Revision: 1.1 $
+ * @since Jan 4, 2008 2:37:29 PM
+ */
+public class I18nStruts2Adapter implements LocaleResolver, I18nResourceProvider
+{
+
+    /**
+     * prefix/suffix for missing entries.
+     */
+    public static final String UNDEFINED_KEY = "???"; //$NON-NLS-1$
+
+    /**
+     * logger.
+     */
+    private static Log log = LogFactory.getLog(I18nWebworkAdapter.class);
+
+    /**
+     * @see LocaleResolver#resolveLocale(PageContext)
+     */
+    @Override
+    public Locale resolveLocale(PageContext pageContext)
+    {
+
+        Locale result = null;
+        ValueStack stack = ActionContext.getContext().getValueStack();
+
+        Iterator<Object> iterator = stack.getRoot().iterator();
+        while (iterator.hasNext())
+        {
+            Object o = iterator.next();
+
+            if (o instanceof LocaleProvider)
+            {
+                LocaleProvider lp = (LocaleProvider) o;
+                result = lp.getLocale();
+
+                break;
+            }
+        }
+
+        if (result == null)
+        {
+            log.debug("Missing LocalProvider actions, init locale to default");
+            result = Locale.getDefault();
+        }
+
+        return result;
+    }
+
+    /**
+     * @see I18nResourceProvider#getResource(String, String, Tag, javax.servlet.jsp.PageContext)
+     */
+    @Override
+    public String getResource(String resourceKey, String defaultValue, Tag tag, PageContext pageContext)
+    {
+
+        // if resourceKey isn't defined either, use defaultValue
+        String key = (resourceKey != null) ? resourceKey : defaultValue;
+
+        String message = null;
+        ValueStack stack = TagUtils.getStack(pageContext);
+        Iterator<Object> iterator = stack.getRoot().iterator();
+
+        while (iterator.hasNext())
+        {
+            Object o = iterator.next();
+
+            if (o instanceof TextProvider)
+            {
+                TextProvider tp = (TextProvider) o;
+                message = tp.getText(key, null, (String) null);
+
+                break;
+            }
+        }
+
+        // if user explicitely added a titleKey we guess this is an error
+        if (message == null && resourceKey != null)
+        {
+            log.debug(Messages.getString("Localization.missingkey", resourceKey)); //$NON-NLS-1$
+            message = UNDEFINED_KEY + resourceKey + UNDEFINED_KEY;
+        }
+
+        return message;
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/displaytag/src/main/java/org/displaytag/localization/I18nStruts2Adapter.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 19:33:07 UTC (rev 1226)
+++ trunk/src/site/changes/changes.xml	2014-08-17 19:47:09 UTC (rev 1227)
@@ -112,6 +112,9 @@
         is set to
         <tt>bottom</tt>
       </action>
+      <action type="add" dev="fgiust" issue="DISPL-511" due-to="T SnowWolf Wagner">
+        Added new i18N adapter for Struts 2, <tt>org.displaytag.localization.I18nStruts2Adapter</tt>
+      </action>
     </release>
     
     <!-- 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1226] trunk/src/site/markdown/source-repository.md

[<fg...@us...>]

Revision: 1226
          http://sourceforge.net/p/displaytag/code/1226
Author:   fgiust
Date:     2014-08-17 19:33:07 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
update source repository urls

Modified Paths:
--------------
    trunk/src/site/markdown/source-repository.md

Modified: trunk/src/site/markdown/source-repository.md
===================================================================
--- trunk/src/site/markdown/source-repository.md	2014-08-17 18:57:36 UTC (rev 1225)
+++ trunk/src/site/markdown/source-repository.md	2014-08-17 19:33:07 UTC (rev 1226)
@@ -14,14 +14,14 @@
 
 The source can be checked out anonymously from SVN with this command:
 
-    $ svn checkout https://displaytag.svn.sourceforge.net/svnroot/displaytag/trunk displaytag
+    $ svn checkout https://svn.code.sf.net/p/displaytag/code/trunk/ displaytag
 
 ### Developer access
 
 Everyone can access the Subversion repository via HTTPS, but Committers
 must checkout the Subversion repository via HTTPS.
 
-    $ svn checkout https://displaytag.svn.sourceforge.net/svnroot/displaytag/trunk displaytag
+    $ svn checkout svn+ssh://fg...@sv.../p/displaytag/code/trunk displaytag
 
 To commit changes to the repository, execute the following command to
 commit your changes (svn will prompt you for your password)
@@ -34,7 +34,7 @@
 blocking http access to the Subversion repository, you can try to access
 it via the developer connection:
 
-    $ svn checkout https://displaytag.svn.sourceforge.net/svnroot/displaytag/trunk displaytag
+    $ svn checkout https://svn.code.sf.net/p/displaytag/code/trunk displaytag
 
 ### Access through a proxy
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1225] trunk

[<fg...@us...>]

Revision: 1225
          http://sourceforge.net/p/displaytag/code/1225
Author:   fgiust
Date:     2014-08-17 18:57:36 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-601 Javascript function and hidden form fields not rendered when paging.banner.placement is set to bottom

Modified Paths:
--------------
    trunk/src/site/changes/changes.xml
    trunk/src/site/markdown/export.md
    trunk/src/site/markdown/export_filter.md

Added Paths:
-----------
    trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ601Test.java
    trunk/displaytag/src/test/resources/jsps/DISPL-601.jsp

Added: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ601Test.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ601Test.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ601Test.java	2014-08-17 18:57:36 UTC (rev 1225)
@@ -0,0 +1,63 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.jsptests;
+
+import org.displaytag.test.DisplaytagCase;
+import org.displaytag.util.ParamEncoder;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+
+/**
+ * Tests for DISPL-601 - javascript function and hidden form fields not rendered when "paging.banner.placement"="bottom"
+ * used.
+ * @author Fabrizio Giustina
+ * @version $Revision: 1081 $ ($Author: fgiust $)
+ */
+public class Displ601Test extends DisplaytagCase
+{
+
+    /**
+     * @see org.displaytag.test.DisplaytagCase#getJspName()
+     */
+    public String getJspName()
+    {
+        return "DISPL-601.jsp";
+    }
+
+    @Override
+    @Test
+    public void doTest() throws Exception
+    {
+        WebRequest request = new GetMethodWebRequest(getJspUrl(getJspName()));
+
+        ParamEncoder encoder = new ParamEncoder("table");
+
+        WebResponse response = runner.getResponse(request);
+        Assert.assertEquals(3, response.getElementsByTagName("input").length);
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ601Test.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/displaytag/src/test/resources/jsps/DISPL-601.jsp
===================================================================
--- trunk/displaytag/src/test/resources/jsps/DISPL-601.jsp	                        (rev 0)
+++ trunk/displaytag/src/test/resources/jsps/DISPL-601.jsp	2014-08-17 18:57:36 UTC (rev 1225)
@@ -0,0 +1,30 @@
+<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:display="urn:jsptld:http://displaytag.sf.net">
+  <jsp:text> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
+  </jsp:text>
+  <jsp:directive.page contentType="text/html; charset=UTF8"/>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+      <title>Displaytag unit test</title>
+    </head>
+    <body>
+      <jsp:scriptlet> <![CDATA[
+                java.util.List testData = new java.util.ArrayList();
+                testData.add(new org.displaytag.test.KnownValueWithId("A"));
+                testData.add(new org.displaytag.test.KnownValueWithId("B"));
+                testData.add(new org.displaytag.test.KnownValueWithId("C"));
+                testData.add(new org.displaytag.test.KnownValueWithId("D"));
+                request.setAttribute( "test", testData);
+            ]]>
+      </jsp:scriptlet>
+      <form name="testform" action="${pageContext.request.requestURI}">
+        <display:table items="${test}" id="table" pagesize="2" form="testform">
+          <display:column property="id"/>
+          <display:column>foo</display:column>
+          <display:setProperty name="paging.banner.placement" value="bottom" />
+        </display:table>
+      </form>
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/resources/jsps/DISPL-601.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 14:06:46 UTC (rev 1224)
+++ trunk/src/site/changes/changes.xml	2014-08-17 18:57:36 UTC (rev 1225)
@@ -106,6 +106,12 @@
         <tt>maxLength</tt>
         is set
       </action>
+      <action type="fix" dev="fgiust" issue="DISPL-601">
+        Javascript function and hidden form fields not rendered when
+        <tt>paging.banner.placement</tt>
+        is set to
+        <tt>bottom</tt>
+      </action>
     </release>
     
     <!-- 

Modified: trunk/src/site/markdown/export.md
===================================================================
--- trunk/src/site/markdown/export.md	2014-08-17 14:06:46 UTC (rev 1224)
+++ trunk/src/site/markdown/export.md	2014-08-17 18:57:36 UTC (rev 1225)
@@ -22,7 +22,7 @@
 
 The export.types parameter contains the list of registered export views.
 For each export type you can configure other parameters: see the export.
-exportname.\* parameters in [configuration](#configuration.html).
+exportname.\* parameters in [configuration](configuration.html).
 
 You can enable/disable a specific export type using the export.
 exportname.enabled parameter.

Modified: trunk/src/site/markdown/export_filter.md
===================================================================
--- trunk/src/site/markdown/export_filter.md	2014-08-17 14:06:46 UTC (rev 1224)
+++ trunk/src/site/markdown/export_filter.md	2014-08-17 18:57:36 UTC (rev 1225)
@@ -41,10 +41,10 @@
 Configure the Filter in your web.xml:
 
 ```xml
-      <filter>
-        <filter-name>ResponseOverrideFilter</filter-name>
-        <filter-class>org.displaytag.filter.ResponseOverrideFilter</filter-class>
-      </filter>
+  <filter>
+    <filter-name>ResponseOverrideFilter</filter-name>
+    <filter-class>org.displaytag.filter.ResponseOverrideFilter</filter-class>
+  </filter>
 ```
 
 And add mappings for urls the filter will intercept, for example:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1224] trunk

[<fg...@us...>]

Revision: 1224
          http://sourceforge.net/p/displaytag/code/1224
Author:   fgiust
Date:     2014-08-17 14:06:46 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-611 Column text should not abbreviated in pdf/excel export when maxLength is set

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java
    trunk/displaytag-examples/src/main/webapp/example-export.jsp
    trunk/src/site/changes/changes.xml

Modified: trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java	2014-08-17 14:03:10 UTC (rev 1223)
+++ trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java	2014-08-17 14:06:46 UTC (rev 1224)
@@ -329,7 +329,13 @@
 
                     // Get the value to be displayed for the column
                     column.initialize();
-                    CellStruct struct = new CellStruct(column, column.getChoppedAndLinkedValue());
+
+                    @SuppressWarnings("deprecation")
+                    String cellvalue = MediaTypeEnum.HTML.equals(model.getMedia())
+                        ? column.getChoppedAndLinkedValue()
+                        : ObjectUtils.toString(column.getValue(true));
+
+                    CellStruct struct = new CellStruct(column, cellvalue);
                     currentRowValues.put(new Integer(column.getHeaderCell().getColumnNumber()), struct);
                 }
             }
@@ -350,7 +356,13 @@
                     Column column = columnIterator.nextColumn();
                     column.initialize();
                     // Get the value to be displayed for the column
-                    CellStruct struct = new CellStruct(column, column.getChoppedAndLinkedValue());
+
+                    @SuppressWarnings("deprecation")
+                    String cellvalue = MediaTypeEnum.HTML.equals(model.getMedia())
+                        ? column.getChoppedAndLinkedValue()
+                        : ObjectUtils.toString(column.getValue(true));
+
+                    CellStruct struct = new CellStruct(column, cellvalue);
                     nextRowValues.put(new Integer(column.getHeaderCell().getColumnNumber()), struct);
                 }
             }
@@ -367,13 +379,12 @@
                     currentRow.getRowNumber() + rowIterator.getPageOffset());
             }
 
-            Iterator<HeaderCell> headerCellsIter = model.getHeaderCellList().iterator();
             ArrayList<CellStruct> structsForRow = new ArrayList<CellStruct>(model.getHeaderCellList().size());
             lowestEndedGroup = NO_RESET_GROUP;
             lowestStartedGroup = NO_RESET_GROUP;
-            while (headerCellsIter.hasNext())
+
+            for (HeaderCell header : model.getHeaderCellList())
             {
-                HeaderCell header = headerCellsIter.next();
 
                 // Get the value to be displayed for the column
                 CellStruct struct = currentRowValues.get(new Integer(header.getColumnNumber()));
@@ -453,9 +464,8 @@
             // open row
             writeRowOpener(currentRow);
 
-            for (Iterator<CellStruct> iterator = structsForRow.iterator(); iterator.hasNext();)
+            for (CellStruct struct : structsForRow)
             {
-                CellStruct struct = iterator.next();
                 writeColumnOpener(struct.column);
                 writeColumnValue(struct.decoratedValue, struct.column);
                 writeColumnCloser(struct.column);

Modified: trunk/displaytag-examples/src/main/webapp/example-export.jsp
===================================================================
--- trunk/displaytag-examples/src/main/webapp/example-export.jsp	2014-08-17 14:03:10 UTC (rev 1223)
+++ trunk/displaytag-examples/src/main/webapp/example-export.jsp	2014-08-17 14:06:46 UTC (rev 1224)
@@ -4,10 +4,10 @@
   <jsp:scriptlet> request.setAttribute( "test", new org.displaytag.sample.TestList(10, false) );</jsp:scriptlet>
   <tags:page>
     <h1>Data exporting</h1>
-    <display:table name="test" export="true" id="currentRowObject">
+    <display:table items="${test}" export="true" id="currentRowObject">
       <display:setProperty name="export.rtf.filename" value="example.rtf"/>
       <display:column property="id" title="ID"/>
-      <display:column property="email"/>
+      <display:column property="email" maxLength="10"/>
       <display:column property="status"/>
       <display:column property="longDescription" media="csv excel xml pdf" title="Not On HTML"/>
       <display:column property="date"/>
@@ -16,6 +16,13 @@
       </display:column>
       <display:column media="csv excel" title="URL" property="url"/>
       <display:setProperty name="export.pdf" value="true"/>
+      <display:caption>This is the table caption</display:caption>
+      <display:footer media="html">
+        <tr>
+          <td colspan="4">Total count:</td>
+          <td colspan="1">${fn:length(test)}</td>
+        </tr>
+      </display:footer>
     </display:table>
     <p>
       When you set the Table Tag's
@@ -33,7 +40,7 @@
     <p>
       Please note that the basic export functionality will
       <strong>not</strong>
-      work when the JSP page is included in another page via a jsp:include or the RequestDispatcher. Front end
+      work when the JSP page is included in another page via a <tt>jsp:include</tt> or the RequestDispatcher. Front end
       frameworks such as Struts and Tiles will do this behind the scenes. If you want to use export functionality in any
       of these scenarios, you must configure an export filter (configuration is explained in the displaytag
       documentation). Also, make sure you check the FAQ on displaytag website.

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 14:03:10 UTC (rev 1223)
+++ trunk/src/site/changes/changes.xml	2014-08-17 14:06:46 UTC (rev 1224)
@@ -101,6 +101,11 @@
       <action type="update" dev="fgiust" issue="DISPL-677" due-to="Yannik Hampe">Updated portlet support to JSR-286/portlet 2.0
         and added support for JSR-286 resources
       </action>
+      <action type="fix" dev="fgiust" issue="DISPL-611">
+        Column text should not abbreviated in pdf/excel export when
+        <tt>maxLength</tt>
+        is set
+      </action>
     </release>
     
     <!-- 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1223] trunk/displaytag/src/main/resources/META-INF/ displaytag.tld

[<fg...@us...>]

Revision: 1223
          http://sourceforge.net/p/displaytag/code/1223
Author:   fgiust
Date:     2014-08-17 14:03:10 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
fix sample

Modified Paths:
--------------
    trunk/displaytag/src/main/resources/META-INF/displaytag.tld

Modified: trunk/displaytag/src/main/resources/META-INF/displaytag.tld
===================================================================
--- trunk/displaytag/src/main/resources/META-INF/displaytag.tld	2014-08-17 13:03:59 UTC (rev 1222)
+++ trunk/displaytag/src/main/resources/META-INF/displaytag.tld	2014-08-17 14:03:10 UTC (rev 1223)
@@ -657,8 +657,8 @@
   <display:footer>
     <tr>
       <td>Total Bill:</td>
-      <td><c:out value="${totals.column2}" /></td>
-    <tr>
+      <td>${totals.column2}</td>
+    </tr>
   </display:footer>
 </display:table>
 ]]>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1222] trunk/src/site/markdown/i18n.md

[<fg...@us...>]

Revision: 1222
          http://sourceforge.net/p/displaytag/code/1222
Author:   fgiust
Date:     2014-08-17 13:03:59 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-668 fixed typo in documentation

Modified Paths:
--------------
    trunk/src/site/markdown/i18n.md

Modified: trunk/src/site/markdown/i18n.md
===================================================================
--- trunk/src/site/markdown/i18n.md	2014-08-17 12:58:28 UTC (rev 1221)
+++ trunk/src/site/markdown/i18n.md	2014-08-17 13:03:59 UTC (rev 1222)
@@ -16,8 +16,8 @@
 Will make displaytag output One item found when only a row is displayed.
 
 In order to support other languages you can add any number of additional
-files named displaytag\_LANGUAGE.properties . For example, you can add a
-displaytag\_IT.properties for italian users with the following content:
+files named displaytag\_language.properties . For example, you can add a
+displaytag\_it.properties for italian users with the following content:
 
 `paging.banner.one_item_found=Un solo elemento trovato`
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1221] trunk

[<fg...@us...>]

Revision: 1221
          http://sourceforge.net/p/displaytag/code/1221
Author:   fgiust
Date:     2014-08-17 12:58:28 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-677 Updated portlet support to JSR-286/portlet 2.0 and added support for JSR-286 resources

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/portlet/PortletHref.java
    trunk/displaytag/src/main/java/org/displaytag/portlet/PortletRequestHelper.java
    trunk/src/site/changes/changes.xml

Modified: trunk/displaytag/src/main/java/org/displaytag/portlet/PortletHref.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/portlet/PortletHref.java	2014-08-17 12:50:19 UTC (rev 1220)
+++ trunk/displaytag/src/main/java/org/displaytag/portlet/PortletHref.java	2014-08-17 12:58:28 UTC (rev 1221)
@@ -26,12 +26,12 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.portlet.MimeResponse;
 import javax.portlet.PortletMode;
 import javax.portlet.PortletModeException;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSecurityException;
 import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
 import javax.portlet.WindowStateException;
 
@@ -103,7 +103,7 @@
     // Portlet request and response are needed for feature checking and generating the URLs
     private final PortletRequest portletRequest;
 
-    private final RenderResponse renderResponse;
+    private final MimeResponse renderResponse;
 
     private Map<String, String[]> parameters = new LinkedHashMap<String, String[]>();
 
@@ -122,7 +122,7 @@
      * @param portletRequest request to to feature checking with, may not be null.
      * @param renderResponse response to generate the URLs from, may not be null.
      */
-    public PortletHref(PortletRequest portletRequest, RenderResponse renderResponse)
+    public PortletHref(PortletRequest portletRequest, MimeResponse renderResponse)
     {
         if (portletRequest == null)
         {

Modified: trunk/displaytag/src/main/java/org/displaytag/portlet/PortletRequestHelper.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/portlet/PortletRequestHelper.java	2014-08-17 12:50:19 UTC (rev 1220)
+++ trunk/displaytag/src/main/java/org/displaytag/portlet/PortletRequestHelper.java	2014-08-17 12:58:28 UTC (rev 1221)
@@ -23,8 +23,8 @@
 
 import java.util.Map;
 
+import javax.portlet.MimeResponse;
 import javax.portlet.PortletRequest;
-import javax.portlet.RenderResponse;
 import javax.servlet.jsp.PageContext;
 
 import org.displaytag.util.Href;
@@ -50,7 +50,7 @@
 
     private final PortletRequest portletRequest;
 
-    private final RenderResponse renderResponse;
+    private final MimeResponse renderResponse;
 
     /**
      * Creates a new request helper for the specified PageContext. Retrieves the PortletRequest and RenderResponse from
@@ -73,7 +73,7 @@
                 + "'");
         }
 
-        this.renderResponse = (RenderResponse) pageContext.findAttribute(JAVAX_PORTLET_RESPONSE);
+        this.renderResponse = (MimeResponse) pageContext.findAttribute(JAVAX_PORTLET_RESPONSE);
         if (this.portletRequest == null)
         {
             throw new IllegalStateException("A RenderResponse could not be found in the PageContext for the key='"

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 12:50:19 UTC (rev 1220)
+++ trunk/src/site/changes/changes.xml	2014-08-17 12:58:28 UTC (rev 1221)
@@ -86,14 +86,21 @@
         factory for different tables not work.
       </action>
       <action type="fix" dev="fgiust" issue="DISPL-457" due-to="Mike Calmus">HtmlTableWriter make inconsistent use of
-        TableModel within methods.</action>
+        TableModel within methods.
+      </action>
       <action type="add" dev="fgiust" issue="DISPL-230" due-to="Peter Daugavietis, Mike Calmus">
         New
         <tt>export.banner.placement</tt>
         property
       </action>
       <action type="fix" dev="fgiust" issue="DISPL-606" due-to="Hilde Meuris">Page numbers localized using wrong locale</action>
-      <action type="update" dev="fgiust"  >Removed deprecated column tag attributes: <tt>paramScope</tt></action>
+      <action type="update" dev="fgiust">
+        Removed deprecated column tag attributes:
+        <tt>paramScope</tt>
+      </action>
+      <action type="update" dev="fgiust" issue="DISPL-677" due-to="Yannik Hampe">Updated portlet support to JSR-286/portlet 2.0
+        and added support for JSR-286 resources
+      </action>
     </release>
     
     <!-- 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1220] trunk

[<fg...@us...>]

Revision: 1220
          http://sourceforge.net/p/displaytag/code/1220
Author:   fgiust
Date:     2014-08-17 12:50:19 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
removed deprecated paramScope attribute

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTag.java
    trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTagBeanInfo.java
    trunk/displaytag/src/main/resources/META-INF/displaytag.tld
    trunk/displaytag-examples/src/main/webapp/example-decorator-link.jsp
    trunk/src/site/changes/changes.xml
    trunk/src/site/markdown/tut_links.md

Modified: trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTag.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTag.java	2014-08-17 12:30:43 UTC (rev 1219)
+++ trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTag.java	2014-08-17 12:50:19 UTC (rev 1220)
@@ -189,15 +189,6 @@
     private String paramProperty;
 
     /**
-     * The scope within which to search for the bean specified by the paramName attribute. If not specified, all scopes
-     * are searched. If paramName is not provided, then the current object being iterated on is assumed to be the target
-     * bean. (optional)
-     * @deprecated use Expressions in paramName
-     */
-    @SuppressWarnings("dep-ann")
-    private String paramScope;
-
-    /**
      * If this attribute is provided, then the column's displayed is limited to this number of characters. An elipse
      * (...) is appended to the end if this column is linked, and the user can mouseover the elipse to get the full
      * text. (optional)
@@ -458,15 +449,6 @@
     }
 
     /**
-     * setter for the "paramScope" tag attribute.
-     * @param value attribute value
-     */
-    public void setParamScope(String value)
-    {
-        this.paramScope = value;
-    }
-
-    /**
      * setter for the "scope" tag attribute.
      * @param value attribute value
      */
@@ -774,18 +756,12 @@
             if (this.paramId != null)
             {
                 // parameter value is in a different object than the iterated one
-                if (this.paramName != null || this.paramScope != null)
+                if (this.paramName != null)
                 {
                     // create a complete string for compatibility with previous version before expression evaluation.
                     // this approach is optimized for new expressions, not for previous property/scope parameters
                     StringBuffer expression = new StringBuffer();
 
-                    // append scope
-                    if (StringUtils.isNotBlank(this.paramScope))
-                    {
-                        expression.append(this.paramScope).append("Scope.");
-                    }
-
                     // base bean name
                     if (this.paramId != null)
                     {
@@ -852,7 +828,6 @@
         this.paramId = null;
         this.paramName = null;
         this.paramProperty = null;
-        this.paramScope = null;
         this.property = null;
         this.sortable = false;
         this.sortName = null;
@@ -907,8 +882,7 @@
             .append("maxLength", this.maxLength) //$NON-NLS-1$
             .append("decorator", this.decorator) //$NON-NLS-1$
             .append("href", this.href) //$NON-NLS-1$
-            .append("title", this.title) //$NON-NLS-1$
-            .append("paramScope", this.paramScope) //$NON-NLS-1$
+            .append("title", this.title) //$NON-NLS-1$ 
             .append("property", this.property) //$NON-NLS-1$
             .append("paramProperty", this.paramProperty) //$NON-NLS-1$
             .append("headerAttributeMap", this.headerAttributeMap) //$NON-NLS-1$

Modified: trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTagBeanInfo.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTagBeanInfo.java	2014-08-17 12:30:43 UTC (rev 1219)
+++ trunk/displaytag/src/main/java/org/displaytag/tags/ColumnTagBeanInfo.java	2014-08-17 12:50:19 UTC (rev 1220)
@@ -102,10 +102,6 @@
                 ColumnTag.class,
                 null,
                 "setParamProperty")); //$NON-NLS-1$
-            proplist.add(new PropertyDescriptor("paramScope", //$NON-NLS-1$
-                ColumnTag.class,
-                null,
-                "setParamScope")); //$NON-NLS-1$
             proplist.add(new PropertyDescriptor("property", //$NON-NLS-1$
                 ColumnTag.class,
                 null,

Modified: trunk/displaytag/src/main/resources/META-INF/displaytag.tld
===================================================================
--- trunk/displaytag/src/main/resources/META-INF/displaytag.tld	2014-08-17 12:30:43 UTC (rev 1219)
+++ trunk/displaytag/src/main/resources/META-INF/displaytag.tld	2014-08-17 12:50:19 UTC (rev 1220)
@@ -455,8 +455,7 @@
       <type>java.lang.String</type>
       <description>
         The name of the request parameter that will be dynamically added to the generated href URL. The corresponding
-        value is defined by the paramProperty and (optional) paramName attributes, optionally scoped by the paramScope
-        attribute.
+        value is defined by the paramProperty and (optional) paramName attributes.
       </description>
     </attribute>
     <attribute>
@@ -467,8 +466,7 @@
       <description>
         The name of a JSP bean that is a String containing the value for the request parameter named by paramId (if
         paramProperty is not specified), or a JSP bean whose property getter is called to return a String (if
-        paramProperty is specified). The JSP bean is constrained to the bean scope specified by the paramScope property,
-        if it is specified. If paramName is omitted, then it is assumed that the current object being iterated on is the
+        paramProperty is specified). If paramName is omitted, then it is assumed that the current object being iterated on is the
         target bean.
       </description>
     </attribute>
@@ -487,17 +485,6 @@
       </description>
     </attribute>
     <attribute>
-      <name>paramScope</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
-      <description>
-        @deprecated - use Expressions in paramName. The scope within which to search for the bean specified by the
-        paramName attribute. If not specified, all scopes are searched. If paramName is not provided, then the current
-        object being iterated on is assumed to be the target bean.
-      </description>
-    </attribute>
-    <attribute>
       <name>maxLength</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>

Modified: trunk/displaytag-examples/src/main/webapp/example-decorator-link.jsp
===================================================================
--- trunk/displaytag-examples/src/main/webapp/example-decorator-link.jsp	2014-08-17 12:30:43 UTC (rev 1219)
+++ trunk/displaytag-examples/src/main/webapp/example-decorator-link.jsp	2014-08-17 12:50:19 UTC (rev 1220)
@@ -21,7 +21,7 @@
     </p>
     <h2>Struts-like approach</h2>
     <p>The column tag provides 5 struts-like attributes that can be set to create a dynamic linke ( href, paramID,
-      paramName, paramProperty, paramScope ). See the display:column documentation, and the struts documentation for a
+      paramName, paramProperty). See the display:column documentation, and the struts documentation for a
       complete description of their usage, but basically:
     </p>
     <dl class="dl-horizontal">
@@ -35,23 +35,20 @@
       </dd>
       <dt>paramProperty</dt>
       <dd>property to call on the object specified above to return the value that gets tacked onto the URL.</dd>
-      <dt>paramScope</dt>
-      <dd>specific scope where the databean lives, typically null</dd>
     </dl>
-    <p>Of these params, you typically would not use paramName and paramScope. Leaving each as null indicates that you
+    <p>Of these params, you typically would not use paramName. Leaving as null indicates that you
       want to use the object corresponding to the current row being processed.
     </p>
     <display:table name="sessionScope.details">
       <display:column property="id" title="ID" href="details.jsp" paramId="id"/>
-      <display:column property="email" href="details.jsp" paramId="action" paramName="testparam"
-        paramScope="request"/>
+      <display:column property="email" href="details.jsp" paramId="action" paramName="testparam" />
       <display:column property="status" href="details.jsp" paramId="id" paramProperty="id"/>
     </display:table>
     <tags:code>
 <![CDATA[
 <display:table name="sessionScope.details">
   <display:column property="id" title="ID" href="details.jsp" paramId="id"/>
-  <display:column property="email" href="details.jsp" paramId="action" paramName="testparam" paramScope="request"/>
+  <display:column property="email" href="details.jsp" paramId="action" paramName="testparam" />
   <display:column property="status" href="details.jsp" paramId="id" paramProperty="id"/>
 </display:table>
 ]]>

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 12:30:43 UTC (rev 1219)
+++ trunk/src/site/changes/changes.xml	2014-08-17 12:50:19 UTC (rev 1220)
@@ -93,7 +93,20 @@
         property
       </action>
       <action type="fix" dev="fgiust" issue="DISPL-606" due-to="Hilde Meuris">Page numbers localized using wrong locale</action>
+      <action type="update" dev="fgiust"  >Removed deprecated column tag attributes: <tt>paramScope</tt></action>
     </release>
+    
+    <!-- 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+     -->
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.
       </action>

Modified: trunk/src/site/markdown/tut_links.md
===================================================================
--- trunk/src/site/markdown/tut_links.md	2014-08-17 12:30:43 UTC (rev 1219)
+++ trunk/src/site/markdown/tut_links.md	2014-08-17 12:50:19 UTC (rev 1220)
@@ -39,8 +39,8 @@
 ### Struts-like approach
 
 The column tag provides 5 struts-like attributes that can be set to
-create a dynamic linke ( href, paramID, paramName, paramProperty,
-paramScope ). See the display:column documentation, and the struts
+create a dynamic linke ( href, paramID, paramName, paramProperty). 
+See the display:column documentation, and the struts
 documentation for a complete description of their usage, but basically:
 
 href
@@ -57,17 +57,13 @@
 :   property to call on the object specified above to return the value
     that gets tacked onto the URL.
 
-paramScope
-:   specific scope where the databean lives, typically null
-
-Of these params, you typically would not use paramName and
-paramScope. Leaving each as null indicates that you want to use the
+Of these params, you typically would not use paramName. Leaving each as null indicates that you want to use the
 object corresponding to the current row being processed.
 
 ```html
 <display:table name="sessionScope.details">
   <display:column property="id" title="ID" href="details.jsp" paramId="id" />
-  <display:column property="email" href="details.jsp" paramId="action" paramName="testparam" paramScope="request" />
+  <display:column property="email" href="details.jsp" paramId="action" paramName="testparam" />
   <display:column property="status" href="details.jsp" paramId="id" paramProperty="id" />
 </display:table>
 ```

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1219] trunk

[<fg...@us...>]

Revision: 1219
          http://sourceforge.net/p/displaytag/code/1219
Author:   fgiust
Date:     2014-08-17 12:30:43 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-606 Page numbers localized using wrong locale

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/decorator/TotalTableDecorator.java
    trunk/displaytag/src/main/java/org/displaytag/pagination/PaginatedListSmartListHelper.java
    trunk/displaytag/src/main/java/org/displaytag/pagination/Pagination.java
    trunk/displaytag/src/main/java/org/displaytag/pagination/SmartListHelper.java
    trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java
    trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java
    trunk/src/site/changes/changes.xml

Modified: trunk/displaytag/src/main/java/org/displaytag/decorator/TotalTableDecorator.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/decorator/TotalTableDecorator.java	2014-08-17 11:57:05 UTC (rev 1218)
+++ trunk/displaytag/src/main/java/org/displaytag/decorator/TotalTableDecorator.java	2014-08-17 12:30:43 UTC (rev 1219)
@@ -235,9 +235,9 @@
             }
             else if (groupPropertyName != null && groupPropertyName.equals(cell.getBeanPropertyName()))
             {
-                buffer.append(grandTotal ? totalLabel : MessageFormat.format(
-                    subtotalLabel,
-                    new Object[]{previousValues.get(groupPropertyName)}));
+                buffer.append(grandTotal ? totalLabel : new MessageFormat(subtotalLabel, this.tableModel
+                    .getProperties()
+                    .getLocale()).format(new Object[]{previousValues.get(groupPropertyName)}));
             }
 
             buffer.append("</td>"); //$NON-NLS-1$

Modified: trunk/displaytag/src/main/java/org/displaytag/pagination/PaginatedListSmartListHelper.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/pagination/PaginatedListSmartListHelper.java	2014-08-17 11:57:05 UTC (rev 1218)
+++ trunk/displaytag/src/main/java/org/displaytag/pagination/PaginatedListSmartListHelper.java	2014-08-17 12:30:43 UTC (rev 1219)
@@ -180,8 +180,11 @@
             bannerFormat = this.properties.getPagingBannerFull();
         }
 
-        return pagination.getFormattedBanner(this.properties.getPagingPageLink(), this.properties
-            .getPagingPageSelected(), this.properties.getPagingPageSeparator(), bannerFormat);
+        return pagination.getFormattedBanner(
+            this.properties.getPagingPageLink(),
+            this.properties.getPagingPageSelected(),
+            this.properties.getPagingPageSeparator(),
+            bannerFormat);
     }
 
     @Override
@@ -221,7 +224,7 @@
             message = this.properties.getPagingFoundSomeItems();
         }
 
-        return MessageFormat.format(message, objs);
+        return new MessageFormat(message, this.properties.getLocale()).format(objs);
     }
 
     /**

Modified: trunk/displaytag/src/main/java/org/displaytag/pagination/Pagination.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/pagination/Pagination.java	2014-08-17 11:57:05 UTC (rev 1218)
+++ trunk/displaytag/src/main/java/org/displaytag/pagination/Pagination.java	2014-08-17 12:30:43 UTC (rev 1219)
@@ -294,7 +294,7 @@
             this.isLast() ? this.currentPage : this.lastPage}; // this.lastPage is null if the last page is displayed
 
         // return the full banner
-        return MessageFormat.format(fullBanner, pageObjects);
+        return new MessageFormat(fullBanner, this.properties.getLocale()).format(pageObjects);
     }
 
     /**

Modified: trunk/displaytag/src/main/java/org/displaytag/pagination/SmartListHelper.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/pagination/SmartListHelper.java	2014-08-17 11:57:05 UTC (rev 1218)
+++ trunk/displaytag/src/main/java/org/displaytag/pagination/SmartListHelper.java	2014-08-17 12:30:43 UTC (rev 1219)
@@ -296,7 +296,7 @@
             message = this.properties.getPagingFoundSomeItems();
         }
 
-        return MessageFormat.format(message, objs);
+        return new MessageFormat(message, this.properties.getLocale()).format(objs);
     }
 
     /**

Modified: trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java	2014-08-17 11:57:05 UTC (rev 1218)
+++ trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java	2014-08-17 12:30:43 UTC (rev 1219)
@@ -715,7 +715,7 @@
         }
 
         Object[] exportOptions = {buffer.toString()};
-        write(MessageFormat.format(this.properties.getExportBanner(), exportOptions));
+        write(new MessageFormat(this.properties.getExportBanner(), this.properties.getLocale()).format(exportOptions));
     }
 
     /**

Modified: trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java	2014-08-17 11:57:05 UTC (rev 1218)
+++ trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java	2014-08-17 12:30:43 UTC (rev 1219)
@@ -80,6 +80,7 @@
     private String id;
 
     int lowestEndedGroup;
+
     int lowestStartedGroup;
 
     /**
@@ -272,7 +273,7 @@
     {
         // Ok, start bouncing through our list (only the visible part)
         boolean fullList = false;
-        if ( ! MediaTypeEnum.HTML.equals(model.getMedia()) && model.getProperties().getExportFullList())
+        if (!MediaTypeEnum.HTML.equals(model.getMedia()) && model.getProperties().getExportFullList())
         {
             fullList = true;
         }
@@ -361,8 +362,9 @@
             }
             if (totalsTableDecorator != null)
             {
-                totalsTableDecorator.initRow( currentRow.getRowNumber(), currentRow.getRowNumber()
-                    + rowIterator.getPageOffset());
+                totalsTableDecorator.initRow(
+                    currentRow.getRowNumber(),
+                    currentRow.getRowNumber() + rowIterator.getPageOffset());
             }
 
             Iterator<HeaderCell> headerCellsIter = model.getHeaderCellList().iterator();
@@ -384,8 +386,11 @@
                     // Why npe?
                     String priorBodyValue = prior != null ? prior.bodyValue : null;
                     String nextBodyValue = next != null ? next.bodyValue : null;
-                    short groupingValue = groupColumns(struct.bodyValue,
-                            priorBodyValue, nextBodyValue, header.getGroup());
+                    short groupingValue = groupColumns(
+                        struct.bodyValue,
+                        priorBodyValue,
+                        nextBodyValue,
+                        header.getGroup());
 
                     if (tableDecorator != null || totalsTableDecorator != null)
                     {
@@ -424,8 +429,10 @@
                     }
                     if (tableDecorator != null)
                     {
-                        struct.decoratedValue = tableDecorator.displayGroupedValue(struct.bodyValue,
-                                groupingValue, header.getColumnNumber());
+                        struct.decoratedValue = tableDecorator.displayGroupedValue(
+                            struct.bodyValue,
+                            groupingValue,
+                            header.getColumnNumber());
                     }
                     else if (groupingValue == GROUP_END || groupingValue == GROUP_NO_CHANGE)
                     {
@@ -477,17 +484,17 @@
             }
         }
         // how is this really going to work?
-        //    the totaler is notified whenever we start or stop a group, and the totaler tracks the current state of the
-        //      the totals; the totaler writes nothing
-        //    when the row is finished, it is the responsibility of the decorator or exporter to ask for the totaler total and write it
-        // when the row is finished,
+        // the totaler is notified whenever we start or stop a group, and the totaler tracks the current state of the
+        // the totals; the totaler writes nothing
+        // when the row is finished, it is the responsibility of the decorator or exporter to ask for the totaler total
+        // and write it when the row is finished,
 
         // render empty list message
         if (model.getRowListPage().size() == 0)
         {
-            writeEmptyListRowMessage(MessageFormat.format(
-                model.getProperties().getEmptyListRowMessage(),
-                new Object[]{new Integer(model.getNumberOfColumns())}));
+            writeEmptyListRowMessage(new MessageFormat(model.getProperties().getEmptyListRowMessage(), model
+                .getProperties()
+                .getLocale()).format(new Object[]{new Integer(model.getNumberOfColumns())}));
         }
     }
 
@@ -505,12 +512,11 @@
     protected void writeSubgroupStart(TableModel model) throws Exception
     {
     }
+
     protected void writeSubgroupStop(TableModel model) throws Exception
     {
     }
 
-
-
     /**
      * Called by writeTableBody to write the start of the row structure.
      * @param row The table row for which the content is written.

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 11:57:05 UTC (rev 1218)
+++ trunk/src/site/changes/changes.xml	2014-08-17 12:30:43 UTC (rev 1219)
@@ -85,9 +85,14 @@
       <action type="fix" dev="fgiust" issue="DISPL-505" due-to="Mike Calmus">Class cache usage causes make using different
         factory for different tables not work.
       </action>
-      <action type="fix" dev="fgiust" issue="DISPL-457" due-to="Mike Calmus">HtmlTableWriter make inconsistent use of TableModel within methods.</action>
-      
-      <action type="add" dev="fgiust" issue="DISPL-230" due-to="Peter Daugavietis, Mike Calmus">New <tt>export.banner.placement</tt> property</action>
+      <action type="fix" dev="fgiust" issue="DISPL-457" due-to="Mike Calmus">HtmlTableWriter make inconsistent use of
+        TableModel within methods.</action>
+      <action type="add" dev="fgiust" issue="DISPL-230" due-to="Peter Daugavietis, Mike Calmus">
+        New
+        <tt>export.banner.placement</tt>
+        property
+      </action>
+      <action type="fix" dev="fgiust" issue="DISPL-606" due-to="Hilde Meuris">Page numbers localized using wrong locale</action>
     </release>
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1218] trunk

[<fg...@us...>]

Revision: 1218
          http://sourceforge.net/p/displaytag/code/1218
Author:   fgiust
Date:     2014-08-17 11:57:05 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-230 new export.banner.placement property

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java
    trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java
    trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java
    trunk/src/site/changes/changes.xml
    trunk/src/site/markdown/configuration.md

Added Paths:
-----------
    trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ230.java
    trunk/displaytag/src/test/resources/jsps/DISPL-230.jsp

Modified: trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java	2014-08-17 10:01:28 UTC (rev 1217)
+++ trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java	2014-08-17 11:57:05 UTC (rev 1218)
@@ -93,6 +93,11 @@
     public static final String PROPERTY_STRING_EXPORTBANNER_ITEM = "export.banner.item"; //$NON-NLS-1$
 
     /**
+     * property <code>export.banner</code>.
+     */
+    public static final String PROPERTY_STRING_EXPORTBANNER_PLACEMENT = "export.banner.placement"; //$NON-NLS-1$
+
+    /**
      * property <code>export.banner.sepchar</code>.
      */
     public static final String PROPERTY_STRING_EXPORTBANNER_SEPARATOR = "export.banner.sepchar"; //$NON-NLS-1$
@@ -994,7 +999,7 @@
     public boolean getAddPagingBannerTop()
     {
         String placement = getProperty(PROPERTY_STRING_BANNER_PLACEMENT);
-        return "top".equals(placement) || "both".equals(placement); //$NON-NLS-1$ //$NON-NLS-2$
+        return StringUtils.equals("top", placement) || StringUtils.equals("both", placement); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -1004,10 +1009,31 @@
     public boolean getAddPagingBannerBottom()
     {
         String placement = getProperty(PROPERTY_STRING_BANNER_PLACEMENT);
-        return "bottom".equals(placement) || "both".equals(placement); //$NON-NLS-1$ //$NON-NLS-2$
+        return StringUtils.equals("bottom", placement) || StringUtils.equals("both", placement); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
+     * Should paging banner be added before the table?
+     * @return boolean
+     */
+    public boolean getAddExportBannerTop()
+    {
+        String placement = getProperty(PROPERTY_STRING_EXPORTBANNER_PLACEMENT);
+        return StringUtils.equals("top", placement) || StringUtils.equals("both", placement); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    /**
+     * Should paging banner be added after the table?
+     * @return boolean
+     */
+    public boolean getAddExportBannerBottom()
+    {
+        String placement = getProperty(PROPERTY_STRING_EXPORTBANNER_PLACEMENT);
+        // no value specified puts it on th bottom too to ensure proper backward compatibility
+        return !StringUtils.equals("top", placement); //$NON-NLS-1$
+    }
+
+    /**
      * Returns the appropriate css class for a table row.
      * @param rowNumber row number
      * @return the value of <code>PROPERTY_CSS_TR_EVEN</code> if rowNumber is even or <code>PROPERTY_CSS_TR_ODD</code>

Modified: trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java	2014-08-17 10:01:28 UTC (rev 1217)
+++ trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java	2014-08-17 11:57:05 UTC (rev 1218)
@@ -169,7 +169,19 @@
             writeFormFields(model);
             write(js);
         }
-        writeSearchResultAndNavigation(model);
+
+        // Put the page stuff there if it needs to be there...
+        if (properties.getAddPagingBannerTop())
+        {
+            writeSearchResultAndNavigation(model);
+        }
+
+        // add export links (only if the table is not empty)
+        if (this.export && this.properties.getAddExportBannerTop() && model.getRowListPage().size() != 0)
+        {
+            // generate export link
+            writeExportLinks(model);
+        }
     }
 
     /**
@@ -619,7 +631,7 @@
         }
 
         // add export links (only if the table is not empty)
-        if (this.export && model.getRowListPage().size() != 0)
+        if (this.export && this.properties.getAddExportBannerBottom() && model.getRowListPage().size() != 0)
         {
             writeExportLinks(model);
         }

Modified: trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java	2014-08-17 10:01:28 UTC (rev 1217)
+++ trunk/displaytag/src/main/java/org/displaytag/render/TableWriterTemplate.java	2014-08-17 11:57:05 UTC (rev 1218)
@@ -114,12 +114,8 @@
                 return;
             }
 
-            // Put the page stuff there if it needs to be there...
-            if (properties.getAddPagingBannerTop())
-            {
-                // search result and navigation bar
-                writeTopBanner(model);
-            }
+            // search result, navigation bar and export links.
+            writeTopBanner(model);
 
             // open table
             writeTableOpener(model);

Added: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ230.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ230.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ230.java	2014-08-17 11:57:05 UTC (rev 1218)
@@ -0,0 +1,106 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.jsptests;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.displaytag.tags.TableTagParameters;
+import org.displaytag.test.DisplaytagCase;
+import org.displaytag.util.ParamEncoder;
+import org.junit.Assert;
+import org.junit.Test;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.HTMLElement;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+
+public class Displ230 extends DisplaytagCase
+{
+
+    /**
+     * @see org.displaytag.test.DisplaytagCase#getJspName()
+     */
+    public String getJspName()
+    {
+        return "DISPL-230.jsp";
+    }
+
+    /**
+     * Check that model modifications made by table decorator specified with in the decorator property the table tag
+     * show up in the csv export.
+     * @param jspName jsp name, with full path
+     * @throws Exception any axception thrown during test.
+     */
+    @Override
+    @Test
+    public void doTest() throws Exception
+    {
+        testWithPlacement("top");
+        testWithPlacement("bottom");
+        testWithPlacement("both");
+    }
+
+    /**
+     * @param placement
+     * @throws MalformedURLException
+     * @throws IOException
+     * @throws SAXException
+     */
+    private void testWithPlacement(String placement) throws MalformedURLException, IOException, SAXException
+    {
+        ParamEncoder encoder = new ParamEncoder("table");
+        String mediaParameter = encoder.encodeParameterName(TableTagParameters.PARAMETER_EXPORTTYPE);
+
+        WebRequest request = new GetMethodWebRequest(getJspUrl(getJspName()));
+        request.setParameter("placement", placement);
+
+        WebResponse response = runner.getResponse(request);
+
+        HTMLElement[] elements = response.getElementsWithClassName("testitem");
+
+        if (StringUtils.equals(placement, "top"))
+        {
+            Assert.assertEquals(2, elements.length);
+            Assert.assertEquals("SPAN", elements[0].getTagName());
+            Assert.assertEquals("TABLE", elements[1].getTagName());
+        }
+        else if (StringUtils.equals(placement, "bottom"))
+        {
+            Assert.assertEquals(2, elements.length);
+            Assert.assertEquals("TABLE", elements[0].getTagName());
+            Assert.assertEquals("SPAN", elements[1].getTagName());
+        }
+        else if (StringUtils.equals(placement, "both"))
+        {
+            Assert.assertEquals(3, elements.length);
+            Assert.assertEquals("SPAN", elements[0].getTagName());
+            Assert.assertEquals("TABLE", elements[1].getTagName());
+            Assert.assertEquals("SPAN", elements[2].getTagName());
+        }
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ230.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/displaytag/src/test/resources/jsps/DISPL-230.jsp
===================================================================
--- trunk/displaytag/src/test/resources/jsps/DISPL-230.jsp	                        (rev 0)
+++ trunk/displaytag/src/test/resources/jsps/DISPL-230.jsp	2014-08-17 11:57:05 UTC (rev 1218)
@@ -0,0 +1,29 @@
+<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:display="urn:jsptld:http://displaytag.sf.net">
+  <jsp:text> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
+  </jsp:text>
+  <jsp:directive.page contentType="text/html; charset=UTF8"/>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+      <title>Displaytag unit test</title>
+    </head>
+    <body>
+      <jsp:scriptlet> <![CDATA[
+                java.util.List testData = new java.util.ArrayList();
+                testData.add(new org.displaytag.test.KnownValue());
+                request.setAttribute( "test", testData);
+            ]]>
+      </jsp:scriptlet>
+      <display:table items="${test}" id="table" export="true">
+        <display:setProperty name="export.banner.placement" value="${param.placement}"/>
+        <display:setProperty name="export.banner">
+          <span class="testitem">EXPORTLINKS</span>
+        </display:setProperty>
+        <display:setProperty name="css.table" value="testitem"/>
+        <display:column property="ant"/>
+        <display:column property="bee"/>
+      </display:table>
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/resources/jsps/DISPL-230.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 10:01:28 UTC (rev 1217)
+++ trunk/src/site/changes/changes.xml	2014-08-17 11:57:05 UTC (rev 1218)
@@ -86,6 +86,8 @@
         factory for different tables not work.
       </action>
       <action type="fix" dev="fgiust" issue="DISPL-457" due-to="Mike Calmus">HtmlTableWriter make inconsistent use of TableModel within methods.</action>
+      
+      <action type="add" dev="fgiust" issue="DISPL-230" due-to="Peter Daugavietis, Mike Calmus">New <tt>export.banner.placement</tt> property</action>
     </release>
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.

Modified: trunk/src/site/markdown/configuration.md
===================================================================
--- trunk/src/site/markdown/configuration.md	2014-08-17 10:01:28 UTC (rev 1217)
+++ trunk/src/site/markdown/configuration.md	2014-08-17 11:57:05 UTC (rev 1218)
@@ -105,6 +105,14 @@
     <td>yes</td>
   </tr>
   <tr>
+    <td><tt>export.banner.placement</tt></td>
+    <td>top</td>
+    <td>top, bottom, both</td>
+    <td>Position for the export links (before and/or after the table). Since displaytag 2.0</td>
+    <td>yes</td>
+    <td>yes</td>
+  </tr>
+  <tr>
     <td>export.banner.sepchar</td>
     <td>&#xa0;u007C</td>
     <td>any string</td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1217] trunk

[<fg...@us...>]

Revision: 1217
          http://sourceforge.net/p/displaytag/code/1217
Author:   fgiust
Date:     2014-08-17 10:01:28 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-457 HtmlTableWriter make inconsistent use of TableModel within methods

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java
    trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java
    trunk/src/site/changes/changes.xml

Modified: trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java	2014-08-17 09:50:42 UTC (rev 1216)
+++ trunk/displaytag/src/main/java/org/displaytag/render/HtmlTableWriter.java	2014-08-17 10:01:28 UTC (rev 1217)
@@ -71,11 +71,6 @@
     private static Logger log = LoggerFactory.getLogger(HtmlTableWriter.class);
 
     /**
-     * <code>TableModel</code>
-     */
-    private TableModel tableModel;
-
-    /**
      * <code>TableProperties</code>
      */
     private TableProperties properties;
@@ -131,7 +126,6 @@
      * @param out The output destination.
      */
     public HtmlTableWriter(
-        TableModel tableModel,
         TableProperties tableProperties,
         Href baseHref,
         boolean export,
@@ -143,7 +137,6 @@
         HtmlAttributeMap attributeMap,
         String uid)
     {
-        this.tableModel = tableModel;
         this.properties = tableProperties;
         this.baseHref = baseHref;
         this.export = export;
@@ -163,7 +156,7 @@
     @Override
     protected void writeTopBanner(TableModel model)
     {
-        if (this.tableModel.getForm() != null)
+        if (model.getForm() != null)
         {
 
             String js = "<script type=\"text/javascript\">\n"
@@ -173,10 +166,10 @@
                 + "    objfrm.submit();\n"
                 + "}\n"
                 + "</script>";
-            writeFormFields();
+            writeFormFields(model);
             write(js);
         }
-        writeSearchResultAndNavigation();
+        writeSearchResultAndNavigation(model);
     }
 
     /**
@@ -189,11 +182,11 @@
         this.write(getOpenTag());
     }
 
-    private void writeFormFields()
+    private void writeFormFields(TableModel model)
     {
         Map<String, String[]> parameters = baseHref.getParameterMap();
 
-        ParamEncoder pe = new ParamEncoder(this.tableModel.getId());
+        ParamEncoder pe = new ParamEncoder(model.getId());
 
         addIfMissing(parameters, pe.encodeParameterName(TableTagParameters.PARAMETER_ORDER));
         addIfMissing(parameters, pe.encodeParameterName(TableTagParameters.PARAMETER_PAGE));
@@ -316,7 +309,7 @@
     @Override
     protected void writeBottomBanner(TableModel model)
     {
-        writeNavigationAndExportLinks();
+        writeNavigationAndExportLinks(model);
     }
 
     /**
@@ -438,7 +431,7 @@
 
         if (log.isDebugEnabled())
         {
-            log.debug("[" + tableModel.getId() + "] getTableHeader called");
+            log.debug("[" + model.getId() + "] getTableHeader called");
         }
 
         // open thead
@@ -448,14 +441,14 @@
         write(TagConstants.TAG_TR_OPEN);
 
         // no columns?
-        if (this.tableModel.isEmpty())
+        if (model.isEmpty())
         {
             write(TagConstants.TAG_TH_OPEN);
             write(TagConstants.TAG_TH_CLOSE);
         }
 
         // iterator on columns for header
-        Iterator<HeaderCell> iterator = this.tableModel.getHeaderCellList().iterator();
+        Iterator<HeaderCell> iterator = model.getHeaderCellList().iterator();
 
         while (iterator.hasNext())
         {
@@ -475,7 +468,7 @@
                 headerCell.addHeaderClass(this.properties.getCssSorted());
 
                 // sort order css class
-                headerCell.addHeaderClass(this.properties.getCssOrder(this.tableModel.isSortOrderAscending()));
+                headerCell.addHeaderClass(this.properties.getCssOrder(model.isSortOrderAscending()));
             }
 
             // append th with html attributes
@@ -488,7 +481,7 @@
             if (headerCell.getSortable())
             {
                 // creates the link for sorting
-                Anchor anchor = new Anchor(getSortingHref(headerCell), header);
+                Anchor anchor = new Anchor(getSortingHref(headerCell, model), header);
 
                 // append to buffer
                 header = anchor.toString();
@@ -506,7 +499,7 @@
 
         if (log.isDebugEnabled())
         {
-            log.debug("[" + tableModel.getId() + "] getTableHeader end");
+            log.debug("[" + model.getId() + "] getTableHeader end");
         }
     }
 
@@ -515,27 +508,29 @@
      * @param headerCell header cell the link should be added to
      * @return Href for sorting
      */
-    private Href getSortingHref(HeaderCell headerCell)
+    private Href getSortingHref(HeaderCell headerCell, TableModel model)
     {
         // costruct Href from base href, preserving parameters
         Href href = (Href) this.baseHref.clone();
 
-        if (this.tableModel.getForm() != null)
+        if (model.getForm() != null)
         {
-            href = new PostHref(href, tableModel.getForm());
+            href = new PostHref(href, model.getForm());
         }
 
         if (this.paginatedList == null)
         {
             // add column number as link parameter
-            if (!this.tableModel.isLocalSort() && (headerCell.getSortName() != null))
+            if (!model.isLocalSort() && (headerCell.getSortName() != null))
             {
-                href.addParameter(encodeParameter(TableTagParameters.PARAMETER_SORT), headerCell.getSortName());
-                href.addParameter(encodeParameter(TableTagParameters.PARAMETER_SORTUSINGNAME), "1");
+                href.addParameter(encodeParameter(TableTagParameters.PARAMETER_SORT, model), headerCell.getSortName());
+                href.addParameter(encodeParameter(TableTagParameters.PARAMETER_SORTUSINGNAME, model), "1");
             }
             else
             {
-                href.addParameter(encodeParameter(TableTagParameters.PARAMETER_SORT), headerCell.getColumnNumber());
+                href.addParameter(
+                    encodeParameter(TableTagParameters.PARAMETER_SORT, model),
+                    headerCell.getColumnNumber());
             }
 
             boolean nowOrderAscending = true;
@@ -543,24 +538,22 @@
             if (headerCell.getDefaultSortOrder() != null)
             {
                 boolean sortAscending = SortOrderEnum.ASCENDING.equals(headerCell.getDefaultSortOrder());
-                nowOrderAscending = headerCell.isAlreadySorted()
-                    ? !this.tableModel.isSortOrderAscending()
-                    : sortAscending;
+                nowOrderAscending = headerCell.isAlreadySorted() ? !model.isSortOrderAscending() : sortAscending;
             }
             else
             {
-                nowOrderAscending = !(headerCell.isAlreadySorted() && this.tableModel.isSortOrderAscending());
+                nowOrderAscending = !(headerCell.isAlreadySorted() && model.isSortOrderAscending());
             }
 
             int sortOrderParam = nowOrderAscending ? SortOrderEnum.ASCENDING.getCode() : SortOrderEnum.DESCENDING
                 .getCode();
-            href.addParameter(encodeParameter(TableTagParameters.PARAMETER_ORDER), sortOrderParam);
+            href.addParameter(encodeParameter(TableTagParameters.PARAMETER_ORDER, model), sortOrderParam);
 
             // If user want to sort the full table I need to reset the page number.
             // or if we aren't sorting locally we need to reset the page as well.
-            if (this.tableModel.isSortFullTable() || !this.tableModel.isLocalSort())
+            if (model.isSortFullTable() || !model.isLocalSort())
             {
-                href.addParameter(encodeParameter(TableTagParameters.PARAMETER_PAGE), 1);
+                href.addParameter(encodeParameter(TableTagParameters.PARAMETER_PAGE, model), 1);
             }
         }
         else
@@ -580,7 +573,7 @@
             String dirParam;
             if (headerCell.isAlreadySorted())
             {
-                dirParam = tableModel.isSortOrderAscending() ? properties.getPaginationDescValue() : properties
+                dirParam = model.isSortOrderAscending() ? properties.getPaginationDescValue() : properties
                     .getPaginationAscValue();
             }
             else
@@ -602,13 +595,13 @@
      * @param parameterName parameter name to encode
      * @return String encoded parameter name
      */
-    private String encodeParameter(String parameterName)
+    private String encodeParameter(String parameterName, TableModel model)
     {
         // paramEncoder has been already instantiated?
         if (this.paramEncoder == null)
         {
             // use the id attribute to get the unique identifier
-            this.paramEncoder = new ParamEncoder(this.tableModel.getId());
+            this.paramEncoder = new ParamEncoder(model.getId());
         }
 
         return this.paramEncoder.encodeParameterName(parameterName);
@@ -617,25 +610,25 @@
     /**
      * Generates table footer with links for export commands.
      */
-    public void writeNavigationAndExportLinks()
+    protected void writeNavigationAndExportLinks(TableModel model)
     {
         // Put the page stuff there if it needs to be there...
         if (this.properties.getAddPagingBannerBottom())
         {
-            writeSearchResultAndNavigation();
+            writeSearchResultAndNavigation(model);
         }
 
         // add export links (only if the table is not empty)
-        if (this.export && this.tableModel.getRowListPage().size() != 0)
+        if (this.export && model.getRowListPage().size() != 0)
         {
-            writeExportLinks();
+            writeExportLinks(model);
         }
     }
 
     /**
      * generates the search result and navigation bar.
      */
-    public void writeSearchResultAndNavigation()
+    protected void writeSearchResultAndNavigation(TableModel model)
     {
         if ((this.paginatedList == null && this.pagesize != 0 && this.listHelper != null)
             || (this.paginatedList != null))
@@ -643,9 +636,9 @@
             // create a new href
             Href navigationHref = (Href) this.baseHref.clone();
 
-            if (tableModel.getForm() != null)
+            if (model.getForm() != null)
             {
-                navigationHref = new PostHref(navigationHref, tableModel.getForm());
+                navigationHref = new PostHref(navigationHref, model.getForm());
             }
 
             write(this.listHelper.getSearchResultsSummary());
@@ -653,7 +646,7 @@
             String pageParameter;
             if (paginatedList == null)
             {
-                pageParameter = encodeParameter(TableTagParameters.PARAMETER_PAGE);
+                pageParameter = encodeParameter(TableTagParameters.PARAMETER_PAGE, model);
             }
             else
             {
@@ -671,7 +664,7 @@
     /**
      * Writes the formatted export links section.
      */
-    private void writeExportLinks()
+    private void writeExportLinks(TableModel model)
     {
         // Figure out what formats they want to export, make up a little string
         Href exportHref = (Href) this.baseHref.clone();
@@ -692,7 +685,7 @@
                 }
 
                 exportHref.addParameter(
-                    encodeParameter(TableTagParameters.PARAMETER_EXPORTTYPE),
+                    encodeParameter(TableTagParameters.PARAMETER_EXPORTTYPE, model),
                     currentExportType.getCode());
 
                 // export marker

Modified: trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-17 09:50:42 UTC (rev 1216)
+++ trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-17 10:01:28 UTC (rev 1217)
@@ -1686,7 +1686,6 @@
         }
         // use HtmlTableWriter to write table
         new HtmlTableWriter(
-            this.tableModel,
             this.properties,
             this.baseHref,
             this.export,

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 09:50:42 UTC (rev 1216)
+++ trunk/src/site/changes/changes.xml	2014-08-17 10:01:28 UTC (rev 1217)
@@ -85,6 +85,7 @@
       <action type="fix" dev="fgiust" issue="DISPL-505" due-to="Mike Calmus">Class cache usage causes make using different
         factory for different tables not work.
       </action>
+      <action type="fix" dev="fgiust" issue="DISPL-457" due-to="Mike Calmus">HtmlTableWriter make inconsistent use of TableModel within methods.</action>
     </release>
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1216] trunk

[<fg...@us...>]

Revision: 1216
          http://sourceforge.net/p/displaytag/code/1216
Author:   fgiust
Date:     2014-08-17 09:50:42 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-505 Class cache usage causes make using different factory for different tables not work

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java
    trunk/src/site/changes/changes.xml
    trunk/src/site/markdown/dependencies.md

Added Paths:
-----------
    trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationColumnDecorator.java
    trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecorator.java
    trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecoratorFactory.java
    trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ505Test.java
    trunk/displaytag/src/test/resources/jsps/DISPL-505.jsp

Modified: trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java	2014-08-17 09:36:32 UTC (rev 1215)
+++ trunk/displaytag/src/main/java/org/displaytag/properties/TableProperties.java	2014-08-17 09:50:42 UTC (rev 1216)
@@ -1306,11 +1306,6 @@
      */
     private Object getClassPropertyInstance(String key) throws FactoryInstantiationException
     {
-        Object instance = objectCache.get(key);
-        if (instance != null)
-        {
-            return instance;
-        }
 
         String className = getProperty(key);
 
@@ -1320,11 +1315,17 @@
             return null;
         }
 
+        Object instance = objectCache.get(className);
+        if (instance != null)
+        {
+            return instance;
+        }
+
         try
         {
             Class< ? > classProperty = ReflectHelper.classForName(className);
             instance = classProperty.newInstance();
-            objectCache.put(key, instance);
+            objectCache.put(className, instance);
             return instance;
         }
         catch (Exception e)

Added: trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationColumnDecorator.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationColumnDecorator.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationColumnDecorator.java	2014-08-17 09:50:42 UTC (rev 1216)
@@ -0,0 +1,38 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.decorator;
+
+import javax.servlet.jsp.PageContext;
+
+import org.displaytag.exception.DecoratorException;
+import org.displaytag.properties.MediaTypeEnum;
+
+
+public class NoDecorationColumnDecorator implements DisplaytagColumnDecorator
+{
+
+    @Override
+    public Object decorate(Object columnValue, PageContext pageContext, MediaTypeEnum media) throws DecoratorException
+    {
+        return columnValue;
+    }
+}


Property changes on: trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationColumnDecorator.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecorator.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecorator.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecorator.java	2014-08-17 09:50:42 UTC (rev 1216)
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.decorator;
+
+public class NoDecorationDecorator extends TableDecorator
+{
+
+}


Property changes on: trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecorator.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecoratorFactory.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecoratorFactory.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecoratorFactory.java	2014-08-17 09:50:42 UTC (rev 1216)
@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.decorator;
+
+import javax.servlet.jsp.PageContext;
+
+import org.displaytag.exception.DecoratorInstantiationException;
+import org.displaytag.render.TableTotaler;
+
+
+public class NoDecorationDecoratorFactory implements DecoratorFactory
+{
+
+    @Override
+    public DisplaytagColumnDecorator loadColumnDecorator(PageContext pageContext, String decoratorName)
+        throws DecoratorInstantiationException
+    {
+        return new NoDecorationColumnDecorator();
+    }
+
+    @Override
+    public TableDecorator loadTableDecorator(PageContext pageContext, String decoratorName)
+        throws DecoratorInstantiationException
+    {
+        return new NoDecorationDecorator();
+    }
+
+    @Override
+    public TableTotaler loadTableTotaler(PageContext pageContext, String decoratorName)
+        throws DecoratorInstantiationException
+    {
+        return null;
+    }
+}


Property changes on: trunk/displaytag/src/test/java/org/displaytag/decorator/NoDecorationDecoratorFactory.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ505Test.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ505Test.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ505Test.java	2014-08-17 09:50:42 UTC (rev 1216)
@@ -0,0 +1,82 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.jsptests;
+
+import org.displaytag.decorator.DateColumnDecorator;
+import org.displaytag.test.DisplaytagCase;
+import org.displaytag.test.KnownTypes;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.WebTable;
+
+
+/**
+ * Tests for DISPL-505 - Class cache usage causes make using different factory for different tables not work.
+ * @author Mike Calmus
+ * @version $Revision: 1081 $ ($Author: fgiust $)
+ */
+public class Displ505Test extends DisplaytagCase
+{
+
+    /**
+     * @see org.displaytag.test.DisplaytagCase#getJspName()
+     */
+    public String getJspName()
+    {
+        return "DISPL-505.jsp";
+    }
+
+    /**
+     * Check additional parameters in urls.
+     * @param jspName jsp name, with full path
+     * @throws Exception any Exception thrown during test.
+     */
+    @Override
+    @Test
+    public void doTest() throws Exception
+    {
+        WebRequest request = new GetMethodWebRequest(getJspUrl(getJspName()));
+
+        WebResponse response = runner.getResponse(request);
+
+        if (log.isDebugEnabled())
+            log.debug("RESPONSE: " + response.getText());
+
+        WebTable[] tables = response.getTables();
+
+        Assert.assertEquals("Wrong number of tables.", 2, tables.length);
+
+        Assert.assertEquals(
+            "Expected decorated value not found.",
+            new DateColumnDecorator().decorate(KnownTypes.TIME_VALUE, null, null),
+            tables[0].getCellAsText(1, 0));
+
+        Assert.assertEquals(
+            "Expected decorated value not found.",
+            KnownTypes.TIME_VALUE.toString(),
+            tables[1].getCellAsText(1, 0));
+    }
+}
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ505Test.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/displaytag/src/test/resources/jsps/DISPL-505.jsp
===================================================================
--- trunk/displaytag/src/test/resources/jsps/DISPL-505.jsp	                        (rev 0)
+++ trunk/displaytag/src/test/resources/jsps/DISPL-505.jsp	2014-08-17 09:50:42 UTC (rev 1216)
@@ -0,0 +1,33 @@
+<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:display="urn:jsptld:http://displaytag.sf.net">
+  <jsp:text>
+    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
+  </jsp:text>
+  <jsp:directive.page contentType="text/html; charset=UTF8"/>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+      <title>DISPL-505</title>
+    </head>
+    <body>
+      <jsp:scriptlet>
+        <![CDATA[
+                java.util.List testData = new java.util.ArrayList();
+                testData.add(new org.displaytag.test.KnownTypes());
+                request.setAttribute( "test", testData);
+        ]]>
+      </jsp:scriptlet>
+      <display:table items="${test}" id="table">
+        <display:column property="time" decorator="org.displaytag.decorator.DateColumnDecorator"/>
+        <display:column property="long"/>
+        <display:setProperty name="export.decorated" value="false"/>
+      </display:table>
+      <display:table items="${test}" id="table2">
+        <display:setProperty name="factory.decorator" value="org.displaytag.decorator.NoDecorationDecoratorFactory"/>
+        <display:column property="time" decorator="org.displaytag.decorator.DateColumnDecorator"/>
+        <display:column property="long"/>
+        <display:setProperty name="export.decorated" value="false"/>
+      </display:table>
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/resources/jsps/DISPL-505.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-17 09:36:32 UTC (rev 1215)
+++ trunk/src/site/changes/changes.xml	2014-08-17 09:50:42 UTC (rev 1216)
@@ -82,6 +82,9 @@
         in order to escape parameters only when composing the final URL, avoid double encoding that could happen in some
         situations
       </action>
+      <action type="fix" dev="fgiust" issue="DISPL-505" due-to="Mike Calmus">Class cache usage causes make using different
+        factory for different tables not work.
+      </action>
     </release>
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.

Modified: trunk/src/site/markdown/dependencies.md
===================================================================
--- trunk/src/site/markdown/dependencies.md	2014-08-17 09:36:32 UTC (rev 1215)
+++ trunk/src/site/markdown/dependencies.md	2014-08-17 09:50:42 UTC (rev 1216)
@@ -1,5 +1,4 @@
-Dependencies
-------------
+# Dependencies
 
 See [displaytag/dependencies.html](displaytagdependencies.html) for the
 list of dependencies needed by displaytag.
@@ -9,19 +8,39 @@
 of including all the needed libraries for you.
 
 ```xml
-        <dependency>
-          <groupId>org.displaytag</groupId>
-          <artifactId>displaytag</artifactId>
-          <version>2.0</version>
-        </dependency>
+<dependency>
+  <groupId>org.displaytag</groupId>
+  <artifactId>displaytag</artifactId>
+  <version>2.0</version>
+</dependency>
 ```
 
-### Optional modules
+Since displaytag uses [http://www.slf4j.org/](slf4j) for logging you will
+also need to choose a slf4j logging implementation (by default displaytag dependencies
+will only include slf4j-api, in order to let you choose your preferred implementation).
+You usually may want to include the log4j adapter, using:
 
-Starting from the 1.1 release optional modules are distributed as
-additional jars. Any module could require additional dependencies:
+```xml
+<dependency>
+  <groupId>org.slf4j</groupId>
+  <artifactId>slf4j-log4j12</artifactId>
+  <version>1.7.7</version>
+</dependency>
+```
 
--   [displaytag portlet](displaytag-portletdependencies.html)
--   [displaytag excel export
-    module](#displaytag-export-poidependencies.html)
+## Optional dependencies
 
+By default Displaytag render excel files using a text-based format. You may need to enable a different exporter
+using excel binary format: the exporter is included by default in the distribution but you will also need to include
+the `poi` dependency in order to use it:
+
+```xml
+<dependency>
+  <groupId>org.apache.poi</groupId>
+  <artifactId>poi</artifactId>
+  <version>3.10-FINAL</version>
+</dependency>
+```
+
+(the export-poi module was distributed in a separate jar before version 2.0. Since displaytag 2.0 the module is not
+required since it has been included in the main jar)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1215] trunk/displaytag/src/main/java/org/displaytag /tags/TableTag.java

[<fg...@us...>]

Revision: 1215
          http://sourceforge.net/p/displaytag/code/1215
Author:   fgiust
Date:     2014-08-17 09:36:32 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-308 made methods public for extensions

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java

Modified: trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-17 09:30:24 UTC (rev 1214)
+++ trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-17 09:36:32 UTC (rev 1215)
@@ -337,7 +337,7 @@
      * Is this the last iteration?
      * @return boolean <code>true</code> if this is the last iteration
      */
-    protected boolean isLastIteration()
+    public boolean isLastIteration()
     {
         return this.lastIteration;
     }
@@ -393,7 +393,7 @@
      * Is the current row empty?
      * @return true if the current row is empty
      */
-    protected boolean isEmpty()
+    public boolean isEmpty()
     {
         return this.currentRow == null;
     }
@@ -670,7 +670,7 @@
      * Returns the properties.
      * @return TableProperties
      */
-    protected TableProperties getProperties()
+    public TableProperties getProperties()
     {
         return this.properties;
     }
@@ -743,7 +743,7 @@
      * Is this the first iteration?
      * @return boolean <code>true</code> if this is the first iteration
      */
-    protected boolean isFirstIteration()
+    public boolean isFirstIteration()
     {
         if (log.isDebugEnabled())
         {
@@ -1148,7 +1148,7 @@
      * @return <code>true</code> if the current row must be evaluated because is included in output or because is
      * included in sorting.
      */
-    protected boolean isIncludedRow()
+    public boolean isIncludedRow()
     {
         return filteredRows.contains(this.rowNumber);
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1214] trunk/displaytag/src/main/java/org/displaytag /tags/TableTag.java

[<fg...@us...>]

Revision: 1214
          http://sourceforge.net/p/displaytag/code/1214
Author:   fgiust
Date:     2014-08-17 09:30:24 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
DISPL-609 missing info in javadoc

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java

Modified: trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-17 09:21:25 UTC (rev 1213)
+++ trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-17 09:30:24 UTC (rev 1214)
@@ -452,8 +452,8 @@
 
     /**
      * setter for the "sort" attribute.
-     * @param value "page" (sort a single page) or "list" (sort the full list)
-     * @throws InvalidTagAttributeValueException if value is not "page" or "list"
+     * @param value "page" (sort a single page), "list" (sort the full list), "external" (list already sorted)
+     * @throws InvalidTagAttributeValueException if value is not "page", "list" or "external"
      */
     public void setSort(String value) throws InvalidTagAttributeValueException
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1213] trunk/displaytag/src/test/resources

[<fg...@us...>]

Revision: 1213
          http://sourceforge.net/p/displaytag/code/1213
Author:   fgiust
Date:     2014-08-17 09:21:25 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
struts/webwork configuration cleaned up

Modified Paths:
--------------
    trunk/displaytag/src/test/resources/WEB-INF/struts-config.xml
    trunk/displaytag/src/test/resources/xwork.xml

Modified: trunk/displaytag/src/test/resources/WEB-INF/struts-config.xml
===================================================================
--- trunk/displaytag/src/test/resources/WEB-INF/struts-config.xml	2014-08-17 08:58:33 UTC (rev 1212)
+++ trunk/displaytag/src/test/resources/WEB-INF/struts-config.xml	2014-08-17 09:21:25 UTC (rev 1213)
@@ -2,17 +2,8 @@
 <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
 <struts-config>
     <action-mappings>
-        <action parameter="/jsps/titlekey.jsp" path="/jsps/titlekey.jsp"
-            type="org.apache.struts.actions.ForwardAction" />
-        <action parameter="/jsps/titlekeyautocolumn.jsp" path="/jsps/titlekeyautocolumn.jsp"
-            type="org.apache.struts.actions.ForwardAction" />
-        <action parameter="/standard/titlekey.jsp" path="/standard/titlekey.jsp"
-            type="org.apache.struts.actions.ForwardAction" />
-        <action parameter="/el/titlekey.jsp" path="/el/titlekey.jsp" type="org.apache.struts.actions.ForwardAction" />
-        <action parameter="/standard/titlekeyautocolumn.jsp" path="/standard/titlekeyautocolumn.jsp"
-            type="org.apache.struts.actions.ForwardAction" />
-        <action parameter="/el/titlekeyautocolumn.jsp" path="/el/titlekeyautocolumn.jsp"
-            type="org.apache.struts.actions.ForwardAction" />
+        <action parameter="/jsps/titlekey.jsp" path="/jsps/titlekey.jsp" type="org.apache.struts.actions.ForwardAction" />
+        <action parameter="/jsps/titlekeyautocolumn.jsp" path="/jsps/titlekeyautocolumn.jsp" type="org.apache.struts.actions.ForwardAction" />
     </action-mappings>
     <message-resources parameter="strutsresources" />
 </struts-config>

Modified: trunk/displaytag/src/test/resources/xwork.xml
===================================================================
--- trunk/displaytag/src/test/resources/xwork.xml	2014-08-17 08:58:33 UTC (rev 1212)
+++ trunk/displaytag/src/test/resources/xwork.xml	2014-08-17 09:21:25 UTC (rev 1213)
@@ -14,23 +14,4 @@
             <result name="success" type="dispatcher">/jsps/titlekeyautocolumn.jsp</result>
         </action>
     </package>
-    <!-- Configuration for the default package. -->
-    <package name="standard" extends="webwork-default" namespace="/standard">
-        <default-interceptor-ref name="defaultStack" />
-        <action name="titlekey.jsp" class="com.opensymphony.xwork.ActionSupport">
-            <result name="success" type="dispatcher">/standard/titlekey.jsp</result>
-        </action>
-        <action name="titlekeyautocolumn.jsp" class="com.opensymphony.xwork.ActionSupport">
-            <result name="success" type="dispatcher">/standard/titlekeyautocolumn.jsp</result>
-        </action>
-    </package>
-    <package name="el" extends="webwork-default" namespace="/el">
-        <default-interceptor-ref name="defaultStack" />
-        <action name="titlekey.jsp" class="com.opensymphony.xwork.ActionSupport">
-            <result name="success" type="dispatcher">/el/titlekey.jsp</result>
-        </action>
-        <action name="titlekeyautocolumn.jsp" class="com.opensymphony.xwork.ActionSupport">
-            <result name="success" type="dispatcher">/el/titlekey.jsp</result>
-        </action>
-    </package>
 </xwork>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1212] trunk

[<fg...@us...>]

Revision: 1212
          http://sourceforge.net/p/displaytag/code/1212
Author:   fgiust
Date:     2014-08-17 08:58:33 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
cleaning up dependencies

Modified Paths:
--------------
    trunk/displaytag/pom.xml
    trunk/pom.xml

Modified: trunk/displaytag/pom.xml
===================================================================
--- trunk/displaytag/pom.xml	2014-08-17 08:44:19 UTC (rev 1211)
+++ trunk/displaytag/pom.xml	2014-08-17 08:58:33 UTC (rev 1212)
@@ -14,6 +14,11 @@
   <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.3.2</version>
+    </dependency>
+    <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <version>1.9.2</version>
@@ -25,11 +30,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.3.2</version>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>1.7.7</version>
@@ -81,6 +81,14 @@
           <groupId>org.apache.avalon.framework</groupId>
           <artifactId>avalon-framework-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis-ext</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -93,8 +101,8 @@
       <groupId>avalon-framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
       <version>4.2.0</version>
-        <!-- required by FOP -->
     </dependency>
+     
     
     
     <!-- optional dependencies for LocaleResolvers -->
@@ -112,6 +120,30 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-chain</groupId>
+          <artifactId>commons-chain</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-fileupload</groupId>
+          <artifactId>commons-fileupload</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-validator</groupId>
+          <artifactId>commons-validator</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>oro</groupId>
+          <artifactId>oro</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>antlr</groupId>
+          <artifactId>antlr</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -137,6 +169,10 @@
           <artifactId>commons-logging</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>commons-fileupload</groupId>
+          <artifactId>commons-fileupload</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>com.servlets</groupId>
           <artifactId>cos</artifactId>
         </exclusion>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2014-08-17 08:44:19 UTC (rev 1211)
+++ trunk/pom.xml	2014-08-17 08:58:33 UTC (rev 1212)
@@ -184,6 +184,19 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.17</version>
+        <configuration>
+          <useFile>false</useFile>
+          <redirectTestOutputToFile>false</redirectTestOutputToFile>
+          <forkMode>once</forkMode>
+          <argLine>-Xmx512m</argLine>
+          <forkCount>1</forkCount>
+          <systemProperties>
+            <property>
+              <name>java.awt.headless</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1211] trunk

[<fg...@us...>]

Revision: 1211
          http://sourceforge.net/p/displaytag/code/1211
Author:   fgiust
Date:     2014-08-17 08:44:19 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
partial cleanup of dependencies

Modified Paths:
--------------
    trunk/displaytag/pom.xml
    trunk/displaytag/src/test/java/org/displaytag/export/excel/SubtotaledExcelTest.java
    trunk/displaytag-examples/pom.xml
    trunk/pom.xml

Modified: trunk/displaytag/pom.xml
===================================================================
--- trunk/displaytag/pom.xml	2014-08-16 22:06:16 UTC (rev 1210)
+++ trunk/displaytag/pom.xml	2014-08-17 08:44:19 UTC (rev 1211)
@@ -11,164 +11,223 @@
   <groupId>org.displaytag</groupId>
   <artifactId>displaytag</artifactId>
   <name>Display tag library</name>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-  </properties>
   <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>jasper</artifactId>
-      <scope>test</scope>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.9.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>jasper-el</artifactId>
-      <scope>test</scope>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.3.2</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
     </dependency>
     <dependency>
-      <groupId>org.httpunit</groupId>
-      <artifactId>httpunit</artifactId>
-      <scope>test</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
+      <artifactId>jstl</artifactId>
+      <version>1.2</version>
     </dependency>
+    
+    
+    
+    <!-- optional dependencies for exporting -->
     <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>ognl</groupId>
-      <artifactId>ognl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>xwork</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>com.itextpdf</groupId>
       <artifactId>itextpdf</artifactId>
+      <version>5.5.2</version>
     </dependency>
     <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi</artifactId>
+      <version>3.10-FINAL</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>fop</artifactId>
+      <version>1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.avalon.framework</groupId>
+          <artifactId>avalon-framework-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.avalon.framework</groupId>
+          <artifactId>avalon-framework-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <optional>true</optional>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+      <version>4.2.0</version>
+        <!-- required by FOP -->
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.2.0</version>
+        <!-- required by FOP -->
     </dependency>
+    
+    
+    <!-- optional dependencies for LocaleResolvers -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>struts</groupId>
+      <artifactId>struts</artifactId>
+      <version>1.2.7</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
+      <version>3.2.10.RELEASE</version>
       <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>opensymphony</groupId>
-      <artifactId>oscore</artifactId>
-      <scope>test</scope>
+      <artifactId>webwork</artifactId>
+      <version>2.1.5</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.servlets</groupId>
+          <artifactId>cos</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>opensymphony</groupId>
+          <artifactId>pell-multipart</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>velocity</groupId>
+          <artifactId>velocity-dep</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
+    <!-- END optional dependencies -->
     <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <optional>true</optional>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>webwork</artifactId>
-      <optional>true</optional>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.portlet</groupId>
       <artifactId>portlet-api</artifactId>
+      <version>2.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi</artifactId>
-      <optional>true</optional>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-ooxml</artifactId>
-      <optional>true</optional>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>1.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
+      <version>3.2.10.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>struts</groupId>
-      <artifactId>struts</artifactId>
+      <groupId>org.httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.7.2</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.xmlgraphics</groupId>
-      <artifactId>fop</artifactId>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>jasper</artifactId>
+      <version>6.0.41</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId> 
-        <!-- required by FOP -->
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>jasper-el</artifactId>
+      <version>6.0.41</version>
+      <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-api</artifactId> 
-        <!-- required by FOP -->
-    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-clover-plugin</artifactId>
         <version>2.4</version>
-        
-        <!-- 
-        <groupId>com.atlassian.maven.plugins</groupId>
+        <!-- <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
         <version>4.0.0</version>
          -->
@@ -200,6 +259,10 @@
       </plugin>
     </plugins>
   </build>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+  </properties>
   <reporting>
     <plugins>
     <!-- 

Modified: trunk/displaytag/src/test/java/org/displaytag/export/excel/SubtotaledExcelTest.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/export/excel/SubtotaledExcelTest.java	2014-08-16 22:06:16 UTC (rev 1210)
+++ trunk/displaytag/src/test/java/org/displaytag/export/excel/SubtotaledExcelTest.java	2014-08-17 08:44:19 UTC (rev 1211)
@@ -27,10 +27,10 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.displaytag.model.HeaderCell;
 import org.displaytag.model.Row;
 import org.displaytag.model.TableModel;
@@ -133,7 +133,7 @@
         str.close();
 
         FileInputStream istr = new FileInputStream(f);
-        Workbook wb = WorkbookFactory.create(istr);
+        Workbook wb = new HSSFWorkbook(istr);
 
         Sheet sh = wb.getSheetAt(0);
 
@@ -165,7 +165,7 @@
         str.close();
 
         FileInputStream istr = new FileInputStream(f);
-        Workbook wb = WorkbookFactory.create(istr);
+        Workbook wb = new HSSFWorkbook(istr);
 
         Sheet sh = wb.getSheetAt(0);
 

Modified: trunk/displaytag-examples/pom.xml
===================================================================
--- trunk/displaytag-examples/pom.xml	2014-08-16 22:06:16 UTC (rev 1210)
+++ trunk/displaytag-examples/pom.xml	2014-08-17 08:44:19 UTC (rev 1211)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>displaytag-doc</artifactId>
     <groupId>org.displaytag</groupId>
@@ -28,48 +29,46 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.itextpdf</groupId>
       <artifactId>itextpdf</artifactId>
+      <version>5.5.2</version>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.7</version>
+    </dependency>
+    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>taglibs</groupId>
       <artifactId>standard</artifactId>
+      <version>1.1.2</version>
     </dependency>
     <dependency>
       <groupId>org.displaytag</groupId>
       <artifactId>displaytag</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-ooxml</artifactId>
-    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2014-08-16 22:06:16 UTC (rev 1210)
+++ trunk/pom.xml	2014-08-17 08:44:19 UTC (rev 1211)
@@ -338,258 +338,6 @@
       </plugin>
     </plugins>
   </reporting>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.11</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>xmlunit</groupId>
-        <artifactId>xmlunit</artifactId>
-        <version>1.5</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>1.9.2</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-collections4</artifactId>
-        <version>4.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.3.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.7.7</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.7</version>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.5</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet.jsp</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>2.1</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>jstl</artifactId>
-        <version>1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.httpunit</groupId>
-        <artifactId>httpunit</artifactId>
-        <version>1.7.2</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.itextpdf</groupId>
-        <artifactId>itextpdf</artifactId>
-        <version>5.5.2</version>
-      </dependency>
-      <dependency>
-        <groupId>taglibs</groupId>
-        <artifactId>standard</artifactId>
-        <version>1.1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>jasper</artifactId>
-        <version>6.0.41</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>jasper-el</artifactId>
-        <version>6.0.41</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-el</groupId>
-        <artifactId>commons-el</artifactId>
-        <version>1.0</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>3.2.10.RELEASE</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
-        <version>3.2.10.RELEASE</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>opensymphony</groupId>
-        <artifactId>webwork</artifactId>
-        <version>2.1.5</version>
-        <optional>true</optional>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.servlets</groupId>
-            <artifactId>cos</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>opensymphony</groupId>
-            <artifactId>pell-multipart</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>velocity</groupId>
-            <artifactId>velocity-dep</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>opensymphony</groupId>
-        <artifactId>xwork</artifactId>
-        <version>1.0.3</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>opensymphony</groupId>
-        <artifactId>oscore</artifactId>
-        <version>2.2.4</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>2.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>ognl</groupId>
-        <artifactId>ognl</artifactId>
-        <version>2.6.5</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi</artifactId>
-        <version>3.10-FINAL</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.poi</groupId>
-        <artifactId>poi-ooxml</artifactId>
-        <version>3.10-FINAL</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>3.2.10.RELEASE</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xmlgraphics</groupId>
-        <artifactId>fop</artifactId>
-        <version>1.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.avalon.framework</groupId>
-            <artifactId>avalon-framework-impl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.avalon.framework</groupId>
-            <artifactId>avalon-framework-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>avalon-framework</groupId>
-        <artifactId>avalon-framework-impl</artifactId>
-        <version>4.2.0</version>
-        <!-- required by FOP -->
-      </dependency>
-      <dependency>
-        <groupId>avalon-framework</groupId>
-        <artifactId>avalon-framework-api</artifactId>
-        <version>4.2.0</version>
-        <!-- required by FOP -->
-      </dependency>
-      <dependency>
-        <groupId>struts</groupId>
-        <artifactId>struts</artifactId>
-        <version>1.2.7</version>
-        <exclusions>
-          <exclusion>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <distributionManagement>
     <site>
       <id>displaytag</id>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1210] trunk/src/site/changes/changes.xml

[<fg...@us...>]

Revision: 1210
          http://sourceforge.net/p/displaytag/code/1210
Author:   fgiust
Date:     2014-08-16 22:06:16 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
added test for DISPL-530

Modified Paths:
--------------
    trunk/src/site/changes/changes.xml

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-16 22:04:30 UTC (rev 1209)
+++ trunk/src/site/changes/changes.xml	2014-08-16 22:06:16 UTC (rev 1210)
@@ -69,8 +69,19 @@
         adhere to servlet specs regarding content type setting
       </action>
       <action type="fix" dev="fgiust" issue="DISPL-675" due-to="Michael Osipov">Response character encoding is set on export even
-        if the export type is a binary file</action>
-      <action type="fix" dev="fgiust" issue="DISPL-430">Columns with body data between <display:column> and </display:column> are not render properly (empty) when last displayed element was removed</action>
+        if the export type is a binary file
+      </action>
+      <action type="fix" dev="fgiust" issue="DISPL-430">
+        Columns with body data between
+        <display:column> and </display:column>
+        are not render properly (empty) when last displayed element was removed
+      </action>
+      <action type="fix" dev="fgiust" issue="DISPL-530">
+        Reworked
+        <tt>DefaultHref</tt>
+        in order to escape parameters only when composing the final URL, avoid double encoding that could happen in some
+        situations
+      </action>
     </release>
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1209] trunk/displaytag/src/test/java/org/displaytag /util/DefaultHrefTest.java

[<fg...@us...>]

Revision: 1209
          http://sourceforge.net/p/displaytag/code/1209
Author:   fgiust
Date:     2014-08-16 22:04:30 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
testcase for DISPL-530

Modified Paths:
--------------
    trunk/displaytag/src/test/java/org/displaytag/util/DefaultHrefTest.java

Modified: trunk/displaytag/src/test/java/org/displaytag/util/DefaultHrefTest.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/util/DefaultHrefTest.java	2014-08-16 21:59:53 UTC (rev 1208)
+++ trunk/displaytag/src/test/java/org/displaytag/util/DefaultHrefTest.java	2014-08-16 22:04:30 UTC (rev 1209)
@@ -328,4 +328,17 @@
         URLAssert.assertEquals(url, href.toString());
     }
 
+    public void testaddParameterMap()
+    {
+        Map<String, String[]> parametersMap = new HashMap<String, String[]>();
+
+        parametersMap.put("modifiedArray", new String[]{"a&nbspb", "c&nbspd"});
+
+        DefaultHref defaultHref = new DefaultHref("");
+        defaultHref.addParameterMap(parametersMap);
+        String[] modifiedArray = parametersMap.get("modifiedArray");
+        Assert.assertEquals(modifiedArray[0], "a&nbspb");
+        Assert.assertEquals(modifiedArray[1], "c&nbspd");
+    }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1208] trunk

[<fg...@us...>]

Revision: 1208
          http://sourceforge.net/p/displaytag/code/1208
Author:   fgiust
Date:     2014-08-16 21:59:53 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
DISPL-430 Columns with body data  between <display:column>  and  </display:column>  are not  render properly (empty) when last displayed element  was removed 

Modified Paths:
--------------
    trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java
    trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java
    trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp
    trunk/src/site/changes/changes.xml

Modified: trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java
===================================================================
--- trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-16 21:07:06 UTC (rev 1207)
+++ trunk/displaytag/src/main/java/org/displaytag/tags/TableTag.java	2014-08-16 21:59:53 UTC (rev 1208)
@@ -1124,12 +1124,12 @@
                 start = (this.pageNumber - 1) * this.pagesize;
 
                 // invalid page requested, go back to last page
-                if (start > fullSize)
+                if (start >= fullSize)
                 {
+
                     int div = fullSize / this.pagesize;
-                    start = (fullSize % this.pagesize == 0) ? div : div + 1;
+                    start = ((fullSize % this.pagesize == 0) ? div - 1 : div) * pagesize;
                 }
-
                 end = start + this.pagesize;
             }
 

Modified: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java	2014-08-16 21:07:06 UTC (rev 1207)
+++ trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java	2014-08-16 21:59:53 UTC (rev 1208)
@@ -21,11 +21,15 @@
  */
 package org.displaytag.jsptests;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+
 import org.displaytag.tags.TableTagParameters;
 import org.displaytag.test.DisplaytagCase;
 import org.displaytag.util.ParamEncoder;
 import org.junit.Assert;
 import org.junit.Test;
+import org.xml.sax.SAXException;
 
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebRequest;
@@ -49,11 +53,6 @@
         return "DISPL-629.jsp";
     }
 
-    /**
-     * Check addictional parameters in paging.banner.*.
-     * @param jspName jsp name, with full path
-     * @throws Exception any axception thrown during test.
-     */
     @Override
     @Test
     public void doTest() throws Exception
@@ -61,22 +60,29 @@
         WebRequest request = new GetMethodWebRequest(getJspUrl(getJspName()));
 
         ParamEncoder encoder = new ParamEncoder("table");
-        request.setParameter(encoder.encodeParameterName(TableTagParameters.PARAMETER_PAGE), "2");
+        request.setParameter(encoder.encodeParameterName(TableTagParameters.PARAMETER_PAGE), "5");
+        request.setParameter("pagesize", "1");
 
-        WebResponse response;
+        checkLastColumn(request);
 
-        response = runner.getResponse(request);
+        request = new GetMethodWebRequest(getJspUrl(getJspName()));
 
-        if (log.isDebugEnabled())
-        {
-            log.debug(response.getText());
-        }
+        request.setParameter(encoder.encodeParameterName(TableTagParameters.PARAMETER_PAGE), "10");
+        request.setParameter("pagesize", "2");
 
+        checkLastColumn(request);
+
+    }
+
+    private void checkLastColumn(WebRequest request) throws MalformedURLException, IOException, SAXException
+    {
+        WebResponse response = runner.getResponse(request);
+
         WebTable[] tables = response.getTables();
         Assert.assertEquals(1, tables.length);
 
-        Assert.assertEquals("Wrong column content", "foo", tables[0].getCellAsText(1, 2));
-
+        Assert.assertEquals("Wrong column content", "D", tables[0].getCellAsText(tables[0].getRowCount() - 1, 0));
+        Assert.assertEquals("Wrong column content", "foo", tables[0].getCellAsText(tables[0].getRowCount() - 1, 1));
     }
 
 }
\ No newline at end of file

Modified: trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp
===================================================================
--- trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp	2014-08-16 21:07:06 UTC (rev 1207)
+++ trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp	2014-08-16 21:59:53 UTC (rev 1208)
@@ -11,15 +11,15 @@
     <body>
       <jsp:scriptlet> <![CDATA[
                 java.util.List testData = new java.util.ArrayList();
-                testData.add(new org.displaytag.test.KnownValue());
-                testData.add(new org.displaytag.test.KnownValue());
-                testData.add(new org.displaytag.test.KnownValue());
+                testData.add(new org.displaytag.test.KnownValueWithId("A"));
+                testData.add(new org.displaytag.test.KnownValueWithId("B"));
+                testData.add(new org.displaytag.test.KnownValueWithId("C"));
+                testData.add(new org.displaytag.test.KnownValueWithId("D"));
                 request.setAttribute( "test", testData);
             ]]>
       </jsp:scriptlet>
-      <display:table items="${test}" id="table" pagesize="1">
-        <display:column property="ant"/>
-        <display:column property="bee"/>
+      <display:table items="${test}" id="table" pagesize="${param.pagesize}">
+        <display:column property="id"/>
         <display:column>foo</display:column>
       </display:table>
     </body>

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-16 21:07:06 UTC (rev 1207)
+++ trunk/src/site/changes/changes.xml	2014-08-16 21:59:53 UTC (rev 1208)
@@ -70,6 +70,7 @@
       </action>
       <action type="fix" dev="fgiust" issue="DISPL-675" due-to="Michael Osipov">Response character encoding is set on export even
         if the export type is a binary file</action>
+      <action type="fix" dev="fgiust" issue="DISPL-430">Columns with body data between <display:column> and </display:column> are not render properly (empty) when last displayed element was removed</action>
     </release>
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1207] trunk/displaytag/src/test/resources/jsps/ DISPL-526.jsp

[<fg...@us...>]

Revision: 1207
          http://sourceforge.net/p/displaytag/code/1207
Author:   fgiust
Date:     2014-08-16 21:07:06 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
testcase for DISPL-526

Added Paths:
-----------
    trunk/displaytag/src/test/resources/jsps/DISPL-526.jsp

Added: trunk/displaytag/src/test/resources/jsps/DISPL-526.jsp
===================================================================
--- trunk/displaytag/src/test/resources/jsps/DISPL-526.jsp	                        (rev 0)
+++ trunk/displaytag/src/test/resources/jsps/DISPL-526.jsp	2014-08-16 21:07:06 UTC (rev 1207)
@@ -0,0 +1,29 @@
+<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:display="urn:jsptld:http://displaytag.sf.net">
+  <jsp:text> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
+  </jsp:text>
+  <jsp:directive.page contentType="text/html; charset=UTF8"/>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+      <title>Displaytag unit test</title>
+    </head>
+    <body>
+      <jsp:scriptlet> <![CDATA[
+  java.util.ArrayList list = new java.util.ArrayList();
+  java.util.Map map1 = new java.util.HashMap();
+  map1.put("Entry1", 1); //The value, 1, is the same as the one below.
+  map1.put("Entry2", 2);
+  list.add(map1);
+  java.util.Map map2 = new java.util.HashMap();
+  map2.put("Entry1", 1); //The value, 1, will not show up in HTML, as it is the same as the one directly above. 
+                                            // If it is change to another value, like 2, it will show up.
+  map2.put("Entry2", 5);
+  list.add(map2);
+  request.setAttribute("testList", list);
+            ]]>
+      </jsp:scriptlet>
+      <display:table name="testList" />
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/resources/jsps/DISPL-526.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1206] trunk/displaytag/src/test/java/org/displaytag /jsptests/Displ526Test.java

[<fg...@us...>]

Revision: 1206
          http://sourceforge.net/p/displaytag/code/1206
Author:   fgiust
Date:     2014-08-16 21:04:35 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
testcase for DISPL-526

Added Paths:
-----------
    trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ526Test.java

Added: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ526Test.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ526Test.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ526Test.java	2014-08-16 21:04:35 UTC (rev 1206)
@@ -0,0 +1,79 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.jsptests;
+
+import org.displaytag.tags.TableTagParameters;
+import org.displaytag.test.DisplaytagCase;
+import org.displaytag.util.ParamEncoder;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.WebTable;
+
+
+/**
+ * Tests for DISPL-526 - cell value that is the same as the one vertically above is omitted.
+ * @author Fabrizio Giustina
+ * @version $Revision: 1081 $ ($Author: fgiust $)
+ */
+public class Displ526Test extends DisplaytagCase
+{
+
+    /**
+     * @see org.displaytag.test.DisplaytagCase#getJspName()
+     */
+    public String getJspName()
+    {
+        return "DISPL-526.jsp";
+    }
+
+    /**
+     * Check addictional parameters in paging.banner.*.
+     * @param jspName jsp name, with full path
+     * @throws Exception any axception thrown during test.
+     */
+    @Override
+    @Test
+    public void doTest() throws Exception
+    {
+        WebRequest request = new GetMethodWebRequest(getJspUrl(getJspName()));
+
+        WebResponse response;
+
+        response = runner.getResponse(request);
+
+        if (log.isDebugEnabled())
+        {
+            log.debug(response.getText());
+        }
+
+        WebTable[] tables = response.getTables();
+        Assert.assertEquals(1, tables.length);
+
+        Assert.assertEquals("Wrong column content", "1", tables[0].getCellAsText(2, 1));
+
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ526Test.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1205] trunk/displaytag/src/test

[<fg...@us...>]

Revision: 1205
          http://sourceforge.net/p/displaytag/code/1205
Author:   fgiust
Date:     2014-08-16 20:57:56 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
testcase for DISPL-629

Added Paths:
-----------
    trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java
    trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp

Added: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java
===================================================================
--- trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java	                        (rev 0)
+++ trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java	2014-08-16 20:57:56 UTC (rev 1205)
@@ -0,0 +1,82 @@
+/**
+ * Copyright (C) 2002-2014 Fabrizio Giustina, the Displaytag team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.displaytag.jsptests;
+
+import org.displaytag.tags.TableTagParameters;
+import org.displaytag.test.DisplaytagCase;
+import org.displaytag.util.ParamEncoder;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.WebTable;
+
+
+/**
+ * Tests for DISPL-629 - display:column w/o property works correctly only on first page.
+ * @author Fabrizio Giustina
+ * @version $Revision: 1081 $ ($Author: fgiust $)
+ */
+public class Displ629Test extends DisplaytagCase
+{
+
+    /**
+     * @see org.displaytag.test.DisplaytagCase#getJspName()
+     */
+    public String getJspName()
+    {
+        return "DISPL-629.jsp";
+    }
+
+    /**
+     * Check addictional parameters in paging.banner.*.
+     * @param jspName jsp name, with full path
+     * @throws Exception any axception thrown during test.
+     */
+    @Override
+    @Test
+    public void doTest() throws Exception
+    {
+        WebRequest request = new GetMethodWebRequest(getJspUrl(getJspName()));
+
+        ParamEncoder encoder = new ParamEncoder("table");
+        request.setParameter(encoder.encodeParameterName(TableTagParameters.PARAMETER_PAGE), "2");
+
+        WebResponse response;
+
+        response = runner.getResponse(request);
+
+        if (log.isDebugEnabled())
+        {
+            log.debug(response.getText());
+        }
+
+        WebTable[] tables = response.getTables();
+        Assert.assertEquals(1, tables.length);
+
+        Assert.assertEquals("Wrong column content", "foo", tables[0].getCellAsText(1, 2));
+
+    }
+
+}
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/java/org/displaytag/jsptests/Displ629Test.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp
===================================================================
--- trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp	                        (rev 0)
+++ trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp	2014-08-16 20:57:56 UTC (rev 1205)
@@ -0,0 +1,27 @@
+<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:display="urn:jsptld:http://displaytag.sf.net">
+  <jsp:text> <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
+  </jsp:text>
+  <jsp:directive.page contentType="text/html; charset=UTF8"/>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+      <title>Displaytag unit test</title>
+    </head>
+    <body>
+      <jsp:scriptlet> <![CDATA[
+                java.util.List testData = new java.util.ArrayList();
+                testData.add(new org.displaytag.test.KnownValue());
+                testData.add(new org.displaytag.test.KnownValue());
+                testData.add(new org.displaytag.test.KnownValue());
+                request.setAttribute( "test", testData);
+            ]]>
+      </jsp:scriptlet>
+      <display:table items="${test}" id="table" pagesize="1">
+        <display:column property="ant"/>
+        <display:column property="bee"/>
+        <display:column>foo</display:column>
+      </display:table>
+    </body>
+  </html>
+</jsp:root>
\ No newline at end of file


Property changes on: trunk/displaytag/src/test/resources/jsps/DISPL-629.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[displaytag-cvs] SF.net SVN: displaytag:[1204] trunk/src/site/changes/changes.xml

[<fg...@us...>]

Revision: 1204
          http://sourceforge.net/p/displaytag/code/1204
Author:   fgiust
Date:     2014-08-16 20:41:06 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
changelog

Modified Paths:
--------------
    trunk/src/site/changes/changes.xml

Modified: trunk/src/site/changes/changes.xml
===================================================================
--- trunk/src/site/changes/changes.xml	2014-08-16 20:40:37 UTC (rev 1203)
+++ trunk/src/site/changes/changes.xml	2014-08-16 20:41:06 UTC (rev 1204)
@@ -29,8 +29,8 @@
       <action type="update" dev="fgiust">Changed licensing from "artistic license" to a more standard, OSI-approved MIT
         license.
       </action>
-      <action type="update" dev="fgiust" issue="DISPL-450 DISPL-650">Update itext to version 5.5.2. As a side effect, the RTF export format had tto be
-        removed, since it's not supported anymore in recent itext versions.
+      <action type="update" dev="fgiust" issue="DISPL-450 DISPL-650">Update itext to version 5.5.2. As a side effect, the RTF export
+        format had tto be removed, since it's not supported anymore in recent itext versions.
       </action>
       <action type="fix" dev="fgiust" due-to="Johno Crawford" issue="DISPL-688">CSV export fixes.</action>
       <action type="fix" dev="fgiust" due-to="Michael Osipov" issue="DISPL-687">
@@ -38,11 +38,12 @@
         <tt>org.displaytag.localization.LocaleResolver.resolveLocale(HttpServletRequest)</tt>
         to
         <tt>org.displaytag.localization.LocaleResolver.resolveLocale(PageContext)</tt>
-        , so custom locale resolvers needs to be adapted in order to compile/work with displaytag 2.0. 
+        , so custom locale resolvers needs to be adapted in order to compile/work with displaytag 2.0.
       </action>
       <action type="fix" dev="fgiust" issue="DISPL-292">
         Export in pdf/excel format was not exporting the full list with
-        <tt>export.amount=list</tt>.
+        <tt>export.amount=list</tt>
+        .
       </action>
       <action type="update" dev="fgiust">
         Renamed the display:table
@@ -53,15 +54,22 @@
         deprecated, now that support for the non EL-version has been dropped. Use
         <tt>items</tt>
         to mimic standard jstl tags like
-        <tt>c:forEach</tt>. The old attribute still remains as deprecated.
+        <tt>c:forEach</tt>
+        . The old attribute still remains as deprecated.
       </action>
-        <action type="add" dev="fgiust">Added new <tt>export.banner.item</tt> property for customizing the links generated in the export banner.</action>
-        <action type="fix" dev="fgiust" issue="DISPL-676" due-to="Michael Osipov">Some JUnit tests fail if VM locale language is not English</action>
-      
-      
-      
-      
-      
+      <action type="add" dev="fgiust">
+        Added new
+        <tt>export.banner.item</tt>
+        property for customizing the links generated in the export banner.
+      </action>
+      <action type="fix" dev="fgiust" issue="DISPL-676" due-to="Michael Osipov">Some JUnit tests fail if VM locale language is not
+        English
+      </action>
+      <action type="fix" dev="fgiust" issue="DISPL-674" due-to="Michael Osipov">BufferedResponseWrapper implementation does not
+        adhere to servlet specs regarding content type setting
+      </action>
+      <action type="fix" dev="fgiust" issue="DISPL-675" due-to="Michael Osipov">Response character encoding is set on export even
+        if the export type is a binary file</action>
     </release>
     <release version="1.2" date="December 27, 2008" description="">
       <action type="add" dev="fgiust" issue="DISPL-552" due-to="Punit Mohatta"> Export to excel: auto adjust column width.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.