Author: cziegeler Date: Fri Jan 21 06:14:25 2005 New Revision: 125931 URL: http://svn.apache.org/viewcvs?view=rev&rev=125931 Log: Use pattern for logkit configuration Added: cocoon/trunk/src/blocks/apples/WEB-INF/xconf/apples.logkit - copied unchanged from r125902, cocoon/trunk/src/blocks/apples/WEB-INF/logkitconf/apples.logkit cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cron.logkit - copied unchanged from r125902, cocoon/trunk/src/blocks/cron/WEB-INF/logkitconf/cron.logkit cocoon/trunk/src/blocks/forms/WEB-INF/xconf/forms.logkit - copied unchanged from r125902, cocoon/trunk/src/blocks/forms/WEB-INF/logkitconf/forms.logkit cocoon/trunk/src/blocks/portal/WEB-INF/xconf/portal.logkit - copied unchanged from r125902, cocoon/trunk/src/blocks/portal/WEB-INF/logkitconf/portal.logkit cocoon/trunk/src/blocks/slide/WEB-INF/xconf/slide.logkit - copied unchanged from r125902, cocoon/trunk/src/blocks/slide/WEB-INF/logkitconf/slide.logkit Removed: cocoon/trunk/src/blocks/apples/WEB-INF/logkitconf/ cocoon/trunk/src/blocks/cron/WEB-INF/logkitconf/ cocoon/trunk/src/blocks/forms/WEB-INF/logkitconf/ cocoon/trunk/src/blocks/portal/WEB-INF/logkitconf/ cocoon/trunk/src/blocks/slide/WEB-INF/logkitconf/ cocoon/trunk/src/webapp/WEB-INF/logkitconf/ Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHelper.java cocoon/trunk/src/webapp/WEB-INF/logkit.xconf
Copied: cocoon/trunk/src/blocks/apples/WEB-INF/xconf/apples.logkit (from r125902, cocoon/trunk/src/blocks/apples/WEB-INF/logkitconf/apples.logkit) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/apples/WEB-INF/xconf/apples.logkit?view=diff&rev=125931&p1=cocoon/trunk/src/blocks/apples/WEB-INF/logkitconf/apples.logkit&r1=125902&p2=cocoon/trunk/src/blocks/apples/WEB-INF/xconf/apples.logkit&r2=125931 ============================================================================== Copied: cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cron.logkit (from r125902, cocoon/trunk/src/blocks/cron/WEB-INF/logkitconf/cron.logkit) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cron.logkit?view=diff&rev=125931&p1=cocoon/trunk/src/blocks/cron/WEB-INF/logkitconf/cron.logkit&r1=125902&p2=cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cron.logkit&r2=125931 ============================================================================== Copied: cocoon/trunk/src/blocks/forms/WEB-INF/xconf/forms.logkit (from r125902, cocoon/trunk/src/blocks/forms/WEB-INF/logkitconf/forms.logkit) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/WEB-INF/xconf/forms.logkit?view=diff&rev=125931&p1=cocoon/trunk/src/blocks/forms/WEB-INF/logkitconf/forms.logkit&r1=125902&p2=cocoon/trunk/src/blocks/forms/WEB-INF/xconf/forms.logkit&r2=125931 ============================================================================== Copied: cocoon/trunk/src/blocks/portal/WEB-INF/xconf/portal.logkit (from r125902, cocoon/trunk/src/blocks/portal/WEB-INF/logkitconf/portal.logkit) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/WEB-INF/xconf/portal.logkit?view=diff&rev=125931&p1=cocoon/trunk/src/blocks/portal/WEB-INF/logkitconf/portal.logkit&r1=125902&p2=cocoon/trunk/src/blocks/portal/WEB-INF/xconf/portal.logkit&r2=125931 ============================================================================== Copied: cocoon/trunk/src/blocks/slide/WEB-INF/xconf/slide.logkit (from r125902, cocoon/trunk/src/blocks/slide/WEB-INF/logkitconf/slide.logkit) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/WEB-INF/xconf/slide.logkit?view=diff&rev=125931&p1=cocoon/trunk/src/blocks/slide/WEB-INF/logkitconf/slide.logkit&r1=125902&p2=cocoon/trunk/src/blocks/slide/WEB-INF/xconf/slide.logkit&r2=125931 ============================================================================== Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java?view=diff&rev=125931&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r1=125930&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r2=125931 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Fri Jan 21 06:14:25 2005 @@ -778,6 +778,7 @@ } return WildcardHelper.match(null, uri, parsedPattern); } + /** * Release the source resolver that may have been created by the first call to * loadConfiguration(). Modified: cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHelper.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHelper.java?view=diff&rev=125931&p1=cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHelper.java&r1=125930&p2=cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHelper.java&r2=125931 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHelper.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHelper.java Fri Jan 21 06:14:25 2005 @@ -37,6 +37,7 @@ import org.apache.cocoon.configuration.ConfigurationBuilder; import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.source.SimpleSourceResolver; +import org.apache.cocoon.matching.helpers.WildcardHelper; import org.apache.cocoon.util.log.Log4JConfigurator; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.TraversableSource; @@ -123,7 +124,11 @@ final Configuration[] children = conf.getChildren("include"); for(int i=0; i<children.length; i++) { String directoryURI = children[i].getAttribute("dir"); - final String ending = children[i].getAttribute("postfix", null); + final String pattern = children[i].getAttribute("pattern", null); + int[] parsedPattern = null; + if ( pattern != null ) { + parsedPattern = WildcardHelper.compilePattern(pattern); + } Source directory = null; try { directory = resolver.resolveURI(directoryURI, source.getURI(), CONTEXT_PARAMETERS); @@ -131,7 +136,7 @@ final Iterator c = ((TraversableSource)directory).getChildren().iterator(); while ( c.hasNext() ) { final Source s = (Source)c.next(); - if ( ending == null || s.getURI().endsWith(ending) ) { + if ( parsedPattern == null || this.match(s.getURI(), parsedPattern) ) { final Configuration includeConf = builder.build(s.getInputStream()); // add targets and categories categories.addAllChildren(includeConf.getChild("categories")); @@ -221,4 +226,13 @@ public LoggerManager getLoggerManager() { return this.loggerManager; } + + private boolean match(String uri, int[] parsedPattern ) { + int pos = uri.lastIndexOf('/'); + if ( pos != -1 ) { + uri = uri.substring(pos+1); + } + return WildcardHelper.match(null, uri, parsedPattern); + } + } Modified: cocoon/trunk/src/webapp/WEB-INF/logkit.xconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/logkit.xconf?view=diff&rev=125931&p1=cocoon/trunk/src/webapp/WEB-INF/logkit.xconf&r1=125930&p2=cocoon/trunk/src/webapp/WEB-INF/logkit.xconf&r2=125931 ============================================================================== --- cocoon/trunk/src/webapp/WEB-INF/logkit.xconf (original) +++ cocoon/trunk/src/webapp/WEB-INF/logkit.xconf Fri Jan 21 06:14:25 2005 @@ -181,5 +181,5 @@ </categories> <!-- Include logging confs from different blocks --> - <include dir="context://WEB-INF/logkitconf" postfix=".logkit"/> + <include dir="context://WEB-INF/xconf" pattern="*.logkit"/> </logkit>
