Modified: pdfbox/site/publish/userguide/tutorials.html
URL: 
http://svn.apache.org/viewvc/pdfbox/site/publish/userguide/tutorials.html?rev=1179729&r1=1179728&r2=1179729&view=diff
==============================================================================
--- pdfbox/site/publish/userguide/tutorials.html (original)
+++ pdfbox/site/publish/userguide/tutorials.html Thu Oct  6 18:03:38 2011
@@ -1,8 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia -->
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+
+
+
+
+
+
+
+
+
+
+<html xmlns="http://www.w3.org/1999/xhtml";>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>Apache PDFBox - 
     PDFBox - Tutorials</title>
     <style type="text/css" media="all">
@@ -11,161 +20,252 @@
       @import url("../css/site.css");
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" 
media="print" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-  </head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      </head>
   <body class="composite">
     <div id="banner">
-                  <a href="" id="bannerLeft" title="Apache PDFBox">
-                                                <img src="../images/Logo.gif" 
alt="Apache PDFBox" />
-                </a>
-                        <a href="http://www.apache.org/"; id="bannerRight" 
title="The Apache Software Foundation">
-                                        <img 
src="http://www.apache.org/images/asf_logo.gif"; alt="The Apache Software 
Foundation" />
-                </a>
+                  <a href="" id="bannerLeft"  title="Apache PDFBox"  >
+    
+                                            <img src="../images/Logo.gif" 
alt="Apache PDFBox" />
+    
+            </a>
+                        <a href="http://www.apache.org/"; id="bannerRight"  
title="The Apache Software Foundation"  >
+    
+                                    <img 
src="http://www.apache.org/images/asf_logo.gif"; alt="The Apache Software 
Foundation" />
+    
+            </a>
             <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="breadcrumbs">
+          
+  
+
+  
+    
             
-                
-                  <div class="xright">        
-                
-      </div>
+  
+    
+              <div class="xright">      
+  
+
+  
+    
+            
+  
+    
+  </div>
       <div class="clear">
         <hr/>
       </div>
     </div>
     <div id="leftColumn">
       <div id="navcolumn">
-             
-                
-                                <h5>About</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../index.html" title="Welcome">Welcome</a>
-            </li>
-                  <li class="none">
-                          <a href="../download.html" 
title="Download">Download</a>
-            </li>
-                  <li class="none">
-                          <a href="../dependencies.html" 
title="Dependencies">Dependencies</a>
-            </li>
-                  <li class="none">
-                          <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="externalLink" title="License">License</a>
-            </li>
-                  <li class="none">
-                          <a href="../mail-lists.html" title="Mailing 
Lists">Mailing Lists</a>
-            </li>
-                  <li class="none">
-                          <a 
href="https://issues.apache.org/jira/browse/PDFBOX"; class="externalLink" 
title="Issue Tracker">Issue Tracker</a>
-            </li>
-                  <li class="none">
-                          <a href="../team-list.html" title="Project 
Team">Project Team</a>
-            </li>
-                  <li class="none">
-                          <a href="../references.html" 
title="References">References</a>
-            </li>
-                  <li class="none">
-                          <a 
href="http://www.apache.org/foundation/sponsorship.html"; class="externalLink" 
title="ASF Sponsorship Program">ASF Sponsorship Program</a>
-            </li>
-                  <li class="none">
-                          <a 
href="http://www.apache.org/foundation/thanks.html"; class="externalLink" 
title="ASF Thanks">ASF Thanks</a>
-            </li>
+           
+  
+
+  
+    
+            
+  
+    
+                   <h5>About</h5>
+            <ul>
+              
+    <li class="none">
+                    <a href="../index.html">Welcome</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../download.html">Download</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../dependencies.html">Dependencies</a>
+          </li>
+              
+    <li class="none">
+                    <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="externalLink">License</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../mail-lists.html">Mailing Lists</a>
+          </li>
+              
+    <li class="none">
+                    <a href="https://issues.apache.org/jira/browse/PDFBOX"; 
class="externalLink">Issue Tracker</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../team-list.html">Project Team</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../references.html">References</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="http://www.apache.org/foundation/sponsorship.html"; 
class="externalLink">ASF Sponsorship Program</a>
+          </li>
+              
+    <li class="none">
+                    <a href="http://www.apache.org/security"; 
class="externalLink">Security</a>
+          </li>
+              
+    <li class="none">
+                    <a href="http://www.apache.org/foundation/thanks.html"; 
class="externalLink">ASF Thanks</a>
+          </li>
           </ul>
-                       <h5>Command Line Utilities</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../commandlineutilities/index.html" 
title="Index">Index</a>
-            </li>
-                  <li class="none">
-                          <a 
href="../commandlineutilities/ConvertColorspace.html" 
title="ConvertColorspace">ConvertColorspace</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/Decrypt.html" 
title="Decrypt">Decrypt</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/Encrypt.html" 
title="Encrypt">Encrypt</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/ExtractText.html" 
title="ExtractText">ExtractText</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/Overlay.html" 
title="Overlay">Overlay</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/PrintPDF.html" 
title="PrintPDF">PrintPDF</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/PDFDebugger.html" 
title="PDFDebugger">PDFDebugger</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/PDFMerger.html" 
title="PDFMerger">PDFMerger</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/PDFReader.html" 
title="PDFReader">PDFReader</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/PDFSplit.html" 
title="PDFSplit">PDFSplit</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/PDFToImage.html" 
title="PDFToImage">PDFToImage</a>
-            </li>
-                  <li class="none">
-                          <a href="../commandlineutilities/TextToPDF.html" 
title="TextToPDF">TextToPDF</a>
-            </li>
-                  <li class="none">
-                          <a 
href="../commandlineutilities/WriteDecodedDoc.html" 
title="WriteDecodedDoc">WriteDecodedDoc</a>
-            </li>
+              <h5>Command Line Utilities</h5>
+            <ul>
+              
+    <li class="none">
+                    <a href="../commandlineutilities/index.html">Index</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/ConvertColorspace.html">ConvertColorspace</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../commandlineutilities/Decrypt.html">Decrypt</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../commandlineutilities/Encrypt.html">Encrypt</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/ExtractText.html">ExtractText</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../commandlineutilities/Overlay.html">Overlay</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/PrintPDF.html">PrintPDF</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/PDFDebugger.html">PDFDebugger</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/PDFMerger.html">PDFMerger</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/PDFReader.html">PDFReader</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/PDFSplit.html">PDFSplit</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/PDFToImage.html">PDFToImage</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/TextToPDF.html">TextToPDF</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../commandlineutilities/WriteDecodedDoc.html">WriteDecodedDoc</a>
+          </li>
           </ul>
-                       <h5>Developers Guide</h5>
-                  <ul>
-                  <li class="none">
-                          <a href="../userguide/index.html" 
title="Index">Index</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/bookmarks.html" 
title="Bookmarks">Bookmarks</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/building_pdfbox.html" 
title="Building PDFBox">Building PDFBox</a>
-            </li>
-                  <li class="none">
-            <strong>Tutorials</strong>
-          </li>
-                  <li class="none">
-                          <a href="../userguide/cookbook.html" 
title="Cookbook">Cookbook</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/faq.html" title="FAQ">FAQ</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/file_references.html" 
title="File References">File References</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/fonts.html" 
title="Fonts">Fonts</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/highlighting.html" 
title="Highlighting">Highlighting</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/metadata.html" 
title="Metadata">Metadata</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/redistribution.html" 
title="Redistribution">Redistribution</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/dot_net.html" title=".NET 
Version">.NET Version</a>
-            </li>
-                  <li class="none">
-                          <a href="../userguide/text_extraction.html" 
title="Text Extraction">Text Extraction</a>
-            </li>
+              <h5>Developers Guide</h5>
+            <ul>
+              
+    <li class="none">
+                    <a href="../userguide/index.html">Index</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/bookmarks.html">Bookmarks</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/building_pdfbox.html">Building 
PDFBox</a>
+          </li>
+              
+    <li class="none">
+              <strong>Tutorials</strong>
+        </li>
+              
+    <li class="none">
+                    <a href="../userguide/cookbook.html">Cookbook</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/faq.html">FAQ</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/file_references.html">File 
References</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/fonts.html">Fonts</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/highlighting.html">Highlighting</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/metadata.html">Metadata</a>
+          </li>
+              
+    <li class="none">
+                    <a 
href="../userguide/redistribution.html">Redistribution</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/dot_net.html">.NET Version</a>
+          </li>
+              
+    <li class="none">
+                    <a href="../userguide/text_extraction.html">Text 
Extraction</a>
+          </li>
           </ul>
-                             <a href="http://maven.apache.org/"; title="Built 
by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" 
src="../images/logos/maven-feather.png" />
-      </a>
-                   
-                
-            </div>
+                                                 
+                        
+                        
+                        
+                        
+            <a href="http://www.apache.org/events/current-event.html"; 
title="ApacheCon" class="poweredBy">
+                            <img  class="poweredBy"  
+                    alt="ApacheCon" 
+                    
src="http://www.apache.org/events/current-event-125x125.png"; 
+                    width="125"
+                    height="125"
+              />
+            </a>
+                                
+                        
+                        
+                        
+                        
+            <a href="http://maven.apache.org/"; title="Maven" class="poweredBy">
+                            <img  class="poweredBy"  
+                    alt="Maven" 
+                    
src="http://maven.apache.org/images/logos/maven-feather.png"; 
+                    width="90"
+                    height="30"
+              />
+            </a>
+                               
+  
+
+  
+    
+            
+  
+    
+        </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -191,35 +291,35 @@
       In addition the <a href="cookbook.html">Cookbook</a> provides a wide 
range of samples including sample code. 
       </p>
       
-      <table align="center" border="1" class="bodyTable">
+      <table border="0" class="bodyTable">
           <tr class="a">
-               <th align="left">Tutorial</th>
-               <th align="left">Description</th>
+               <th>Tutorial</th>
+               <th>Description</th>
          </tr>
          <tr class="b">
-               <td align="left"><a href="bookmarks.html">Bookmarks</a></td>
-               <td align="left">PDF Bookmarks allow for a quick navigation 
within documents similar to a Table of Contents. 
+               <td><a href="bookmarks.html">Bookmarks</a></td>
+               <td>PDF Bookmarks allow for a quick navigation within documents 
similar to a Table of Contents. 
                The Tutorial covers how to read bookmarks as well as how to 
generate them.</td>
          </tr>
          <tr class="a">
-               <td align="left"><a href="file_references.html">File 
References</a></td>
-               <td align="left">A PDF file can contain references to external 
files as well as files embedded in the PDF itself.
+               <td><a href="file_references.html">File References</a></td>
+               <td>A PDF file can contain references to external files as well 
as files embedded in the PDF itself.
                The Tutorial covers how handle such references as well as how 
to embed a file in a PDF document.</td>
          </tr>
          <tr class="b">
-               <td align="left"><a 
href="highlighting.html">Highlighting</a></td>
-               <td align="left">PDF allows for text to be highlighted. This 
can be useful for example to highlight results of a search.
+               <td><a href="highlighting.html">Highlighting</a></td>
+               <td>PDF allows for text to be highlighted. This can be useful 
for example to highlight results of a search.
                 There are different ways to approach this covered in the 
tutorial.</td>
          </tr>
          <tr class="a">
-               <td align="left"><a href="metadata.html">Metadata</a></td>
-               <td align="left">PDF documents can have metadata associated 
with the document or certain objects within the document. As an example 
+               <td><a href="metadata.html">Metadata</a></td>
+               <td>PDF documents can have metadata associated with the 
document or certain objects within the document. As an example 
                metadata can be used to store the author of a document as well 
as copyright information for an image embedded in the document.
                The Tutorial covers how to read and generate such metadata.</td>
          </tr>
          <tr class="b">
-               <td align="left"><a href="text_extraction.html">Text 
Extraction</a></td>
-               <td align="left">One of the main features of PDFBox is its 
ability to quickly and accurately extract text from a variety of PDF documents.
+               <td><a href="text_extraction.html">Text Extraction</a></td>
+               <td>One of the main features of PDFBox is its ability to 
quickly and accurately extract text from a variety of PDF documents.
                The tutorial covers different approaches to handle that 
task.</td>
          </tr>
       </table>
@@ -233,10 +333,20 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;                    2008-2011
-                        <a href="http://www.apache.org/";>The Apache Software 
Foundation</a>.
-            All Rights Reserved.      
-                
+      <div class="center">&#169;  
+          2008-2011
+    
+          The Apache Software Foundation
+          
+  
+
+  
+    
+            
+  
+    
+  . All Rights Reserved.<br/>
+        Apache PDFBox, PDFBox, Apache, the Apache feather logo, and the Apache 
PDFBox project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">
         <hr/>

Modified: pdfbox/site/src/site/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/pdfbox/site/src/site/resources/css/site.css?rev=1179729&r1=1179728&r2=1179729&view=diff
==============================================================================
--- pdfbox/site/src/site/resources/css/site.css (original)
+++ pdfbox/site/src/site/resources/css/site.css Thu Oct  6 18:03:38 2011
@@ -23,3 +23,7 @@
 #bannerLeft img {
     padding-top: 10px;
 }
+
+#footer {
+    text-align: center;
+}

Added: pdfbox/site/src/site/site.vm
URL: 
http://svn.apache.org/viewvc/pdfbox/site/src/site/site.vm?rev=1179729&view=auto
==============================================================================
--- pdfbox/site/src/site/site.vm (added)
+++ pdfbox/site/src/site/site.vm Thu Oct  6 18:03:38 2011
@@ -0,0 +1,389 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+#macro ( link $href $name )
+  #if ( ( $href.toLowerCase().startsWith("http") || 
$href.toLowerCase().startsWith("https") ) )
+    <a href="$href" class="externalLink">$name</a>
+  #else
+    <a href="$href">$name</a>
+  #end
+#end
+
+#macro ( banner $banner $id )
+  #if ( $banner )
+    #if( $banner.href )
+      <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" 
#end >
+    #else
+        <div id="$id">
+    #end
+
+    #if( $banner.src )
+        #set ( $src = $banner.src )
+        #if ( ! ( $src.toLowerCase().startsWith("http") || 
$src.toLowerCase().startsWith("https") ) )
+            #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+            #set ( $src = $src.replaceAll( "\\", "/" ) )
+        #end
+        #if ( $banner.alt )
+            #set ( $alt = $banner.alt )
+        #else
+            #set ( $alt = $banner.name )
+        #end
+        <img src="$src" alt="$alt" />
+    #else
+        $banner.name
+    #end
+
+    #if( $banner.href )
+        </a>
+    #else
+        </div>
+    #end
+  #end
+#end
+
+#macro ( links $links )
+  #set ( $counter = 0 )
+  #foreach( $item in $links )
+    #set ( $counter = $counter + 1 )
+    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, 
$relativePath ) )
+    #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+    #link( $currentItemHref $item.name )
+    #if ( $links.size() > $counter )
+      |
+    #end
+  #end
+#end
+
+#macro ( breadcrumbs $breadcrumbs )
+  #set ( $counter = 0 )
+  #foreach( $item in $breadcrumbs )
+    #set ( $counter = $counter + 1 )
+    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, 
$relativePath ) )
+    #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+    #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
+      $item.name
+    #else
+      #link( $currentItemHref $item.name )
+    #end
+    #if ( $breadcrumbs.size() > $counter )
+      &gt;
+    #end
+  #end
+#end
+
+#macro ( displayTree $display $item )
+  #if ( $item && $item.items && $item.items.size() > 0 )
+    #foreach( $subitem in $item.items )
+      #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, 
$relativePath ) )
+      #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
+      #set ( $display = false )
+      #if ( $alignedFileName == $subitemHref )
+        #set ( $display = true )
+      #end
+
+      #displayTree( $display $subitem )
+    #end
+  #end
+#end
+
+#macro ( menuItem $item )
+  #set ( $collapse = "none" )
+  #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath 
) )
+  #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+  #if ( $item && $item.items && $item.items.size() > 0 )
+    #if ( $item.collapse == false )
+      #set ( $collapse = "expanded" )
+    #else
+      ## By default collapsed
+      #set ( $collapse = "collapsed" )
+    #end
+
+    #set ( $display = false )
+    #displayTree( $display $item )
+
+    #if ( $alignedFileName == $currentItemHref || $display )
+      #set ( $collapse = "expanded" )
+    #end
+  #end
+  <li class="$collapse">
+    #if ( $item.img )
+      #if ( ! ( $item.img.toLowerCase().startsWith("http") || 
$item.img.toLowerCase().startsWith("https") ) )
+        #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
+        #set ( $src = $src.replaceAll( "\\", "/" ) )
+        <img src="$src"/>
+      #else
+        <img src="$item.img" align="absbottom" style="border-width: 0"/>
+      #end
+    #end
+    #if ( $alignedFileName == $currentItemHref )
+      <strong>$item.name</strong>
+    #else
+      #link( $currentItemHref $item.name )
+    #end
+  #if ( $item && $item.items && $item.items.size() > 0 )
+    #if ( $collapse == "expanded" )
+      <ul>
+        #foreach( $subitem in $item.items )
+          #menuItem( $subitem )
+        #end
+      </ul>
+    #end
+  #end
+  </li>
+#end
+
+#macro ( mainMenu $menus )
+  #foreach( $menu in $menus )
+    #if ( $menu.name )
+    <h5>$menu.name</h5>
+    #end
+    #if ( $menu.items && $menu.items.size() > 0 )
+    <ul>
+      #foreach( $item in $menu.items )
+        #menuItem( $item )
+      #end
+    </ul>
+    #end
+  #end
+#end
+
+#macro ( copyright )
+  #if ( $project )
+    #set ( $currentYear = ${currentDate.year} + 1900 )
+
+    #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != 
${currentYear.toString()} ) )
+      ${project.inceptionYear}-${currentYear}
+    #else
+      ${currentYear}
+    #end
+
+    #if ( ${project.organization} && ${project.organization.name} )
+      ${project.organization.name}
+    #end
+  #end
+#end
+
+#macro ( publishDate $position $publishDate $version )
+  #if ( $publishDate && $publishDate.format )
+    #set ( $format = $publishDate.format )
+  #else
+    #set ( $format = "yyyy-MM-dd" )
+  #end
+
+  $dateFormat.applyPattern( $format )
+
+  #set ( $dateToday = $dateFormat.format( $currentDate ) )
+
+  #if ( $publishDate && $publishDate.position )
+    #set ( $datePosition = $publishDate.position )
+  #else
+    #set ( $datePosition = "left" )
+  #end
+
+  #if ( $version )
+    #if ( $version.position )
+      #set ( $versionPosition = $version.position )
+    #else
+      #set ( $versionPosition = "left" )
+    #end
+  #else
+    #set ( $version = "" )
+    #set ( $versionPosition = "left" )
+  #end
+
+  #set ( $breadcrumbs = $decoration.body.breadcrumbs )
+  #set ( $links = $decoration.body.links )
+
+  #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 
0 )
+    #set ( $prefix = "&nbsp;|" )
+  #else
+    #set ( $prefix = "" )
+  #end
+
+  #if ( $datePosition.equalsIgnoreCase( $position ) )
+    #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( 
$datePosition.equalsIgnoreCase( "bottom" ) ) )
+      $prefix $i18n.getString( "site-renderer", $locale, 
"template.lastpublished" ): $dateToday
+      #if ( $versionPosition.equalsIgnoreCase( $position ) )
+        &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" 
): ${project.version}
+      #end
+    #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( 
$datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+      <div id="lastPublished">
+        $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): 
$dateToday
+        #if ( $versionPosition.equalsIgnoreCase( $position ) )
+          &nbsp;| $i18n.getString( "site-renderer", $locale, 
"template.version" ): ${project.version}
+        #end
+      </div>
+    #elseif ( $datePosition.equalsIgnoreCase("left") )
+      <div class="xleft">
+        $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): 
$dateToday
+        #if ( $versionPosition.equalsIgnoreCase( $position ) )
+          &nbsp;| $i18n.getString( "site-renderer", $locale, 
"template.version" ): ${project.version}
+        #end
+        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+          | #breadcrumbs( $breadcrumbs )
+        #end
+      </div>
+    #end
+  #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+    #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( 
$versionPosition.equalsIgnoreCase( "bottom" ) ) )
+      $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): 
${project.version}
+    #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || 
( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+      <div id="lastPublished">
+        $i18n.getString( "site-renderer", $locale, "template.version" ): 
${project.version}
+      </div>
+    #elseif ( $versionPosition.equalsIgnoreCase("left") )
+      <div class="xleft">
+        $i18n.getString( "site-renderer", $locale, "template.version" ): 
${project.version}
+        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+          | #breadcrumbs( $breadcrumbs )
+        #end
+      </div>
+    #end
+  #elseif ( $position.equalsIgnoreCase( "left" ) )
+    #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+      <div class="xleft">
+        #breadcrumbs( $breadcrumbs )
+      </div>
+    #end
+  #end
+#end
+
+#macro ( poweredByLogo $poweredBy )
+    #if( $poweredBy )
+        #foreach ($item in $poweredBy)
+            #if( $item.href )
+                #set ( $href = $PathTool.calculateLink( $item.href, 
$relativePath ) )
+                #set ( $href = $href.replaceAll( "\\", "/" ) )
+            #else
+                #set ( $href="http://maven.apache.org/"; )
+            #end
+
+            #if( $item.name )
+                #set ( $name = $item.name )
+            #else
+                #set ( $name = $i18n.getString( "site-renderer", $locale, 
"template.builtby" )  )
+                #set ( $name = "${name} Maven"  )
+            #end
+
+            #if( $item.img )
+                #set ( $img = $item.img )
+            #else
+                #set ( $img = "images/logos/maven-feather.png" )
+            #end
+
+            #if( $item.width )
+                #set ( $width = $item.width )
+            #else
+                #set ( $width = "90" )
+            #end
+
+            #if( $item.height )
+                #set ( $height = $item.height )
+            #else
+                #set ( $height = "30" )
+            #end
+
+            <a href="$href" title="$name" class="poweredBy">
+              #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+              #set ( $img = $img.replaceAll( "\\", "/" ) )
+              <img  class="poweredBy"  
+                    alt="$name" 
+                    src="$img" 
+                    width="$width"
+                    height="$height"
+              />
+            </a>
+        #end
+        #if( $poweredBy.isEmpty() )
+          <a href="http://maven.apache.org/"; title="$i18n.getString( 
"site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+            <img class="poweredBy" 
+                 alt="$i18n.getString( "site-renderer", $locale, 
"template.builtby" ) Maven" 
+                 src="$relativePath/images/logos/maven-feather.png" 
+                 width="90"
+                 height="30"
+                 border="1" />
+          </a>
+        #end
+    #else
+        <a href="http://maven.apache.org/"; title="$i18n.getString( 
"site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+          <img class="poweredBy" 
+               alt="$i18n.getString( "site-renderer", $locale, 
"template.builtby" ) Maven" 
+               src="$relativePath/images/logos/maven-feather.png" 
+               width="90"
+               height="30"
+               border="1"
+               />
+        </a>
+    #end
+#end
+
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <title>$title</title>
+    <style type="text/css" media="all">
+      @import url("$relativePath/css/maven-base.css");
+      @import url("$relativePath/css/maven-theme.css");
+      @import url("$relativePath/css/site.css");
+    </style>
+    <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" 
media="print" />
+    #foreach( $author in $authors )
+      <meta name="author" content="$author" />
+    #end
+    <meta http-equiv="Content-Type" content="text/html; 
charset=${outputEncoding}" />
+    #if ( $decoration.body.head )
+      #foreach( $item in $decoration.body.head.getChildren() )
+        ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
+        ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
+        ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
+        #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" )
+        #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) )
+        #if ( $item.name == "script" )
+          $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" 
)
+        #else
+          $StringUtils.replace( $item.toString(), $documentHeader, "" )
+        #end
+      #end
+    #end
+  </head>
+  <body class="composite">
+    <div id="banner">
+      #banner( $decoration.bannerLeft "bannerLeft" )
+      #banner( $decoration.bannerRight "bannerRight" )
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      #publishDate( "left" $decoration.publishDate $decoration.version )
+      <div class="xright">#links( $decoration.body.links )#publishDate( 
"right" $decoration.publishDate $decoration.version )</div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       #publishDate( "navigation-top" $decoration.publishDate 
$decoration.version )
+       #mainMenu( $decoration.body.menus )
+       #poweredByLogo( $decoration.poweredBy )
+       #publishDate( "navigation-bottom" $decoration.publishDate 
$decoration.version )
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        $bodyContent
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="center">&#169;#copyright()#publishDate( "bottom" 
$decoration.publishDate $decoration.version ). All Rights Reserved.<br/>
+        Apache PDFBox, PDFBox, Apache, the Apache feather logo, and the Apache 
PDFBox project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Modified: pdfbox/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/pdfbox/site/src/site/site.xml?rev=1179729&r1=1179728&r2=1179729&view=diff
==============================================================================
--- pdfbox/site/src/site/site.xml (original)
+++ pdfbox/site/src/site/site.xml Thu Oct  6 18:03:38 2011
@@ -33,7 +33,7 @@
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-stylus-skin</artifactId>
-    <version>1.0.1</version>
+    <version>1.3</version>
   </skin>
   <body>
     <menu name="About">
@@ -48,6 +48,8 @@
       <item name="References" href="references.html"/>
       <item name="ASF Sponsorship Program"
             href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Security"
+            href="http://www.apache.org/security"/>
       <item name="ASF Thanks"
             href="http://www.apache.org/foundation/thanks.html"/>
     </menu>
@@ -85,4 +87,15 @@
     </menu>
     <menu ref="reports"/>
   </body>
+    <poweredBy>
+     <!-- Add ApacheCon logo -->
+     <logo name="ApacheCon" 
href="http://www.apache.org/events/current-event.html";
+           img="http://www.apache.org/events/current-event-125x125.png";
+           width="125"
+           height="125"/>
+     <!-- Keep the default logo as well -->
+     <logo name="Maven" href="http://maven.apache.org/";
+           img="http://maven.apache.org/images/logos/maven-feather.png"/>
+   </poweredBy>
+ 
 </project>

Modified: pdfbox/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/pdfbox/site/src/site/xdoc/index.xml?rev=1179729&r1=1179728&r2=1179729&view=diff
==============================================================================
--- pdfbox/site/src/site/xdoc/index.xml (original)
+++ pdfbox/site/src/site/xdoc/index.xml Thu Oct  6 18:03:38 2011
@@ -14,17 +14,6 @@
  ! See the License for the specific language governing permissions and
  ! limitations under the License.
  !-->
-<!DOCTYPE document [
-  <!-- These are the entity sets for ISO Latin 1 characters for the XHTML -->
-  <!ENTITY % HTMLlat1 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent";>
-  %HTMLlat1;
-  <!-- These are the entity sets for special characters for the XHTML -->
-  <!ENTITY % HTMLsymbol PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent";>
-  %HTMLsymbol;
-  <!-- These are the entity sets for symbol characters for the XHTML -->
-  <!ENTITY % HTMLspecial PUBLIC "-//W3C//ENTITIES Special for XHTML//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent";>
-  %HTMLspecial;
-]>
 <document xmlns="http://maven.apache.org/XDOC/2.0";
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
@@ -36,7 +25,7 @@
   <body>
     <section name="Apache PDFBox - Java PDF Library">
       <p>
-        Apache PDFBox&trade; is an open source Java PDF library for working 
with PDF documents.
+        Apache PDFBox&#x2122; is an open source Java PDF library for working 
with PDF documents.
         This project allows creation of new PDF documents, manipulation of 
existing documents
         and the ability to extract content from documents. Apache PDFBox also 
includes several
         command line utilities. Apache PDFBox is published under the


Reply via email to