forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1657748 - in /forrest/trunk/tools/xxe: README.txt common_config.xml document-v10.xxe document-v20.xxe toolBar.xml
Date Fri, 06 Feb 2015 07:08:26 GMT
Author: sjur
Date: Fri Feb  6 07:08:25 2015
New Revision: 1657748

URL: http://svn.apache.org/r1657748
Log:
Updates to the xxe tool to make it compatible with version 4.x of Xmlmind XML Editor. These
changes have been lingering around on my harddisk for a long time, and are by now more or
less irrelevant: XXE is now at version 6.x, and from version 5.x onwards the free edition
is no more. But if anyone is still using version 4, or is using any of the paid versions,
this might still be valuable. No guarantee for the usability of the code with newer versions
of XXE though. It worked with version 4, but it has not been tested with newer versions of
XXE.

Modified:
    forrest/trunk/tools/xxe/README.txt
    forrest/trunk/tools/xxe/common_config.xml
    forrest/trunk/tools/xxe/document-v10.xxe
    forrest/trunk/tools/xxe/document-v20.xxe
    forrest/trunk/tools/xxe/toolBar.xml

Modified: forrest/trunk/tools/xxe/README.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/README.txt?rev=1657748&r1=1657747&r2=1657748&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/README.txt (original)
+++ forrest/trunk/tools/xxe/README.txt Fri Feb  6 07:08:25 2015
@@ -27,7 +27,8 @@ questions to XXE support or mailing list
 
 Requirements:
 =============
-* XXE 3.0p1+ (version 1.3 of the tool works with XXE version 2.5p3 - 3.0)
+* XXE 4.x (version 1.4 of the tool works with XXE version 4.0 > 3.0, and
+           version 1.3 of the tool works with XXE version 2.5p3 - 3.0)
 * Forrest 0.5+
 
 
@@ -45,11 +46,7 @@ Upgrading
 Installing
 ==========
 
-* Extract into the XXE application config directory (e.g. D:\Program Files\XMLmind_XML_Editor\config)
-  OR
-* Extract into your XXE user directory (e.g. ~/.xxe/addon/config) (only for version 1.3+
of this config)
-  For version 1.3+ of this tool, this is the recommended installation location, as it permits
upgrading XXE without having to reinstall the tool
-  NOTE: This location is new for XXE 2.10, and is not tested with earlier releases!
+Follow the instructions on http://www.xmlmind.com/xmleditor/addons.shtml#manual_install
 
 
 Developer Instructions
@@ -66,6 +63,11 @@ folder in the XXE 'addon' folder. Run th
 History
 =======
 
+1.5:
+----
+- Updated the tool to work with XXE 4.x
+  NOTE: This change is backwards INCOMPATIBLE, therefore the tool now requires XXE 4.x
+
 1.4:
 ----
 - Updated the tool to work with XXE 3.0p1 (FOR-779).

Modified: forrest/trunk/tools/xxe/common_config.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/common_config.xml?rev=1657748&r1=1657747&r2=1657748&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/common_config.xml (original)
+++ forrest/trunk/tools/xxe/common_config.xml Fri Feb  6 07:08:25 2015
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  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
 
@@ -17,16 +17,19 @@
 -->
 <configuration name="Forrest Common"
   xsi:schemaLocation="http://www.xmlmind.com/xmleditor/schema/configuration
-                      xsd/configuration.xsd"
+                      ../xxe_config_pack/config/xsd/configuration.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://www.xmlmind.com/xmleditor/schema/configuration"
   xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration">
+
   <include location="toolBar.xml" />
+  
   <documentResources>
     <resource path="//img/@src"/>
     <resource path="//figure/@src"/>
     <resource path="//icon/@src"/>
   </documentResources>
+  
   <elementTemplate xmlns="" name="tableHeaded">
     <table>
       <tr>
@@ -43,6 +46,7 @@
       </tr>
     </table>
   </elementTemplate>
+
   <elementTemplate xmlns="" name="tableUnheaded">
     <table>
       <tr>
@@ -55,27 +59,34 @@
       </tr>
     </table>
   </elementTemplate>
+  
   <elementTemplate xmlns="" name="tableRow">
     <tr>
       <td></td>
       <td></td>
     </tr>
   </elementTemplate>
-<!-- Bindings =========================================================== -->
-<!--   modified from xhtml & docbook config files =============== -->
-<!-- attempt to behave like a word-processor. -->
+  
+  <!-- Bindings =========================================================== -->
+  <!--   modified from xhtml & docbook config files =============== -->
+
+  <!-- attempt to behave like a word-processor. -->
+
   <binding>
     <keyPressed code="ENTER" />
     <command name="forrest.splitOrInsertNewLine" />
   </binding>
+
   <binding>
     <keyPressed code="DELETE" />
     <command name="forrest.joinOrDeleteChar" />
   </binding>
+
   <binding>
     <keyPressed code="BACK_SPACE" />
     <command name="forrest.joinOrDeleteChar" parameter="backwards" />
   </binding>
+
   <command name="forrest.splitOrInsertNewLine">
     <macro trace="false">
       <choice>
@@ -87,6 +98,7 @@
       </choice>
     </macro>
   </command>
+
   <command name="forrest.joinOrDeleteChar">
     <macro trace="false">
       <choice>
@@ -98,35 +110,40 @@
       </choice>
     </macro>
   </command>
-<!-- An easy way to insert a table row -->
+
+  <!-- An easy way to insert a table row -->
   <binding>
     <keyPressed code="ENTER" modifiers="mod"/>
     <command name="add" parameter="after[implicitElement] #template(tr,tableRow)" />
   </binding>
-<!-- An easy way to insert a br -->
+
+
+  <!-- An easy way to insert a br -->
   <binding>
     <keyPressed code="ENTER" modifiers="shift" />
     <command name="forrest.insertLineBreak" />
   </binding>
+
   <command name="forrest.insertLineBreak">
     <macro>
       <sequence>
         <command name="insert" parameter="into br" />
-<!-- harmless if macro fails starting from here -->
+        <!-- harmless if macro fails starting from here -->
         <command name="insertNode" parameter="textAfter" />
         <command name="cancelSelection" />
       </sequence>
     </macro>
   </command>
-  <command name="forrest.tableColumn">
-    <class>com.xmlmind.xmleditapp.xhtml.table.TableColumn</class>
-  </command>
-  <command name="forrest.tableRow">
-    <class>com.xmlmind.xmleditapp.xhtml.table.TableRow</class>
+
+  <command name="forrest.tableEdit">
+    <class>com.xmlmind.xmleditext.xhtml.table.HTMLTableEdit</class>
   </command>
-<!-- Menu =========================================================== -->
-<!--   modified from xhtml config files ============================= -->
+
+  <!-- Menu =========================================================== -->
+  <!--   modified from xhtml config files ============================= -->
+
   <menu label="Forrest" mnemonic="F">
+
     <item label="Insert Table With heading row"
           command="add"
           parameter="after[implicitElement] #template(table,tableHeaded)" />
@@ -134,36 +151,32 @@
           command="add"
           parameter="after[implicitElement] #template(table,tableUnheaded)" />
     <separator />
-    <item label="Insert Column Before"
-          mnemonic="B"
-          icon="xxe-config:common/icons/ColumnInsertBefore16.gif"
-          command="forrest.tableColumn"
-          parameter="insertBefore"/>
-    <item label="Insert Column After"
-          mnemonic="A"
-          icon="xxe-config:common/icons/ColumnInsertAfter16.gif"
-          command="forrest.tableColumn"
-          parameter="insertAfter"/>
-    <item label="Delete Column"
-          mnemonic="D" 
-          icon="xxe-config:common/icons/ColumnDelete16.gif"
-          command="forrest.tableColumn"
-          parameter="delete"/>
+    <item label="Insert Column _Before"
+          icon="xxe-config:common/icons/insertColumnBefore.png"
+          command="forrest.tableEdit"
+          parameter="insertColumnBefore"/>
+    <item label="Insert Column _After"
+          icon="xxe-config:common/icons/insertColumnAfter.png"
+          command="forrest.tableEdit"
+          parameter="insertColumnAfter"/>
+    <item label="_Delete Column"
+          icon="xxe-config:common/icons/deleteColumn.png"
+          command="forrest.tableEdit"
+          parameter="deleteColumn"/>
     <separator />
-    <item label="Insert Row Before"
-          mnemonic="I"
-          icon="xxe-config:common/icons/RowInsertBefore16.gif"
-          command="forrest.tableRow"
-          parameter="insertBefore"/>
-    <item label="Insert Row After"
-          mnemonic="n"
-          icon="xxe-config:common/icons/RowInsertAfter16.gif"
-          command="forrest.tableRow"
-          parameter="insertAfter"/>
-    <item label="Delete Row"
-          mnemonic="e" 
-          icon="xxe-config:common/icons/RowDelete16.gif"
-          command="forrest.tableRow"
-          parameter="delete"/>
+    <item label="_Insert Row Before"
+          icon="xxe-config:common/icons/insertRowBefore.png"
+          command="forrest.tableEdit"
+          parameter="insertRowBefore"/>
+    <item label="I_nsert Row After"
+          icon="xxe-config:common/icons/insertRowAfter.png"
+          command="forrest.tableEdit"
+          parameter="insertRowAfter"/>
+    <item label="D_elete Row"
+          icon="xxe-config:common/icons/deleteRow.png"
+          command="forrest.tableEdit"
+          parameter="deleteRow"/>
+
   </menu>
+
 </configuration>

Modified: forrest/trunk/tools/xxe/document-v10.xxe
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/document-v10.xxe?rev=1657748&r1=1657747&r2=1657748&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/document-v10.xxe (original)
+++ forrest/trunk/tools/xxe/document-v10.xxe Fri Feb  6 07:08:25 2015
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  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
 
@@ -17,11 +17,13 @@
 -->
 <configuration name="Forrest Document v1.x"
   xsi:schemaLocation="http://www.xmlmind.com/xmleditor/schema/configuration
-                      xsd/configuration.xsd"
+                      ../xxe_config_pack/config/xsd/configuration.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://www.xmlmind.com/xmleditor/schema/configuration"
   xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration">
+
   <include location="common_config.xml" />
+  
   <detect>
     <or>
       <dtdPublicId substring="true">DTD Documentation V1.1</dtdPublicId>
@@ -29,17 +31,21 @@
       <dtdPublicId substring="true">DTD Documentation V1.3</dtdPublicId>
     </or>
   </detect>
+    
   <dtd publicId="-//APACHE//DTD Documentation V1.1//EN" 
        systemId="dtd/document-v11.dtd" />
   <dtd publicId="-//APACHE//DTD Documentation V1.2//EN" 
        systemId="dtd/document-v12.dtd" />
   <dtd publicId="-//APACHE//DTD Documentation V1.3//EN" 
        systemId="dtd/document-v13.dtd" />
+
   <template name="Document DTD v1.1" location="template/document11.xml" />
   <template name="Document DTD v1.2" location="template/document12.xml" />
   <template name="Document DTD v1.3" location="template/document13.xml" />
+  
   <css name="Formatted v1.x" location="css/document1x.css" />
-<!-- v1.x versus v2.x commands -->
+   
+  <!-- v1.x versus v2.x commands -->
   <command name="forrest.convertFork">
     <macro trace="false">
       <sequence>
@@ -47,6 +53,7 @@
       </sequence>
     </macro>
   </command>
+
   <command name="forrest.convertLink">
     <macro trace="false">
       <sequence>
@@ -54,4 +61,5 @@
       </sequence>
     </macro>
   </command>
+
 </configuration>

Modified: forrest/trunk/tools/xxe/document-v20.xxe
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/document-v20.xxe?rev=1657748&r1=1657747&r2=1657748&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/document-v20.xxe (original)
+++ forrest/trunk/tools/xxe/document-v20.xxe Fri Feb  6 07:08:25 2015
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  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
 
@@ -17,22 +17,30 @@
 -->
 <configuration name="Forrest Document v2.x"
   xsi:schemaLocation="http://www.xmlmind.com/xmleditor/schema/configuration
-                      xsd/configuration.xsd"
+                      ../xxe_config_pack/config/xsd/configuration.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://www.xmlmind.com/xmleditor/schema/configuration"
   xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration">
+
   <include location="common_config.xml" />
+  
   <detect>
     <or>
       <dtdPublicId substring="true">DTD Documentation V2.0</dtdPublicId>
     </or>
   </detect>
+    
   <dtd publicId="-//APACHE//DTD Documentation V2.0//EN" 
        systemId="dtd/document-v20.dtd" />
+
   <template name="Document DTD v2.0" location="template/document20.xml" />
+  
   <css name="Formatted v2.x" location="css/document2x.css" />
-<!-- v1.x versus v2.x commands -->
-<!-- no forrest.convertFork because <a> doesn't have @target -->
+  
+  <!-- v1.x versus v2.x commands -->
+  
+  <!-- no forrest.convertFork because <a> doesn't have @target -->
+
   <command name="forrest.convertLink">
     <macro trace="false">
       <choice>
@@ -41,11 +49,13 @@
       </choice>
     </macro>
   </command>
+
   <command name="forrest.crossReference">
-    <class>com.xmlmind.xmleditapp.xhtml.CrossReference</class>
+    <class>com.xmlmind.xmleditext.xhtml.CrossReference</class>
   </command>
+
   <menu label="Forrest" mnemonic="F">
-    <insert/>
+  <insert/>
     <separator />
     <item label="Go to Opposite Link End"
           mnemonic="G" 

Modified: forrest/trunk/tools/xxe/toolBar.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/toolBar.xml?rev=1657748&r1=1657747&r2=1657748&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/toolBar.xml (original)
+++ forrest/trunk/tools/xxe/toolBar.xml Fri Feb  6 07:08:25 2015
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  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
 
@@ -21,76 +21,98 @@
   xmlns="http://www.xmlmind.com/xmleditor/schema/configuration"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration">
-  <toolBar>
+  
+   <toolBar>
     <button toolTip="Convert to strong" 
-            icon="xxe-config:common/icons2/b.gif">
+            icon="xxe-config:common/icons/boldText.png">
       <command name="convert" parameter="[implicitElement] strong" />
     </button>
+
     <button toolTip="Convert to emphasis" 
-            icon="xxe-config:common/icons2/emphasis.gif">
+            icon="xxe-config:common/icons/italicText.png">
       <command name="convert" parameter="[implicitElement] em" />
     </button>
+
     <button toolTip="Convert to code" 
-            icon="xxe-config:common/icons2/tt.gif">
+            icon="xxe-config:common/icons/typewriterText.png">
       <command name="convert" parameter="[implicitElement] code" />
     </button>
+
     <button toolTip="Convert to link" 
-            icon="xxe-config:common/icons2/link_menu.gif">
+            icon="xxe-config:common/icons/hyperText_menu.png">
       <menu>
         <item label="link" command="forrest.convertLink"/>
         <item label="fork" command="forrest.convertFork"/>
       </menu>
     </button>
-    <button toolTip="Convert to subscript" icon="icons/sub.png">
+
+    <button toolTip="Convert to subscript"
+            icon="icons/sub.png">
       <command name="convert" parameter="[implicitElement] sub" />
     </button>
-    <button toolTip="Convert to superscript" icon="icons/sup.png">
+
+    <button toolTip="Convert to superscript"
+            icon="icons/sup.png">
       <command name="convert" parameter="[implicitElement] sup" />
     </button>
-    <button toolTip="Convert to plain text" icon="xxe-config:common/icons2/plain.gif">
+
+    <button toolTip="Convert to plain text"
+            icon="xxe-config:common/icons/normalText.png">
       <command name="convert" parameter="[implicitElement] #text" />
     </button>
+
     <separator />
-    <button toolTip="Add section" icon="xxe-config:common/icons2/section.gif">
-      <command name="add" parameter="after[implicitElement] section" />
+
+    <button toolTip="Add section" icon="xxe-config:common/icons/section.png">
+        <command name="add" parameter="after[implicitElement] section" />
     </button>
-    <button toolTip="Add paragraph" icon="xxe-config:common/icons2/para.gif">
+
+	<button toolTip="Add paragraph" icon="xxe-config:common/icons/paragraph.png">
       <command name="add" parameter="after[implicitElement] p" />
     </button>
-    <button toolTip="Add source" icon="xxe-config:common/icons2/edit.gif">
+	
+	<button toolTip="Add source" icon="xxe-config:common/icons/editDocument.png">
       <command name="add" parameter="after[implicitElement] source" />
     </button>
+
     <button toolTip="Add note" icon="icons/note.png">
-      <menu>
-        <item label="Add note" command="add" parameter="after[implicitElement] note" />
-        <item label="Add warning" command="add" parameter="after[implicitElement] warning"
/>
-        <item label="Add fixme" command="add" parameter="after[implicitElement] fixme"
/>
-      </menu>
+		<menu>
+			<item label="Add note" command="add" parameter="after[implicitElement] note" />
+			<item label="Add warning" command="add" parameter="after[implicitElement] warning"
/>
+			<item label="Add fixme" command="add" parameter="after[implicitElement] fixme" />
+		</menu>
     </button>
-    <separator />
-    <button toolTip="Add unordered list" 
-            icon="xxe-config:common/icons2/itemizedlist.gif">
+	
+	<separator />
+
+	<button toolTip="Add unordered list" 
+            icon="xxe-config:common/icons/itemizedList.png">
       <command name="add" parameter="after[implicitElement] ul" />
     </button>
-    <button toolTip="Add ordered list" icon="xxe-config:common/icons2/orderedlist.gif">
+
+    <button toolTip="Add ordered list" icon="xxe-config:common/icons/orderedList.png">
       <command name="add" parameter="after[implicitElement] ol" />
     </button>
-    <button toolTip="Table" icon="xxe-config:common/icons2/table.gif">
-      <menu>
-        <item label="With heading row" command="add" parameter="after[implicitElement]
#template(table,tableHeaded)" />
-        <item label="Without heading row" command="add" parameter="after[implicitElement]
#template(table,tableUnheaded)" />
-        <separator />
-        <item label="Insert Column Before" command="forrest.tableColumn" parameter="insertBefore"/>
-        <item label="Insert Column After" command="forrest.tableColumn" parameter="insertAfter"/>
-        <item label="Delete Column" command="forrest.tableColumn" parameter="delete"/>
-        <separator />
-        <item label="Insert Row Before" command="forrest.tableRow" parameter="insertBefore"/>
-        <item label="Insert Row After" command="forrest.tableRow" parameter="insertAfter"/>
-        <item label="Delete Row" command="forrest.tableRow" parameter="delete"/>
-      </menu>
+
+    <button toolTip="Table" icon="xxe-config:common/icons/table_menu.png">
+		<menu>
+			<item label="With heading row" command="add" parameter="after[implicitElement] #template(table,tableHeaded)"
/>
+			<item label="Without heading row" command="add" parameter="after[implicitElement] #template(table,tableUnheaded)"
/>
+			<separator />
+			<item label="Insert Column Before" command="forrest.tableEdit" parameter="insertColumnBefore"/>
+			<item label="Insert Column After" command="forrest.tableEdit" parameter="insertColumnAfter"/>
+			<item label="Delete Column" command="forrest.tableEdit" parameter="deleteColumn"/>
+			<separator />
+			<item label="Insert Row Before" command="forrest.tableEdit" parameter="insertRowBefore"/>
+			<item label="Insert Row After" command="forrest.tableEdit" parameter="insertRowAfter"/>
+			<item label="Delete Row" command="forrest.tableEdit" parameter="deleteRow"/>
+		</menu>
     </button>
-    <button toolTip="Add image" icon="xxe-config:common/icons2/figure.gif">
+
+    <button toolTip="Add image" icon="xxe-config:common/icons/figure.png">
       <command name="add" parameter="after[implicitElement] img" />
     </button>
+	
   </toolBar>
+
 </configuration>



Mime
View raw message