You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/03/22 22:07:58 UTC
svn commit: r387946 - in
/cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring:
conf/applicationContext.xml flow.js sitemap.xmap
Author: cziegeler
Date: Wed Mar 22 13:07:56 2006
New Revision: 387946
URL: http://svn.apache.org/viewcvs?rev=387946&view=rev
Log:
Fix sample
Modified:
cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml
cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/flow.js
cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap
Modified: cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml?rev=387946&r1=387945&r2=387946&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml (original)
+++ cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml Wed Mar 22 13:07:56 2006
@@ -20,12 +20,12 @@
<beans>
<bean id="spring-test"
- class="org.apache.cocoon.spring.samples.SpringTest"
+ class="org.apache.cocoon.core.container.spring.TestBean"
abstract="false"
singleton="true"
lazy-init="default">
- <property name="core"><ref bean="org.apache.cocoon.core.Core"/></property>
- <property name="javaVersion" value="${java.specification.version}"/>
+ <property name="settings"><ref bean="org.apache.cocoon.core.Settings"/></property>
+ <property name="javaVersion" value="${java.specification.version}"/>
</bean>
</beans>
Modified: cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/flow.js
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/flow.js?rev=387946&r1=387945&r2=387946&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/flow.js (original)
+++ cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/flow.js Wed Mar 22 13:07:56 2006
@@ -20,11 +20,11 @@
function test() {
var component = cocoon.getComponent("spring-test");
- var core = cocoon.getComponent("org.apache.cocoon.core.Core");
+ var settings = cocoon.getComponent("org.apache.cocoon.core.Settings");
cocoon.sendPage("test", { "message" : component.getMessage(),
- "configuration" : core.getSettings().getConfiguration(),
- "coreinjection" : component.getCore().getSettings().getWorkDirectory(),
+ "configuration" : settings.getConfiguration(),
+ "coreinjection" : component.getSettings().getWorkDirectory(),
"javaVersion" : component.getJavaVersion()
}
);
Modified: cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap?rev=387946&r1=387945&r2=387946&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap (original)
+++ cocoon/trunk/cocoon-webapp/src/main/webapp/samples/spring/sitemap.xmap Wed Mar 22 13:07:56 2006
@@ -18,7 +18,10 @@
<!-- @version $Id$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
+ <map:components>
+ <!-- Include spring config -->
+ <map:include-beans src="conf/applicationContext.xml"/>
+ </map:components>
<map:flow language="javascript">
<map:script src="flow.js"/>
</map:flow>