Done.
On 07/22/2014 12:59 PM, Matt Raible wrote:
I see no problems with this. My site is probably a good test bed for
upgrading from 5.0.x to 5.1 when it's close to ready.
On Tue, Jul 22, 2014 at 10:53 AM, Glen Mazza <glen.ma...@gmail.com> wrote:
Hi Team, I'm about to check in ROL-2030 (Upgrade Xinha from 0.95 to
0.96.1). I noticed in our server-side runtimeConfigDefs we have not two
but three editors defined, even though we're just using two (plain text and
Xinha), and that XinhaEditor, for "historical reasons", needs to use the
older editor-rte.jsp constant. For simplicity and to reduce confusion, I'd
like us to just use two strings by getting rid of editor-rte (as shown
below), and do an update in our 500-to-510 migration script: update weblog
set editorpage = 'editor-xinha.jsp' where editorpage = 'editor-rte.jsp'.
That should end up working fine for us (Roller works fine anyway if it
can't understand the value for editorpage in the weblog table, it defaults
to plain editor-text.jsp then.) Any problem with that?
Thanks,
Glen
Index: app/src/main/java/org/apache/roller/weblogger/ui/core/
plugins/XinhaEditor.java
===================================================================
---
app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
(revision 1612545)
+++
app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
(working copy)
@@ -21,7 +21,6 @@
/**
* A rich text WYSIWYG editor using Xinha.
- * Uses ID of 'editor-rte.jsp' for historical reasons.
*/
public class XinhaEditor implements WeblogEntryEditor {
@@ -30,9 +29,7 @@
public String getId() {
- // return RTE becuase at one point we replaced RTE with Xinha
- // the real RTE editor will have to use a differernt ID.
- return "editor-rte.jsp";
+ return "editor-xinha.jsp";
}
public String getName() {
Index: app/src/main/resources/org/apache/roller/weblogger/
config/runtimeConfigDefs.xml
===================================================================
---
app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
(revision 1612545)
+++
app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
(working copy)
@@ -108,7 +108,7 @@
</property-def>
<property-def name="users.editor.pages"
key="configForm.editorPages">
<type>text</type>
- <default-value>editor-text.jsp,editor-rte.jsp,editor-
xinha.jsp</default-value>
+ <default-value>editor-text.jsp,editor-xinha.jsp</default-value>
<rows>3</rows>
<cols>40</cols>
</property-def>
