Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/RequestUriTest.java =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/RequestUriTest.java (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/RequestUriTest.java (working copy) @@ -1,6 +1,6 @@ package org.displaytag.jsptests; -import org.displaytag.properties.MediaTypeEnum; + import org.displaytag.tags.TableTagParameters; import org.displaytag.test.DisplaytagCase; import org.displaytag.test.URLAssert; @@ -48,7 +48,7 @@ assertEquals("Wrong number of tables.", 1, tables.length); WebLink[] links = response.getLinks(); - assertEquals("Wrong number of links in result.", 4, links.length); + assertEquals("Wrong number of links in result.", 6, links.length); URLAssert.assertEquals(CONTEXT + "/goforit?" Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/NoContextTest.java =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/NoContextTest.java (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/NoContextTest.java (working copy) @@ -44,7 +44,7 @@ assertEquals("Wrong number of tables.", 1, tables.length); WebLink[] links = response.getLinks(); - assertEquals("Wrong number of links in result.", 8, links.length); + assertEquals("Wrong number of links in result.", 10, links.length); for (int j = 0; j < links.length; j++) { Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/ExportLinksTest.java =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/ExportLinksTest.java (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/ExportLinksTest.java (working copy) @@ -40,7 +40,7 @@ WebLink[] links = response.getLinks(); - assertEquals("Wrong number of export links. ", 4, links.length); + assertEquals("6 links were expected: csv, excel, xml, pdf, wpdf, rtf.", 6, links.length); Set linkTexts = new HashSet(); for (int j = 0; j < links.length; j++) Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/Displ298RtfTest.java =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/Displ298RtfTest.java (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/Displ298RtfTest.java (working copy) @@ -40,7 +40,7 @@ ExportViewFactory factory = ExportViewFactory.getInstance(); factory.registerExportView("rtf", "org.displaytag.export.DefaultRtfExportView"); MediaTypeEnum rtfMedia = MediaTypeEnum.fromName("rtf"); - assertNotNull("Pdf export view not correctly registered.", rtfMedia); + assertNotNull("Rtf export view not correctly registered.", rtfMedia); request.setParameter(mediaParameter, Integer.toString(rtfMedia.getCode())); WebResponse response = runner.getResponse(request); Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/EncodedUriTest.java =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/EncodedUriTest.java (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/jsptests/EncodedUriTest.java (working copy) @@ -48,7 +48,7 @@ assertEquals("Wrong number of tables.", 1, tables.length); WebLink[] links = response.getLinks(); - assertEquals("Wrong number of links in result.", 4, links.length); + assertEquals("Wrong number of links in result.", 6, links.length); if (SystemUtils.isJavaVersionAtLeast(1.4f)) { Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/decorator/ModelDecorator.java =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/decorator/ModelDecorator.java (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/java/org/displaytag/decorator/ModelDecorator.java (working copy) @@ -8,10 +8,22 @@ { public static final String DECORATED_VALUE = "decoratedValue"; - - public String getDecoratedValue() - { - return DECORATED_VALUE; - } - -} \ No newline at end of file + + private String value; + + public ModelDecorator() + { + this.value = DECORATED_VALUE; + } + + public String getDecoratedValue() + { + return this.value; + } + + public void setDecoratedValue(String value) + { + this.value = value; + + } +} Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/resources/displaytag.properties =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/resources/displaytag.properties (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/resources/displaytag.properties (working copy) @@ -1,2 +1,11 @@ +export.types=csv excel xml pdf rtf wpdf + +# test the sample WYSIWYG iText exporters +export.rtf=true +export.rtf.class=org.displaytag.export.DefaultRtfExportView + +export.wpdf=true +export.wpdf.class=org.displaytag.export.DefaultPdfExportView + # test the sample pdf view, not enabled by default in distribution -export.pdf=true +export.pdf=true \ No newline at end of file Index: C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/resources/el/DISPL-298-media-decorator.jsp =================================================================== --- C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/resources/el/DISPL-298-media-decorator.jsp (revision 1084) +++ C:/Workshop/jluix/displaytag_now/displaytag-temp/src/test/resources/el/DISPL-298-media-decorator.jsp (working copy) @@ -15,16 +15,10 @@ testData.add(new org.displaytag.test.KnownValue()); request.setAttribute( "test", testData); org.displaytag.decorator.ModelDecorator decorator = new org.displaytag.decorator.ModelDecorator(); - pageContext.setAttribute("htmlModelDecorator", decorator); - pageContext.setAttribute("wexcelModelDecorator", decorator); - pageContext.setAttribute("wpdfModelDecorator", decorator); - pageContext.setAttribute("rtfModelDecorator", decorator); + pageContext.setAttribute("modelDecorator", decorator); ]]> - - - - +