Author: nick
Date: Sat Oct 18 19:59:42 2014
New Revision: 1632834

URL: http://svn.apache.org/r1632834
Log:
Republish site

Modified:
    poi/site/publish/apidocs/index-all.html
    poi/site/publish/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureInfo.html
    poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html
    poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Sheet.html
    poi/site/publish/apidocs/org/apache/poi/ss/util/SheetUtil.html
    poi/site/publish/changes.html
    poi/site/publish/changes.rss
    poi/site/publish/encryption.html
    poi/site/src/documentation/content/xdocs/status.xml

Modified: poi/site/publish/apidocs/index-all.html
URL: 
http://svn.apache.org/viewvc/poi/site/publish/apidocs/index-all.html?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/apidocs/index-all.html (original)
+++ poi/site/publish/apidocs/index-all.html Sat Oct 18 19:59:42 2014
@@ -18284,6 +18284,10 @@ return null</div>
 <dd>
 <div class="block">Compute width of a single cell</div>
 </dd>
+<dt><span class="strong"><a 
href="./org/apache/poi/ss/util/SheetUtil.html#getCellWithMerges(org.apache.poi.ss.usermodel.Sheet,%20int,%20int)">getCellWithMerges(Sheet,
 int, int)</a></span> - Static method in class org.apache.poi.ss.util.<a 
href="./org/apache/poi/ss/util/SheetUtil.html" title="class in 
org.apache.poi.ss.util">SheetUtil</a></dt>
+<dd>
+<div class="block">Return the cell, taking account of merged regions.</div>
+</dd>
 <dt><span class="strong"><a 
href="./org/apache/poi/xssf/model/StylesTable.html#getCellXfAt(int)">getCellXfAt(int)</a></span>
 - Method in class org.apache.poi.xssf.model.<a 
href="./org/apache/poi/xssf/model/StylesTable.html" title="class in 
org.apache.poi.xssf.model">StylesTable</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a 
href="./org/apache/poi/hssf/usermodel/HeaderFooter.html#getCenter()">getCenter()</a></span>
 - Method in class org.apache.poi.hssf.usermodel.<a 
href="./org/apache/poi/hssf/usermodel/HeaderFooter.html" title="class in 
org.apache.poi.hssf.usermodel">HeaderFooter</a></dt>

Modified: 
poi/site/publish/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureInfo.html
URL: 
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureInfo.html?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureInfo.html 
(original)
+++ poi/site/publish/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureInfo.html 
Sat Oct 18 19:59:42 2014
@@ -116,7 +116,7 @@ implements <a href="../../../../../../or
  ...
  </pre>
  
- <p><b>Signing a office document</b></p>
+ <p><b>Signing an office document</b></p>
  
  <pre>
  // loading the keystore - pkcs12 is used here, but of course jks &amp; co are 
also valid

Modified: 
poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html
URL: 
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html 
(original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html 
Sat Oct 18 19:59:42 2014
@@ -514,10 +514,18 @@
 <td class="colLast"><span class="strong">SSCellRange.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/SSCellRange.html#getCells()">getCells</a></strong>()</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static <a 
href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface 
in org.apache.poi.ss.usermodel">Cell</a></code></td>
+<td class="colLast"><span class="strong">SheetUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/SheetUtil.html#getCellWithMerges(org.apache.poi.ss.usermodel.Sheet,%20int,%20int)">getCellWithMerges</a></strong>(<a
 href="../../../../../../org/apache/poi/ss/usermodel/Sheet.html" 
title="interface in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
+                 int&nbsp;rowIx,
+                 int&nbsp;colIx)</code>
+<div class="block">Return the cell, taking account of merged regions.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code><a 
href="../../../../../../org/apache/poi/ss/util/SSCellRange.html" title="type 
parameter in SSCellRange">K</a>[]</code></td>
 <td class="colLast"><span class="strong">SSCellRange.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/SSCellRange.html#getFlattenedCells()">getFlattenedCells</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface 
in org.apache.poi.ss.usermodel">Cell</a></code></td>
 <td class="colLast"><span class="strong">CellUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/CellUtil.html#translateUnicodeValues(org.apache.poi.ss.usermodel.Cell)">translateUnicodeValues</a></strong>(<a
 href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" 
title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block">Looks for text in the cell that should be unicode, like 
&alpha; and provides the

Modified: 
poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Sheet.html
URL: 
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Sheet.html?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Sheet.html 
(original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Sheet.html 
Sat Oct 18 19:59:42 2014
@@ -267,6 +267,14 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><code>static <a 
href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface 
in org.apache.poi.ss.usermodel">Cell</a></code></td>
+<td class="colLast"><span class="strong">SheetUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/SheetUtil.html#getCellWithMerges(org.apache.poi.ss.usermodel.Sheet,%20int,%20int)">getCellWithMerges</a></strong>(<a
 href="../../../../../../org/apache/poi/ss/usermodel/Sheet.html" 
title="interface in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
+                 int&nbsp;rowIx,
+                 int&nbsp;colIx)</code>
+<div class="block">Return the cell, taking account of merged regions.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static double</code></td>
 <td class="colLast"><span class="strong">SheetUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/SheetUtil.html#getColumnWidth(org.apache.poi.ss.usermodel.Sheet,%20int,%20boolean)">getColumnWidth</a></strong>(<a
 href="../../../../../../org/apache/poi/ss/usermodel/Sheet.html" 
title="interface in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
               int&nbsp;column,
@@ -274,7 +282,7 @@
 <div class="block">Compute width of a column and return the result</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static double</code></td>
 <td class="colLast"><span class="strong">SheetUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/SheetUtil.html#getColumnWidth(org.apache.poi.ss.usermodel.Sheet,%20int,%20boolean,%20int,%20int)">getColumnWidth</a></strong>(<a
 href="../../../../../../org/apache/poi/ss/usermodel/Sheet.html" 
title="interface in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
               int&nbsp;column,
@@ -284,14 +292,14 @@
 <div class="block">Compute width of a column based on a subset of the rows and 
return the result</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <a 
href="../../../../../../org/apache/poi/ss/usermodel/Row.html" title="interface 
in org.apache.poi.ss.usermodel">Row</a></code></td>
 <td class="colLast"><span class="strong">CellUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/CellUtil.html#getRow(int,%20org.apache.poi.ss.usermodel.Sheet)">getRow</a></strong>(int&nbsp;rowIndex,
       <a href="../../../../../../org/apache/poi/ss/usermodel/Sheet.html" 
title="interface in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet)</code>
 <div class="block">Get a row from the spreadsheet, and create it if it doesn't 
exist.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setBorderBottom(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setBorderBottom</a></strong>(int&nbsp;border,
                <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,
@@ -300,7 +308,7 @@
 <div class="block">Sets the borderBottom attribute of the RegionUtil 
object</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setBorderLeft(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setBorderLeft</a></strong>(int&nbsp;border,
              <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,
@@ -310,7 +318,7 @@
  cells on the left</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setBorderRight(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setBorderRight</a></strong>(int&nbsp;border,
               <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,
@@ -319,7 +327,7 @@
 <div class="block">Sets the borderRight attribute of the RegionUtil 
object</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setBorderTop(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setBorderTop</a></strong>(int&nbsp;border,
             <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,
@@ -328,7 +336,7 @@
 <div class="block">Sets the borderBottom attribute of the RegionUtil 
object</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setBottomBorderColor(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setBottomBorderColor</a></strong>(int&nbsp;color,
                     <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,
@@ -337,7 +345,7 @@
 <div class="block">Sets the bottomBorderColor attribute of the RegionUtil 
object</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setLeftBorderColor(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setLeftBorderColor</a></strong>(int&nbsp;color,
                   <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,
@@ -346,7 +354,7 @@
 <div class="block">Sets the leftBorderColor attribute of the RegionUtil 
object</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setRightBorderColor(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setRightBorderColor</a></strong>(int&nbsp;color,
                    <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,
@@ -355,7 +363,7 @@
 <div class="block">Sets the rightBorderColor attribute of the RegionUtil 
object</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="strong">RegionUtil.</span><code><strong><a 
href="../../../../../../org/apache/poi/ss/util/RegionUtil.html#setTopBorderColor(int,%20org.apache.poi.ss.util.CellRangeAddress,%20org.apache.poi.ss.usermodel.Sheet,%20org.apache.poi.ss.usermodel.Workbook)">setTopBorderColor</a></strong>(int&nbsp;color,
                  <a 
href="../../../../../../org/apache/poi/ss/util/CellRangeAddress.html" 
title="class in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;region,

Modified: poi/site/publish/apidocs/org/apache/poi/ss/util/SheetUtil.html
URL: 
http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/util/SheetUtil.html?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/util/SheetUtil.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/util/SheetUtil.html Sat Oct 18 
19:59:42 2014
@@ -150,6 +150,14 @@ extends java.lang.Object</pre>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static <a 
href="../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in 
org.apache.poi.ss.usermodel">Cell</a></code></td>
+<td class="colLast"><code><strong><a 
href="../../../../../org/apache/poi/ss/util/SheetUtil.html#getCellWithMerges(org.apache.poi.ss.usermodel.Sheet,%20int,%20int)">getCellWithMerges</a></strong>(<a
 href="../../../../../org/apache/poi/ss/usermodel/Sheet.html" title="interface 
in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
+                 int&nbsp;rowIx,
+                 int&nbsp;colIx)</code>
+<div class="block">Return the cell, taking account of merged regions.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static double</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../../org/apache/poi/ss/util/SheetUtil.html#getColumnWidth(org.apache.poi.ss.usermodel.Sheet,%20int,%20boolean)">getColumnWidth</a></strong>(<a
 href="../../../../../org/apache/poi/ss/usermodel/Sheet.html" title="interface 
in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
               int&nbsp;column,
@@ -157,7 +165,7 @@ extends java.lang.Object</pre>
 <div class="block">Compute width of a column and return the result</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static double</code></td>
 <td class="colLast"><code><strong><a 
href="../../../../../org/apache/poi/ss/util/SheetUtil.html#getColumnWidth(org.apache.poi.ss.usermodel.Sheet,%20int,%20boolean,%20int,%20int)">getColumnWidth</a></strong>(<a
 href="../../../../../org/apache/poi/ss/usermodel/Sheet.html" title="interface 
in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
               int&nbsp;column,
@@ -254,7 +262,7 @@ extends java.lang.Object</pre>
 <a name="containsCell(org.apache.poi.ss.util.CellRangeAddress, int, int)">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>containsCell</h4>
 <pre>public static&nbsp;boolean&nbsp;containsCell(<a 
href="../../../../../org/apache/poi/ss/util/CellRangeAddress.html" title="class 
in org.apache.poi.ss.util">CellRangeAddress</a>&nbsp;cr,
@@ -262,6 +270,26 @@ extends java.lang.Object</pre>
                    int&nbsp;colIx)</pre>
 </li>
 </ul>
+<a name="getCellWithMerges(org.apache.poi.ss.usermodel.Sheet, int, int)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getCellWithMerges</h4>
+<pre>public static&nbsp;<a 
href="../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in 
org.apache.poi.ss.usermodel">Cell</a>&nbsp;getCellWithMerges(<a 
href="../../../../../org/apache/poi/ss/usermodel/Sheet.html" title="interface 
in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet,
+                     int&nbsp;rowIx,
+                     int&nbsp;colIx)</pre>
+<div class="block">Return the cell, taking account of merged regions. Allows 
you to find the
+  cell who's contents are shown in a given position in the sheet.
+ 
+ <p>If the cell at the given co-ordinates is a merged cell, this will
+  return the primary (top-left) most cell of the merged region.
+ <p>If the cell at the given co-ordinates is not in a merged region,
+  then will return the cell itself.
+ <p>If there is no cell defined at the given co-ordinates, will return
+  null.</div>
+</li>
+</ul>
 </li>
 </ul>
 </li>

Modified: poi/site/publish/changes.html
URL: 
http://svn.apache.org/viewvc/poi/site/publish/changes.html?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/changes.html (original)
+++ poi/site/publish/changes.html Sat Oct 18 19:59:42 2014
@@ -257,6 +257,12 @@ if (VERSION > 3) {
 <ul>
         
 <li>
+<img class="icon" alt="add" src="images/add.jpg"> SheetUtil.getCellWithMerges 
for getting a cell at a co-ordinate, or the primary one of it's merged region 
if it's a merged cell</li>
+        
+<li>
+<img class="icon" alt="add" src="images/add.jpg"> <a 
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=56836";>56836</a> - XML 
signature support</li>
+        
+<li>
 <img class="icon" alt="fix" src="images/fix.jpg"> <a 
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=57080";>57080</a> - 
IndexOutOfBoundsException in poi decryptor</li>
         
 <li>

Modified: poi/site/publish/changes.rss
URL: 
http://svn.apache.org/viewvc/poi/site/publish/changes.rss?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/changes.rss (original)
+++ poi/site/publish/changes.rss Sat Oct 18 19:59:42 2014
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" 
"http://my.netscape.com/publish/formats/rss-0.91.dtd";>
-<rss version="0.91"><channel><title>POI 
Changes</title><link>http://poi.apache.org/changes.html</link><description>POI 
Changes</description><language>en-us</language><item><title> fix(bug 
57080)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 57080) - IndexOutOfBoundsException in poi 
decryptor</description></item><item><title> 
add</title><link>http://poi.apache.org/changes.html</link><description> add by 
POI Developers - The minimum Apache Ant version required to build has been 
increased to 1.8.x or later</description></item><item><title> add(bug 
56956)</title><link>http://poi.apache.org/changes.html</link><description> add 
by POI Developers (bug 56956) - Add a NPOIFSFileSystem constructor with a 
FileChannel and the read-only option</description></item><item><title> fix(bug 
56914)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56914) - XSSFRowShifter.updateConditionalFormatting 
throws IOOB
 E when there are more than 1 
CTConditionalFormatting</description></item><item><title> fix(bug 
56913)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56913) - Replace usages of o.a.p.util.ArrayUtil.copyOf* 
methods with replacements from j.u.Arrays</description></item><item><title> 
fix(bug 
51483)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 51483) - XSSF locking of specific features not 
working</description></item><item><title> fix(bug 
48195)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 48195) - Formulas: Fix incorrect evaluation of IF() with 
ROW()/COLUMN() as else-result.</description></item><item><title> fix(bug 
55280)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 55280) - XSSF: Greatly improve performance of shifting 
rows in sheets with many merged regions.</description></item><item><titl
 e> fix(bug 
51222)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 51222) - XSSFColor.getARGBHex() returns wrong color for 
Excel 2007 xlsx file</description></item><item><title> fix(bug 
56730)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56730) - Fix exporting XML if schema contains 
ref-elements</description></item><item><title> fix(bug 
56864)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56864) - XWPFLatentStyles.isLatentStyle always returns 
true if there is at least 1 lsdException</description></item><item><title> 
fix(bug 
56854)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56854) - XMLBeans performance when using getXXXList() 
and other proxy methods</description></item></channel></rss>
\ No newline at end of file
+<rss version="0.91"><channel><title>POI 
Changes</title><link>http://poi.apache.org/changes.html</link><description>POI 
Changes</description><language>en-us</language><item><title> 
add</title><link>http://poi.apache.org/changes.html</link><description> add by 
POI Developers - SheetUtil.getCellWithMerges for getting a cell at a 
co-ordinate, or the primary one of it's merged region if it's a merged 
cell</description></item><item><title> add(bug 
56836)</title><link>http://poi.apache.org/changes.html</link><description> add 
by POI Developers (bug 56836) - XML signature 
support</description></item><item><title> fix(bug 
57080)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 57080) - IndexOutOfBoundsException in poi 
decryptor</description></item><item><title> 
add</title><link>http://poi.apache.org/changes.html</link><description> add by 
POI Developers - The minimum Apache Ant version required to build has been 
increased to 1.8.x or later</descr
 iption></item><item><title> add(bug 
56956)</title><link>http://poi.apache.org/changes.html</link><description> add 
by POI Developers (bug 56956) - Add a NPOIFSFileSystem constructor with a 
FileChannel and the read-only option</description></item><item><title> fix(bug 
56914)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56914) - XSSFRowShifter.updateConditionalFormatting 
throws IOOBE when there are more than 1 
CTConditionalFormatting</description></item><item><title> fix(bug 
56913)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56913) - Replace usages of o.a.p.util.ArrayUtil.copyOf* 
methods with replacements from j.u.Arrays</description></item><item><title> 
fix(bug 
51483)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 51483) - XSSF locking of specific features not 
working</description></item><item><title> fix(bug 48195)</title><link>http://p
 oi.apache.org/changes.html</link><description> fix by POI Developers (bug 
48195) - Formulas: Fix incorrect evaluation of IF() with ROW()/COLUMN() as 
else-result.</description></item><item><title> fix(bug 
55280)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 55280) - XSSF: Greatly improve performance of shifting 
rows in sheets with many merged regions.</description></item><item><title> 
fix(bug 
51222)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 51222) - XSSFColor.getARGBHex() returns wrong color for 
Excel 2007 xlsx file</description></item><item><title> fix(bug 
56730)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56730) - Fix exporting XML if schema contains 
ref-elements</description></item><item><title> fix(bug 
56864)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56864) - XWPFLatentStyles.i
 sLatentStyle always returns true if there is at least 1 
lsdException</description></item><item><title> fix(bug 
56854)</title><link>http://poi.apache.org/changes.html</link><description> fix 
by POI Developers (bug 56854) - XMLBeans performance when using getXXXList() 
and other proxy methods</description></item></channel></rss>
\ No newline at end of file

Modified: poi/site/publish/encryption.html
URL: 
http://svn.apache.org/viewvc/poi/site/publish/encryption.html?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/publish/encryption.html (original)
+++ poi/site/publish/encryption.html Sat Oct 18 19:59:42 2014
@@ -341,6 +341,103 @@ fs.writeFilesystem(fos);
 fos.close();     
      </pre>
      
+     
+     
+<a name="XML-based+formats+-+Signing+%28XML+Signature%29"></a>
+<div class="h3">
+<h3>XML-based formats - Signing (XML Signature)</h3>
+</div>
+     
+<p>An Office document can be digital signed by a <a 
href="http://en.wikipedia.org/wiki/XML_Signature";>XML Signature</a>
+     to protect it from unauthorized modifications, i.e. modifications without 
having the original certificate.
+     The current implementation is based on the <a 
href="http://eid-applet.googlecode.com";>eID Applet</a> which
+     is dual-licensed to <a 
href="https://code.google.com/p/eid-applet/source/browse/trunk/README.txt";>ASF/POI</a>.
+     Instead of using the internal <a 
href="http://www.jsourcecode.com/class.php?proj=jdk%5Copenjdk&jar=openjdk-6-b14&class=org.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory";>JDK
 API</a>
+     this version is based on <a href="http://santuario.apache.org";>Apache 
Santuario</a>.</p>
+     
+<p>The classes have been tested against the following libraries, which need to 
be included additionally to the default
+     dependencies:</p>
+     
+<ul>
+     
+<li>BouncyCastle bcpkix and bcprov (tested against 1.51)</li>
+     
+<li>Apache Santuario "xmlsec" (tested against 2.0.1)</li>
+     
+<li>and slf4j-api (tested against 1.7.7)</li>     
+     
+</ul>
+     
+<p>Depending on the <a 
href="http://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureConfig.html";>configuration</a>
+     and the activated <a 
href="http://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/dsig/facets/package-summary.html";>facets</a>
+     various <a href="http://en.wikipedia.org/wiki/XAdES";>XAdES levels</a> are 
supported - the support for higher levels (XAdES-T+)
+     depend on supporting services and although the code is adopted, the 
integration is not well tested ... please support us on
+     integration (testing) with timestamp and revocation (OCSP) services. 
+     </p>
+     
+<p>Further test examples can be found in the corresponding <a 
href="http://svn.apache.org/viewvc/poi/branches/xml_signature/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java?view=markup";>test
 class</a>.</p>
+     
+     
+     
+<a name="Validating+a+signed+office+document"></a>
+<div class="h3">
+<h3>Validating a signed office document</h3>
+</div>
+
+     
+<pre class="code">
+OPCPackage pkg = OPCPackage.open(..., PackageAccess.READ);
+SignatureConfig sic = new SignatureConfig();
+sic.setOpcPackage(pkg);
+SignatureInfo si = new SignatureInfo();
+si.setSignatureConfig(sic);
+boolean isValid = si.validate();
+...
+     </pre>
+     
+     
+     
+<a name="Signing+an+office+document"></a>
+<div class="h3">
+<h3>Signing an office document</h3>
+</div>
+     
+     
+<pre class="code">
+// loading the keystore - pkcs12 is used here, but of course jks &amp; co are 
also valid
+// the keystore needs to contain a private key and it's certificate having a
+// 'digitalSignature' key usage
+char password[] = "test".toCharArray();
+File file = new File("test.pfx");
+KeyStore keystore = KeyStore.getInstance("PKCS12");
+FileInputStream fis = new FileInputStream(file);
+keystore.load(fis, password);
+fis.close();
+
+// extracting private key and certificate
+String alias = "xyz"; // alias of the keystore entry
+Key key = keystore.getKey(alias, password);
+X509Certificate x509 = (X509Certificate)keystore.getCertificate(alias);
+
+// filling the SignatureConfig entries (minimum fields, more options are 
available ...)
+SignatureConfig signatureConfig = new SignatureConfig();
+signatureConfig.setKey(keyPair.getPrivate());
+signatureConfig.setSigningCertificateChain(Collections.singletonList(x509));
+OPCPackage pkg = OPCPackage.open(..., PackageAccess.READ_WRITE);
+signatureConfig.setOpcPackage(pkg);
+
+// adding the signature document to the package
+SignatureInfo si = new SignatureInfo();
+si.setSignatureConfig(signatureConfig);
+si.confirmSignature();
+// optionally verify the generated signature
+boolean b = si.verifySignature();
+assert (b);
+// write the changes back to disc
+pkg.close();
+     </pre>
+     
+     
   
 
   

Modified: poi/site/src/documentation/content/xdocs/status.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1632834&r1=1632833&r2=1632834&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Sat Oct 18 19:59:42 2014
@@ -38,6 +38,7 @@
     </devs>
 
     <release version="3.11-beta3" date="2014-??-??">
+        <action dev="PD" type="add">SheetUtil.getCellWithMerges for getting a 
cell at a co-ordinate, or the primary one of it's merged region if it's a 
merged cell</action>
         <action dev="PD" type="add" fixes-bug="56836">XML signature 
support</action>
         <action dev="PD" type="fix" 
fixes-bug="57080">IndexOutOfBoundsException in poi decryptor</action>
         <action dev="PD" type="add">The minimum Apache Ant version required to 
build has been increased to 1.8.x or later</action>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to