Author: mrdon
Date: Thu Nov 16 00:32:03 2006
New Revision: 475637
URL: http://svn.apache.org/viewvc?view=rev&rev=475637
Log:
Changed manager dependencies to optional, will scream bloody murder when used
by not set
WW-1506
Modified:
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
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?view=diff&rev=475637&r1=475636&r2=475637
==============================================================================
---
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 16 00:32:03 2006
@@ -110,7 +110,7 @@
private static FreemarkerManager freemarkerManager;
- @Inject
+ @Inject(required=false)
public static void setFreemarkerManager(FreemarkerManager mgr) {
freemarkerManager = mgr;
}
@@ -131,9 +131,12 @@
throws ServletException, IOException {
String timerKey = "FreemarkerPageFilter_applyDecorator: ";
+ if (freemarkerManager == null) {
+ throw new ServletException("Missing freemarker dependency");
+ }
+
try {
UtilTimerStack.push(timerKey);
-
// get the configuration and template
Configuration config =
freemarkerManager.getConfiguration(servletContext);
Modified:
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java?view=diff&rev=475637&r1=475636&r2=475637
==============================================================================
---
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
(original)
+++
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
Thu Nov 16 00:32:03 2006
@@ -51,7 +51,7 @@
private static VelocityManager velocityManager;
- @Inject
+ @Inject(required=false)
public static void setVelocityManager(VelocityManager mgr) {
velocityManager = mgr;
}
@@ -70,6 +70,11 @@
HttpServletRequest req, HttpServletResponse
res,
ServletContext servletContext, ActionContext
ctx)
throws ServletException, IOException {
+
+ if (velocityManager == null) {
+ throw new ServletException("Missing freemarker dependency");
+ }
+
try {
// init (if needed)
