forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526389 - in /forrest/trunk/tools/xxe: build.xml common_config.xml document-v10.xxe document-v20.xxe template/document11.xml template/document12.xml template/document13.xml template/document20.xml toolBar.xml
Date Sat, 07 Apr 2007 07:28:46 GMT
Author: crossley
Date: Sat Apr  7 00:28:44 2007
New Revision: 526389

URL: http://svn.apache.org/viewvc?view=rev&rev=526389
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/tools/xxe/build.xml
    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/template/document11.xml
    forrest/trunk/tools/xxe/template/document12.xml
    forrest/trunk/tools/xxe/template/document13.xml
    forrest/trunk/tools/xxe/template/document20.xml
    forrest/trunk/tools/xxe/toolBar.xml

Modified: forrest/trunk/tools/xxe/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/build.xml?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/build.xml (original)
+++ forrest/trunk/tools/xxe/build.xml Sat Apr  7 00:28:44 2007
@@ -15,34 +15,28 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <project basedir="." name="xxe-forrest" default="dist">
-
   <target name="-init">
     <property environment="env"/>
     <property name="version" value="1.4"/>
     <property name="dist.dir" location="dist"/>
     <property name="dist.name" value="XXE_forrest_config"/>
   </target>
-  
   <target name="clean" depends="-init" description="Clean all generated files">
-    <!-- created files -->
+<!-- created files -->
     <delete dir="${dist.dir}"/>
-    <!-- copied files -->
+<!-- copied files -->
     <delete dir="entity"/>
     <delete dir="dtd"/>
     <delete file="catalog.xml"/>
   </target>
-  
   <target name="dist" depends="-init, update" description="Build zip file">
     <mkdir dir="${dist.dir}"/>
     <zip destfile="${dist.dir}/${dist.name}-${version}.zip">
       <zipfileset prefix="forrest" dir="." excludes="dist/**"/>
     </zip>
   </target>
-  
   <target name="update" depends="clean, copy-dtds, copy-catalog" description="Update schemas
from FORREST_HOME"/>
-  
   <target name="copy-dtds" depends="-init" description="Copy DTDs from FORREST_HOME">
     <copy todir=".">
       <fileset dir="${env.FORREST_HOME}/main/webapp/resources/schema/">
@@ -50,10 +44,8 @@
         <include name="dtd/**"/>
       </fileset>
     </copy>
-  </target>  
-
+  </target>
   <target name="copy-catalog" depends="-init" description="Copy Catalog from FORREST_HOME">
     <copy file="${env.FORREST_HOME}/main/webapp/resources/schema/catalog.forrest.xcat"
tofile="catalog.xml"/>
-  </target>  
-
+  </target>
 </project>

Modified: forrest/trunk/tools/xxe/common_config.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/common_config.xml?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/common_config.xml (original)
+++ forrest/trunk/tools/xxe/common_config.xml Sat Apr  7 00:28:44 2007
@@ -21,15 +21,12 @@
   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>
@@ -46,7 +43,6 @@
       </tr>
     </table>
   </elementTemplate>
-
   <elementTemplate xmlns="" name="tableUnheaded">
     <table>
       <tr>
@@ -59,34 +55,27 @@
       </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>
@@ -98,7 +87,6 @@
       </choice>
     </macro>
   </command>
-
   <command name="forrest.joinOrDeleteChar">
     <macro trace="false">
       <choice>
@@ -110,43 +98,35 @@
       </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>
-
-  <!-- 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)" />
@@ -185,7 +165,5 @@
           icon="xxe-config:common/icons/RowDelete16.gif"
           command="forrest.tableRow"
           parameter="delete"/>
-
   </menu>
-
 </configuration>

Modified: forrest/trunk/tools/xxe/document-v10.xxe
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/document-v10.xxe?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/document-v10.xxe (original)
+++ forrest/trunk/tools/xxe/document-v10.xxe Sat Apr  7 00:28:44 2007
@@ -21,9 +21,7 @@
   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>
@@ -31,21 +29,17 @@
       <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>
@@ -53,7 +47,6 @@
       </sequence>
     </macro>
   </command>
-
   <command name="forrest.convertLink">
     <macro trace="false">
       <sequence>
@@ -61,5 +54,4 @@
       </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?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/document-v20.xxe (original)
+++ forrest/trunk/tools/xxe/document-v20.xxe Sat Apr  7 00:28:44 2007
@@ -21,26 +21,18 @@
   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>
@@ -49,13 +41,11 @@
       </choice>
     </macro>
   </command>
-
   <command name="forrest.crossReference">
     <class>com.xmlmind.xmleditapp.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/template/document11.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/template/document11.xml?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/template/document11.xml (original)
+++ forrest/trunk/tools/xxe/template/document11.xml Sat Apr  7 00:28:44 2007
@@ -5,8 +5,9 @@
   <header>
     <title>Template for Document DTD v11</title>
   </header>
-
   <body>
-    <p>This is a template.</p>
+    <p>
+      This is a template.
+    </p>
   </body>
 </document>

Modified: forrest/trunk/tools/xxe/template/document12.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/template/document12.xml?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/template/document12.xml (original)
+++ forrest/trunk/tools/xxe/template/document12.xml Sat Apr  7 00:28:44 2007
@@ -5,8 +5,9 @@
   <header>
     <title>Template for Document DTD v12</title>
   </header>
-
   <body>
-    <p>This is a template.</p>
+    <p>
+      This is a template.
+    </p>
   </body>
 </document>

Modified: forrest/trunk/tools/xxe/template/document13.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/template/document13.xml?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/template/document13.xml (original)
+++ forrest/trunk/tools/xxe/template/document13.xml Sat Apr  7 00:28:44 2007
@@ -5,8 +5,9 @@
   <header>
     <title>Template for Document DTD v13</title>
   </header>
-
   <body>
-    <p>This is a template.</p>
+    <p>
+      This is a template.
+    </p>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: forrest/trunk/tools/xxe/template/document20.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/template/document20.xml?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/template/document20.xml (original)
+++ forrest/trunk/tools/xxe/template/document20.xml Sat Apr  7 00:28:44 2007
@@ -5,8 +5,9 @@
   <header>
     <title>Template for Document DTD v20</title>
   </header>
-
   <body>
-    <p>This is a template.</p>
+    <p>
+      This is a template.
+    </p>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: forrest/trunk/tools/xxe/toolBar.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/xxe/toolBar.xml?view=diff&rev=526389&r1=526388&r2=526389
==============================================================================
--- forrest/trunk/tools/xxe/toolBar.xml (original)
+++ forrest/trunk/tools/xxe/toolBar.xml Sat Apr  7 00:28:44 2007
@@ -21,23 +21,19 @@
   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">
       <command name="convert" parameter="[implicitElement] strong" />
     </button>
-
     <button toolTip="Convert to emphasis" 
             icon="xxe-config:common/icons2/emphasis.gif">
       <command name="convert" parameter="[implicitElement] em" />
     </button>
-
     <button toolTip="Convert to code" 
             icon="xxe-config:common/icons2/tt.gif">
       <command name="convert" parameter="[implicitElement] code" />
     </button>
-
     <button toolTip="Convert to link" 
             icon="xxe-config:common/icons2/link_menu.gif">
       <menu>
@@ -45,71 +41,56 @@
         <item label="fork" command="forrest.convertFork"/>
       </menu>
     </button>
-
     <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">
       <command name="convert" parameter="[implicitElement] sup" />
     </button>
-
     <button toolTip="Convert to plain text" icon="xxe-config:common/icons2/plain.gif">
       <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" />
+      <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/icons2/para.gif">
       <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/icons2/edit.gif">
       <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>
-    </button>
-	
-	<separator />
-
-	<button toolTip="Add unordered list" 
+      <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">
       <command name="add" parameter="after[implicitElement] ul" />
     </button>
-
     <button toolTip="Add ordered list" icon="xxe-config:common/icons2/orderedlist.gif">
       <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>
+      <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>
-
     <button toolTip="Add image" icon="xxe-config:common/icons2/figure.gif">
       <command name="add" parameter="after[implicitElement] img" />
     </button>
-	
   </toolBar>
-
 </configuration>



Mime
View raw message