jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject [2/2] jspwiki-site git commit: migrating asf-cms based site
Date Tue, 21 Mar 2017 20:33:51 GMT
migrating asf-cms based site


Project: http://git-wip-us.apache.org/repos/asf/jspwiki-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki-site/commit/afc8021c
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki-site/tree/afc8021c
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki-site/diff/afc8021c

Branch: refs/heads/asf-cms
Commit: afc8021cc9c034f42d9b22ce3b9403dfbec6ff3f
Parents: 
Author: juanpablo <juanpablo@apache.org>
Authored: Tue Mar 21 21:33:24 2017 +0100
Committer: juanpablo <juanpablo@apache.org>
Committed: Tue Mar 21 21:33:24 2017 +0100

----------------------------------------------------------------------
 README.txt                                      |  29 ++
 content/community/mailing_lists.mdtext          |  39 ++
 content/community/people.mdtext                 |  39 ++
 content/community/social_media.mdtext           |  11 +
 content/css/jspwiki.css                         | 406 +++++++++++++++++++
 content/css/jspwiki_print.css                   |  12 +
 content/development/edit_website.mdtext         |  71 ++++
 content/development/source_and_guide.mdtext     |  53 +++
 content/extpaths.txt                            |   3 +
 content/general/downloads.mdtext                |  46 +++
 content/general/news.mdtext                     |  54 +++
 content/images/SilkIconSet-readme.txt           |  22 +
 content/images/apache_incubator_logo.png        | Bin 0 -> 4234 bytes
 .../images/apache_software_foundation_logo.gif  | Bin 0 -> 7129 bytes
 .../images/apache_software_foundation_logo.png  | Bin 0 -> 6142 bytes
 content/images/arrdown.png                      | Bin 0 -> 248 bytes
 content/images/arrdownsmall.gif                 | Bin 0 -> 178 bytes
 content/images/arrup.gif                        | Bin 0 -> 130 bytes
 content/images/attach-strip.png                 | Bin 0 -> 4244 bytes
 content/images/attachment_big.png               | Bin 0 -> 842 bytes
 content/images/attachment_small.gif             | Bin 0 -> 933 bytes
 content/images/attachment_small.png             | Bin 0 -> 391 bytes
 content/images/book_open.png                    | Bin 0 -> 622 bytes
 content/images/downGreenArrow.png               | Bin 0 -> 176 bytes
 content/images/editor-strip.gif                 | Bin 0 -> 3354 bytes
 content/images/error.gif                        | Bin 0 -> 1139 bytes
 content/images/exclamation.gif                  | Bin 0 -> 1095 bytes
 content/images/favicon.ico                      | Bin 0 -> 1150 bytes
 content/images/favicon.png                      | Bin 0 -> 631 bytes
 content/images/filter.gif                       | Bin 0 -> 321 bytes
 content/images/information.gif                  | Bin 0 -> 1154 bytes
 content/images/jspwiki-icons.png                | Bin 0 -> 2668 bytes
 content/images/jspwiki-strip.gif                | Bin 0 -> 1588 bytes
 content/images/jspwiki_logo.png                 | Bin 0 -> 7882 bytes
 content/images/jspwiki_logo_s.png               | Bin 0 -> 5694 bytes
 content/images/note.png                         | Bin 0 -> 870 bytes
 content/images/out.png                          | Bin 0 -> 927 bytes
 content/images/personal.png                     | Bin 0 -> 1089 bytes
 content/images/preview.gif                      | Bin 0 -> 1821 bytes
 content/images/progress.gif                     | Bin 0 -> 9941 bytes
 content/images/resize-horizontal.gif            | Bin 0 -> 1318 bytes
 content/images/search.gif                       | Bin 0 -> 920 bytes
 content/images/slimbox_close.gif                | Bin 0 -> 139 bytes
 content/images/slimbox_close.png                | Bin 0 -> 1394 bytes
 content/images/slimbox_close_hover.gif          | Bin 0 -> 139 bytes
 content/images/sortable.gif                     | Bin 0 -> 866 bytes
 content/images/sorted_down.gif                  | Bin 0 -> 844 bytes
 content/images/sorted_up.gif                    | Bin 0 -> 845 bytes
 content/images/spin.gif                         | Bin 0 -> 5461 bytes
 content/images/tip.png                          | Bin 0 -> 1638 bytes
 content/images/xml.png                          | Bin 0 -> 691 bytes
 content/images/xmlCoffeeCup.png                 | Bin 0 -> 1182 bytes
 content/index.mdtext                            |  43 ++
 content/pmc/board_reports.mdtext                |  14 +
 content/pmc/how_to_release.mdtext               | 280 +++++++++++++
 content/sitemap.html                            |   2 +
 lib/path.pm                                     |  40 ++
 lib/view.pm                                     | 139 +++++++
 templates/release.mdtext                        |   1 +
 templates/sidenav.mdtext                        |  43 ++
 templates/single_narrative.html                 |   1 +
 templates/skeleton.html                         | 118 ++++++
 62 files changed, 1466 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
new file mode 100755
index 0000000..ec5a7de
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,29 @@
+Working on the conversion of the JSPWiki website to the ASF CMS,
+see https://issues.apache.org/jira/browse/JSPWIKI-727
+
+To build the site, locally:
+- install python and some needed dependencies, as described in 
+  http://apache.org/dev/cmsref.html#local-build
+  
+- check/out export the build scripts (https://svn.apache.org/repos/infra/websites/cms/build/) 
+  to some directory, for example, let's say we have:
+  + $SVN_HOME/site
+    ++ trunk                 (from svn, contains cms site files)
+    ++ scripts               (svn-exported from the previous URL)
+
+- make sure the markdown processing daemon is up:
+  $ export MARKDOWN_SOCKET=`pwd`/scripts/markdown.socket PYTHONPATH=`pwd`
+  $ python ./scripts/markdownd.py
+
+- create a new directory in which the generated site files will be created. So, our
+  previous example would look like this:
+  + $SVN_HOME/site
+    ++ trunk                 (from svn, contains cms site files)
+    ++ scripts               (svn-exported from the previous URL)
+    ++ target-site           (newly created directory, NOT under svn control)
+  
+- cd into scripts directory and execute: 
+  $ ./build_site.pl --source-base ../trunk/ --target-base ../target-site
+  
+Editing the site online instructions at http://apache.org/dev/cms.html#usage
+More info at http://apache.org/dev/cmsref.html#overview
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/community/mailing_lists.mdtext
----------------------------------------------------------------------
diff --git a/content/community/mailing_lists.mdtext b/content/community/mailing_lists.mdtext
new file mode 100755
index 0000000..fb203bb
--- /dev/null
+++ b/content/community/mailing_lists.mdtext
@@ -0,0 +1,39 @@
+Title: Mailing lists
+
+## JSPWiki-user
+
+The jspwiki-user mailing list is hosted at Apache and can be joined by sending 
+an e-mail to <user-subscribe@jspwiki.apache.org>. You can also browse
+the list archives through  either <a class="external" 
+href="https://lists.apache.org/list.html?user@jspwiki.apache.org">Pony Mail!</a> 
+or <a class="external" 
+href="http://mail-archives.apache.org/mod_mbox/jspwiki-user/">mod_mbox</a>.
+
+## JSPWiki-dev
+
+This is the list for JSPWiki developers and contributors, and anyone who is 
+interested in the current state and development. For example, all bug reports 
+and enhancement requests from JIRA are automatically sent here. The jspwiki-dev 
+list is hosted at Apache, so you join by sending an email to 
+<dev-subscribe@jspwiki.apache.org>. The list archives are also browseable through 
+either <a class="external" 
+href="https://lists.apache.org/list.html?dev@jspwiki.apache.org">Pony Mail!</a>
+or <a href="http://mail-archives.apache.org/mod_mbox/jspwiki-dev/"
+class="external">mod_mbox</a>.
+
+## JSPWiki-commits
+
+If you subscribe to this list you will get emailed when (a committer) commits 
+new or changed files to the Git repository. The jspwiki-commits list is hosted
+at Apache, join it by sending an email to 
+<commits-subscribe@jspwiki.apache.org>. Again, the list archives are also browseable
+through either <a class="external" 
+href="https://lists.apache.org/list.html?commits@jspwiki.apache.org">Pony Mail!</a> 
+or <a class="external" 
+href="http://mail-archives.apache.org/mod_mbox/jspwiki-commits/">mod_mbox</a>.
+
+## Unsubscribing
+
+Unsubscribing is equally easy: you can just send an email to 
+&lt;user|dev|commits&gt;-unsubscribe@jspwiki.apache.org from the same
+email address that you originally subscribed from.

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/community/people.mdtext
----------------------------------------------------------------------
diff --git a/content/community/people.mdtext b/content/community/people.mdtext
new file mode 100755
index 0000000..ddc0bfb
--- /dev/null
+++ b/content/community/people.mdtext
@@ -0,0 +1,39 @@
+Title: People
+
+## JSPWiki contributors
+
+The current JSPWiki committer list:
+
+  * Murray Altheims
+  * Dirk Frederickx
+  * Siegfried Goeschl
+  * Florian Holeczek
+  * Janne Jalkanen
+  * Andrew Jaquith
+  * Dave Koelmeyer
+  * Glen Mazza
+  * Harry Metske
+  * Craig Russell
+  * Juan Pablo Santos
+  * Christoph Sauer
+  * David Vittor
+  
+  
+And, of course, all the fine people of the jspwiki-dev [mailing list]!
+
+## PMC
+
+The Project Management Committee consists of 
+
+  * Murray Altheims
+  * Dirk Frederickx
+  * Siegfried Goeschl
+  * Florian Holeczek
+  * Andrew Jaquith
+  * Dave Koelmeyer
+  * Harry Metske
+  * Craig Russell
+  * Juan Pablo Santos
+  * David Vittor
+  
+[mailing list]: mailing_lists.html

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/community/social_media.mdtext
----------------------------------------------------------------------
diff --git a/content/community/social_media.mdtext b/content/community/social_media.mdtext
new file mode 100755
index 0000000..3b7f6a8
--- /dev/null
+++ b/content/community/social_media.mdtext
@@ -0,0 +1,11 @@
+Title: Social Media
+
+Although conversations about JSPWiki happen on our [mailing lists], you can follow
+us on social media too:
+
+* JSPWiki <a class="external" href="https://www.facebook.com/ApacheJSPWiki/">Facebook</a> page
+
+* JSPWiki <a class="external" href="https://twitter.com/jspwiki">Twitter</a> account
+
+
+[mailing lists]: mailing_lists.html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/css/jspwiki.css
----------------------------------------------------------------------
diff --git a/content/css/jspwiki.css b/content/css/jspwiki.css
new file mode 100755
index 0000000..8343148
--- /dev/null
+++ b/content/css/jspwiki.css
@@ -0,0 +1,406 @@
+/* jspwiki.css original file, with a few modifications:                */
+/* all background-images point to ./images/*                           */
+/* added lines 66-69                                                   */
+/* removed padding on classes breadcrumbs and copyright, lines 204-205 */
+#wikibody{margin:1em 2em;padding:.25em;}
+#header,#footer{padding:0 0 0 20%;}
+#header .applicationlogo{position:absolute;left:2em;right:auto;width:18%;}
+#footer .applicationlogo,#footer .companylogo,#footer .wikiversion,#footer .rssfeed,#header .companylogo{display:none;}
+#header .userbox{float:right;}
+#header .pagename{float:left;}
+#header .searchbox{clear:right;float:right;}
+#header .breadcrumbs{clear:both;}
+#favorites{float:left;overflow:hidden;margin-top:1.75em;width:18%;padding:.5em;}
+#favorites .userbox{border:1px solid #ddd;margin-bottom:.5em;padding:.25em .5em;display:none;}
+#favorites .login,#favorites .logoff{clear:left;}
+#content{margin:1em 0;}
+#page,#wikibody.fav-right #favorites{float:right;}
+#wikibody.fav-right #page,#favorites{float:left;}
+* html #page,* html #wikibody.fav-right #favorites{margin-left:-3px;}
+* html #wikibody.fav-right #page,* html #favorites{margin-right:-3px;}
+#wikibody.fav-right #header,#wikibody.fav-right #footer{padding:0 20% 0 0;}
+#wikibody.fav-right #header .applicationlogo{left:auto;right:2em;}
+#page{width:80%;}
+#wikibody.fav-slide #page{width:100%;}
+#actionsTop{float:right;z-index:10;}
+* html #actionsTop{margin-top:1px;}
+#actionsBottom{text-align:right;margin-bottom:.5em;}
+* html #header,* html .userbox{height:1%;}
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:none;}
+:focus{outline:0;}
+body{color:black;background:white;margin:0;font:76%/140% Verdana,Arial,Helvetica,sans-serif;}
+table{border-collapse:collapse;border-spacing:0;empty-cells:show;}
+h1,h2,h3,h4,p,blockquote,label,ul,ol,dl,hr,.hr,.quote{margin:.5em 0;}
+th,td{padding:.25em .5em;}
+.hr{display:block;border-bottom:1px solid #ddd;}
+hr,.hr,.clearbox{clear:both;}
+.titlebox{color:#555;padding:.25em 1em;}
+.pagename{font-size:175%;line-height:1.4;font-weight:bold;margin-bottom:.5em;}
+h2,h3,h4{clear:left;margin:1em 0 .5em 0;padding:.25em;line-height:1.2;}
+h2{font-size:150%;}
+h2 .editsection,h2 .hashlink{font-size:67%;}
+h3{font-size:132%;}
+h3 .editsection,h3 .hashlink{font-size:76%;}
+h4{font-size:116%;}
+h4 .editsection,h4 .hashlink{font-size:86%;}
+a.editsection,a.hashlink{font-weight:normal;line-height:1.2;padding:.25em;text-decoration:none;color:#ccc;}
+a.editsection:hover,a.hashlink:hover{background-color:#ddd;color:blue!important;}
+h2:hover .editsection,h3:hover .editsection,h4:hover .editsection,h2:hover .hashlink,h3:hover .hashlink,h4:hover .hashlink{color:#999;}
+b,i{color:inherit;}
+br{clear:both;}
+ul ul,ol ol{margin:0;}
+ul,ol{padding-left:3em;}
+dl dt{font-weight:bold;}
+dl dd{margin-left:2em;}
+.wikiform tr{vertical-align:middle;}
+.formvalue{font-weight:bold;}
+.formhelp{font-style:italic;margin:.5em 0;}
+legend,label{font-weight:bold;white-space:nowrap;padding-right:.5em;}
+fieldset{margin:.5em 0;padding:.5em;border:1px solid #ddd;}
+.wikiform input[type='submit'],.wikiform input[type='button'],.wikiform input[type='file'],.wikiform button{cursor:pointer;}
+.wikiform input,.wikiform option{padding:0 .25em;}
+code,tt,pre{font:110% Monaco,"Courier New",Courier,monospace;overflow:auto;}
+pre{clear:both;white-space:pre;margin:1em 2.5%;padding:.5em;background:#f9f9f9;border:1px solid #ddd;_width:100%;_overflow-x:auto;_padding-bottom:1.5em;}
+#previewcontent,#info,#pagecontent,#attach,#findcontent,.diffbody{overflow-y:hidden;_width:100%;_overflow-x:auto;_padding-bottom:1.5em!important;}
+a{color:blue;}
+#pagecontent li{padding-bottom:0.3em;}
+#pagecontent a[href^="http://"], #pagecontent a[href^="https://"], a.external{background-image:url(../images/out.png);background-repeat:no-repeat;background-position:right center;padding-right:8px;}
+a:hover{background-color:#DBF0FF;}
+.leftmenu li:hover{background-color:#DBF0FF;}
+.hover{background-color:#eee;}
+* html .hover{background-color:#eee;}
+*:first-child+html .hover{background-color:#eee;}
+a.createpage{color:red;text-decoration:none;border-bottom:1px dashed red;}
+a.feed{background-image:url(../images/jspwiki-strip.gif);background-repeat:no-repeat;background-position:0 0;text-indent:16px;margin:0 .5em;width:16px;height:16px;text-decoration:none;overflow:hidden;display:block;float:right;}
+img{border:none;}
+.applicationlogo a{display:block;height:64px;width:64px;overflow:hidden;margin-left:auto;margin-right:auto;text-indent:-1000px;background:url(../images/jspwiki_logo.png) -64px 0 no-repeat;}
+/*.applicationlogo a:hover{background-position:0 0;}*/
+a.footnoteref{vertical-align:super;font-size:85%;}
+a.footnote{vertical-align:super;color:#04A;}
+.small{font-size:85%;}
+.sub{font-size:85%;vertical-align:sub;}
+.sup{font-size:85%;vertical-align:super;}
+.strike{text-decoration:line-through;}
+.center{text-align:center;}
+.center table{margin-left:auto;margin-right:auto;text-align:left;}
+.quote{border-left:4px solid #bbb;padding-left:3em;margin:0 .5em;}
+.ltr{direction:ltr;}
+.rtl{direction:rtl;}
+.invisible{display:none;}
+.additinfo{background-color:#e0e0ff;}
+.diffnote,.information,.warning,.error{display:block;clear:both;margin:1em .5em;padding:1em 1em 1em 3em;background-position:.8em .9em;background-repeat:no-repeat;}
+td .information,td .warning,td .error{margin:0;}
+.diffnote,.information{background-image:url(../images/information.gif);background-color:#e0e0ff;}
+.warning{background-image:url(../images/exclamation.gif);background-color:#ffff80;}
+.error{background-image:url(../images/error.gif);background-color:#ffe0e0;color:#c00000;}
+.error * li{margin-left:0;padding-left:0;}
+.commentbox{display:block;float:right;clear:right;width:35%;overflow:hidden;border:1px solid #ddd;background:#f9f9f9;padding:0 .5em;margin:0 0 1em .5em;font-size:90%;}
+.commentbox li{margin-left:0;padding-left:0;}
+.wikitable{margin:.5em .25em;}
+.wikitable tr{vertical-align:top;}
+.wikitable * th{border:1px solid #ddd;background-color:#eee;vertical-align:top;}
+.wikitable * td{border:1px solid #ddd;vertical-align:top;text-align:left;}
+.zebra-table tr.odd td{background-color:#eee;}
+.wikitable * td.split{border-top:1px solid #d9d9d9;}
+#upload{float:left;}
+#progressbar{float:left;margin-left:1em;width:30em;border:2px solid #ddd;visibility:hidden;}
+#progressbar .ajaxprogress{background:url(../images/progress.gif) repeat-x;height:18px;text-align:center;width:0;}
+.attachtype{line-height:1.6;font-size:11px;padding-left:20px;background-repeat:no-repeat;background-position:0 0;background-image:url(../images/attach-strip.png);}
+#attach-gif{background-position:0 -112px;}
+#attach-png{background-position:0 -112px;}
+#attach-bmp{background-position:0 -112px;}
+#attach-jpg{background-position:0 -112px;}
+#attach-jpeg{background-position:0 -112px;}
+#attach-text{background-position:0 -16px;}
+#attach-txt{background-position:0 -16px;}
+#attach-zip{background-position:0 -128px;}
+#attach-jar{background-position:0 -128px;}
+#attach-tar{background-position:0 -128px;}
+#attach-pdf{background-position:0 -80px;}
+#attach-doc{background-position:0 -32px;}
+#attach-xls{background-position:0 -48px;}
+#attach-ppt{background-position:0 -64px;}
+#attach-swf{background-position:0 -96px;}
+#attach-mov{background-position:0 -160px;}
+#attach-mp3{background-position:0 -144px;}
+#attach-wav{background-position:0 -144px;}
+#diffcontent{clear:both;}
+.diffbody{padding:.5em;}
+td.diffadd,td.diffrem,td.diff{font:110% Monaco,"Courier New",Courier,monospace;line-height:1;}
+td.diffadd{background:#9f9;}
+td.diffrem{background:#f93;}
+td.diff{background:#fff;}
+.diff-wikitext{font:110% Monaco,"Courier New",Courier,monospace;line-height:1;overflow:auto;}
+.diff-insertion{background:#9f9;text-decoration:none;color:black;}
+.diff-deletion{background:#f93;text-decoration:line-through;color:black;}
+.diff-nextprev{vertical-align:super;text-decoration:none;}
+.textarea-resizer{background:#eee url(../images/resize-horizontal.gif) top center;cursor:s-resize;font-size:1px;height:6px;line-height:6px;overflow:hidden;}
+#toolbuttons,#toolextra,#searchbar{margin-left:1em;clear:both;}
+#tools span{float:left;display:block;padding:.25em 0;margin-right:1em;}
+#toolbuttons span{border:1px solid #ddd;}
+a.tool{float:left;display:block;background:transparent;margin:2px;text-decoration:none;}
+a.tool:hover,.btn:hover{background-color:#ddd!important;}
+#tools a.tool{border:none;background-repeat:no-repeat;background-image:url("../images/editor-strip.gif");background-color:transparent;height:16px;width:16px;text-indent:20px;overflow:hidden;}
+#tbREDO{background-position:0 0;width:auto!important;}
+#tbUNDO{background-position:0 -16px;width:auto!important;}
+#tbH1{background-position:0 -192px;}
+#tbH2{background-position:0 -208px;}
+#tbH3{background-position:0 -224px;}
+#tbB{background-position:0 -176px;}
+#tbI{background-position:0 -256px;}
+#tbLink{background-position:0 -48px;}
+#tbMONO{background-position:0 -160px;}
+#tbPRE{background-position:0 -64px;}
+#tbCODE{background-position:0 -80px;}
+#tbHR{background-position:0 -240px;}
+#tbBR{background-position:0 -112px;}
+#tbDL{background-position:0 -272px;}
+#tbSUP{background-position:0 -336px;}
+#tbSUB{background-position:0 -320px;}
+#tbSTRIKE{background-position:0 -304px;}
+#tbUL{background-position:0 -256px;}
+#tbOL{background-position:0 -272px;}
+#tbLEFT{background-position:0 -288px;}
+#tbCENTER{background-position:0 -304px;}
+#tbRIGHT{background-position:0 -320px;}
+#tbJUST{background-position:0 -336px;}
+#tbQUOTE{background-position:0 -272px;}
+#tbIMG{background-position:0 -96px;}
+#tbTABLE{background-position:0 -144px;}
+#tbTOC{background-position:0 -32px;}
+#tbTAB{background-position:0 -128px;}
+#tbSIGN{background-position:0 -288px;}
+#tbDOREPLACE{background-image:url("../images/doreplace.png")!important;}
+.editor{font:110% Monaco,"Courier New",Courier,monospace;padding:4px;width:99%;}
+#toctoc{position:relative;margin:.5em 0;}
+#toctoc label{display:block;margin:0;padding:.5em;}
+#toctoc ul{border:3px solid #eee;width:auto;overflow:auto;height:150px;list-style:none;margin:0;padding:0;}
+#toctoc a{display:block;padding:0 .5em;cursor:pointer;overflow:hidden;white-space:nowrap;}
+* html #editorarea{padding:4px 0;}
+*:first-child+html #editorarea{padding:4px 0;}
+#submitbuttons input{margin-right:2em;}
+#commentcontent,#editcontent{width:100%;}
+#searchbar{display:block!important;}
+#searchbar span{white-space:nowrap;}
+#findSuggestionMenu{position:absolute;color:white;background-color:rgba(0,0,0,0.7);-moz-border-radius:10px;-webkit-border-radius:5px;-webkit-box-shadow:0 0 5px rgba(0,0,0,0.5);z-index:10;font-size:85%;overflow:hidden;}
+* html #findSuggestionMenu{background:url(../images/tip.png) top left;}
+*:first-child+html #findSuggestionMenu{background:url(../images/tip.png) top left;}
+#findSuggestionMenu ul{list-style:none;margin:0;padding:0;}
+#findSuggestionMenu li{padding:.25em .5em;cursor:pointer;}
+#findSuggestionMenu .hover{background-color:rgba(0,0,0,0.5);-moz-border-radius:10px;-webkit-border-radius:5px;}
+* html #findSuggestionMenu .hover{background-color:black;}
+*:first-child+html #findSuggestionMenu .hover{background-color:black;}
+.userbox{overflow:hidden;padding:.5em 0;}
+#favorites .userbox a.action,#favorites .userbox .username{float:left;display:block;margin-right:4px;}
+.username{font-style:italic;padding:.25em .5em;}
+.wikiversion,.rssfeed{font-size:90%;padding:.25em;text-align:center;}
+#details,#scope{margin-left:2em;}
+.graphBar{padding:0;color:white;border-color:#f93;border-left-style:solid;border-bottom-style:solid;}
+.fragment{margin:.25em;font:90% Monaco,"Courier New",Courier,monospace;}
+.fragment_ellipsis{font-weight:bold;}
+.nosearchresult{font-style:italic;}
+.cursor{background-color:#eee;}
+.searchword,.searchmatch{background-color:#f93;color:black;text-decoration:inherit;}
+.copyright{padding:0;font-size:90%;text-align:center;color:#555;}
+.breadcrumbs{font-size:90%;padding:0;}
+#incomingLinks,#outgoingLinks,#externalLinks,#attachmentLinks,#versionhistory{width:30%;overflow:hidden;margin-right:.5em;float:left;}
+#versionhistory td{white-space:nowrap;}
+.pagination{margin:.25em;padding:.5em;background:#eee;}
+.pagination a{cursor:pointer;}
+.pagination a,.pagination .cursor{padding:.5em;}
+.pagination .cursor,.pagination a:hover{background-color:#d7d7d7;}
+td.changenote{font-style:italic;}
+th.changenote,td.changenote{width:30%;overflow:hidden;}
+#info th select{display:block;}
+.pageactions{line-height:1.5;}
+.pageactions ul{list-style:none;margin:0;padding:0;}
+.pageactions li{display:block;float:left;}
+.pageactions li ul{position:absolute;background:white;border:2px solid #ddd;left:0;z-index:10;}
+.pageactions li ul li ul{position:static;left:auto;}
+.pageactions li ul li{display:block;white-space:nowrap;float:none;}
+.pageactions li ul li.separator{border-top:2px solid #ddd;}
+.pageactions li ul li ul{position:static;left:auto;border:none;}
+#hiddenmorepopup{display:none;border:1px solid #ddd;}
+#hiddenmorepopup ul{list-style:none;margin:0;padding:0;}
+#morebutton ul a{padding:.25em .5em;text-decoration:none;cursor:pointer;}
+.pageactions a.action{display:block;}
+#morebutton a:hover,a.action:hover,#sectiontoc a:hover .userbox a.action:hover,a.action.quick2bottom:hover,a.action.quick2top:hover{background-color:#eee!important;}
+#searchTools a.action,.userbox a.action,a.action.edit,a.action.more{padding:.25em .5em;text-decoration:none;line-height:normal;border:1px solid #ddd;background:#f9f9f9;white-space:nowrap;}
+a.action.edit,a.action.more{margin-left:4px;border-bottom:none;}
+a.action.more{padding-right:1.5em;background:#f9f9f9 url(../images/arrdownsmall.gif) 95% center no-repeat;}
+a.action.quick2top,a.action.quick2bottom{overflow:hidden;padding:0;text-indent:20px;width:20px;margin:0 0 0 2px;}
+a.action.quick2top{float:right;background:url(../images/arrup.gif) no-repeat 3px 3px;}
+.popup ul{position:absolute;background:white;border:2px solid #ddd;padding:.25em;margin:0;left:0;z-index:15;list-style:none;}
+.popup li a{display:block;line-height:1.5;white-space:nowrap;cursor:pointer;}
+.popup a:hover{background-color:#eee!important;}
+#pagecontent{padding:.5em 0;}
+#sneakpreviewheader{clear:both;font-size:110%;background-color:#ddd;padding:.5em;margin:.5em 0;}
+.previewcontent{background-image:url(../images/preview.gif);}
+.spin{background:url(../images/spin.gif) no-repeat;width:16px;height:16px;margin:0 .5em;}
+#searchForm #query{width:164px;padding:2px 22px 2px 2px;vertical-align:middle;color:#555;}
+#searchSubmit{position:absolute;top:5px;right:3px;margin:0;padding:0;width:16px;height:16px;border:none;background:url(../images/search.gif) no-repeat center;overflow:hidden;cursor:pointer;}
+#searchboxMenu{position:absolute;background:white;border:2px solid #ddd;padding:.25em;left:0;z-index:15;}
+* html #searchboxMenu{white-space:nowrap;}
+#searchboxMenu ul{list-style:none;margin:0;padding:0;}
+#searchboxMenu li{padding:0 .5em;}
+#searchTools a:hover,#searchboxMenu li:hover{background:#eee;}
+#searchboxMenu div{margin:.5em 0;}
+#searchTools{text-align:left;}
+.imageplugin{margin:.5em 0;}
+.imageplugin img{border:0;}
+.imageplugin caption{font-size:90%;}
+.imageplugin *{padding:0;margin:0;}
+.index .header{padding:4px;background:#f9f9f9;border:1px solid #ddd;text-align:center;font-size:1.4em;}
+.index .body{margin-top:.5ex;}
+.index .section{color:red;font-size:1.4em;display:block;border-bottom:2px solid silver;margin-top:1.5ex;}
+div.toc{width:60%;float:left;clear:left;}
+a.toc{color:grey;padding:.25em;}
+a.toc:hover{background:#eee;}
+#favorites .toc{width:100%;}
+#pagecontent .toc h4{font-size:1.4em;}
+.toc ul{padding-left:0;list-style:none;}
+.toc li{margin-left:1em;padding-left:0;}
+.toc li.toclevel-1{margin-left:.5em;}
+.toc li.toclevel-2{margin-left:1.5em;}
+.toc li.toclevel-3{margin-left:2.5em;}
+.weblog{margin:0 2em;clear:both;}
+.weblogentry{margin:.5em 0;}
+.weblogentryheading{padding:.25em .5em;font-size:90%;background:#e0e0e0;float:right;}
+.weblogentrytitle{padding:.25em .5em;font-size:120%;line-height:1.2;font-weight:bold;background:#e0e0e0;}
+.weblogentrybody{margin-left:.5em;clear:both;}
+.weblogentryfooter{font-size:90%;padding:.25em .5em;border-bottom:3px solid #e0e0e0;clear:both;}
+.weblogarchive li{margin-left:1em;display:block;list-style-type:none;}
+.archiveyear{font-weight:bold;text-decoration:none;margin-left:0!important;}
+.archiveyear:after{content:" AD";}
+.weblogcommentstitle{background:#e0e0e0;margin:1em .5em 0 .5em;padding:.5em;font-weight:bold;font-size:120%;line-height:1.1;}
+.weblogcomments{background:#f9f9f9;margin:0 .5em 1em .5em;padding:1em;}
+.recentchanges{table-layout:fixed;}
+.recentchanges .changenote{font-style:italic;}
+.recentchanges td{vertical-align:top;border-bottom:1px solid #f9f9f9;}
+.recentchanges .date{vertical-align:bottom;border-top:1.5em solid white;background-color:#f9f9f9!important;border-bottom:none;}
+.recentchanges tr.odd td{background-color:transparent;}
+div.calendar{border:1px solid black;}
+table.calendar td{text-align:center;}
+table.calendar td.othermonth{color:#707070;}
+table.calendar td.link{background:#f9f9f9;}
+table.calendar tr.weekdays{color:red;}
+.accesskey{text-decoration:underline;}
+.hidetab{display:none;}
+.tabs{clear:both;padding:.5em;border:1px solid #ddd;margin-bottom:.5em;}
+.tabmenu{padding:0 1em;font-weight:bold;}
+.tabs .tabmenu{clear:both;}
+* html .tabmenu{border:1px solid white;}
+*:first-child+html .tabmenu{border:1px solid white;}
+.tabmenu a{float:left;margin:0 0 -1px -1px;padding:.25em .5em;border:1px solid #ddd;color:gray;background:#f9f9f9;text-decoration:none;cursor:pointer;line-height:normal;}
+.tabmenu a:hover{background:#eee;}
+.tabmenu a.activetab{color:black;background:transparent;border-bottom:1px solid white;cursor:default;}
+.accordion,.tabbedAccordion{clear:both;border:1px solid #ddd;margin-bottom:.5em;}
+.accordion .toggle{border:2px solid #f9f9f9;background:#f9f9f9;cursor:pointer;font-weight:bold;line-height:1.4;padding:.25em 1em .25em 0;}
+.accordion .toggle:hover,.menu .toggle:hover{background:#eee;}
+.accordion .tab{padding:0 1em;}
+.menu{clear:both;color:gray;font-weight:bold;}
+.menu.top{margin-left:.5em;}
+.menu.left{float:left;margin-top:.5em;}
+.menu.right{float:right;margin-top:.5em;}
+.menu .toggle{background:#f9f9f9;border:1px solid #ddd;cursor:pointer;padding:.25em .5em;}
+.menu.top .toggle{float:left;margin:0 0 -1px -1px;display:inline;}
+.menu.left .toggle{margin:0 -1px -1px 0;}
+.menu.right .toggle{margin:0 0 -1px -1px;}
+.menu .toggle.active{background:transparent;cursor:default;color:black;}
+.menu.top .toggle.active{border-bottom:1px solid white;}
+.menu.left .toggle.active{border-right:1px solid white;}
+.menu.right .toggle.active{border-left:1px solid white;}
+.tabbedAccordion{padding:.5em;}
+.leftAccordion,.rightAccordion{margin-bottom:.5em;}
+.leftAccordion .tab,.rightAccordion .tab{border:1px solid #ddd!important;margin:0 0 -2px 0;padding:.25em .5em;}
+* html .columns{width:100%;}
+*:first-child+html .columns{width:100%;}
+.columns .col{float:left;padding:0 .25em;}
+.tip-anchor{border-bottom:2px solid #545454;cursor:pointer;}
+.tip-tip{color:white;width:auto;z-index:100;font-size:90%;background-color:rgba(0,0,0,0.7);-moz-border-radius:10px;-webkit-border-radius:5px;-webkit-box-shadow:0 0 5px rgba(0,0,0,0.5);}
+.tip-title{font-weight:bold;padding:8px 8px 4px;}
+* html .tip-title{background:url(../images/tip.png) top left;}
+*:first-child+html .tip-title{background:url(../images/tip.png) top left;}
+.tip-text{padding:4px 8px 8px;}
+.tip-text th{background:grey!important;}
+* html .tip-text{background:url(../images/tip.png) bottom right;}
+*:first-child+html .tip-text{background:url(images/tip.png) bottom right;}
+.tip-tip a{color:white!important;}
+div.collapse ul,div.collapse ol{margin:0;padding:0;}
+* html div.collapse ul,* html div.collapse ol{width:100%;}
+div.collapse li{list-style-type:none;}
+.collapse .collapsebody,.collapsebox .collapse .collapsebody{padding-left:1.5em;}
+*:first-child+html .collapse .collapsebody,*:first-child+html .collapsebox .collapse .collapsebody{float:left;padding-left:.5em;}
+* html .collapse .collapsebody,* html .collapsebox .collapse .collapsebody{float:left;padding-left:.5em;}
+.collapseBullet,.collapseOpen,.collapseClose{clear:left;float:left;text-align:center;text-decoration:none;color:blue;font:bold small Monaco,"Courier New",Courier,monospace;width:1.2em;height:1em;}
+.collapseOpen,.collapseClose{cursor:pointer;}
+.collapsebox{clear:right;border:1px solid #ddd;margin:0 0 .5em 0;}
+.collapsetitle{margin:0;padding:.25em 0;border:2px solid white;}
+.collapsebox .collapsebody{padding:0 .5em;}
+.sortable .sortAscending,.sortable .sortDescending,.sortable .sort{background-repeat:no-repeat;background-position:2px 4px;cursor:pointer;padding-left:11px;}
+.sortable .sort{background-image:url(../images/sortable.gif);}
+.sortable .sortAscending{background-image:url(../images/sorted_down.gif);background-position:2px 6px;}
+.sortable .sortDescending{background-image:url(../images/sorted_up.gif);background-position:2px 0;}
+a.slimbox{font-weight:bold;font-size:1.3em;padding:0 .2em;}
+a.slimbox:visited,a.slimbox:active,a.slimbox:link{text-decoration:none;border:none;}
+a.slimbox:hover{background:#eee;}
+#lbOverlay{position:absolute;left:0;top:0;width:100%;background-color:#000;cursor:pointer;}
+#lbCenter,#lbBottomContainer{position:absolute;left:50%;overflow:hidden;font:90% Verdana,Helvetica,sans-serif;color:#666;line-height:1.5;text-align:left;}
+#lbBottomContainer{padding:0 12px;}
+#lbCenter{padding:12px 12px 0 12px;}
+#lbCenter a{outline:none;}
+.lbLoading{background:#fff url(../images/spin.gif) no-repeat center;}
+#lbImage{border:10px solid #fff;border-top-width:1.4em;background-color:#fff;background-repeat:no-repeat;background-position:center center;position:relative;}
+#lbBottom{border:10px solid #fff;border-top-style:none;background-color:#fff;}
+#lbBottom div{white-space:nowrap;overflow:hidden;}
+#lbCaption,#lbPrevLink,#lbNextLink{font-weight:bold;}
+#lbPrevLink{padding-right:1em;}
+#lbNextLink{padding-left:1em;}
+#lbCloseLink{display:block;position:absolute;width:28px;height:28px;top:0;right:0;background:url(../images/slimbox_close.png) no-repeat;z-index:10;}
+* html #lbCloseLink{background:url(../images/slimbox_close.gif) 4px 12px no-repeat;}
+* html #lbCloseLink:hover{background-image:url(../images/slimbox_close_hover.gif);}
+#lbBottomContainer *:visited,#lbBottomContainer *:active,#lbBottomContainer *:link,#lbCenter *:visited,#lbCenter *:active,#lbCenter *:link{text-decoration:none;border-bottom:none;}
+.categoryLink{border-bottom:2px solid #545454;text-decoration:none;}
+.categoryPopup{color:white;z-index:100;font-size:90%;margin-top:2px;position:absolute;z-index:10;background-color:rgba(0,0,0,0.7);-moz-border-radius:10px;-webkit-border-radius:5px;-webkit-box-shadow:0 0 5px rgba(0,0,0,0.5);}
+* html .categoryPopup{width:240px;}
+*:first-child+html .categoryPopup{width:240px;}
+.categoryPopup a:link,.categoryPopup a:active,.categoryPopup a:visited{color:white;text-decoration:none;}
+.categoryTitle{padding:4px;font-weight:bold;}
+* html .categoryTitle{background:url(../images/tip.png) top left;}
+*:first-child+html .categoryTitle{background:url(../images/tip.png) top left;}
+.categoryText{padding:4px 0;}
+* html .categoryText{background:url(../images/tip.png) bottom right;}
+*:first-child+html .categoryText{background:url(../images/tip.png) bottom right;}
+.categoryText ul{list-style:none;margin:0!important;padding:0!important;}
+.categoryText li{display:block;padding:0 8px;}
+.categoryPopup .hover{background-color:rgba(0,0,0,0.5);-moz-border-radius:10px;-webkit-border-radius:5px;}
+* html .categoryPopup .hover{background-color:black;}
+*:first-child+html .categoryPopup .hover{background-color:black;}
+.str{color:#489a1b;}
+.kwd{color:#1b609a;}
+.com{color:#888;}
+.typ{color:#666;}
+.lit{color:#066;}
+.pun{color:#660;}
+.pln{color:#000;}
+.tag{color:#008;}
+.atn{color:#606;}
+.atv{color:#080;}
+.dec{color:#606;}
+@media print{.str{color:#060;}
+.kwd{color:#006;font-weight:bold;}
+.com{color:#600;font-style:italic;}
+.typ{color:#404;font-weight:bold;}
+.lit{color:#044;}
+.pun{color:#440;}
+.pln{color:#000;}
+.tag{color:#006;font-weight:bold;}
+.atn{color:#404;}
+.atv{color:#060;}
+}
+div.coverflow{background-color:#000;color:#fff;visibility:hidden;position:relative;overflow:hidden;}
+div.coverflow *{margin:0;padding:0;}
+div.coverflow .imgcontainer{position:relative;}
+div.coverflow img{position:absolute;border:none;}
+div.coverflow .slider{position:relative;border:1px solid #bbb;z-index:10001;}
+div.coverflow .knob{background:#fff;width:100px;height:15px;}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/css/jspwiki_print.css
----------------------------------------------------------------------
diff --git a/content/css/jspwiki_print.css b/content/css/jspwiki_print.css
new file mode 100755
index 0000000..7227ff1
--- /dev/null
+++ b/content/css/jspwiki_print.css
@@ -0,0 +1,12 @@
+.applicationlogo,.companylogo,.titlebox,.userbox,.searchbox,.breadcrumbs,.pageactions,.quicklinks,#actionsTop,#actionsBottom,#favorites,#addattachment,#findhelp,a.editsection,a.hashlink,.collapsebox .collapseOpen,.collapsebox .collapseClose,.table-filter .filterrow,.tabmenu{display:none;}
+#attachments,#addcomment,#pagecontent,#editcontent,#previewcontent,#diffcontent,#infocontent,#findquery,#userPrefs,#pagecontent .tabmenu{display:block;visibility:visible;}
+tt,pre{overflow:visible;}
+a{text-decoration:none;}
+html>body #previewcontent,html>body #info,html>body #pagecontent,html>body #attach,html>body #findcontent{overflow:visible;}
+* html #previewcontent,* html #info,* html #pagecontent,* html #attach,* html #findcontent{overflow-x:visible;}
+.pagename,#header,#footer,#page{width:100%!important;margin:0!important;padding:0!important;float:none!important;clear:both!important;position:static!important;overflow:visible!important;}
+.pagename{font-size:250%;margin-bottom:1.5em;padding-bottom:.5em;border-bottom:3px solid #555;color:#555;}
+.hidetab{display:block;}
+.tabs{border:none;}
+a.slimbox{display:none;}
+.commentbox{float:none;}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/development/edit_website.mdtext
----------------------------------------------------------------------
diff --git a/content/development/edit_website.mdtext b/content/development/edit_website.mdtext
new file mode 100755
index 0000000..d51cc07
--- /dev/null
+++ b/content/development/edit_website.mdtext
@@ -0,0 +1,71 @@
+Title: Edit Website
+
+(adapted from MRUnit site)
+
+The website uses the Apache CMS. More detailed documentation is available on 
+the Apache Infrastructure pages including a quickstart guide on the
+[Apache bookmarklet][] and a [reference manual][]. It is also useful to look at
+[other Apache CMS sites][] for examples.
+
+## Process
+
+  1. Commit a change to the website's source [Markdown][] files located at [Site's trunk][]. 
+Before committing, test that the site still builds locally by following
+[these instructions][].
+
+    If deleting a file or changing the name of a file make a trivial edit to
+lib/path.pm or lib/view.pm to force a full site rebuild. If making a simple edit
+it is easier to just use the Apache bookmarklet.
+
+  2. Wait a few minutes to get the email on the commits list that buildbot has
+rebuilt the [staging website][].
+
+  3. If the change looks ok, commit the change to the production website by one
+of the following:
+
+    * Using the Apache bookmarklet and selecting [Publish site][]
+    * curl -sL http://s.apache.org/cms-cli | perl on your local machine
+    * ssh -t <user\>@people.apache.org publish.pl jspwiki <your Apache ID\>
+
+**Note:** you don't need to be an Apache committer to edit this site; non-committers 
+should follow this [FAQ][], using the anonymous user, to get their proposed 
+changes live.
+
+<!--- (not currently generating content from source)
+## Site content generated from source
+
+  Some pages of the site (namely, the changelog, the release version at the 
+bottom of the sidebar and the translation status) are generated from source. To 
+refresh them, follow the instructions and execute the unit test at 
+`$SVN/trunk/tests/org/apache/wiki/site/SiteGenerator.java`
+-->
+
+## Posting generated content
+
+  1. Add the path to content/extpaths.txt relative to the extpaths.txt
+file to prevent the content getting deleted when the staging site is published
+  2. Commit the generated content directly to the [production site svn][]
+
+
+## Style
+
+  * Try to limit line length to 80 columns, fold -s <filename\> on Linux is
+helpful for limiting line length
+  * Use links in the [link name][] style rather than [link name][1] because it
+is more difficult to match up the numbers and removing links causes all the
+numbers to have to get updated
+  * Indent with spaces not tabs
+  * Use * for lists and indent lists by two spaces
+
+[Apache bookmarklet]: http://apache.org/dev/cms.html#usage
+[reference manual]: http://apache.org/dev/cmsref.html
+[other Apache CMS sites]: http://apache.org/dev/cmsadoption.html
+
+[production site svn]: https://svn.apache.org/repos/infra/websites/production/jspwiki
+
+[Markdown]: http://daringfireball.net/projects/markdown/syntax
+[these instructions]: http://apache.org/dev/cmsref.html#local-build
+[Staging website]: http://jspwiki.staging.apache.org/
+[Publish site]: https://cms.apache.org/jspwiki/publish
+[Site's trunk]: https://svn.apache.org/repos/asf/jspwiki/site/trunk
+[FAQ]: http://www.apache.org/dev/cmsref.html#non-committer

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/development/source_and_guide.mdtext
----------------------------------------------------------------------
diff --git a/content/development/source_and_guide.mdtext b/content/development/source_and_guide.mdtext
new file mode 100755
index 0000000..5e066fe
--- /dev/null
+++ b/content/development/source_and_guide.mdtext
@@ -0,0 +1,53 @@
+Title: Getting and Building JSPWiki Source code
+
+## Getting JSPWiki Source Code
+
+JSPWiki [source code][] is maintained using Git.
+
+Checkout the code using:
+
+    git clone http://git-wip-us.apache.org/repos/asf/jspwiki.git jspwiki
+
+Change http to https if you are a developer intending to git push. You can check 
+[Getting started with Git at the ASF][] for further information. There is also a 
+[GitHub mirror][], so you can also fork and send your PRs from there.
+
+See the [Edit Website][] page for the website sources.
+
+## Building JSPWiki
+
+Apache JSPWiki is a <a href="http://maven.apache.org">Maven</a>-based project and 
+builds using the same commands as other Maven projects.  The JSPWiki team maintains 
+a <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob_plain;f=mvn_cheat-sheet.md">cheat sheet</a>
+of common Maven tasks for this project. Current release is 2.10.2 and can be reached through 
+the [downloads] page, with development going into 2.10.3.
+
+### Coding standards:
+
+  * Use the <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob_plain;f=jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml">Eclipse</a>
+and <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob_plain;f=jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml">Checkstyle</a>
+formatters (both automatically incorporated when you run mvn eclipse:eclipse on the project.)
+  * Remove trailing whitespace and whitespace on empty lines
+
+### Commits:
+
+  * All commits except those to the website or for releases should start with 
+JSPWIKI-num: JIRA title. If committing a patch from a contributor the commit 
+message should read JSPWIKI-num: JIRA title. Contributed by contributor's name.
+  * Try not to break the current build by making sure that trunk still builds 
+before committing.
+  * Bump the version (in Release.java). Please see the [versioning proposal][] on 
+which version number follows which one. 
+  * Add a suitable [ChangeLog][] entry describing your change(s).
+  * When resolving the JIRA, be sure to set the fix version to the current next 
+planned release version as this is used to create the release notes.
+
+
+[Getting started with Git at the ASF]: https://reference.apache.org/committer/git
+[GitHub mirror]: https://github.com/apache/jspwiki
+[Edit Website]: edit_website.html
+[Release Page]: ../pmc/how_to_release.html
+[downloads]: ../general/downloads.html
+[source code]: https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary
+[versioning proposal]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=VersioningProposal
+[ChangeLog]: https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob_plain;f=ChangeLog;hb=HEAD
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/extpaths.txt
----------------------------------------------------------------------
diff --git a/content/extpaths.txt b/content/extpaths.txt
new file mode 100755
index 0000000..ce13e77
--- /dev/null
+++ b/content/extpaths.txt
@@ -0,0 +1,3 @@
+# File format: lines starting with # or space chars are ignored.
+# source https://svn.apache.org/repos/asf/infrastructure/site/trunk/content/extpaths.txt
+apidocs
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/general/downloads.mdtext
----------------------------------------------------------------------
diff --git a/content/general/downloads.mdtext b/content/general/downloads.mdtext
new file mode 100755
index 0000000..081d59e
--- /dev/null
+++ b/content/general/downloads.mdtext
@@ -0,0 +1,46 @@
+Title: Downloads
+
+**Current source and binary distributions** are available through the
+<a class="external" href="http://www.apache.org/dyn/closer.lua/jspwiki/2.10.2/">Apache mirrors</a>.
+
+Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To 
+do so, use the checksum and <br/>signature files from the main Apache site at
+<a class="external" href="http://www.apache.org/dist/jspwiki/">http://www.apache.org/dist/jspwiki</a>.
+Find here the <a class="external" href="http://www.apache.org/dist/jspwiki/KEYS">KEYS</a> file, which 
+contains all OpenPGP keys <br/>we use to sign releases.
+
+<br/>**Previous source and binary distributions** are available through the
+<a class="external" href="http://archive.apache.org/dist/jspwiki/">
+Apache archives</a>.
+
+<br/>**Source, javadocs and build artifacts** are also available via the 
+**<a class="external" href="https://repository.apache.org/index.html#nexus-search;quick~jspwiki">
+Apache Nexus</a>** repository, which is synced to 
+<a class="external" href="http://search.maven.org/#search|ga|1|org.apache.jspwiki">Central repo</a>,
+<br/>under `org.apache.jspwiki` groupId.
+
+If you want to build directly from the sources, please check the [Get and Build Source][] page.
+
+
+<br/>**Release Index**
+
+* **20-Feb-2016**: The current release version is 
+<a class="external" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.10#section-NewIn2.10-NewInJSPWiki2.10.2ReleasedOn20022016">2.10.2</a>.
+This release fixes the following issues:<br/>
+<a class="external" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12327049">https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12327049</a>
+
+* **29-May-2014**: The current release version is 
+<a class="external" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.10#section-NewIn2.10-NewInJSPWiki2.10.1ReleasedOn29052014">2.10.1</a>.
+This release fixes the following issues:<br/>
+<a class="external" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12325764">https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12319521</a>
+
+* **01-Feb-2014**: released version 
+<a class="external" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.10#section-NewIn2.10-NewInJSPWiki2.10.0ReleasedOn01022014">2.10.0</a>.
+This release fixes the following issues:<br/>
+<a class="external" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12323941&styleName=Html&projectId=12310732">https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12323941&styleName=Html&projectId=12310732</a>
+
+* **15-May-2013**: released version <a class="external" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.9">2.9.1-incubating</a>.
+This release fixes the following issues:<br/>
+<a class="external" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12321249">https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12321249</a>
+
+[Get and Build Source]: ../development/source_and_guide.html

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/general/news.mdtext
----------------------------------------------------------------------
diff --git a/content/general/news.mdtext b/content/general/news.mdtext
new file mode 100755
index 0000000..a2c1895
--- /dev/null
+++ b/content/general/news.mdtext
@@ -0,0 +1,54 @@
+Title: News
+
+## Project News
+
+  * **06-Apr-2016:** new committer and PMC member - Dave Koelmeyer
+
+  * **20-Feb-2016:** Official [Apache JSPWiki 2.10.2 release][] is out!
+
+  * **23-Dec-2014:** new committer and PMC member - David Vittor
+
+  * **21-Aug-2014:** new committer and PMC member - Siegfried Goeschl
+
+  * **29-May-2014:** Official [Apache JSPWiki 2.10.1 release][] is out!
+
+  * **01-Feb-2014:** Official [Apache JSPWiki 2.10.0 release][] is out!
+
+  * **01-Jan-2014:** New JSPWiki wiki available, <https://jspwiki-wiki.apache.org>
+
+  * **17-July-2013:** Apache JSPWiki has graduated from the Incubator! It's now a top-level
+                      Apache project.
+
+  * **15-May-2013:** Official [Apache JSPWiki 2.9.1-incubating release][] is out!
+
+  * **04-Jan-2013:** new committer and PPMC member - Glen Mazza
+  
+  * **01-Dec-2012:** Official Apache JSPWiki 2.9.0-incubating release is out!
+
+  * **01-Nov-2012:** New mentor - Siegfried Goeschl.
+
+  * **01-May-2012:** New, yet familiar, project website.
+
+  * **23-Jan-2012:** The previous attempt to graduate to an ASF top-level 
+project did not succeed for various reasons. A new effort is started to 
+graduate with a 2.9 codebase (based on 2.8), so no JCR backend and no Stripes, 
+but the traditional JSPWiki, the progress can still be followed at our 
+[JIRA][] issue tracker.
+
+  * **24-May-2009:** We started an effort to graduate to an ASF top-level 
+project, the progress can be followed at our JIRA issue tracker.
+
+  * **24-Apr-2009:** Well, it seems that it took a few more weeks to actually 
+make the release - and we ain't there yet. But Harry Metske and Florian 
+Holeczek joined the PPMC, which is of course good news.
+
+  * **29-Jun-2008:** JSPWiki trunk is now completely Apache-licensed, and we're 
+looking to have an incubator release in a few weeks. Also, Harry Metske joins 
+us as a committer.
+
+
+[JIRA]: https://issues.apache.org/jira/browse/JSPWIKI
+[Apache JSPWiki 2.9.1-incubating release]: downloads.html
+[Apache JSPWiki 2.10.0 release]: downloads.html
+[Apache JSPWiki 2.10.1 release]: downloads.html
+[Apache JSPWiki 2.10.2 release]: downloads.html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/SilkIconSet-readme.txt
----------------------------------------------------------------------
diff --git a/content/images/SilkIconSet-readme.txt b/content/images/SilkIconSet-readme.txt
new file mode 100755
index 0000000..400a64d
--- /dev/null
+++ b/content/images/SilkIconSet-readme.txt
@@ -0,0 +1,22 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/apache_incubator_logo.png
----------------------------------------------------------------------
diff --git a/content/images/apache_incubator_logo.png b/content/images/apache_incubator_logo.png
new file mode 100755
index 0000000..81fb31e
Binary files /dev/null and b/content/images/apache_incubator_logo.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/apache_software_foundation_logo.gif
----------------------------------------------------------------------
diff --git a/content/images/apache_software_foundation_logo.gif b/content/images/apache_software_foundation_logo.gif
new file mode 100755
index 0000000..fb4445f
Binary files /dev/null and b/content/images/apache_software_foundation_logo.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/apache_software_foundation_logo.png
----------------------------------------------------------------------
diff --git a/content/images/apache_software_foundation_logo.png b/content/images/apache_software_foundation_logo.png
new file mode 100755
index 0000000..947d681
Binary files /dev/null and b/content/images/apache_software_foundation_logo.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/arrdown.png
----------------------------------------------------------------------
diff --git a/content/images/arrdown.png b/content/images/arrdown.png
new file mode 100755
index 0000000..2db7b11
Binary files /dev/null and b/content/images/arrdown.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/arrdownsmall.gif
----------------------------------------------------------------------
diff --git a/content/images/arrdownsmall.gif b/content/images/arrdownsmall.gif
new file mode 100755
index 0000000..067aae7
Binary files /dev/null and b/content/images/arrdownsmall.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/arrup.gif
----------------------------------------------------------------------
diff --git a/content/images/arrup.gif b/content/images/arrup.gif
new file mode 100755
index 0000000..a150039
Binary files /dev/null and b/content/images/arrup.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/attach-strip.png
----------------------------------------------------------------------
diff --git a/content/images/attach-strip.png b/content/images/attach-strip.png
new file mode 100755
index 0000000..2eb1305
Binary files /dev/null and b/content/images/attach-strip.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/attachment_big.png
----------------------------------------------------------------------
diff --git a/content/images/attachment_big.png b/content/images/attachment_big.png
new file mode 100755
index 0000000..2577d50
Binary files /dev/null and b/content/images/attachment_big.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/attachment_small.gif
----------------------------------------------------------------------
diff --git a/content/images/attachment_small.gif b/content/images/attachment_small.gif
new file mode 100755
index 0000000..54e8f2a
Binary files /dev/null and b/content/images/attachment_small.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/attachment_small.png
----------------------------------------------------------------------
diff --git a/content/images/attachment_small.png b/content/images/attachment_small.png
new file mode 100755
index 0000000..ea897cc
Binary files /dev/null and b/content/images/attachment_small.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/book_open.png
----------------------------------------------------------------------
diff --git a/content/images/book_open.png b/content/images/book_open.png
new file mode 100755
index 0000000..7d863f9
Binary files /dev/null and b/content/images/book_open.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/downGreenArrow.png
----------------------------------------------------------------------
diff --git a/content/images/downGreenArrow.png b/content/images/downGreenArrow.png
new file mode 100755
index 0000000..ea1318f
Binary files /dev/null and b/content/images/downGreenArrow.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/editor-strip.gif
----------------------------------------------------------------------
diff --git a/content/images/editor-strip.gif b/content/images/editor-strip.gif
new file mode 100755
index 0000000..ef2eea3
Binary files /dev/null and b/content/images/editor-strip.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/error.gif
----------------------------------------------------------------------
diff --git a/content/images/error.gif b/content/images/error.gif
new file mode 100755
index 0000000..fc5a96c
Binary files /dev/null and b/content/images/error.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/exclamation.gif
----------------------------------------------------------------------
diff --git a/content/images/exclamation.gif b/content/images/exclamation.gif
new file mode 100755
index 0000000..6fbc3f1
Binary files /dev/null and b/content/images/exclamation.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/favicon.ico
----------------------------------------------------------------------
diff --git a/content/images/favicon.ico b/content/images/favicon.ico
new file mode 100755
index 0000000..005f115
Binary files /dev/null and b/content/images/favicon.ico differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/favicon.png
----------------------------------------------------------------------
diff --git a/content/images/favicon.png b/content/images/favicon.png
new file mode 100755
index 0000000..bb6f654
Binary files /dev/null and b/content/images/favicon.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/filter.gif
----------------------------------------------------------------------
diff --git a/content/images/filter.gif b/content/images/filter.gif
new file mode 100755
index 0000000..7ebec79
Binary files /dev/null and b/content/images/filter.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/information.gif
----------------------------------------------------------------------
diff --git a/content/images/information.gif b/content/images/information.gif
new file mode 100755
index 0000000..0aa4275
Binary files /dev/null and b/content/images/information.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/jspwiki-icons.png
----------------------------------------------------------------------
diff --git a/content/images/jspwiki-icons.png b/content/images/jspwiki-icons.png
new file mode 100755
index 0000000..881e868
Binary files /dev/null and b/content/images/jspwiki-icons.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/jspwiki-strip.gif
----------------------------------------------------------------------
diff --git a/content/images/jspwiki-strip.gif b/content/images/jspwiki-strip.gif
new file mode 100755
index 0000000..b64b718
Binary files /dev/null and b/content/images/jspwiki-strip.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/jspwiki_logo.png
----------------------------------------------------------------------
diff --git a/content/images/jspwiki_logo.png b/content/images/jspwiki_logo.png
new file mode 100755
index 0000000..488daab
Binary files /dev/null and b/content/images/jspwiki_logo.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/jspwiki_logo_s.png
----------------------------------------------------------------------
diff --git a/content/images/jspwiki_logo_s.png b/content/images/jspwiki_logo_s.png
new file mode 100755
index 0000000..df50b59
Binary files /dev/null and b/content/images/jspwiki_logo_s.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/note.png
----------------------------------------------------------------------
diff --git a/content/images/note.png b/content/images/note.png
new file mode 100755
index 0000000..bd20e4a
Binary files /dev/null and b/content/images/note.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/out.png
----------------------------------------------------------------------
diff --git a/content/images/out.png b/content/images/out.png
new file mode 100755
index 0000000..c3ae876
Binary files /dev/null and b/content/images/out.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/personal.png
----------------------------------------------------------------------
diff --git a/content/images/personal.png b/content/images/personal.png
new file mode 100755
index 0000000..f53a0a4
Binary files /dev/null and b/content/images/personal.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/preview.gif
----------------------------------------------------------------------
diff --git a/content/images/preview.gif b/content/images/preview.gif
new file mode 100755
index 0000000..2ceb560
Binary files /dev/null and b/content/images/preview.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/progress.gif
----------------------------------------------------------------------
diff --git a/content/images/progress.gif b/content/images/progress.gif
new file mode 100755
index 0000000..91bc2fe
Binary files /dev/null and b/content/images/progress.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/resize-horizontal.gif
----------------------------------------------------------------------
diff --git a/content/images/resize-horizontal.gif b/content/images/resize-horizontal.gif
new file mode 100755
index 0000000..827c333
Binary files /dev/null and b/content/images/resize-horizontal.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/search.gif
----------------------------------------------------------------------
diff --git a/content/images/search.gif b/content/images/search.gif
new file mode 100755
index 0000000..84222d5
Binary files /dev/null and b/content/images/search.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/slimbox_close.gif
----------------------------------------------------------------------
diff --git a/content/images/slimbox_close.gif b/content/images/slimbox_close.gif
new file mode 100755
index 0000000..b9b48fd
Binary files /dev/null and b/content/images/slimbox_close.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/slimbox_close.png
----------------------------------------------------------------------
diff --git a/content/images/slimbox_close.png b/content/images/slimbox_close.png
new file mode 100755
index 0000000..81a24d8
Binary files /dev/null and b/content/images/slimbox_close.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/slimbox_close_hover.gif
----------------------------------------------------------------------
diff --git a/content/images/slimbox_close_hover.gif b/content/images/slimbox_close_hover.gif
new file mode 100755
index 0000000..8425928
Binary files /dev/null and b/content/images/slimbox_close_hover.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/sortable.gif
----------------------------------------------------------------------
diff --git a/content/images/sortable.gif b/content/images/sortable.gif
new file mode 100755
index 0000000..13b56ed
Binary files /dev/null and b/content/images/sortable.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/sorted_down.gif
----------------------------------------------------------------------
diff --git a/content/images/sorted_down.gif b/content/images/sorted_down.gif
new file mode 100755
index 0000000..6621ce0
Binary files /dev/null and b/content/images/sorted_down.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/sorted_up.gif
----------------------------------------------------------------------
diff --git a/content/images/sorted_up.gif b/content/images/sorted_up.gif
new file mode 100755
index 0000000..a057306
Binary files /dev/null and b/content/images/sorted_up.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/spin.gif
----------------------------------------------------------------------
diff --git a/content/images/spin.gif b/content/images/spin.gif
new file mode 100755
index 0000000..a0e53f8
Binary files /dev/null and b/content/images/spin.gif differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/tip.png
----------------------------------------------------------------------
diff --git a/content/images/tip.png b/content/images/tip.png
new file mode 100755
index 0000000..49d05c4
Binary files /dev/null and b/content/images/tip.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/xml.png
----------------------------------------------------------------------
diff --git a/content/images/xml.png b/content/images/xml.png
new file mode 100755
index 0000000..315c4f4
Binary files /dev/null and b/content/images/xml.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/images/xmlCoffeeCup.png
----------------------------------------------------------------------
diff --git a/content/images/xmlCoffeeCup.png b/content/images/xmlCoffeeCup.png
new file mode 100755
index 0000000..7503bff
Binary files /dev/null and b/content/images/xmlCoffeeCup.png differ

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/index.mdtext
----------------------------------------------------------------------
diff --git a/content/index.mdtext b/content/index.mdtext
new file mode 100755
index 0000000..3bcb498
--- /dev/null
+++ b/content/index.mdtext
@@ -0,0 +1,43 @@
+Title: Apache JSPWiki
+
+## Welcome to Apache JSPWiki
+
+Apache JSPWiki is a leading open source WikiWiki engine, feature-rich 
+and built around standard JEE components (Java, servlets, JSP). 
+
+Some of its features include:
+
+  * WikiMarkup/Structured Text
+  * File attachments 
+  * Templates support
+  * Data storage through your choice of two WikiPage Providers, with the
+capability to create and plug in new ones
+  * Security: fine grained control over authorization and authentication, yet 
+simple to configure
+  * Easy plugin interface
+  * UTF-8 support
+  * JSP-based
+  * Easy-ish installation
+  * Page locking to prevent editing conflicts
+  * Support for Multiple Wikis
+
+## Project status
+
+  * **06-Apr-2016:** new committer and PMC member - Dave Koelmeyer
+
+  * **20-Feb-2016:** Official [Apache JSPWiki 2.10.2 release][] is out!
+
+  * **23-Dec-2014:** new committer and PMC member - David Vittor
+
+  * **21-Aug-2014:** new committer and PMC member - Siegfried Goeschl
+
+  * **29-May-2014:** Official [Apache JSPWiki 2.10.1 release][] is out!
+
+  * **01-Feb-2014:** Official [Apache JSPWiki 2.10.0 release][] is out!
+
+
+[Apache JSPWiki 2.10.0 release]: general/downloads.html
+
+[Apache JSPWiki 2.10.1 release]: general/downloads.html
+
+[Apache JSPWiki 2.10.2 release]: general/downloads.html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/pmc/board_reports.mdtext
----------------------------------------------------------------------
diff --git a/content/pmc/board_reports.mdtext b/content/pmc/board_reports.mdtext
new file mode 100755
index 0000000..f64b71f
--- /dev/null
+++ b/content/pmc/board_reports.mdtext
@@ -0,0 +1,14 @@
+Title: JSPWiki Board reports
+
+  * See <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki-asf-docs.git;a=tree" 
+class="external">https://git-wip-us.apache.org/repos/asf?p=jspwiki-asf-docs.git;a=tree</a>.
+
+  * The Board report can be started from a **template** by using the
+<a href="https://reporter.apache.org/" class="external">
+Apache Committee Report Helper</a>.
+
+  * The Board report can be submitted either through <a 
+href="https://svn.apache.org/repos/private/foundation/board" class="external">
+SVN</a> or through <a href="https://whimsy.apache.org/board/agenda" 
+class="external">Whimsy Board Agenda</a>. In any case, it also must
+be sent to board@apache.org, with private@jspwiki.apache.org cc'ed.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/pmc/how_to_release.mdtext
----------------------------------------------------------------------
diff --git a/content/pmc/how_to_release.mdtext b/content/pmc/how_to_release.mdtext
new file mode 100755
index 0000000..9d8f5ff
--- /dev/null
+++ b/content/pmc/how_to_release.mdtext
@@ -0,0 +1,280 @@
+Title: How to Release
+
+Title: How to Release
+
+## How to Release
+
+[TOC]
+  
+## tl;dr
+
+Once you've done your first release, you'd most probably be more comfortable with 
+the quick guide to get the release out (nevertheless, all steps are explained below):
+
+  1. Prepare the release
+
+        mvn clean install apache-rat:rat -Papache-release               # generates artifacts, checks for AL headers
+        mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true  # review pom.xml, confirm only appropiate sections have been changed
+        mvn deploy -Papache-release                                     # deploy a snapshot
+        mvn release:clean                                               # prepare the release 1/3
+        mvn release:prepare -DautoVersionSubmodules=true                # prepare the release 2/3
+        mvn release:perform                                             # prepare the release 3/3
+
+  2. Close the staging repo
+
+  3. Svn copy binaries and source to https://dist.apache.org/repos/dist/dev/jspwiki/X.Y.Z/
+
+  4. Run the vote and, if successful, continue with the items on the list
+
+  5. Publish Nexus repository
+
+  6. Publish binaries and source to the [mirrors][]
+
+  7. Publish latest javadocs
+
+  8. Wait for 24 hours, then announce the release
+
+  9. Add the next release version to JIRA
+
+## First time release managers
+
+  1. Generate [PGP code signing keys][]
+
+  2. Add the PGP code signing keys to the [KEYS file][] as documented on the 
+[Infrastructure site][]
+
+  3. Put in a [Infrastructure JIRA][] asking to get added to the jspwiki unix 
+group on `people.apache.org`
+
+  4. Copy the modified KEYS file to the release folder 
+`/www/www.apache.org/dist/jspwiki` on `people.apache.org` and ensure it 
+has `0664` permissions.
+
+  5. Add the following `servers` to your Maven `settings.xml` file:
+
+        <servers>
+          <server>
+            <id>apache.releases.https</id>
+            <username>APACHE-ID</username>
+            <password>APACHE-PASSWORD</password>
+          </server>
+          <server>
+            <id>apache.snapshots.https</id>
+            <username>APACHE-ID</username>
+            <password>APACHE-PASSWORD</password>
+          </server>
+          <server>
+            <id>svn.apache.org</id>
+            <username>APACHE-ID</username>
+            <password>APACHE-PASSWORD</password>
+          </server>
+        </servers>
+
+Note that your password doesn't need to be inside the `settings.xml` file, due to 
+[Maven encryption capabilities][]. It is also convenient to [setup the ssh keys][] 
+on `people.apache.org`, otherwise you'll have to enter your login password a number of times.
+
+## Create a release candidate
+
+### Generate release candidate artifacts
+
+  1. **Generate artifacts**
+	
+        mvn clean install apache-rat:rat -Papache-release
+	
+    This will check that all files have AL headers and also build artifacts, sources and sign
+
+	
+  2. **Check `POMs` for release**
+
+        mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true 
+	
+    Perform quick diffs between `pom.xml` files and their sibling `pom.xml.tag` files to see if the 
+license or any other info has been removed (should never happen, but just to stay on the safe side).
+
+### Prepare the release
+
+  1. **Publish a snapshot**
+  
+        mvn deploy -Papache-release
+
+  2. **Prepare the release**
+	
+        mvn release:clean
+        mvn release:prepare -DautoVersionSubmodules=true 
+		  
+  3. **Stage the release for a vote**
+	
+        mvn release:perform
+
+  4. **Close the staging repository**
+
+    1. Login to <https://repository.apache.org> and select Staging Repositories 
+on the left under Build Promotion.
+
+    2. Select org.apache.jspwiki from the list of repositories, then click [Close][]
+using "Apache JSPWiki X.Y.Z" as the description to allow others to see the repository.
+
+  5. **Svn copy binaries and source to https://dist.apache.org/repos/dist/dev/jspwiki/X.Y.Z/**, suggested structure
+
+        binaries
+            portable
+            webapp
+        source
+        wikipages        
+
+## Run a vote
+
+  1. Send the following to <dev@jspwiki.apache.org>:
+
+        Subject: [VOTE] Release JSPWiki version X.Y.Z
+        
+        This is a release vote for Apache JSPWiki, version X.Y.Z. The vote will be open for at least 72 hours from now.
+        
+        It fixes the following issues:
+        https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=<REPLACE>
+        
+        Note that we are voting upon the source (tag), binaries are provided for convenience.
+
+        Everybody is encouraged to vote.
+        
+        Source and binary files:
+        http://people.apache.org/~<REPLACE>/jspwiki-X.Y.Z-candidate-$RC
+
+        Nexus staging repo: https://repository.apache.org/content/repositories/orgapachejspwiki-...
+        
+        The tag to be voted upon:
+        http://svn.apache.org/repos/asf/jspwiki/tags/release-X.Y.Z/
+        
+        JSPWiki's KEYS file containing PGP keys we use to sign the release:
+        http://www.apache.org/dist/jspwiki/KEYS
+
+        *** Please download, test and vote:
+
+        [ ] +1 Approve the release
+        [ ]  0 Don't mind
+        [ ] -1 Disapprove the release (please provide specific comments)
+    
+  Note that the PMC needs to vote upon the release before any release can be made official.
+
+## Roll Out
+
+If the vote passes, roll out the release:
+
+  1. **Publish Nexus repository**
+
+    1. Login to <https://repository.apache.org> and select Staging Repositories 
+on the left under Build Promotion.
+
+    2. Select the repository that was closed earlier, and click Release, using 
+the description "Apache JSPWiki X.Y.Z"
+
+  2. **Publish src and bin distributions to the [mirrors][]**
+
+    1. `svn checkout` <https://dist.apache.org/repos/dist/release/jspwiki>
+
+    2. `svn copy` the release artifacts from `https://dist.apache.org/repos/dist/dev/jspwiki/$VERSION-CANDIDATE` 
+to `https://dist.apache.org/repos/dist/release/jspwiki/$VERSION`
+
+    3. `svn delete` older releases
+
+  3. **Publish javadocs on jspwiki.apache.org**
+
+    1. `svn checkout` <https://svn.apache.org/repos/infra/websites/production/jspwiki/content/apidocs/>
+
+    2. `svn add` javadocs directory/ies, which have been generated as part of the release (check for `*/target/apidocs` folders)
+
+    3. modify the three links on <https://svn.apache.org/repos/infra/websites/production/jspwiki/content/apidocs/index.html> so they point to the new javadocs
+
+  4. **Wait 24 hours for mirrors to sync**
+
+  5. **Post link to the full release notes** along with links to the major JIRA 
+changes **on the front page of the site**
+
+## Announce the release
+
+  1. Send the following from an apache.org address to <announce@apache.org>, 
+<user@jspwiki.apache.org>, <dev@jspwiki.apache.org>:
+
+        Subject: [ANNOUNCE] Apache JSPWiki X.Y.Z released
+        
+        The Apache JSPWiki team is pleased to announce the release of JSPWiki X.Y.Z.
+        
+        This is the <REPLACE> release on the X.Y series of Apache JSPWiki, a feature-rich and 
+        extensible WikiWiki engine built around the standard JEE components.
+        
+        The release is available here:
+        http://www.apache.org/dyn/closer.cgi/jspwiki/
+
+        JSPWiki Maven artifacts are available under org.apache.jspwiki groupId, 
+        version X.Y.Z
+        
+        The full change log is available here:
+        https://issues.apache.org/jira/browse/JSPWIKI/fixforversion/<REPLACE>
+
+        A curated change log is also available here:
+        https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn<REPLACE>
+        
+        We welcome your help and feedback. For more information on how to
+        report problems, and to get involved visit the project website at
+        http://jspwiki.apache.org/
+        
+        The Apache JSPWiki Team
+
+## Add the next release version to JIRA
+
+  1. Add the [next version number to JIRA][]
+
+  2. Mark the released version as "released" with a release date
+
+## Troubleshooting
+
+  1. Cygwin mixes Windows path with cygdrive, so `mvn release:prepare` fails on svn commit
+
+    Current workaround: perform release vía `cmd.exe`
+
+  2. Avoid gpg signing prompt when using Maven release plugin
+
+    See <http://stackoverflow.com/q/14114528>
+
+  3. `mvn release:prepare` doesn't find `svn` credentials
+
+    On your `settings.xml` file you should have one `<server />` entry for each of the following ones:
+
+    * `apache.snapshots.https`: to be able to deploy snapshots
+    * `apache.releases.https`: to be able to deploy releases
+    * `svn.apache.org`: to be able to create tags
+
+    Alternatively, for the last one, you could pass `-Dusername=[username] -Dpassword=[password]` to the `mvn` command 
+(source: <http://stackoverflow.com/q/1255593>)
+  
+  4. Release fails after a `tag` has been generated and the `pom` versions have been incremented
+
+    No need of `mvn release:rollback`, instead check out the `tag` and `release:perform -DconnectionUrl=scm:svn:https://svn.apache.org/COMPLETE-URL-TO-TAG`
+
+## Other links of interest
+
+* [Maven release plugin cheat sheet][loi_1]
+* [Publishing Maven Artifacts - setup your development environment][loi_2]
+* [Maven release plugin][loi_3]
+* Repository management with Nexus: [Chapter 11. Improved Releases with the Nexus Staging Suite][loi_4]
+
+
+[Maven encryption capabilities]: http://maven.apache.org/guides/mini/guide-encryption.html
+[PGP code signing keys]: http://www.apache.org/dev/release-signing.html#generate
+[KEYS file]: http://svn.apache.org/repos/asf/jspwiki/dist/KEYS
+[Infrastructure site]: http://www.apache.org/dev/release-signing.html#keys-policy
+[Infrastructure JIRA]: https://issues.apache.org/jira/browse/INFRA
+[setup the ssh keys]: http://www.thegeekstuff.com/2008/11/3-steps-to-perform-ssh-login-without-password-using-ssh-keygen-ssh-copy-id/
+
+[Close]: https://docs.sonatype.org/display/Repository/Closing+a+Staging+Repository
+
+[archived]: http://archive.apache.org/dist/jspwiki/
+[mirrors]: http://www.apache.org/dev/mirrors.html
+
+[next version number to JIRA]: https://issues.apache.org/jira/plugins/servlet/project-config/JSPWIKI/versions
+
+[loi_1]: https://confluence.sakaiproject.org/display/REL/Maven+release+plugin+cheat+sheet 
+[loi_2]: http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env
+[loi_3]: http://maven.apache.org/maven-release/maven-release-plugin/
+[loi_4]: http://books.sonatype.com/nexus-book/reference/staging-sect-intro.html

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/content/sitemap.html
----------------------------------------------------------------------
diff --git a/content/sitemap.html b/content/sitemap.html
new file mode 100755
index 0000000..b56e7a3
--- /dev/null
+++ b/content/sitemap.html
@@ -0,0 +1,2 @@
+{% include "single_narrative.html" %}
+

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/lib/path.pm
----------------------------------------------------------------------
diff --git a/lib/path.pm b/lib/path.pm
new file mode 100755
index 0000000..e7ec278
--- /dev/null
+++ b/lib/path.pm
@@ -0,0 +1,40 @@
+package path;
+
+# taken from django's url.py
+
+
+our @patterns = (
+	[qr!\.mdtext$!, single_narrative => { template => "single_narrative.html" }],
+
+	[qr!/sitemap\.html$!, sitemap => { headers => { title => "Sitemap" }} ],
+
+) ;
+
+# for specifying interdependencies between files
+
+our %dependencies = (
+    "/sitemap.html" => [ grep s!^content!!, glob "content/*.mdtext" ],
+);
+
+1;
+
+=head1 LICENSE
+
+           Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+
+             http://www.apache.org/licenses/LICENSE-2.0
+
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/lib/view.pm
----------------------------------------------------------------------
diff --git a/lib/view.pm b/lib/view.pm
new file mode 100755
index 0000000..d1400ea
--- /dev/null
+++ b/lib/view.pm
@@ -0,0 +1,139 @@
+package view;
+
+# BUILD CONSTRAINT:  all views must return $content, $extension.
+# additional return values (as seen below) are optional.  However,
+# careful use of symlinks and dependency management in path.pm can
+# resolve most issues with this constraint.
+
+use strict;
+use warnings;
+use Dotiac::DTL qw/Template *TEMPLATE_DIRS/;
+use Dotiac::DTL::Addon::markup;
+use ASF::Util qw/read_text_file/;
+
+push @TEMPLATE_DIRS, "templates";
+
+# This is most widely used view.  It takes a
+# 'template' argument and a 'path' argument.
+# Assuming the path ends in foo.mdtext, any files
+# like foo.page/bar.mdtext will be parsed and
+# passed to the template in the "bar" (hash)
+# variable.
+
+sub single_narrative {
+    my %args = @_;
+    my $file = "content$args{path}";
+    my $template = $args{template};
+    $args{path} =~ s/\.mdtext$/\.html/;
+    $args{breadcrumbs} = breadcrumbs($args{path});
+
+    read_text_file $file, \%args;
+
+    my $page_path = $file;
+    $page_path =~ s/\.[^.]+$/.page/;
+    if (-d $page_path) {
+        for my $f (grep -f, glob "$page_path/*.mdtext") {
+            $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n";
+            $args{$1} = {};
+            read_text_file $f, $args{$1};
+        }
+    }
+
+    return Template($template)->render(\%args), html => \%args;
+}
+
+# Has the same behavior as the above for foo.page/bar.txt
+# files, parsing them into a bar variable for the template.
+# Otherwise presumes the template is the path.
+
+sub news_page {
+    my %args = @_;
+    my $template = "content$args{path}";
+    $args{breadcrumbs} = breadcrumbs($args{path});
+
+    my $page_path = $template;
+    $page_path =~ s/\.[^.]+$/.page/;
+    if (-d $page_path) {
+        for my $f (grep -f, glob "$page_path/*.mdtext") {
+            $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n";
+            $args{$1} = {};
+            read_text_file $f, $args{$1};
+        }
+    }
+
+    return Template($template)->render(\%args), html => \%args;
+}
+
+sub sitemap {
+    my %args = @_;
+    my $template = "content$args{path}";
+    $args{breadcrumbs} .= breadcrumbs($args{path});
+    my $dir = $template;
+    $dir =~ s!/[^/]+$!!;
+    my %data;
+    for (map "content$_", @{$path::dependencies{$args{path}}}) {
+        if (-f and /\.mdtext$/) {
+            my $file = $_;
+            $file =~ s/^content//;
+            no warnings 'once';
+            for my $p (@path::patterns) {
+                my ($re, $method, $args) = @$p;
+                next unless $file =~ $re;
+                my $s = view->can($method) or die "Can't locate method: $method\n";
+                my ($content, $ext, $vars) = $s->(path => $file, %$args);
+                $file =~ s/\.mdtext$/.$ext/;
+                $data{$file} = $vars;
+                last;
+            }
+        }
+    }
+
+    my $content = "";
+
+    for (sort keys %data) {
+        $content .= "- [$data{$_}->{headers}->{title}]($_)\n";
+        for my $hdr (grep /^#/, split "\n", $data{$_}->{content}) {
+            $hdr =~ /^(#+)\s+([^#]+)?\s+\1\s+\{#([^}]+)\}$/ or next;
+            my $level = length $1;
+            $level *= 4;
+            $content .= " " x $level;
+            $content .= "- [$2]($_#$3)\n";
+        }
+    }
+    $args{content} = $content;
+    return Template($template)->render(\%args), html => \%args;
+}
+
+sub breadcrumbs {
+    my @path = split m!/!, shift;
+    pop @path;
+    my @rv;
+    my $relpath = "";
+    for (@path) {
+        $relpath .= "$_/";
+        $_ ||= "JSPWiki";
+        push @rv, qq(<a href="$relpath">\u$_</a>);
+    }
+    return join "&nbsp;&raquo&nbsp;", @rv;
+}
+
+1;
+
+=head1 LICENSE
+
+           Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+
+             http://www.apache.org/licenses/LICENSE-2.0
+
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/templates/release.mdtext
----------------------------------------------------------------------
diff --git a/templates/release.mdtext b/templates/release.mdtext
new file mode 100755
index 0000000..6b93d6e
--- /dev/null
+++ b/templates/release.mdtext
@@ -0,0 +1 @@
+JSPWiki v2.10.2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/afc8021c/templates/sidenav.mdtext
----------------------------------------------------------------------
diff --git a/templates/sidenav.mdtext b/templates/sidenav.mdtext
new file mode 100755
index 0000000..65b0c82
--- /dev/null
+++ b/templates/sidenav.mdtext
@@ -0,0 +1,43 @@
+**General**
+
+  * [Home](/index.html)
+  * [Downloads](/general/downloads.html)
+  * [News](/general/news.html)
+  * <a href="http://www.apache.org/licenses/" class="external">License</a>
+
+**Documentation**
+
+  * <a href="https://jspwiki-wiki.apache.org" class="external">Wiki</a>
+  * <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Started" class="external">Getting started</a>
+
+**Community**
+
+  * <a href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Involved" class="external">Getting Involved</a>
+  * [Mailing Lists](/community/mailing_lists.html)
+  * [Social Media](/community/social_media.html)
+  * <a href="https://issues.apache.org/jira/browse/JSPWIKI#selectedTab=com.atlassian.jira.plugin.system.project%3Aissues-panel" class="external">Issue Tracker</a>
+  * <a href="http://www.ecyrd.com/JSPWiki/" class="external">Legacy Site</a>
+  * [People](/community/people.html)
+
+**Development**
+
+  * <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=summary" class="external">Browse Sources</a>
+  * [JavaDoc](/apidocs/index.html)
+  * [Get and Build Source](/development/source_and_guide.html)
+  * <a href="https://builds.apache.org/job/JSPWiki/" class="external">Jenkins CI</a>
+  * <a href="https://builds.apache.org/analysis/overview?id=org.apache.jspwiki%3Ajspwiki-builder" class="external">Sonar Analysis</a>
+  * [Edit Website](/development/edit_website.html)
+  * <a href="https://git-wip-us.apache.org/repos/asf?p=jspwiki.git;a=blob;f=ChangeLog" class="external">Change Log</a>
+
+**PMC**
+
+  * [How to Release](/pmc/how_to_release.html)
+  * [Board Reports](/pmc/board_reports.html)
+
+**ASF**
+
+  * <a href="http://www.apache.org" class="external">Website</a>
+  * <a href="http://www.apache.org/foundation/contributing.html" class="external">Donations</a>
+  * <a href="http://www.apache.org/foundation/sponsorship.html" class="external">Sponsorship</a>
+  * <a href="http://www.apache.org/foundation/thanks.html" class="external">Thanks</a>
+


Mime
View raw message