Any reason for defining the ObjectModel bean in the pipeline-impl
modeule instead of in the expression-language-impl module? I also wonder
why you use camel case names for Spring config files instead of
following the name convention that all the rest of the Spring configs in
Cocoon use.
/Daniel
[EMAIL PROTECTED] skrev:
Author: gkossakowski
Date: Fri Sep 14 11:11:52 2007
New Revision: 575768
URL: http://svn.apache.org/viewvc?rev=575768&view=rev
Log:
Switched collecting of ObjectModelProviders to bean-map from Spring
Configurator. It made possible to revert some changes committed in r574029.
Added:
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
(contents, props changed)
- copied, changed from r575483,
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
(contents, props changed)
- copied, changed from r575483,
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
Removed:
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
Modified:
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml