You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2006/03/12 19:25:57 UTC
svn commit: r385331 - in
/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples:
display-freememory.xml linked-updater-content-1.xml
linked-updater-content-2.xml linked-updater-content-3.xml
linked-updater.xml sitemap.xmap welcome.xml
Author: sylvain
Date: Sun Mar 12 10:25:56 2006
New Revision: 385331
URL: http://svn.apache.org/viewcvs?rev=385331&view=rev
Log:
New Ajax stuff with Dojo
Added:
cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/display-freememory.xml (with props)
cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-1.xml (with props)
cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-2.xml (with props)
cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-3.xml (with props)
cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater.xml (with props)
Modified:
cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/sitemap.xmap
cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/welcome.xml
Added: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/display-freememory.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/display-freememory.xml?rev=385331&view=auto
==============================================================================
--- cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/display-freememory.xml (added)
+++ cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/display-freememory.xml Sun Mar 12 10:25:56 2006
@@ -0,0 +1,3 @@
+<span>
+ ${java.lang.Runtime.getRuntime().freeMemory()} bytes
+</span>
\ No newline at end of file
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/display-freememory.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/display-freememory.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-1.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-1.xml?rev=385331&view=auto
==============================================================================
--- cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-1.xml (added)
+++ cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-1.xml Sun Mar 12 10:25:56 2006
@@ -0,0 +1,5 @@
+<div id="changeme">
+ <p>This is some fresh content.</p>
+ <p>This has been added to your page dynamically on
+ ${java.util.Date()}</p>
+</div>
\ No newline at end of file
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-1.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-2.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-2.xml?rev=385331&view=auto
==============================================================================
--- cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-2.xml (added)
+++ cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-2.xml Sun Mar 12 10:25:56 2006
@@ -0,0 +1,5 @@
+<div id="changeme">
+ <p>This is some different fresh content.</p>
+ <p>This has been added to your page dynamically on
+ ${java.util.Date()}</p>
+</div>
\ No newline at end of file
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-2.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-3.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-3.xml?rev=385331&view=auto
==============================================================================
--- cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-3.xml (added)
+++ cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-3.xml Sun Mar 12 10:25:56 2006
@@ -0,0 +1,3 @@
+<div class="insert">
+ <p>This was inserted on ${java.util.Date()}</p>
+</div>
\ No newline at end of file
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater-content-3.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater.xml?rev=385331&view=auto
==============================================================================
--- cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater.xml (added)
+++ cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater.xml Sun Mar 12 10:25:56 2006
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<page>
+ <title>Linked Updating</title>
+ <!-- include ajax scripts -->
+ <script type="text/javascript">
+ // djConfig = { isDebug: true };
+ </script>
+ <script type="text/javascript" src="${cocoon.request.contextPath}/_cocoon/resources/dojo/dojo.js"/>
+ <script type="text/javascript" src="${cocoon.request.contextPath}/_cocoon/resources/ajax/cocoon.js"/>
+ <script type="text/javascript">
+ dojo.require("cocoon.ajax.PartialLink");
+
+ function initTimer() {
+ cocoon.ajax.periodicalUpdate(2000, "display-freememory", "freemem");
+ }
+ dojo.addOnLoad(initTimer);
+ </script>
+
+ <style>
+ .container {border-color: #aaa;border-width: 1px;border-style: dotted; padding: 6px;margin:3px;}
+ #changeme {background-color: #eee; padding: 6px;margin:3px;border-color: green;border-width: 1px;border-style: dotted;padding:2px}
+ #changeme .insert {border-color: blue;border-width: 1px;border-style: dotted; padding: 6px;margin:3px;}
+ .insert {border-color: red;border-width: 1px;border-style: dotted; padding: 6px;margin:3px;}
+ </style>
+ <content>
+ <p>This sample shows dynamic page updating in action, using Ajax.</p>
+
+ <table width="100%">
+ <tr valign="top">
+ <td width="30%">
+ <a href="linked-updater-content-1" dojoType="PartialLink" target="replace#changeme">Click me to do a replace</a><br/>
+ <a href="linked-updater-content-2" dojoType="PartialLink" target="replace#changeme">Click me to do a different replace</a><br/>
+ <a href="linked-updater-content-3" dojoType="PartialLink" target="before#changeme">Click me to insert before</a><br/>
+ <a href="linked-updater-content-3" dojoType="PartialLink" target="top#changeme">Click me to insert at the top</a><br/>
+ <a href="linked-updater-content-3" dojoType="PartialLink" target="bottom#changeme">Click me to insert at the bottom</a><br/>
+ <a href="linked-updater-content-3" dojoType="PartialLink" target="after#changeme">Click me to insert after</a><br/>
+ <br/>
+ Memory available on the server:<br/>
+ <span id="freemem">[unkown]</span>
+ </td>
+ <td>
+ <div class="container">
+ <div>Change Region</div>
+ <div id="changeme">
+ This is the region of the page that gets updated.
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+
+ </content>
+</page>
\ No newline at end of file
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/linked-updater.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/sitemap.xmap?rev=385331&r1=385330&r2=385331&view=diff
==============================================================================
--- cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/sitemap.xmap (original)
+++ cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/sitemap.xmap Sun Mar 12 10:25:56 2006
@@ -19,6 +19,12 @@
@version $Id$
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:components>
+ <map:generators>
+ <!-- use the new implementation of JX -->
+ <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator"/>
+ </map:generators>
+ </map:components>
<map:resources>
<!-- this will later become a virtual transformer -->
@@ -42,6 +48,23 @@
</map:transform>
<map:serialize/>
</map:match>
+
+ <map:match pattern="*.html">
+ <map:generate type="jx" src="{1}.xml"/>
+ <map:call resource="simple-page2html"/>
+ <map:serialize type="html"/>
+ </map:match>
+
+ <map:match pattern="linked-updater-content-*">
+ <map:generate type="jx" src="{0}.xml"/>
+ <map:serialize type="html"/>
+ </map:match>
+
+ <map:match pattern="display-freememory">
+ <map:generate type="jx" src="{0}.xml"/>
+ <map:serialize type="html"/>
+ </map:match>
+
<!-- Generic pipeline to load resources in jars -->
<map:match pattern="resources/*/**">
Modified: cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/welcome.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/welcome.xml?rev=385331&r1=385330&r2=385331&view=diff
==============================================================================
--- cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/welcome.xml (original)
+++ cocoon/trunk/cocoon-ajax/cocoon-ajax-sample/src/main/resources/samples/welcome.xml Sun Mar 12 10:25:56 2006
@@ -23,8 +23,10 @@
<sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
</group>
- <group name="Samples? What samples?">
- <note>The Ajax block is under development, and is a home for Ajax-related stuff that is used by other blocks.
- You can see some Ajax-related demos in the <a href="../forms/">Forms</a> block.</note>
+ <group name="Samples">
+ <sample name="Partial updates" href="linked-updater.html">Partial update sample</sample>
+ <sample name="Cocoon Forms samples" href="../forms/">Ajax is mostly demonstrated in
+ the Forms block. Check out lots of samples there (look for the "(Ajax)" label).
+ </sample>
</group>
</samples>