cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jre...@apache.org
Subject svn commit: r561340 - in /cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring: flow/flow.js sitemap.xmap test.xml
Date Tue, 31 Jul 2007 14:27:04 GMT
Author: jreijn
Date: Tue Jul 31 07:27:01 2007
New Revision: 561340

URL: http://svn.apache.org/viewvc?view=rev&rev=561340
Log:
- COCOON-2101 Fix issue with broken Spring sample
- Fixed indentation of the jx template. (XML should be indented with 2 spaces)

Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/flow/flow.js
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/flow/flow.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/flow/flow.js?view=diff&rev=561340&r1=561339&r2=561340
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/flow/flow.js
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/flow/flow.js
Tue Jul 31 07:27:01 2007
@@ -21,10 +21,8 @@
 function test() {
 
     var component = cocoon.getComponent("spring-test");
-    var settings = cocoon.getComponent(Packages.org.apache.cocoon.configuration.Settings.ROLE);
     
     cocoon.sendPage("test", { "message" : component.getMessage(),
-                              "core" : settings.getUploadDirectory(),
                               "coreinjection" : component.getSettings().getWorkDirectory(),
                               "javaVersion" : component.getJavaVersion()
                              }

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap?view=diff&rev=561340&r1=561339&r2=561340
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/sitemap.xmap
Tue Jul 31 07:27:01 2007
@@ -27,9 +27,9 @@
       </map:match>
 
       <map:match pattern="test">
-          <map:generate src="test.xml" type="jx"/>
-          <map:serialize type="xml"/>
-      </map:match>
+        <map:generate src="test.xml" type="jx"/>
+        <map:serialize type="xml"/>
+      </map:match>      
     </map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml?view=diff&rev=561340&r1=561339&r2=561340
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml
(original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/spring/test.xml
Tue Jul 31 07:27:01 2007
@@ -20,8 +20,6 @@
   <p>This is a simple demo page</p>
   <p>Message from a Spring Bean:</p>
   <p>#{message}</p>
-  <p>Using the Cocoon core through Spring: This is the upload directory:</p>
-  <p>#{core}</p>
   <p>Testing the injection of the core into a bean. This is the working directory:</p>
   <p>#{coreinjection}</p>
   <p>Testing Cocoon settings properties resolution:</p>



Mime
View raw message