You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2005/08/22 15:53:38 UTC
svn commit: r234488 - in /cocoon/blocks/apples/trunk:
java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
samples/sitemap.xmap
Author: reinhard
Date: Mon Aug 22 06:53:31 2005
New Revision: 234488
URL: http://svn.apache.org/viewcvs?rev=234488&view=rev
Log:
use sitemap classloader in Apples, remove dependency on XSP, correct typo
Modified:
cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
cocoon/blocks/apples/trunk/samples/sitemap.xmap
Modified: cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java?rev=234488&r1=234487&r2=234488&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java (original)
+++ cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java Mon Aug 22 06:53:31 2005
@@ -101,11 +101,8 @@
private AppleController instantiateController(String className)
throws Exception {
-
- // TODO think about dynamic reloading of these beasts in future
- // classloading stuf et al.
-
- Class clazz = Class.forName(className);
+
+ Class clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
Object o = clazz.newInstance();
return (AppleController) o;
}
Modified: cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java?rev=234488&r1=234487&r2=234488&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java (original)
+++ cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java Mon Aug 22 06:53:31 2005
@@ -17,7 +17,7 @@
package org.apache.cocoon.components.flow.apples;
/**
- * This interface can be impemented by Apples who do not which
+ * This interface can be impemented by Apples that do not wish
* to be stored, and thus don't have a continuation ID assosociated
* with them.
*/
Modified: cocoon/blocks/apples/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/samples/sitemap.xmap?rev=234488&r1=234487&r2=234488&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/apples/trunk/samples/sitemap.xmap Mon Aug 22 06:53:31 2005
@@ -85,6 +85,9 @@
<map:call continuation="{1}"/>
</map:match>
+ <map:match pattern="continue.*">
+ <map:call continuation="{1}"/>
+ </map:match>
<!--+
| Binding form sample, reuses pipelines stolen from Cocoon Forms
@@ -110,12 +113,12 @@
</map:match>
<map:match pattern="calc/*">
- <map:generate type="serverpages" src="calc/{1}.xsp"/>
+ <map:generate type="jx" src="context://samples/flow/jxcalc/screens/{1}.xml"/>
<map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
<map:parameter name="servletPath" value="{request:servletPath}"/>
<map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
<map:parameter name="contextPath" value="{request:contextPath}"/>
- <map:parameter name="file" value="/samples/apples/calc/{1}.xsp"/>
+ <map:parameter name="file" value="samples/flow/jxcalc/screens/{1}.xml"/>
<map:parameter name="remove" value="{0}"/>
</map:transform>
<map:serialize/>