cziegeler 2003/08/01 03:28:38
Modified: . status.xml
src/java/org/apache/cocoon/servlet CocoonServlet.java
Log:
logkit.xconf can be located at any uri
Revision Changes Path
1.101 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- status.xml 30 Jul 2003 08:21:42 -0000 1.100
+++ status.xml 1 Aug 2003 10:28:38 -0000 1.101
@@ -167,6 +167,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="add">
+ Configuration logkit.xconf can now be read from any location.
+ </action>
<action dev="CZ" type="fix">
Fix the ignoreErrors handling in the cinclude transformer.
</action>
1.13 +10 -3 cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CocoonServlet.java 1 Aug 2003 10:06:41 -0000 1.12
+++ CocoonServlet.java 1 Aug 2003 10:28:38 -0000 1.13
@@ -823,8 +823,15 @@
//Configure the logkit management
String logkitConfig = getInitParameter("logkit-config",
"/WEB-INF/logkit.xconf");
- InputStream is = this.servletContext.getResourceAsStream(logkitConfig);
- if (is == null) is = new FileInputStream(logkitConfig);
+ // test if this is a qualified url
+ InputStream is = null;
+ if ( logkitConfig.indexOf(':') == -1) {
+ is = this.servletContext.getResourceAsStream(logkitConfig);
+ if (is == null) is = new FileInputStream(logkitConfig);
+ } else {
+ URL logkitURL = new URL(logkitConfig);
+ is = logkitURL.openStream();
+ }
final DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
final Configuration conf = builder.build(is);
logKitManager.configure(conf);
