svn commit: r835433 - in /struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh: FreeMarkerMapper2DecoratorSelector.java FreeMarkerPageFilter.java FreemarkerPageFilter.java

[musachy-2]

Author: musachy
Date: Thu Nov 12 16:32:24 2009
New Revision: 835433

URL: http://svn.apache.org/viewvc?rev=835433&view=rev
Log:
remove duplicated file (thanks to windows)

Added:
    struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java   (contents, props changed)
      - copied, changed from r835429, struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
Removed:
    struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerMapper2DecoratorSelector.java
    struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java

Copied: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java (from r835429, struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java?p2=struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java&p1=struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java&r1=835429&r2=835433&rev=835433&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java (original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java Thu Nov 12 16:32:24 2009
@@ -36,7 +36,7 @@
  * Core Filter for integrating SiteMesh + Freemarker into
  * a Java web application.
  */
-public class FreeMarkerPageFilter extends SiteMeshFilter {
+public class FreemarkerPageFilter extends SiteMeshFilter {
 
     @Inject(required=false)
     public static void setFreemarkerManager(FreemarkerManager mgr) {

Propchange: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL