cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r567785 - in /cocoon/trunk/blocks/cocoon-forms: cocoon-forms-impl/src/changes/changes.xml cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml
Date Mon, 20 Aug 2007 19:02:54 GMT
Author: felixk
Date: Mon Aug 20 12:02:50 2007
New Revision: 567785

URL: http://svn.apache.org/viewvc?rev=567785&view=rev
Log:
Deprecate HTMLArea 
(vote result http://marc.info/?l=xml-cocoon-dev&m=118760243106958&w=2)

Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml?rev=567785&r1=567784&r2=567785&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/changes/changes.xml Mon Aug 20
12:02:50 2007
@@ -39,6 +39,10 @@
           <action dev="felixk" type="add" issue="COCOON-2091">
             Add Xinha as alternative for HTMLArea as WYSIWYG online editor as HTMLArea is
no longer maintained.
           </action>
+          <action dev="felixk" type="update">
+            Deprecate HTMLArea. HTMLArea editor will be removed in version 1.1 of cocoon-forms
block. 
+            Use alternatives instead (e.g. Xinha).
+          </action>
         </release>
       </body>
     </document>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap?rev=567785&r1=567784&r2=567785&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
Mon Aug 20 12:02:50 2007
@@ -45,6 +45,16 @@
     
     <map:pipeline id="external-resource">
     
+      <!-- Explicit matcher to show deprecation message in console and log -->
+      <map:match pattern="resource/external/forms/htmlarea/**.js">
+        <map:act type="log">
+          <map:parameter name="level" value="warn"/>
+          <map:parameter name="console" value="true"/>
+          <map:parameter name="message" value="HTMLArea is deprecated. Please use alternatives
instead (e.g. Xinha)."/>
+        </map:act>
+        <map:read src="resource://org/apache/cocoon/forms/resources/htmlarea/{1}.js" type="servletLinkRewriter"/>
+      </map:match>
+    
       <map:match pattern="resource/external/forms/**.js">
       	<map:read src="resource://org/apache/cocoon/forms/resources/{1}.js" type="servletLinkRewriter"/>
       </map:match>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml?rev=567785&r1=567784&r2=567785&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml
(original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml
Mon Aug 20 12:02:50 2007
@@ -43,7 +43,7 @@
   <sample name="Country selector" href="countryselector">Illustrates programmatically
changing flow-jxpath selectionlists.</sample>
   <sample name="Upload" href="upload">Shows an upload widget used with Flowscript</sample>
   <sample name="Form Model GUI" href="form_model_gui.flow">Illustrates the use of Class,
New, Struct, and Union.</sample>
-  <sample name="HTMLArea" href="htmlarea">A simple form using the HTML editor widget
(deprecated, use <a href="xinha">Xinha</a> instead).</sample>
+  <sample name="HTMLArea" href="htmlarea">A simple form using the HTML editor widget
(deprecated, use alternatives instead, e.g. <a href="xinha">Xinha</a>).</sample>
   <sample name="Xinha" href="xinha">A simple form using the Xinha editor widget.</sample>
   <sample name="Aggregate" href="aggregate/example">Aggregate field examples</sample>
   <sample name="Multipage wizard" href="do-multipage.flow">(Ajax) A multipage wizard,
using widget states and actions to move between pages.</sample>



Mime
View raw message