svn commit: r835414 - in /struts/struts2/trunk: ./ bundles/ bundles/admin/ plugins/json/ plugins/osgi/ plugins/osgi/src/main/java/org/apache/struts2/osgi/ plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/

[wesw]

Author: wesw
Date: Thu Nov 12 15:27:45 2009
New Revision: 835414

URL: http://svn.apache.org/viewvc?rev=835414&view=rev
Log:
WW-3291
- fixed compiler errors
- updated svn:ignore on a few dirs

Modified:
    struts/struts2/trunk/   (props changed)
    struts/struts2/trunk/bundles/   (props changed)
    struts/struts2/trunk/bundles/admin/   (props changed)
    struts/struts2/trunk/plugins/json/   (props changed)
    struts/struts2/trunk/plugins/osgi/   (props changed)
    struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java
    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

Propchange: struts/struts2/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 15:27:45 2009
@@ -5,3 +5,4 @@
 *.iml
 *.iws
 target
+.idea

Propchange: struts/struts2/trunk/bundles/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 12 15:27:45 2009
@@ -0,0 +1,6 @@
+target
+.*
+*.iml
+*.ipr
+*.idea
+*.iws

Propchange: struts/struts2/trunk/bundles/admin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 15:27:45 2009
@@ -1 +1,6 @@
 target
+.*
+*.iml
+*.ipr
+*.idea
+*.iws

Propchange: struts/struts2/trunk/plugins/json/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 15:27:45 2009
@@ -1 +1,6 @@
 target
+.*
+*.iml
+*.ipr
+*.idea
+*.iws

Propchange: struts/struts2/trunk/plugins/osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 12 15:27:45 2009
@@ -1 +1,6 @@
 target
+.*
+*.iml
+*.ipr
+*.idea
+*.iws

Modified: struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java?rev=835414&r1=835413&r2=835414&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java (original)
+++ struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java Thu Nov 12 15:27:45 2009
@@ -45,7 +45,6 @@
 public class BundleFreemarkerManager extends FreemarkerManager {
     private static final Logger LOG = LoggerFactory.getLogger(BundleFreemarkerManager.class);
 
-    @Override
     protected TemplateLoader getTemplateLoader(ServletContext servletContext) {
         // construct a FileTemplateLoader for the init-param 'TemplatePath'
         FileTemplateLoader templatePathLoader = null;

Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerMapper2DecoratorSelector.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerMapper2DecoratorSelector.java?rev=835414&r1=835413&r2=835414&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerMapper2DecoratorSelector.java (original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerMapper2DecoratorSelector.java Thu Nov 12 15:27:45 2009
@@ -41,11 +41,11 @@
  *
  * Won't decorate the output if it finds a "decorator" flag in the request
  */
-public class FreemarkerMapper2DecoratorSelector implements DecoratorSelector {
+public class FreeMarkerMapper2DecoratorSelector implements DecoratorSelector {
 
     private final DecoratorMapper decoratorMapper;
 
-    public FreemarkerMapper2DecoratorSelector(DecoratorMapper decoratorMapper) {
+    public FreeMarkerMapper2DecoratorSelector(DecoratorMapper decoratorMapper) {
         this.decoratorMapper = decoratorMapper;
     }
 

Modified: 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?rev=835414&r1=835413&r2=835414&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 15:27:45 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) {