svn commit: r618996 - in /cocoon/whiteboard/micro/core: cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/ cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/ cocoon-sitemap/cocoon-sitemap-i...

[gk...@apache.org]

Author: gkossakowski
Date: Wed Feb  6 06:12:39 2008
New Revision: 618996

URL: http://svn.apache.org/viewvc?rev=618996&view=rev
Log:
Removed PreparedVariableResolver responsible for support of old sitemap expressions.

This it was also possible to remove all nasty infrastructure supporting
PreparedVariableResolver class which was tied very closely to Avalon istelf.

This also cleans up the bad situation that we had before where tests for classes from
cocoon-sitemap-impl where stored in cocoon-core module due to complicated and heavy dependencies.

Removed:
    cocoon/whiteboard/micro/core/cocoon-core/src/test/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
    cocoon/whiteboard/micro/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
    cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/LegacySitemapStringTemplateParser.java
    cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/LegacySubstitutions.java
    cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Modified:
    cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/StringTemplateParserVariableResolver.java
    cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/BridgeElementParser.java

Modified: cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/StringTemplateParserVariableResolver.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/StringTemplateParserVariableResolver.java?rev=618996&r1=618995&r2=618996&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/StringTemplateParserVariableResolver.java (original)
+++ cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/variables/StringTemplateParserVariableResolver.java Wed Feb  6 06:12:39 2008
@@ -62,9 +62,6 @@
     public void setExpression(String expression) throws PatternException {
         this.originalExpr = expression;
         try {
-            if (stringTemplateParser instanceof LegacySitemapStringTemplateParser)
-                this.substitutions = new LegacySubstitutions((LegacySitemapStringTemplateParser) stringTemplateParser, null, expression);
-            else
                 this.substitutions = new Substitutions(stringTemplateParser, null, expression);
         } catch (Exception e) {
             throw new PatternException(e);
@@ -73,10 +70,7 @@
 
     public String resolve(InvokeContext context, Map objectModel) throws PatternException {
         try {
-            if (this.substitutions instanceof LegacySubstitutions)
-                return ((LegacySubstitutions) substitutions).toString(null, this.objectModel, context, objectModel);
-            else
-                return substitutions.toString(null, this.objectModel);
+            return substitutions.toString(null, this.objectModel);
         } catch (Exception e) {
             throw new PatternException(e);
         }

Modified: cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/BridgeElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/BridgeElementParser.java?rev=618996&r1=618995&r2=618996&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/BridgeElementParser.java (original)
+++ cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/BridgeElementParser.java Wed Feb  6 06:12:39 2008
@@ -140,13 +140,6 @@
         beanDef.getPropertyValues().addPropertyValue("resourceLoader", resourceLoader);
         beanDef.getPropertyValues().addPropertyValue("location", this.getConfigurationLocation());
         this.register(beanDef, AvalonBeanPostProcessor.class.getName(), registry);
-
-        final RootBeanDefinition resolverDef = new RootBeanDefinition();
-        resolverDef.setBeanClassName("org.apache.cocoon.components.treeprocessor.variables.PreparedVariableResolver");
-        resolverDef.setLazyInit(false);
-        resolverDef.setScope("prototype");
-        resolverDef.getPropertyValues().addPropertyValue("manager", new RuntimeBeanReference("org.apache.avalon.framework.service.ServiceManager"));
-        this.register(resolverDef, "org.apache.cocoon.components.treeprocessor.variables.VariableResolver", null, registry);
     }
 
     protected ConfigurationInfo readConfiguration(String location, ResourceLoader resourceLoader)