WN-5141

- TODO:  TEMPORARY comment-out problematic Freemarker code

core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java

@@ -371,7 +371,9 @@ public class FreemarkerManager {
 
     protected ScopesHashModel buildScopesHashModel(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, ObjectWrapper wrapper, ValueStack stack) {
         ScopesHashModel model = new ScopesHashModel(wrapper, servletContext, request, stack);
-
+        
+        // TODO:  HashModel's require javax
+/*
         // Create hash model wrapper for servlet context (the application). We need one thread, once per servlet context
         synchronized (servletContext) {
             ServletContextHashModel servletContextModel = (ServletContextHashModel) servletContext.getAttribute(ATTR_APPLICATION_MODEL);
@@ -419,7 +421,7 @@ public class FreemarkerManager {
         }
         model.put(ATTR_REQUEST_PARAMETERS_MODEL, reqParametersModel);
         model.put(KEY_REQUEST_PARAMETERS_STRUTS,reqParametersModel);
-
+*/
         return model;
     }
 
@@ -459,14 +461,17 @@ public class FreemarkerManager {
 
          // presume that most apps will require the class and webapp template loader
          // if people wish to
+         
+         //TODO: WebappTemplateLoader requires javax
+         
          return templatePathLoader != null ?
                  new MultiTemplateLoader(new TemplateLoader[]{
                          templatePathLoader,
-                         new WebappTemplateLoader(servletContext),
+                        // new WebappTemplateLoader(servletContext),
                          new StrutsClassTemplateLoader()
                  })
                  : new MultiTemplateLoader(new TemplateLoader[]{
-                 new WebappTemplateLoader(servletContext),
+                 //new WebappTemplateLoader(servletContext),
                  new StrutsClassTemplateLoader()
          });
      }

plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java

@@ -66,15 +66,18 @@ public class BundleFreemarkerManager extends FreemarkerManager {
 
         // presume that most apps will require the class and webapp template loader
         // if people wish to
+        
+        //TODO: WebAppTemplateLoader requires javax
+        
         return templatePathLoader != null ?
                 new MultiTemplateLoader(new TemplateLoader[]{
                         templatePathLoader,
-                        new WebappTemplateLoader(servletContext),
+                        //new WebappTemplateLoader(servletContext),
                         new StrutsClassTemplateLoader(),
                         new FreeMarkerBundleResourceLoader()
                 })
                 : new MultiTemplateLoader(new TemplateLoader[]{
-                new WebappTemplateLoader(servletContext),
+                //new WebappTemplateLoader(servletContext),
                 new StrutsClassTemplateLoader(),
                 new FreeMarkerBundleResourceLoader()
         });

plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java

@@ -65,8 +65,12 @@ public class FreemarkerRequest extends AbstractViewRequest {
      */
     public static FreemarkerRequest createServletFreemarkerRequest(ApplicationContext applicationContext, Environment env) {
         HttpRequestHashModel requestModel = FreemarkerRequestUtil.getRequestHashModel(env);
-        HttpServletRequest request = requestModel.getRequest();
-        HttpServletResponse response = requestModel.getResponse();
+        
+        //TODO: requires javax
+        
+        HttpServletRequest request = null; //requestModel.getRequest();
+        HttpServletResponse response = null; //requestModel.getResponse();
+        
         DispatchRequest enclosedRequest = new ServletRequest(applicationContext, request, response);
         return new FreemarkerRequest(enclosedRequest, env);
     }

plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java

@@ -74,9 +74,13 @@ public final class FreemarkerRequestUtil {
      * @return The
      */
     public static ApplicationContext getApplicationContext(Environment env) {
-        return ServletUtil.getApplicationContext(
+    	return null;
+    	
+    	// TODO: requies javax
+    	
+       /* return ServletUtil.getApplicationContext(
             getServletContextHashModel(env).getServlet().getServletContext()
-        );
+        );*/
     }
 
 }

plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java

@@ -50,7 +50,10 @@ public class WebappClassTemplateLoader implements TemplateLoader {
      * @param servletContext The servlet context.
      */
     public WebappClassTemplateLoader(ServletContext servletContext) {
-        webappTemplateLoader = new WebappTemplateLoader(servletContext);
+    	
+    	// TODO: requires javax
+    	
+        webappTemplateLoader = null; //new WebappTemplateLoader(servletContext);
         classTemplateLoader = new ClassTemplateLoader(getClass(), "/");
     }