You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2006/04/03 11:11:51 UTC
svn commit: r390985 - in
/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago:
config/TobagoConfig.java config/TobagoConfigParser.java
servlet/ResourceServlet.java webapp/TobagoServletContextListener.java
Author: lofwyr
Date: Mon Apr 3 02:11:49 2006
New Revision: 390985
URL: http://svn.apache.org/viewcvs?rev=390985&view=rev
Log:
write a deprecation warning when using load-theme-resources-from-classpath
Modified:
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=390985&r1=390984&r2=390985&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Mon Apr 3 02:11:49 2006
@@ -134,7 +134,8 @@
return theme;
}
}
- LOG.debug("searching theme '" + name + "' not found. Using default: " + defaultTheme);
+ LOG.debug("searching theme '" + name + "' not found. "
+ + "Using default: " + defaultTheme);
return defaultTheme;
}
@@ -163,6 +164,12 @@
public void setAjaxEnabled(String value) {
this.ajaxEnabled = Boolean.valueOf(value);
+ }
+
+ @Deprecated
+ public void setLoadThemesFromClasspath(String loadThemesFromClasspath) {
+ LOG.warn("Deprecated: setting load-theme-resources-from-classpath is "
+ + "no longer supported");
}
public Theme getDefaultTheme() {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java?rev=390985&r1=390984&r2=390985&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java Mon Apr 3 02:11:49 2006
@@ -38,15 +38,17 @@
private static final Log LOG = LogFactory.getLog(TobagoConfigParser.class);
private static final String TOBAGO_CONFIG_DTD = "/org/apache/myfaces/tobago/config/tobago-config_1_0.dtd";
- public static void parse(ServletContext context, TobagoConfig tobagoConfig)
+ public TobagoConfig parse(ServletContext context)
throws IOException, SAXException, FacesException {
+ TobagoConfig tobagoConfig = new TobagoConfig();
Digester digester = new Digester();
configure(tobagoConfig, digester);
parse(context, digester);
+ return tobagoConfig;
}
- private static Digester configure(TobagoConfig config, Digester digester) {
+ private Digester configure(TobagoConfig config, Digester digester) {
digester.push(config);
digester.setValidating(true);
@@ -71,6 +73,9 @@
digester.addCallMethod(
"tobago-config/mapping-rule/attribute/value", "setValue", 0);
+ // XXX: deprecated! will ever be true (will be removed in next release after 1.0.7)
+ digester.addCallMethod("tobago-config/load-theme-resources-from-classpath", "setLoadThemesFromClasspath", 0);
+
// resource dirs
digester.addCallMethod("tobago-config/resource-dir", "addResourceDir", 0);
@@ -81,10 +86,10 @@
}
// TODO: make it runnable without config file, using defaults
- private static void parse(ServletContext context, Digester digester)
+ private void parse(ServletContext context, Digester digester)
throws IOException, SAXException, FacesException {
- final String configPath = "/WEB-INF/tobago-config.xml";
+ String configPath = "/WEB-INF/tobago-config.xml";
InputStream input = null;
registerDtd(digester);
try {
@@ -100,8 +105,8 @@
}
}
- private static void registerDtd(Digester digester) {
- URL url = TobagoConfigParser.class.getResource(TOBAGO_CONFIG_DTD);
+ private void registerDtd(Digester digester) {
+ URL url = getClass().getResource(TOBAGO_CONFIG_DTD);
if (LOG.isDebugEnabled()) {
LOG.debug("registering dtd: url=" + url);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=390985&r1=390984&r2=390985&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Mon Apr 3 02:11:49 2006
@@ -16,10 +16,9 @@
* limitations under the License.
*/
+import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.io.IOUtils;
-import org.apache.myfaces.tobago.context.Theme;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -40,6 +39,7 @@
private static final Log LOG = LogFactory.getLog(ResourceServlet.class);
+ @Override
protected void service(
HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@@ -49,13 +49,8 @@
String resource = requestURI.substring(
request.getContextPath().length() + 1); // todo: make it "stable"
- if (LOG.isDebugEnabled()) {
- LOG.debug("C " + request.getContextPath());
- LOG.debug("Q " + request.getQueryString());
- LOG.debug("R " + requestURI);
- LOG.debug("L " + resource);
- }
-
+// response.setHeader("Cache-Control", "max-age=3600");
+// response.setDateHeader("Expires", 3600);
// todo: maybe support more extensions (configurable?)
if (requestURI.endsWith(".gif")) {
response.setContentType("image/gif");
@@ -74,7 +69,7 @@
}
InputStream inputStream = null;
try {
- inputStream = Theme.class.getClassLoader().getResourceAsStream(resource);
+ inputStream = ResourceServlet.class.getClassLoader().getResourceAsStream(resource);
IOUtils.copy(inputStream, response.getOutputStream());
} finally {
IOUtils.closeQuietly(inputStream);
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java?rev=390985&r1=390984&r2=390985&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java Mon Apr 3 02:11:49 2006
@@ -49,8 +49,8 @@
try {
// tobago-config.xml
- TobagoConfig tobagoConfig = new TobagoConfig();
- TobagoConfigParser.parse(servletContext, tobagoConfig);
+ TobagoConfig tobagoConfig
+ = new TobagoConfigParser().parse(servletContext);
servletContext.setAttribute(TobagoConfig.TOBAGO_CONFIG, tobagoConfig);
// todo: cleanup, use one central TobagoConfig, no singleton ResourceManager