[waffle-scm] [917] trunk/waffle-distribution/src/site/content: fixup words

Tue, 17 Feb 2009 12:30:30 -0800

Title: [waffle-scm] [917] trunk/waffle-distribution/src/site/content: fixup words

Diff

Modified: trunk/waffle-distribution/src/site/content/file-upload.html (916 => 917)

--- trunk/waffle-distribution/src/site/content/file-upload.html	2009-02-17 20:21:45 UTC (rev 916)
+++ trunk/waffle-distribution/src/site/content/file-upload.html	2009-02-17 20:30:12 UTC (rev 917)
@@ -63,7 +63,7 @@
   to a new request.  Hence, we disable it via the @PRG annotation to show the uploaded files in the referring view.
     </li>
     <li>Waffle honours to the FileUpload interfaces, which allows the implementations and the configuration to be controlled by the
-  user via the registrar.  In particular, Waffle by default uses FileUpload's resource cleanup mechanism, detailed in the 
+  user via the composition class.  In particular, Waffle by default uses FileUpload's resource cleanup mechanism, detailed in the 
   <a href="" guide</a>.
     </li>
   </ul>

Modified: trunk/waffle-distribution/src/site/content/release-notes.html (916 => 917)

--- trunk/waffle-distribution/src/site/content/release-notes.html	2009-02-17 20:21:45 UTC (rev 916)
+++ trunk/waffle-distribution/src/site/content/release-notes.html	2009-02-17 20:30:12 UTC (rev 917)
@@ -5,11 +5,20 @@
 </head>
 <body>
 
-<h1>Waffle - Version 1.3 (Oct 11, 2008)</h1>
+<h1>Waffle - Version 2.x (????, 2009)</h1>
             
 <h2>        Improvement
 </h2>
 <ul>
+<li>Upgrade to PicoContainer 2.x, PicoContainer-Web 2.x for additional runtime speed.
+</li>
+</ul>
+
+<h1>Waffle - Version 1.3 (Oct 11, 2008)</h1>
+
+<h2>        Improvement
+</h2>
+<ul>
 <li>[<a href="" -         Make controller-view mapping configurable
 </li>
 <li>[<a href="" -         Add I18N support for Waffle exception messages
@@ -17,7 +26,6 @@
 <li>[<a href="" -         Allow multiple message resources configurable for a given locale
 </li>
 </ul>
-                
 
 <h1>Waffle - Version 1.2 (Sep 10, 2008)</h1>

Modified: trunk/waffle-distribution/src/site/content/views.html (916 => 917)

--- trunk/waffle-distribution/src/site/content/views.html	2009-02-17 20:21:45 UTC (rev 916)
+++ trunk/waffle-distribution/src/site/content/views.html	2009-02-17 20:30:12 UTC (rev 917)
@@ -126,7 +126,7 @@
 configure the view resolution. This is achieve via simply key/value
 properties, which can be either view prefix or suffix keys or the name
 of the controller. For example, to map "mycontroller.waffle" to, say,
-"/ftl/mycontroller-view.ftl", we'd simply set in our registrar: <textarea
+"/ftl/mycontroller-view.ftl", we'd simply set in our composition class: <textarea
     class="java:nogutter:nocontrols" name="code">
     ViewResolver viewResolver = registry.locateByKey(ViewResolver.class);
     viewResolver.configureView("view.prefix", "/"); // this is the default

Modified: trunk/waffle-distribution/src/site/content/webxml.html (916 => 917)

--- trunk/waffle-distribution/src/site/content/webxml.html	2009-02-17 20:21:45 UTC (rev 916)
+++ trunk/waffle-distribution/src/site/content/webxml.html	2009-02-17 20:30:12 UTC (rev 917)
@@ -23,7 +23,7 @@
 07:
 08:    <display-name>Example Waffle Web-app</display-name>
 09:
-10:    <!-- 1. This is how an application registers its custom Registrar -->
+10:    <!-- 1. This is how an application registers its custom Composition class -->
 11:    <context-param>
 12:      <param-name>webapp-composer-class</param-name>
 13:      <param-value>org.codehaus.waffle.example.MyComposer</param-value>

Modified: trunk/waffle-distribution/src/templates/eclipse/webapp/WEB-INF/web.xml (916 => 917)

--- trunk/waffle-distribution/src/templates/eclipse/webapp/WEB-INF/web.xml	2009-02-17 20:21:45 UTC (rev 916)
+++ trunk/waffle-distribution/src/templates/eclipse/webapp/WEB-INF/web.xml	2009-02-17 20:30:12 UTC (rev 917)
@@ -13,10 +13,10 @@
         <param-value>messages</param-value>
     </context-param>
 
-    <!-- 1. This is how an application registers its custom Registrar -->
+    <!-- 1. This is how an application registers its custom composition class -->
     <context-param>
-        <param-name>org.codehaus.waffle.registrar.Registrar</param-name>
-        <param-value>org.codehaus.waffle.example.paranamer.ParanamerRegistrar</param-value>
+        <param-name>webapp-composer-class</param-name>
+        <param-value>org.codehaus.waffle.example.foo.FooWebappComposer</param-value>
     </context-param>
     <context-param>
         <param-name>org.codehaus.waffle.action.MethodDefinitionFinder</param-name>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to