Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "WN-5141"

Browse Source 
This reverts commit b8b9f8aa37.
This commit is contained in:
jdyer1
2023-11-13 14:56:15 -06:00
committed by Lukasz Lenart
parent a9edf74798
commit ec6c96e16c
5 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+4 -9
View File
@@ -371,9 +371,7 @@ 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);
@@ -421,7 +419,7 @@ public class FreemarkerManager {
}
model.put(ATTR_REQUEST_PARAMETERS_MODEL, reqParametersModel);
model.put(KEY_REQUEST_PARAMETERS_STRUTS,reqParametersModel);
*/
return model;
}
@@ -461,17 +459,14 @@ 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
+2 -5
View File
@@ -66,18 +66,15 @@ 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
+2 -6
View File
@@ -65,12 +65,8 @@ public class FreemarkerRequest extends AbstractViewRequest {
*/
public static FreemarkerRequest createServletFreemarkerRequest(ApplicationContext applicationContext, Environment env) {
HttpRequestHashModel requestModel = FreemarkerRequestUtil.getRequestHashModel(env);
//TODO: requires javax
HttpServletRequest request = null; //requestModel.getRequest();
HttpServletResponse response = null; //requestModel.getResponse();
HttpServletRequest request = requestModel.getRequest();
HttpServletResponse response = 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
+2 -6
View File
@@ -74,13 +74,9 @@ public final class FreemarkerRequestUtil {
* @return The
*/
public static ApplicationContext getApplicationContext(Environment env) {
return null;
// TODO: requies javax
/* return ServletUtil.getApplicationContext(
return ServletUtil.getApplicationContext(
getServletContextHashModel(env).getServlet().getServletContext()
);*/
);
}
}
plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java
+1 -4
View File
@@ -50,10 +50,7 @@ public class WebappClassTemplateLoader implements TemplateLoader {
* @param servletContext The servlet context.
*/
public WebappClassTemplateLoader(ServletContext servletContext) {
// TODO: requires javax
webappTemplateLoader = null; //new WebappTemplateLoader(servletContext);
webappTemplateLoader = new WebappTemplateLoader(servletContext);
classTemplateLoader = new ClassTemplateLoader(getClass(), "/");
}