forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r154263 - in forrest/trunk/plugins/org.apache.forrest.plugin.excel: ./ src/documentation/ src/documentation/classes/ src/documentation/content/xdocs/ src/documentation/content/xdocs/samples/ src/documentation/resources/images/
Date Fri, 18 Feb 2005 12:43:18 GMT
Author: rgardler
Date: Fri Feb 18 04:43:15 2005
New Revision: 154263

URL: http://svn.apache.org/viewcvs?view=rev&rev=154263
Log:

      <action type=add context=Stylesheet dev=js>
        New feature: 'text' in first column to create descriptive text.
      </action>
      <action type=fix context=caption dev=js>
        Minor issue: captions are now included even if Excel skips
        cell at position three and writes weird ss:Index=4.
      </action>
      <action dev=js type=fix>
        Fixed bug: input.xmap pointed to the project's resources dir
        not the plugin's. So, plugin documentation worked fine, but
        any other project didn't.
      </action> (submitted by   Johannes Schaefer)

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/input.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/classes/CatalogManager.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/howto.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/figure-table.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/tabs.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/group.svg
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/project.svg
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/skinconf.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.excel/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/forrest.properties?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/forrest.properties Fri Feb 18 04:43:15
2005
@@ -1,5 +1,4 @@
-# Copyright 2002-2004 The Apache Software Foundation or its licensors,
-# as applicable.
+# 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.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/input.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/input.xmap?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/input.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/input.xmap Fri Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  Copyright 1999-2004 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,7 +21,7 @@
     <map:pipeline>
         <map:match pattern="**-table.xml">
           <map:generate src="{project:content.xdocs}{1}-table.xml" />
-          <map:transform src="{project:resources.stylesheets}/table2document.xsl" />

+          <map:transform src="resources/stylesheets/table2document.xsl" /> 
           <map:serialize type="xml"/>
         </map:match>
     </map:pipeline>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/classes/CatalogManager.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/classes/CatalogManager.properties?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/classes/CatalogManager.properties
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/classes/CatalogManager.properties
Fri Feb 18 04:43:15 2005
@@ -1,5 +1,4 @@
-# Copyright 2002-2004 The Apache Software Foundation or its licensors,
-# as applicable.
+# 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.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/howto.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/howto.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/howto.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/howto.xml
Fri Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  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.
@@ -79,6 +78,15 @@
 	  You may include a caption in the fourth (4th) column.
 	  See the <a href="site:figure-table">Table with figure</a>
 	  as an example.
+        </p>
+      </section>
+    <section>
+      <title>Descriptive Text</title>
+        <p>
+          If you want to include a descriptive text for a section, put
+	  the keyword <code>text</code> into the first column and
+	  the text itself into the second column. You may include more
+          than one paragraph.
         </p>
       </section>
     <section>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/index.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/index.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/index.xml
Fri Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  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.
@@ -31,6 +30,9 @@
         Formatting is not transferred to forrest but some
         calculations are.
       </p>
+      <p>
+        Needs Excel 2003 to save the content as XML.
+      </p>
     </section>
     <section>
       <title>Documentation</title>
@@ -46,7 +48,8 @@
 -->
       </p>
       <p>
-        For implemenation details see <code>table2document.xsl</code>.
+        For implemenation details see
+        <code>resources/stylesheets/table2document.xsl</code>.
       </p>
     </section>
     <section>
@@ -57,15 +60,16 @@
       <ul>
         <li>
 	  <a href="site:simple-table">Simple table</a>: 
-	  Shows the basic features
+	  Shows the basic features.
 	</li>
         <li>
 	  <a href="site:figure-table">Table with figure</a>: 
 	  Shows how to embedd a figure with the table
+          plus additional text.
 	</li>
         <li>
 	  <a href="site:color-table">Color table</a>: 
-	  Specialized table to highlight cells in the color specified
+	  Specialized table to highlight cells in the color specified.
 	</li>
       </ul>
     </section>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/figure-table.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/figure-table.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/figure-table.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/figure-table.xml
Fri Feb 18 04:43:15 2005
@@ -11,7 +11,7 @@
   <Created>2004-11-16T11:18:22Z</Created>
   <LastSaved>2004-12-14T08:22:23Z</LastSaved>
   <Company>UID</Company>
-  <Version>10.6626</Version>
+  <Version>10.6714</Version>
  </DocumentProperties>
  <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
   <DownloadComponents/>
@@ -50,9 +50,20 @@
    <Font ss:Size="12"/>
    <NumberFormat ss:Format="Fixed"/>
   </Style>
+  <Style ss:ID="s30">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <NumberFormat ss:Format="Fixed"/>
+  </Style>
+  <Style ss:ID="s35">
+   <Alignment ss:Vertical="Top"/>
+   <Font x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s36">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Top" ss:WrapText="1"/>
+  </Style>
  </Styles>
  <Worksheet ss:Name="Example table">
-  <Table ss:ExpandedColumnCount="6" ss:ExpandedRowCount="13" x:FullColumns="1"
+  <Table ss:ExpandedColumnCount="6" ss:ExpandedRowCount="12" x:FullColumns="1"
    x:FullRows="1" ss:DefaultColumnWidth="60">
    <Row>
     <Cell ss:StyleID="s21"><Data ss:Type="String">Reference</Data></Cell>
@@ -83,10 +94,13 @@
     <Cell ss:Index="6" ss:StyleID="s22"/>
    </Row>
    <Row>
+    <Cell ss:StyleID="s21"><Data ss:Type="String">text</Data></Cell>
+    <Cell><Data ss:Type="String">There may be additional descriptive text at
the beginning of each section.</Data></Cell>
     <Cell ss:Index="6" ss:StyleID="s22"/>
    </Row>
-   <Row>
-    <Cell ss:Index="6" ss:StyleID="s22"/>
+   <Row ss:AutoFitHeight="0" ss:Height="75">
+    <Cell ss:StyleID="s35"><Data ss:Type="String">text</Data></Cell>
+    <Cell ss:MergeAcross="4" ss:StyleID="s36"><Data ss:Type="String">You may
add more than one paragraph and may use Excel features here like joining cells and line break
for cells. Expecially useful if you write a lot of text. Just make sure your text starts in
the second column.</Data></Cell>
    </Row>
    <Row>
     <Cell ss:Index="2" ss:StyleID="s21"/>
@@ -129,8 +143,8 @@
    <Panes>
     <Pane>
      <Number>3</Number>
-     <ActiveRow>3</ActiveRow>
-     <ActiveCol>2</ActiveCol>
+     <ActiveRow>10</ActiveRow>
+     <ActiveCol>1</ActiveCol>
     </Pane>
    </Panes>
    <ProtectObjects>False</ProtectObjects>
@@ -188,10 +202,12 @@
     <Cell ss:Index="4"><Data ss:Type="String">Caption must be in column D!</Data></Cell>
    </Row>
    <Row>
-    <Cell ss:Index="2" ss:StyleID="s23"/>
+    <Cell ss:StyleID="s21"><Data ss:Type="String">text</Data></Cell>
+    <Cell ss:StyleID="s23"><Data ss:Type="String">This is a mere Example and
does not resemble the structure of any real world shop.</Data></Cell>
    </Row>
    <Row>
-    <Cell ss:Index="2" ss:StyleID="s23"/>
+    <Cell ss:StyleID="s21"><Data ss:Type="String">text</Data></Cell>
+    <Cell ss:MergeAcross="4" ss:StyleID="s30"><Data ss:Type="String">The screenshot
was taken from the web.</Data></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="15">
     <Cell ss:StyleID="s24"/>
@@ -222,6 +238,13 @@
     <HorizontalResolution>600</HorizontalResolution>
     <VerticalResolution>600</VerticalResolution>
    </Print>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>8</ActiveRow>
+     <ActiveCol>1</ActiveCol>
+    </Pane>
+   </Panes>
    <ProtectObjects>False</ProtectObjects>
    <ProtectScenarios>False</ProtectScenarios>
   </WorksheetOptions>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/index.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/index.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/samples/index.xml
Fri Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  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.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/site.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/site.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/site.xml
Fri Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  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.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/tabs.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/tabs.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/content/xdocs/tabs.xml
Fri Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  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.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/group.svg
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/group.svg?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/group.svg
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/group.svg
Fri Feb 18 04:43:15 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2004 The Apache Software Foundation or its licensors, as applicable or its
licensors,
   as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/project.svg
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/project.svg?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/project.svg
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/resources/images/project.svg
Fri Feb 18 04:43:15 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2004 The Apache Software Foundation or its licensors, as applicable or its
licensors,
   as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/skinconf.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/skinconf.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/src/documentation/skinconf.xml Fri
Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  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.
@@ -66,21 +65,20 @@
 
   <!-- mandatory project logo
        default skin: renders it at the top -->
-  <project-name>XLS Table</project-name>
+  <project-name>Excel</project-name>
   <project-description>
-    Excel Sheet input plugin for Apache Forrest: reads (simple)
-    Excel sheets from the Excel "Save As" (Type=XML).
+    Excel Sheet input plugin for Apache Forrest: reads (simple) Excel sheets from the Excel
"Save As" (Type=XML).
   </project-description>
-  <project-url>http://myproj.mygroup.org/</project-url>
+  <project-url>http://forrest.apache.org/plugins/org.apache.forrest.plugin.excel.zip</project-url>
   <project-logo>images/project.png</project-logo>
   <!-- Alternative static image:
   <project-logo>images/project-logo.gif</project-logo> -->
 
   <!-- optional group logo
        default skin: renders it at the top-left corner -->
-  <group-name>MyGroup</group-name>
-  <group-description>MyGroup Description</group-description>
-  <group-url>http://mygroup.org</group-url>
+  <group-name>Plugins</group-name>
+  <group-description>Forrest Plugins</group-description>
+  <group-url>http://forrest.apache.org/plugins/</group-url>
   <group-logo>images/group.png</group-logo>
   <!-- Alternative static image:
   <group-logo>images/group-logo.gif</group-logo> -->

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.excel/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.excel/status.xml?view=diff&r1=154262&r2=154263
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.excel/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.excel/status.xml Fri Feb 18 04:43:15 2005
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
+  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.
@@ -24,6 +23,20 @@
 
   <changes>
     <!-- Add new releases here -->
+    <release version="0.1.1" date="2005-02-01">
+      <action type="add" context="Stylesheet" dev="js">
+        New feature: 'text' in first column to create descriptive text.
+      </action>
+      <action type="fix" context="caption" dev="js">
+        Minor issue: captions are now included even if Excel skips
+        cell at position three and writes weird "ss:Index=4".
+      </action>
+      <action dev="js" type="fix">
+        Fixed bug: input.xmap pointed to the project's resources dir
+        not the plugin's. So, plugin documentation worked fine, but
+        any other project didn't.
+      </action>
+    </release>
     <release version="0.1" date="2004-12-20">
       <!-- Some action types have associated images. By default, images are
       defined for 'add', 'fix', 'remove', 'update' and 'hack'. If you add
@@ -54,9 +67,6 @@
       </action>
       <action context="Forrest" dev="open">
         New feature: include Excel tables in other xml documents.
-      </action>
-      <action context="Stylesheet" dev="open">
-        New feature: 'text' in first column to create descriptive text.
       </action>
       <action context="Stylesheet" dev="open">
         New feature: allow xdoc tags in Cells. Problem: Excel saves



Mime
View raw message