cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r575768 - in /cocoon/trunk: blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/ core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/ core/cocoon-expression-lan...
Date Fri, 14 Sep 2007 18:11:53 GMT
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

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml?rev=575768&r1=575767&r2=575768&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
Fri Sep 14 11:11:52 2007
@@ -31,7 +31,6 @@
   <import resource="classpath:META-INF/cocoon/spring/LegacyStringTemplateParser.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/ObjectModelTemplate.xml"/>
   
-  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"
-        parent="org.apache.cocoon.el.objectmodel.ObjectModel.template"/>
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" parent="org.apache.cocoon.el.objectmodel.ObjectModel.template"/>
   
 </beans>

Modified: cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml?rev=575768&r1=575767&r2=575768&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
(original)
+++ cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
Fri Sep 14 11:11:52 2007
@@ -28,7 +28,6 @@
   <import resource="classpath:META-INF/cocoon/spring/RhinoScope.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/ObjectModelTemplate.xml"/>
   
-  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"
-        parent="org.apache.cocoon.el.objectmodel.ObjectModel.template"/>
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" parent="org.apache.cocoon.el.objectmodel.ObjectModel.template"/>
   
 </beans>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml?rev=575768&r1=575767&r2=575768&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml Fri
Sep 14 11:11:52 2007
@@ -61,6 +61,10 @@
       <artifactId>cocoon-xml-util</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-spring-configurator</artifactId>
+    </dependency>
+    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml?rev=575768&r1=575767&r2=575768&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
Fri Sep 14 11:11:52 2007
@@ -21,13 +21,13 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     
     <!-- ObjectModelEntry provider for 'Packages' -->
-    <bean name="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"
+    <bean name="org.apache.cocoon.el.objectmodel.ObjectModelProvider/Packages"
           class="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider">
       <property name="rootScope" ref="org.mozilla.javascript.Scriptable/rootScope"/>
     </bean>
     
     <!-- ObjectModelEntry provider for 'java' -->
-    <bean name="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"
+    <bean name="org.apache.cocoon.el.objectmodel.ObjectModelProvider/java"
           class="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider">
       <property name="rootScope" ref="org.mozilla.javascript.Scriptable/rootScope"/>
     </bean>

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
(from r575483, cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml?p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml&p1=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml&r1=575483&r2=575768&rev=575768&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
Fri Sep 14 11:11:52 2007
@@ -19,8 +19,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:configurator="http://cocoon.apache.org/schema/configurator"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+                           http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+                           http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
 
     <!-- Default implementation of ObjectModel interface. This bean definition, is a template
actually because it has
          abstract attribute set to "true". It enables Object Model to be defined as scoped
bean elsewhere. -->
@@ -28,12 +30,8 @@
           class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"
           abstract="true">
         <property name="initialEntries">
-          <map>
-            <entry key="cocoon" value-ref="org.apache.cocoon.objectmodel.impl.CocoonEntryObjectModelProvider"/>
-            <entry key="Packages" value-ref="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"/>
-            <entry key="java" value-ref="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"/>
-          </map>
-        </property>        
+          <configurator:bean-map type="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
+        </property>
     </bean>
 
 </beans>

Propchange: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
(from r575483, cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml?p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml&p1=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml&r1=575483&r2=575768&rev=575768&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
(original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
Fri Sep 14 11:11:52 2007
@@ -23,8 +23,8 @@
   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
   
   <!-- Default implementation of ObjectModel interface in pipelineComponent scope. -->
-  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"

-        scope="pipelineComponent" parent="org.apache.cocoon.el.objectmodel.ObjectModel.template">
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" scope="pipelineComponent"

+        parent="org.apache.cocoon.el.objectmodel.ObjectModel.template">
     <aop:scoped-proxy proxy-target-class="false"/>
   </bean>
   

Propchange: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml?rev=575768&r1=575767&r2=575768&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
Fri Sep 14 11:11:52 2007
@@ -21,7 +21,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <!-- ObjectModelEntry provider for 'cocoon' -->
-    <bean name="org.apache.cocoon.objectmodel.impl.CocoonEntryObjectModelProvider"
+    <bean name="org.apache.cocoon.el.objectmodel.ObjectModelProvider/cocoon"
           class="org.apache.cocoon.objectmodel.impl.CocoonEntryObjectModelProvider">
         <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
         <property name="processInfoProvider" ref="org.apache.cocoon.processing.ProcessInfoProvider"/>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml?rev=575768&r1=575767&r2=575768&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml
Fri Sep 14 11:11:52 2007
@@ -26,16 +26,9 @@
   <import resource="classpath:META-INF/cocoon/spring/ObjectModelProviders.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/RhinoScope.xml"/>
+  <import resource="classpath:META-INF/cocoon/spring/ObjectModelTemplate.xml"/>
   
   <!-- Redefining this bean instead of importing because originally it is in "call" scope
-->
-  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl">
-    <property name="initialEntries">
-      <map>
-        <entry key="cocoon" value-ref="org.apache.cocoon.objectmodel.impl.CocoonEntryObjectModelProvider"/>
-        <entry key="Packages" value-ref="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"/>
-        <entry key="java" value-ref="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"/>
-      </map>
-    </property>        
-  </bean>
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" parent="org.apache.cocoon.el.objectmodel.ObjectModel.template"/>
       
   
 </beans>



Mime
View raw message