Struts 2
  1. Struts 2
  2. WW-3291

Update sitemesh-plugin to use version 2.4.2. (CLONE, CATCHALL).

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Critical Critical
    • Resolution: Fixed
    • Affects Version/s: 2.1.6, 2.1.8
    • Fix Version/s: 2.2.1
    • Component/s: Plugin - SiteMesh
    • Labels:
      None
    • Environment:

      JDK 1.5+, Struts 2.1.6+ & SiteMesh 2.4+

    • Flags:
      Patch

      Description

      Catch-all bug for the following bugs: WW-3116 (marked as resolved, not fixed), WW-1128 (should now work on 2.4 and lower), WW-3275 (very good description),

      Detailed description of this issue can be found in the following discussion thread.
      http://www.nabble.com/Struts-2.1.8-%2B-SiteMesh-2.4.2-%2B-FreeMarkerPageFilter-Broken-td25721587.html

      I am attaching a patch that updates the struts2-sitemesh plugin to use the more current SiteMeshPageFilter.java class. The old code was deprecated and deleted from the sitemesh with the 2.4.2 release!

      The new files are as follows. I am testing the freemarker extensively, and will test the velocity a bit later. Please test both and let me know if there are any problems.

      FreeMarkerMapper2DecoratorSelector.java OldDecorator2NewStrutsDecorator.java VelocityMapper2DecoratorSelector.java
      FreeMarkerPageFilter.java OldDecorator2NewStrutsFreemarkerDecorator.java VelocityPageFilter.java
      NoneDecoratorMapper.java OldDecorator2NewStrutsVelocityDecorator.java

      1. WW-3291.diff
        41 kB
        Christian Wolfgang Stone
      2. WW-3291+WW-3296.diff
        103 kB
        musachy

        Issue Links

          Activity

          Christian Wolfgang Stone created issue -
          Christian Wolfgang Stone made changes -
          Field Original Value New Value
          Assignee Christian Wolfgang Stone [ xtianstone ]
          Hide
          Christian Wolfgang Stone added a comment -

          This diff contains the following files:

          FreeMarkerMapper2DecoratorSelector.java
          OldDecorator2NewStrutsDecorator.java
          VelocityMapper2DecoratorSelector.java
          FreeMarkerPageFilter.java
          OldDecorator2NewStrutsFreemarkerDecorator.java
          VelocityPageFilter.java
          NoneDecoratorMapper.java
          OldDecorator2NewStrutsVelocityDecorator.java

          [D] TemplatePageFilter.java

          Show
          Christian Wolfgang Stone added a comment - This diff contains the following files: FreeMarkerMapper2DecoratorSelector.java OldDecorator2NewStrutsDecorator.java VelocityMapper2DecoratorSelector.java FreeMarkerPageFilter.java OldDecorator2NewStrutsFreemarkerDecorator.java VelocityPageFilter.java NoneDecoratorMapper.java OldDecorator2NewStrutsVelocityDecorator.java [D] TemplatePageFilter.java
          Christian Wolfgang Stone made changes -
          Attachment WW-3291.diff [ 14131 ]
          musachy made changes -
          Link This issue blocks WW-3116 [ WW-3116 ]
          musachy made changes -
          Fix Version/s 2.2.0 [ 21960 ]
          Hide
          Christian Wolfgang Stone added a comment -

          Note that I have created WW-3296. I am implementing changes now to completely support mixing freemarker, velocity and JSP decorators, as well as making the same contexts available to the decorators as are available to the results.

          Show
          Christian Wolfgang Stone added a comment - Note that I have created WW-3296 . I am implementing changes now to completely support mixing freemarker, velocity and JSP decorators, as well as making the same contexts available to the decorators as are available to the results.
          Christian Wolfgang Stone made changes -
          Link This issue relates to WW-2865 [ WW-2865 ]
          Hide
          Christian Wolfgang Stone added a comment -

          This is a fix for WW-2865 as well.

          Show
          Christian Wolfgang Stone added a comment - This is a fix for WW-2865 as well.
          Christian Wolfgang Stone made changes -
          Link This issue relates to WW-2865 [ WW-2865 ]
          Christian Wolfgang Stone made changes -
          Flags [Patch]
          Christian Wolfgang Stone made changes -
          Status Open [ 1 ] In Progress [ 3 ]
          Christian Wolfgang Stone made changes -
          Status In Progress [ 3 ] Open [ 1 ]
          Christian Wolfgang Stone made changes -
          Status Open [ 1 ] In Progress [ 3 ]
          Hide
          musachy added a comment -

          patch provided by Chistian Stone

          Show
          musachy added a comment - patch provided by Chistian Stone
          musachy made changes -
          Attachment WW-3291+WW-3296.diff [ 14143 ]
          musachy made changes -
          Link This issue is part of WW-3296 [ WW-3296 ]
          musachy made changes -
          Link This issue is duplicated by WW-3275 [ WW-3275 ]
          musachy committed 835248 (16 files)
          Reviews: none

          WW-3291 Update sitemesh-plugin to use version 2.4.2 patch provided by Christian Wolfgang Stone

          struts2 trunk
          musachy committed 835249 (1 file)
          Reviews: none

          WW-3291 Update sitemesh-plugin to use version 2.4.2 patch provided by Christian Wolfgang Stone

          Jeff Turner made changes -
          Project Import Mon Feb 01 01:17:42 UTC 2010 [ 1264987062082 ]
          Hide
          Lukasz Lenart added a comment -

          It looks like the patch was already applied, could someone confirm?

          Show
          Lukasz Lenart added a comment - It looks like the patch was already applied, could someone confirm?
          Hide
          Lukasz Lenart added a comment -

          Already solved with WW-3296

          Show
          Lukasz Lenart added a comment - Already solved with WW-3296
          Lukasz Lenart made changes -
          Status In Progress [ 3 ] Resolved [ 5 ]
          Assignee Christian Wolfgang Stone [ xtianstone ] Lukasz Lenart [ lukaszlenart ]
          Resolution Fixed [ 1 ]
          Lukasz Lenart made changes -
          Fix Version/s 2.2.1 [ 12315170 ]
          Fix Version/s 2.2.0 [ 12314680 ]
          Lukasz Lenart made changes -
          Status Resolved [ 5 ] Closed [ 6 ]
          Gavin made changes -
          Link This issue blocks WW-3116 [ WW-3116 ]
          Gavin made changes -
          Link This issue is depended upon by WW-3116 [ WW-3116 ]
          Lukasz Lenart made changes -
          Link This issue breaks WW-3330 [ WW-3330 ]

            People

            • Assignee:
              Lukasz Lenart
              Reporter:
              Christian Wolfgang Stone
            • Votes:
              2 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development