adapt to new Anakia version

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268834 13f79535-47bb-0310-9956-ffa450edef68

webpage/build.xml

@@ -36,7 +36,7 @@
              excludes="**/stylesheets/** empty.xml"
              includes="**/*.xml"
              lastModifiedCheck="true"
-             velocityPropertiesFile="${docs.src}/velocity.properties">
+             templatePath="./xdocs/stylesheets">
         </anakia>
 
         <!-- In case we have images some day

webpage/docs/antnews.html

@@ -211,4 +211,3 @@
 
 
 
-

webpage/docs/external.html

@@ -151,65 +151,51 @@
                         <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Compatibility:
-                &nbsp;
-    </font>
+                Compatibility:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Ant 1.2 and 1.3
-                &nbsp;
-    </font>
+                Ant 1.2 and 1.3
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        URL:
-                &nbsp;
-    </font>
+                URL:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="http://jakarta.apache.org/velocity/anakia.html">http://jakarta.apache.org/velocity/anakia.html</a>
-                &nbsp;
-    </font>
+                <a href="http://jakarta.apache.org/velocity/anakia.html">http://jakarta.apache.org/velocity/anakia.html</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Contact:
-                &nbsp;
-    </font>
+                Contact:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="http://jakarta.apache.org/site/mail2.html">Velocity mailing lists</a>
-                &nbsp;
-    </font>
+                <a href="http://jakarta.apache.org/site/mail2.html">Velocity mailing lists</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        License:
-                &nbsp;
-    </font>
+                License:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Apache Software License
-                &nbsp;
-    </font>
+                Apache Software License
+            </font>
 </td>
             </tr>
-
             </table>
                             </blockquote>
       </td></tr>
@@ -238,65 +224,51 @@
                         <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Compatibility:
-                &nbsp;
-    </font>
+                Compatibility:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Ant 1.2 and 1.3
-                &nbsp;
-    </font>
+                Ant 1.2 and 1.3
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        URL:
-                &nbsp;
-    </font>
+                URL:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="http://www.dieter-bogdoll.de/java/AntRunner/">http://www.dieter-bogdoll.de/java/AntRunner/</a>
-                &nbsp;
-    </font>
+                <a href="http://www.dieter-bogdoll.de/java/AntRunner/">http://www.dieter-bogdoll.de/java/AntRunner/</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Contact:
-                &nbsp;
-    </font>
+                Contact:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="mailto:bogdoll@users.sourceforge.net">Dieter Bogdoll</a>
-                &nbsp;
-    </font>
+                <a href="mailto:bogdoll@users.sourceforge.net">Dieter Bogdoll</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        License:
-                &nbsp;
-    </font>
+                License:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        GNU General Public License
-                &nbsp;
-    </font>
+                GNU General Public License
+            </font>
 </td>
             </tr>
-
             </table>
                             </blockquote>
       </td></tr>
@@ -314,65 +286,51 @@
                         <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Compatibility:
-                &nbsp;
-    </font>
+                Compatibility:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Ant 1.2 and 1.3
-                &nbsp;
-    </font>
+                Ant 1.2 and 1.3
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        URL:
-                &nbsp;
-    </font>
+                URL:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip">ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip</a>
-                &nbsp;
-    </font>
+                <a href="ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip">ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Contact:
-                &nbsp;
-    </font>
+                Contact:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="mailto:KHartlage@t-online.de">Klaus Hartlage</a>
-                &nbsp;
-    </font>
+                <a href="mailto:KHartlage@t-online.de">Klaus Hartlage</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        License:
-                &nbsp;
-    </font>
+                License:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        GNU General Public License
-                &nbsp;
-    </font>
+                GNU General Public License
+            </font>
 </td>
             </tr>
-
             </table>
                             </blockquote>
       </td></tr>
@@ -390,66 +348,52 @@
                         <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Compatibility:
-                &nbsp;
-    </font>
+                Compatibility:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        any version of Ant prior to
+                any version of Ant prior to
           and including Ant 1.3
-                &nbsp;
-    </font>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        URL:
-                &nbsp;
-    </font>
+                URL:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="http://ant.netbeans.org">http://ant.netbeans.org</a>
-                &nbsp;
-    </font>
+                <a href="http://ant.netbeans.org">http://ant.netbeans.org</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Contact:
-                &nbsp;
-    </font>
+                Contact:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        
-                    <a href="mailto:nbdev@netbeans.org">nbdev@netbeans.org</a>
-                &nbsp;
-    </font>
+                <a href="mailto:nbdev@netbeans.org">nbdev@netbeans.org</a>
+            </font>
 </td>
             </tr>
-
                                 <tr>
                         <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        License:
-                &nbsp;
-    </font>
+                License:
+            </font>
 </td>
                                 <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-        Sun Public License
-                &nbsp;
-    </font>
+                Sun Public License
+            </font>
 </td>
             </tr>
-
             </table>
                             </blockquote>
       </td></tr>
@@ -499,4 +443,3 @@
 
 
 
-

webpage/docs/index.html

@@ -279,4 +279,3 @@ Comprehensive documentation is included in the source and binary distribtions.
 
 
 
-

webpage/xdocs/stylesheets/site.vsl

@@ -0,0 +1,268 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<!-- Content Stylesheet for Site -->
+
+    ## Defined variables
+    #set ($bodybg = "#ffffff")
+    #set ($bodyfg = "#000000")
+    #set ($bodylink = "#525D76")
+    #set ($bannerbg = "#525D76")
+    #set ($bannerfg = "#ffffff")
+    #set ($subbannerbg = "#828DA6")
+    #set ($subbannerfg = "#ffffff")
+    #set ($tablethbg = "#039acc")
+    #set ($tabletdbg = "#a0ddf0")
+    
+<!-- start the processing -->
+#document()
+<!-- end the processing -->
+
+## This is where the macro's live
+
+#macro ( table $table)
+<table>
+    #foreach ( $items in $table.getChildren() )
+        #if ($items.getName().equals("tr"))
+            #tr ($items)
+        #end
+    #end
+</table>
+#end
+
+#macro ( tr $tr)
+<tr>
+    #foreach ( $items in $tr.getChildren() )
+        #if ($items.getName().equals("td"))
+            #td ($items)
+        #elseif ($items.getName().equals("th"))
+            #th ($items)
+        #end
+    #end
+</tr>
+#end
+
+#macro ( td $value)
+#if ($value.getAttributeValue("colspan"))
+#set ($colspan = $value.getAttributeValue("colspan"))
+#end
+#if ($value.getAttributeValue("rowspan"))
+#set ($rowspan = $value.getAttributeValue("rowspan"))
+#end
+<td bgcolor="$tabletdbg" colspan="$!colspan" rowspan="$!rowspan" valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+        #if ($value.getText().length() != 0 || $value.hasChildren())
+        $xmlout.outputString($value, true)
+        #else
+        &nbsp;
+        #end
+    </font>
+</td>
+#end
+
+#macro ( th $value)
+#if ($value.getAttributeValue("colspan"))
+#set ($colspan = $value.getAttributeValue("colspan"))
+#end
+#if ($value.getAttributeValue("rowspan"))
+#set ($rowspan = $value.getAttributeValue("rowspan"))
+#end
+<td bgcolor="$tablethbg" colspan="$!colspan" rowspan="$!rowspan" valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+        #if ($value.getText().length() != 0 || $value.hasChildren())
+        $xmlout.outputString($value, true)
+        #else
+        &nbsp;
+        #end
+    </font>
+</td>
+#end
+
+#macro ( projectanchor $name $value )
+#if ($value.startsWith("http://"))
+    <a href="$value">$name</a>
+#elseif ($value.startsWith("/site"))
+    <a href="http://jakarta.apache.org$value">$name</a>
+#else
+    <a href="$relativePath$value">$name</a>
+#end
+#end
+
+#macro ( metaauthor $author $email )
+            <meta name="author" value="$author">
+            <meta name="email" value="$email">
+#end
+
+#macro ( image $value )
+#if ($value.getAttributeValue("width"))
+#set ($width=$value.getAttributeValue("width"))
+#end
+#if ($value.getAttributeValue("height"))
+#set ($height=$value.getAttributeValue("height"))
+#end
+#if ($value.getAttributeValue("align"))
+#set ($align=$value.getAttributeValue("align"))
+#end
+<img src="$relativePath$value.getAttributeValue("src")" width="$!width" height="$!height" align="$!align">
+#end
+
+#macro ( source $value)
+    <div align="left">
+    <table cellspacing="4" cellpadding="0" border="0">
+    <tr>
+      <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+    </tr>
+    <tr>
+      <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#ffffff"><pre>$escape.getText($value.getText())</pre></td>
+      <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+    </tr>
+    <tr>
+      <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#023264" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#023264" width="1" height="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+    </tr>
+    </table>
+    </div>
+#end
+
+#macro ( subsection $subsection)
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td bgcolor="$subbannerbg">
+        <font color="$subbannerfg" face="arial,helvetica,sanserif">
+          <strong>$subsection.getAttributeValue("name")</strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+        #foreach ( $items in $subsection.getChildren() )
+            #if ($items.getName().equals("img"))
+                #image ($items)
+            #elseif ($items.getName().equals("source"))
+                #source ($items)
+            #elseif ($items.getName().equals("table"))
+                #table ($items)
+            #else
+                $xmlout.outputString($items)
+            #end
+        #end
+        </blockquote>
+      </td></tr>
+    </table>
+#end
+
+#macro ( section $section)
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td bgcolor="$bannerbg">
+        <font color="$bannerfg" face="arial,helvetica,sanserif">
+          <strong>$section.getAttributeValue("name")</strong>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+        #foreach ( $items in $section.getChildren() )
+            #if ($items.getName().equals("img"))
+                #image ($items)
+            #elseif ($items.getName().equals("source"))
+                #source ($items)
+            #elseif ($items.getName().equals("table"))
+                #table ($items)
+            #elseif ($items.getName().equals("subsection"))
+                #subsection ($items)
+            #else
+                $xmlout.outputString($items)
+            #end
+        #end
+        </blockquote>
+      </td></tr>
+    </table>
+#end
+
+#macro ( makeProject )
+    #set ($menus = $project.getChild("body").getChildren("menu"))
+    #foreach ( $menu in $menus )
+        <p><strong>$menu.getAttributeValue("name")</strong></p>
+        <ul>
+        #foreach ( $item in $menu.getChildren() )
+            #set ($name = $item.getAttributeValue("name"))
+            <li>#projectanchor($name $item.getAttributeValue("href"))</li>
+        #end
+        </ul>
+    #end
+#end
+
+#macro (getProjectImage)
+#if ($project.getChild("logo"))
+<td align="left">
+<a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
+</td>
+<td align="right">
+#set ( $logoString = $project.getChild("logo").getAttributeValue("href") )
+#if ( $logoString.startsWith("/") )
+<a href="$project.getAttributeValue("href")"><img src="$relativePath$logoString" alt="$project.getChild("logo").getText()" border="0"/></a>
+#else
+<a href="$project.getAttributeValue("href")"><img src="$relativePath/$logoString" alt="$project.getChild("logo").getText()" border="0"/></a>
+#end
+</td>
+#else
+<td colspan="2">
+<a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
+</td>
+#end
+#end
+
+#macro (document)
+    <!-- ====================================================================== -->
+    <!-- Main Page Section -->
+    <!-- ====================================================================== -->
+    <html>
+        <head>
+            <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+
+            #set ($authors = $root.getChild("properties").getChildren("author"))
+            #foreach ( $au in $authors )
+                #metaauthor ( $au.getText() $au.getAttributeValue("email") )
+            #end
+
+            <title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
+        </head>
+
+        <body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">        
+            <table border="0" width="100%" cellspacing="0">
+                <!-- TOP IMAGE -->
+                <tr>
+                    #getProjectImage()
+                </tr>
+            </table>
+            <table border="0" width="100%" cellspacing="4">
+                <tr><td colspan="2">
+                    <hr noshade="" size="1"/>
+                </td></tr>
+                
+                <tr>
+                    <!-- LEFT SIDE NAVIGATION -->
+                    <td valign="top" nowrap="true">
+                    #makeProject()
+                    </td>
+                    <td align="left" valign="top">
+                    #set ($allSections = $root.getChild("body").getChildren("section"))
+                    #foreach ( $section in $allSections )
+                        #section ($section)
+                    #end
+                    </td>
+                </tr>
+
+                <!-- FOOTER -->
+                <tr><td colspan="2">
+                    <hr noshade="" size="1"/>
+                </td></tr>
+                <tr><td colspan="2">
+                    <div align="center"><font color="$bodylink" size="-1"><em>
+                    Copyright &#169; 1999-2001, Apache Software Foundation
+                    </em></font></div>
+                </td></tr>
+            </table>
+        </body>
+    </html>
+#end

webpage/xdocs/velocity.properties

@@ -1,2 +0,0 @@
-resource.loader.1.resource.path = ../../jakarta-site2/xdocs/stylesheets
-template.loader.1.template.path = ../../jakarta-site2/xdocs/stylesheets