Author: henkp
Date: Tue Apr 24 18:17:25 2018
New Revision: 1830020
URL: http://svn.apache.org/viewvc?rev=1830020&view=rev
Log:
cleanup
Removed:
attic/site-lua/docs/index.html
attic/site-lua/docs/process.html
attic/site-lua/docs/resolution.html
Modified:
attic/site-lua/docs/data/page.tmpl
attic/site-lua/docs/mk-stuff
Modified: attic/site-lua/docs/data/page.tmpl
URL:
http://svn.apache.org/viewvc/attic/site-lua/docs/data/page.tmpl?rev=1830020&r1=1830019&r2=1830020&view=diff
==============================================================================
--- attic/site-lua/docs/data/page.tmpl (original)
+++ attic/site-lua/docs/data/page.tmpl Tue Apr 24 18:17:25 2018
@@ -19,160 +19,64 @@
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml";>
- <head>
- <!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from XML source: DO NOT EDIT!
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- -->
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <link rel="stylesheet" href="/style/compressed.css" type="text/css"
media="screen, projection"/>
- <link rel="stylesheet" href="/style/style.css" type="text/css"
media="screen, projection"/>
- <link rel="stylesheet" href="/style/attic.css" type="text/css"
media="screen, projection"/>
- <!--[if IE]><link rel="stylesheet" href="/style/ie.css" type="text/css"
media="screen, projection"/><![endif]-->
- <meta name="author" content="The Apache Software Foundation" /><meta
name="email" content="general.AT.attic.apache.DOT.org" />
- <title>Apache {{ page.json.name }} - Apache Attic</title>
-
- </head>
- <body id="sub">
- <div class="container">
- <hr class="space col"/>
- <div class="block">
- <div class="column span-24">
- <div id="header">
- <!-- Add 'default' header section here. -->
- <h1>Apache {{ page.json.name }}</h1>
- </div>
- </div>
- </div>
- <hr/>
- <div class="block content">
- <div class="column span-15 colborder">
-
-<div class="section-content">
-<p><a href="{{ page.json.website }}">Apache {{ page.json.name }}</a> moved
into the Attic in {{ page.json.retired }}.
-{{ page.json.description }}</p>
-
- <table style="margin-left: auto; margin-right:auto; width:90%">
- <tr>
- <th>Read-only Resource</th>
- <th>Link(s)</th>
- </tr>
- <tr>
- <td>Website</td>
-{%- if page.json.website == '#' %}
- <td>n/a</td>
-{%- else %}
- <td><a href="{{ page.json.website }}">{{ page.json.website | replace:
"http://",""; }}</a></td>
-{%- endif %}
- </tr>
- <tr>
- <td>Mailing List Archives</td>
-{%- if page.json.mailnames.size == 0 %}
- <td>n/a</td>
-{%- else %}
- <td>
-{%- for m in page.json.mailnames %}
- {% unless forloop.first %}| {% endunless %}<a
href="http://mail-archives.apache.org/mod_mbox/{{ page.json.full_dash }}-{{ m
}}/">{{ m }}</a>
-{%- endfor %}
- </td>
-{%- endif %}
- </tr>
-{%- if page.json.bugzilla %}
- <tr>
- <td>Issue Tracker</td>
- <td><a href="https://bz.apache.org/bugzilla/buglist.cgi?product={{
page.json.bugzilla }}">Bugzilla</a></td>
- </tr>
-{%- elsif page.json.jira %}
- <tr>
- <td>Issue Tracker</td>
- <td><a href="https://issues.apache.org/jira/browse/{{ page.json.jira
}}/">JIRA</a></td>
- </tr>
-{%- endif %}
-{%- if page.json.wiki %}
- <tr>
- <td>Wiki</td>
- <td><a href="{{ page.json.wiki }}">{{ page.json.wikiname }}</a></td>
- </tr>
-{%- endif %}
-{%- if page.json.scm == 'svn' %}
- <tr>
- <td>Source Code (Subversion)</td>
- <td><a href="http://svn.apache.org/viewvc/{{ page.json.project }}/{{
page.json.subproject }}">svn.apache.org/repos/asf/{{ page.json.project }}/{{
page.json.subproject }}</a></td>
- </tr>
-{%- elsif page.json.scm == 'git-wip' %}
- <tr>
- <td>Source Code (Git)</td>
- <td><a href="https://git-wip-us.apache.org/repos/asf?p={{
page.json.project }}.git">git-wip-us.apache.org/repos/asf?p={{
page.json.project }}.git</a></td>
- </tr>
-{%- elsif page.json.scm %}
-{% comment %} TODO: handle gitbox {% endcomment %}
- <tr>
- <td>Source Code</td>
- <td><a href="{{ page.json.scm }}">{{ page.json.scm }}</a></td>
- </tr>
-{%- endif %}
-{%- unless page.json.subproject %}
- <tr>
- <td>Board Reports</td>
- <td><a href="https://whimsy.apache.org/board/minutes/{{ page.json.board
| default: page.json.project }}.html">Minutes</a></td>
- </tr>
-{%- endunless %}
- <tr>
- <td>Downloads</td>
-{%- if page.json.nodist %}
- <td>n/a</td>
-{%- else %}
- <td><a href="http://archive.apache.org/dist/{{ page.json.dist
}}/">archive.apache.org/dist/{{ page.json.dist }}/</a>
-{%- if page.json.nokeys %}
- <!-- hiding KEYS -->
-{%- else %}
- | <a href="http://archive.apache.org/dist/{{ page.json.dist
}}/KEYS">KEYS</a>
-{%- endif %}
- </td>
-{%- endif %}
- </tr>
- </table>
-
-<p>As with any project in the Attic - if you should choose to fork {{
page.json.name }} outside of Apache,
- please let us know so we can link to your project. </p>
-{%- if page.json.postlude %}
-{{ page.json.postlude }}
-{%- endif %}
-</div>
- </div>
+<head>
+<!--
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+This file is generated from XML source: DO NOT EDIT!
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+-->
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="stylesheet" href="/style/compressed.css" type="text/css"
media="screen, projection"/>
+<link rel="stylesheet" href="/style/style.css" type="text/css" media="screen,
projection"/>
+<link rel="stylesheet" href="/style/attic.css" type="text/css" media="screen,
projection"/>
+<!--[if IE]><link rel="stylesheet" href="/style/ie.css" type="text/css"
media="screen, projection"/><![endif]-->
+<meta name="author" content="The Apache Software Foundation" /><meta
name="email" content="general.AT.attic.apache.DOT.org" />
+<title>%TITLE%</title>
+</head>
+<body id="sub">
+<div class="container">
+ <hr class="space col"/>
+ <div class="block">
+ <div class="column span-24">
+ <div id="header"><h1>%TITLE%</h1></div>
+ </div>
+ </div>
+ <hr/>
+ <div class="block content">
+ <div class="column span-15 colborder">
+ %BODY%
+ </div>
<div class="column span-8 last">
<div class="block">
<div class="nav column span-11">
<div>
- <div class="menuheader">The Apache Attic</div>
- <ul>
- <li><a href="/">Home</a></li>
- <li><a href="/process.html">Process</a></li>
- <li><a href="http://issues.apache.org/jira/browse/ATTIC";>Process
tracking</a></li>
- <li><a
href="https://whimsy.apache.org/board/minutes/Attic.html";>Board
Minutes</a></li>
- </ul>
- <div class="menuheader">Related Apache Links</div>
- <ul>
- <li><a href="http://www.apache.org/";>Foundation</a></li>
- <li><a
href="http://www.apache.org/foundation/thanks.html";>Sponsors</a></li>
- <li><a href="http://incubator.apache.org/";>Incubator</a></li>
- <li><a href="http://apachecon.com/";>ApacheCon</a></li>
- </ul>
+ <div class="menuheader">The Apache Attic</div>
+ <ul>
+ <li><a href="/">Home</a></li>
+ <li><a href="/process.html">Process</a></li>
+ <li><a href="http://issues.apache.org/jira/browse/ATTIC";>Process
tracking</a></li>
+ <li><a
href="https://whimsy.apache.org/board/minutes/Attic.html";>Board
Minutes</a></li>
+ </ul>
+ <div class="menuheader">Related Apache Links</div>
+ <ul>
+ <li><a href="http://www.apache.org/";>Foundation</a></li>
+ <li><a
href="http://www.apache.org/foundation/thanks.html";>Sponsors</a></li>
+ <li><a href="http://incubator.apache.org/";>Incubator</a></li>
+ <li><a href="http://apachecon.com/";>ApacheCon</a></li>
+ </ul>
</div>
</div>
- <div class="nav column prepend-1 span-12 last">
- {% include project.list %}
- </div>
+ <div class="nav column prepend-1 span-12 last">%PROJS%</div>
</div>
</div>
<div class="column span-24 footer">
<hr/>
- <p>Copyright © 2009-2018 The Apache Software Foundation, Licensed
under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
Version 2.0</a>.<br/>
- Apache and the Apache feather logo are trademarks of The Apache
Software Foundation.</p>
- </div>
+ <p>Copyright © 2009-2018 The Apache Software Foundation, Licensed
under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
Version 2.0</a>.
+ <br/>
+ Apache and the Apache feather logo are trademarks of The Apache Software
Foundation.</p>
</div>
</div>
+</div>
</body>
</html>
-
Modified: attic/site-lua/docs/mk-stuff
URL:
http://svn.apache.org/viewvc/attic/site-lua/docs/mk-stuff?rev=1830020&r1=1830019&r2=1830020&view=diff
==============================================================================
--- attic/site-lua/docs/mk-stuff (original)
+++ attic/site-lua/docs/mk-stuff Tue Apr 24 18:17:25 2018
@@ -69,23 +69,6 @@ sub get_json
return { map { ( mk_tag ( $_ ) => $_ ) } @$json } ;
}
-sub get_page
- { my $res = '' ;
- open PAGE, '<', $PAGE_TMPL or Error "can't open $PAGE_TMPL ($!)" ;
- while ( <PAGE> )
- { last if /class="section-content"/ ; $res .= $_ ; }
- $res .= "%BODY%\n" ;
- while ( <PAGE> )
- { last if m!^</div>! ; }
- while ( <PAGE> )
- { $res .= $_ ; }
- close PAGE ;
- $res =~ s/Apache \{\{ page.json.name \}\} - Apache Attic/%TITLE%/g ;
- $res =~ s/Apache \{\{ page.json.name \}\}/%TITLE%/g ;
- $res =~ s/\{\% include project.list \%\}/%PROJS%/g ;
- $res ;
- }
-
sub mk_proj_list
{ my $json = shift ;
my @res = () ;
@@ -94,7 +77,7 @@ sub mk_proj_list
push @res, sprintf '<a href="/projects/%s.html">%s</a>'
, $tag, $hash -> {name} ;
}
- sprintf "<ul>\n%s</ul>", join '', map "<li>$_</li>\n", @res ;
+ sprintf "\n<ul>\n%s</ul>\n", join '', map "<li>$_</li>\n", @res ;
}
sub url { sprintf '<a href="%s">%s</a>', @_ ; }
@@ -182,10 +165,10 @@ TAB
my $json = get_json ;
# print to_json( $json, { canonical => 1, pretty => 1 } );
-my $page = get_page ;
+my $page = get_file $PAGE_TMPL ;
+# print $page ; exit ;
my $projs = mk_proj_list $json ;
$page =~ s/%PROJS%/$projs/ ;
-# print $page ;
gen_page
( PAGE => $page
