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/09/28 17:20:50 UTC
svn commit: r450892 - in /cocoon/trunk:
blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/
blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/
core/cocoon-core/src/test/java/org/apache/cocoon...
Author: cziegeler
Date: Thu Sep 28 08:20:48 2006
New Revision: 450892
URL: http://svn.apache.org/viewvc?view=rev&rev=450892
Log:
Fix sample and add main samples to webapp
Modified:
cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/pom.xml
cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/flow.js
cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/test.xml
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java
cocoon/trunk/core/cocoon-webapp/pom.xml
Modified: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/pom.xml?view=diff&rev=450892&r1=450891&r2=450892
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/pom.xml Thu Sep 28 08:20:48 2006
@@ -34,5 +34,11 @@
<packaging>jar</packaging>
<name>Core-samples-main Block Samples</name>
<description/>
- <dependencies/>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ <version>2.2.0-M2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/flow.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/flow.js?view=diff&rev=450892&r1=450891&r2=450892
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/flow.js (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/flow.js Thu Sep 28 08:20:48 2006
@@ -21,10 +21,10 @@
function test() {
var component = cocoon.getComponent("spring-test");
- var settings = cocoon.getComponent("org.apache.cocoon.core.Settings");
+ var settings = cocoon.getComponent(Packages.org.apache.cocoon.configuration.Settings.ROLE);
cocoon.sendPage("test", { "message" : component.getMessage(),
- "configuration" : settings.getConfiguration(),
+ "core" : settings.getUploadDirectory(),
"coreinjection" : component.getSettings().getWorkDirectory(),
"javaVersion" : component.getJavaVersion()
}
Modified: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/test.xml?view=diff&rev=450892&r1=450891&r2=450892
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/test.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/test.xml Thu Sep 28 08:20:48 2006
@@ -20,8 +20,8 @@
<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 main configuration file location:</p>
- <p>#{configuration}</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>
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java?view=diff&rev=450892&r1=450891&r2=450892
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java Thu Sep 28 08:20:48 2006
@@ -40,7 +40,7 @@
public abstract class CocoonTestCase extends ContainerTestCase {
/**
- * @see org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.spring.test.CocoonXmlWebApplicationContext)
+ * @see org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.spring.avalon.ConfigurationInfo)
*/
protected void addComponents(ConfigurationInfo info)
throws Exception {
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=450892&r1=450891&r2=450892
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Thu Sep 28 08:20:48 2006
@@ -77,6 +77,11 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-samples-main-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-forms-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>