cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Leszek Gawron <lgaw...@mobilebox.pl>
Subject Re: svn commit: r470754 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
Date Fri, 03 Nov 2006 10:51:47 GMT
lgawron@apache.org wrote:
> Author: lgawron
> Date: Fri Nov  3 02:47:52 2006
> New Revision: 470754
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=470754
> Log:
> invalid syntax
> 
> Modified:
>     cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
> 
> Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
> URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java?view=diff&rev=470754&r1=470753&r2=470754
> ==============================================================================
> --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
(original)
> +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
Fri Nov  3 02:47:52 2006
> @@ -40,7 +40,7 @@
>      /** The location of the directory where the different property files are located.
*/
>      protected String location = Constants.DEFAULT_SPRING_CONFIGURATION_LOCATION;
>  
> -    /** The resource loader used to load the property files. 
> +    /** The resource loader used to load the property files.
>       * This loader is either resolving relative to the current sitemap or the
>       * root of the context.
>       */
> @@ -83,17 +83,17 @@
>          }
>          final String mode = (this.settings != null ? this.settings.getRunningMode()
: SettingsDefaults.DEFAULT_RUNNING_MODE);
>          final Properties mergedProps = new Properties();
> -        ResourceUtils.readProperties("classpath:*/META-INF/cocoon/spring", mergedProps,
this.resourceLoader, this.logger);
> -        ResourceUtils.readProperties("classpath:*/META-INF/cocoon/spring/" + mode, mergedProps,
this.resourceLoader, this.logger);
> +        ResourceUtils.readProperties("classpath*:/META-INF/cocoon/spring", mergedProps,
this.resourceLoader, this.logger);
> +        ResourceUtils.readProperties("classpath*:/META-INF/cocoon/spring/" + mode, mergedProps,
this.resourceLoader, this.logger);

won't work anyway. ResourceUtils class is not handling wildcard 
resources properly. I am trying to fix it now.

-- 
Leszek Gawron                                    CTO at MobileBox Ltd.


Mime
View raw message