[jbossweb-commits] JBossWeb SVN: r1275 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2009-11-18 11:56:02 -0500 (Wed, 18 Nov 2009)
New Revision: 1275
Modified:
trunk/java/org/jboss/web/rewrite/RewriteValve.java
trunk/webapps/docs/changelog.xml
Log:
- Better usability of RewriteValve at the context level.
Modified: trunk/java/org/jboss/web/rewrite/RewriteValve.java
===================================================================
--- trunk/java/org/jboss/web/rewrite/RewriteValve.java 2009-11-18 15:46:34 UTC (rev 1274)
+++ trunk/java/org/jboss/web/rewrite/RewriteValve.java 2009-11-18 16:56:02 UTC (rev 1275)
@@ -117,10 +117,15 @@
context = true;
is = ((Context) getContainer()).getServletContext()
.getResourceAsStream("/WEB-INF/" + resourcePath);
- if ((is == null) && (container.getLogger().isInfoEnabled())) {
- container.getLogger().info("No configuration resource found:
/WEB-INF/" + resourcePath);
+ if (container.getLogger().isDebugEnabled()) {
+ if (is == null) {
+ container.getLogger().debug("No configuration resource found:
/WEB-INF/" + resourcePath);
+ } else {
+ container.getLogger().debug("Read configuration from:
/WEB-INF/" + resourcePath);
+ }
}
- } else {
+ }
+ if (is == null) {
String resourceName = getHostConfigPath(resourcePath);
File file = new File(getConfigBase(), resourceName);
try {
@@ -139,8 +144,8 @@
}
is = new FileInputStream(file);
}
- if ((is == null) && (container.getLogger().isInfoEnabled())) {
- container.getLogger().info("No configuration resource found:
" + resourceName +
+ if ((is == null) && (container.getLogger().isDebugEnabled())) {
+ container.getLogger().debug("No configuration resource found:
" + resourceName +
" in " + getConfigBase().getAbsolutePath() + "
or in the classloader");
}
} catch (Exception e) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-11-18 15:46:34 UTC (rev 1274)
+++ trunk/webapps/docs/changelog.xml 2009-11-18 16:56:02 UTC (rev 1275)
@@ -136,6 +136,9 @@
<fix>
<bug>47705</bug>: Fix divide by zero in the manager sessions command.
(funkman)
</fix>
+ <fix>
+ <jboss-jira>JBAS-7159</jboss-jira>: Better usability for Context
level usage of RewriteValve. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">