Browse Source

Add support for <base> to Velocity templates, will be needed by download pages sooner or later

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273647 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
c663d8ce45
34 changed files with 59 additions and 6 deletions
  1. +1
    -0
      docs/ant15_todo.html
  2. +1
    -0
      docs/antnews.html
  3. +2
    -0
      docs/bindownload.html
  4. +1
    -0
      docs/external.html
  5. +1
    -0
      docs/faq.html
  6. +1
    -0
      docs/index.html
  7. +1
    -0
      docs/problems.html
  8. +1
    -0
      docs/projects.html
  9. +1
    -0
      docs/resources.html
  10. +2
    -0
      docs/srcdownload.html
  11. +1
    -0
      proposal/ant-site/anakia/docs/ant15_todo.html
  12. +1
    -0
      proposal/ant-site/anakia/docs/antnews.html
  13. +2
    -0
      proposal/ant-site/anakia/docs/bindownload.html
  14. +1
    -0
      proposal/ant-site/anakia/docs/bylaws.html
  15. +1
    -0
      proposal/ant-site/anakia/docs/contributors.html
  16. +1
    -0
      proposal/ant-site/anakia/docs/cvs.html
  17. +1
    -0
      proposal/ant-site/anakia/docs/external.html
  18. +1
    -0
      proposal/ant-site/anakia/docs/faq.html
  19. +1
    -0
      proposal/ant-site/anakia/docs/guidelines.html
  20. +3
    -3
      proposal/ant-site/anakia/docs/index.html
  21. +1
    -0
      proposal/ant-site/anakia/docs/legal.html
  22. +1
    -0
      proposal/ant-site/anakia/docs/mail.html
  23. +1
    -0
      proposal/ant-site/anakia/docs/mission.html
  24. +1
    -0
      proposal/ant-site/anakia/docs/problems.html
  25. +1
    -0
      proposal/ant-site/anakia/docs/projects.html
  26. +1
    -0
      proposal/ant-site/anakia/docs/resources.html
  27. +2
    -0
      proposal/ant-site/anakia/docs/srcdownload.html
  28. +1
    -0
      proposal/ant-site/anakia/xdocs/bindownload.xml
  29. +4
    -3
      proposal/ant-site/anakia/xdocs/index.xml
  30. +1
    -0
      proposal/ant-site/anakia/xdocs/srcdownload.xml
  31. +9
    -0
      proposal/ant-site/anakia/xdocs/stylesheets/templates.vm
  32. +1
    -0
      xdocs/bindownload.xml
  33. +1
    -0
      xdocs/srcdownload.xml
  34. +9
    -0
      xdocs/stylesheets/templates.vm

+ 1
- 0
docs/ant15_todo.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Erik Hatcher"> <meta name="author" value="Erik Hatcher">
<meta name="email" value="ehatcher@apache.org"> <meta name="email" value="ehatcher@apache.org">
<title>Apache Ant - Ant 1.5 Release To-Do List</title> <title>Apache Ant - Ant 1.5 Release To-Do List</title>
</head> </head>


+ 1
- 0
docs/antnews.html View File

@@ -16,6 +16,7 @@
<meta name="author" value="Magesh Umasankar"> <meta name="author" value="Magesh Umasankar">
<meta name="email" value=""> <meta name="email" value="">
<title>Apache Ant - Ant News</title> <title>Apache Ant - Ant News</title>
</head> </head>


+ 2
- 0
docs/bindownload.html View File

@@ -10,6 +10,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<base href="http://jakarta.apache.org/ant/."/>
<title>Apache Ant - Downloading Ant - Binary Distribution</title> <title>Apache Ant - Downloading Ant - Binary Distribution</title>
</head> </head>


+ 1
- 0
docs/external.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - External Tools and Tasks</title> <title>Apache Ant - External Tools and Tasks</title>
</head> </head>


+ 1
- 0
docs/faq.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - Frequently Asked Questions</title> <title>Apache Ant - Frequently Asked Questions</title>
</head> </head>


+ 1
- 0
docs/index.html View File

@@ -14,6 +14,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="stefan.bodewig@epost.de"> <meta name="email" value="stefan.bodewig@epost.de">
<title>Apache Ant - Ant</title> <title>Apache Ant - Ant</title>
</head> </head>


+ 1
- 0
docs/problems.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Conor MacNeill"> <meta name="author" value="Conor MacNeill">
<meta name="email" value=""> <meta name="email" value="">
<title>Apache Ant - Having Problems?</title> <title>Apache Ant - Having Problems?</title>
</head> </head>


+ 1
- 0
docs/projects.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - Related Projects</title> <title>Apache Ant - Related Projects</title>
</head> </head>


+ 1
- 0
docs/resources.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - Resources</title> <title>Apache Ant - Resources</title>
</head> </head>


+ 2
- 0
docs/srcdownload.html View File

@@ -10,6 +10,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<base href="http://jakarta.apache.org/ant/."/>
<title>Apache Ant - Downloading Ant - Source Distribution</title> <title>Apache Ant - Downloading Ant - Source Distribution</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/ant15_todo.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Erik Hatcher"> <meta name="author" value="Erik Hatcher">
<meta name="email" value="ehatcher@apache.org"> <meta name="email" value="ehatcher@apache.org">
<title>Apache Ant - Ant 1.5 Release To-Do List</title> <title>Apache Ant - Ant 1.5 Release To-Do List</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/antnews.html View File

@@ -16,6 +16,7 @@
<meta name="author" value="Magesh Umasankar"> <meta name="author" value="Magesh Umasankar">
<meta name="email" value=""> <meta name="email" value="">
<title>Apache Ant - Ant News</title> <title>Apache Ant - Ant News</title>
</head> </head>


+ 2
- 0
proposal/ant-site/anakia/docs/bindownload.html View File

@@ -10,6 +10,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<base href="http://ant.apache.org/."/>
<title>Apache Ant - Downloading Ant - Binary Distribution</title> <title>Apache Ant - Downloading Ant - Binary Distribution</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/bylaws.html View File

@@ -10,6 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title>Apache Ant - Apache Ant Project Bylaws</title> <title>Apache Ant - Apache Ant Project Bylaws</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/contributors.html View File

@@ -10,6 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title>Apache Ant - Contributors</title> <title>Apache Ant - Contributors</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/cvs.html View File

@@ -10,6 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title>Apache Ant - CVS Repository</title> <title>Apache Ant - CVS Repository</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/external.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - External Tools and Tasks</title> <title>Apache Ant - External Tools and Tasks</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/faq.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - Frequently Asked Questions</title> <title>Apache Ant - Frequently Asked Questions</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/guidelines.html View File

@@ -10,6 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title>Apache Ant - Project Guidelines</title> <title>Apache Ant - Project Guidelines</title>
</head> </head>


+ 3
- 3
proposal/ant-site/anakia/docs/index.html View File

@@ -14,6 +14,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="stefan.bodewig@epost.de"> <meta name="email" value="stefan.bodewig@epost.de">
<title>Apache Ant - Ant</title> <title>Apache Ant - Ant</title>
</head> </head>
@@ -98,9 +99,8 @@
<tr><td> <tr><td>
<blockquote> <blockquote>
<h3>Apache Ant 1.5.1 Released!</h3> <h3>Apache Ant 1.5.1 Released!</h3>
<p>Version 1.5.1 of Ant has been released. It is available for download
<a href="http://www.apache.org/dist/ant/">here</a>.
</p>
<p>Version 1.5.1 of Ant has been released. It is available for
download as <a href="bindownload.cgi">binary</a> or as <a href="srcdownload.cgi">source</a> distribution.</p>
</blockquote> </blockquote>
</td></tr> </td></tr>
</table> </table>


+ 1
- 0
proposal/ant-site/anakia/docs/legal.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Jon S. Stevens"> <meta name="author" value="Jon S. Stevens">
<meta name="email" value="jon@latchkey.com"> <meta name="email" value="jon@latchkey.com">
<title>Apache Ant - Legal Stuff They Make Us Say</title> <title>Apache Ant - Legal Stuff They Make Us Say</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/mail.html View File

@@ -10,6 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title>Apache Ant - Mailing Lists</title> <title>Apache Ant - Mailing Lists</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/mission.html View File

@@ -10,6 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<title>Apache Ant - Apache Ant Mission</title> <title>Apache Ant - Apache Ant Mission</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/problems.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Conor MacNeill"> <meta name="author" value="Conor MacNeill">
<meta name="email" value=""> <meta name="email" value="">
<title>Apache Ant - Having Problems?</title> <title>Apache Ant - Having Problems?</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/projects.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - Related Projects</title> <title>Apache Ant - Related Projects</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/docs/resources.html View File

@@ -12,6 +12,7 @@
<meta name="author" value="Stefan Bodewig"> <meta name="author" value="Stefan Bodewig">
<meta name="email" value="bodewig@apache.org"> <meta name="email" value="bodewig@apache.org">
<title>Apache Ant - Resources</title> <title>Apache Ant - Resources</title>
</head> </head>


+ 2
- 0
proposal/ant-site/anakia/docs/srcdownload.html View File

@@ -10,6 +10,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<base href="http://ant.apache.org/."/>
<title>Apache Ant - Downloading Ant - Source Distribution</title> <title>Apache Ant - Downloading Ant - Source Distribution</title>
</head> </head>


+ 1
- 0
proposal/ant-site/anakia/xdocs/bindownload.xml View File

@@ -3,6 +3,7 @@


<properties> <properties>
<title>Downloading Ant - Binary Distribution</title> <title>Downloading Ant - Binary Distribution</title>
<base/>
</properties> </properties>


<body> <body>


+ 4
- 3
proposal/ant-site/anakia/xdocs/index.xml View File

@@ -11,9 +11,10 @@


<section name="Ant 1.5.1"> <section name="Ant 1.5.1">
<h3>Apache Ant 1.5.1 Released!</h3> <h3>Apache Ant 1.5.1 Released!</h3>
<p>Version 1.5.1 of Ant has been released. It is available for download
<a href="http://www.apache.org/dist/ant/">here</a>.
</p>

<p>Version 1.5.1 of Ant has been released. It is available for
download as <a href="bindownload.cgi">binary</a> or as <a
href="srcdownload.cgi">source</a> distribution.</p>
</section> </section>


<section name="Apache Ant"> <section name="Apache Ant">


+ 1
- 0
proposal/ant-site/anakia/xdocs/srcdownload.xml View File

@@ -3,6 +3,7 @@


<properties> <properties>
<title>Downloading Ant - Source Distribution</title> <title>Downloading Ant - Source Distribution</title>
<base/>
</properties> </properties>


<body> <body>


+ 9
- 0
proposal/ant-site/anakia/xdocs/stylesheets/templates.vm View File

@@ -144,6 +144,15 @@
#metaauthor ( $au.getText() $au.getAttributeValue("email") ) #metaauthor ( $au.getText() $au.getAttributeValue("email") )
#end #end
#if ($root.getChild("properties").getChild("base"))
#set ($url = $root.getChild("properties").getChild("base").getAttributeValue("href"))
#if ($url)
<base href="$url"/>
#else
<base href="$project.getAttributeValue("href")$relativePath"/>
#end
#end

<title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title> <title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
</head> </head>


+ 1
- 0
xdocs/bindownload.xml View File

@@ -3,6 +3,7 @@


<properties> <properties>
<title>Downloading Ant - Binary Distribution</title> <title>Downloading Ant - Binary Distribution</title>
<base/>
</properties> </properties>


<body> <body>


+ 1
- 0
xdocs/srcdownload.xml View File

@@ -3,6 +3,7 @@


<properties> <properties>
<title>Downloading Ant - Source Distribution</title> <title>Downloading Ant - Source Distribution</title>
<base/>
</properties> </properties>


<body> <body>


+ 9
- 0
xdocs/stylesheets/templates.vm View File

@@ -155,6 +155,15 @@
#metaauthor ( $au.getText() $au.getAttributeValue("email") ) #metaauthor ( $au.getText() $au.getAttributeValue("email") )
#end #end
#if ($root.getChild("properties").getChild("base"))
#set ($url = $root.getChild("properties").getChild("base").getAttributeValue("href"))
#if ($url)
<base href="$url"/>
#else
<base href="$project.getAttributeValue("href")$relativePath"/>
#end
#end

<title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title> <title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
</head> </head>


Loading…
Cancel
Save