You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/07/03 20:07:24 UTC
svn commit: r1499500 [2/3] - in /incubator/jspwiki/trunk: ./ jspwiki-site/
jspwiki-site/src/ jspwiki-site/src/site/ jspwiki-site/src/site/trunk/
jspwiki-site/src/site/trunk/cgi-bin/ jspwiki-site/src/site/trunk/content/
jspwiki-site/src/site/trunk/conte...
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/source_and_guide.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/source_and_guide.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/source_and_guide.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/source_and_guide.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,45 @@
+Title: Getting and Building JSPWiki Source code
+
+## Getting JSPWiki Source Code
+
+JSPWiki source code (<a class="external" href="http://svn.apache.org/viewvc/incubator/jspwiki/">
+browse</a>) is maintained using Apache Subversion.
+
+Checkout the code using:
+
+ svn co http://svn.apache.org/repos/asf/incubator/jspwiki/trunk jspwiki
+
+There is also a European mirror, so you can alternatively use:
+
+ svn co http://svn.eu.apache.org/repos/asf/incubator/jspwiki/trunk jspwiki
+
+Change http to https if you are a developer intending to make commits
+
+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="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/mvn_cheat-sheet.txt?view=co">cheat sheet</a> of common Maven tasks for this project.
+
+Production distributions (see [Release Page][]) still use the Apache Ant "ant dist" target, after the build is done using Maven.
+
+### Coding standards:
+
+ * Use the <a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml?view=co&content-type=text%2Fplain">Eclipse</a>
+and <a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml?view=co&revision=1486481&content-type=text%2Fplain">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.
+ * 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.
+
+
+[Edit Website]: edit_website.html
+[Release Page]: ../ppmc/how_to_release.html
+
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/translations.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/translations.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/translations.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/translations.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,156 @@
+Title: Translation status
+
+## I18n current status
+
+### **de locale**
+ * /src/main/resources/CoreResources_de.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_de.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_de.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **es locale**
+ * /src/main/resources/CoreResources_es.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_es.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_es.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **fi locale**
+ * /src/main/resources/CoreResources_fi.properties
+ * Missing: 3
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_fi.properties
+ * Missing: 2
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_fi.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **fr locale**
+ * /src/main/resources/CoreResources_fr.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_fr.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_fr.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **it locale**
+ * /src/main/resources/CoreResources_it.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_it.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_it.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **nl locale**
+ * /src/main/resources/CoreResources_nl.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_nl.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_nl.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **pt_BR locale**
+ * /src/main/resources/CoreResources_pt_BR.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_pt_BR.properties
+ * Missing: 161
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_pt_BR.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **ru locale**
+ * /src/main/resources/CoreResources_ru.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_ru.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_ru.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+
+### **zh_CN locale**
+ * /src/main/resources/CoreResources_zh_CN.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/templates/default_zh_CN.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
+ * /src/main/resources/plugin/PluginResources_zh_CN.properties
+ * Missing: 0
+ * Outdated: 0
+ * Duplicated: 0
+
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/downloads.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/downloads.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/downloads.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/downloads.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,30 @@
+Title: Downloads
+
+15-May-2013: The current release is version 2.9.1-incubating.
+
+This release fixes the following issues:
+<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=12319521</a>
+
+Current source and binary distributions are available through the
+<a class="external" href="http://www.apache.org/dyn/closer.cgi/incubator/jspwiki/2.9.1-incubating/">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 signature files from the main Apache site at
+<a class="external" href="http://www.apache.org/dist/incubator/jspwiki/2.9.1-incubating/">http://www.apache.org/dist/incubator/jspwiki/2.9.1-incubating/</a>
+Find here the KEYS file, which contains all OpenPGP keys we use to sign releases:
+<a class="external" href="http://www.apache.org/dist/incubator/jspwiki/KEYS">http://www.apache.org/dist/incubator/jspwiki/KEYS</a>
+
+
+Previous source and binary distributions are available through the
+<a class="external" href="http://archive.apache.org/dist/incubator/jspwiki/">
+Apache archives</a>.
+
+<!--
+ Source, javadoc, and build artifacts are also available via the
+ <a class="external" href="https://repository.apache.org/index.html#nexus-search;gav~org.apache.jspwiki~~~~">
+ Nexus</a> repository with the groupId: org.apache.jspwiki and artifactId: jspwiki.
+-->
+
+If you want to build directly from the sources, please check the [Get and Build Source][] page.
+
+[Get and Build Source]: ../development/source_and_guide.html
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/news.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/news.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/news.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/general/news.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,34 @@
+Title: News
+
+## Project News
+
+ * **15-May-2013:** Official [Apache JSPWiki 2.9.1-incubating release][] is out!
+
+ * **04-Jan-2013:** new commiter 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
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/SilkIconSet-readme.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/SilkIconSet-readme.txt?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/SilkIconSet-readme.txt (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/SilkIconSet-readme.txt Wed Jul 3 18:07:22 2013
@@ -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
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/apache_incubator_logo.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/apache_incubator_logo.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/apache_incubator_logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrdown.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrdown.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrdown.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrdownsmall.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrdownsmall.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrdownsmall.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrup.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrup.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/arrup.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attach-strip.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attach-strip.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attach-strip.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_big.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_big.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_big.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_small.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_small.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_small.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_small.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_small.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/attachment_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/book_open.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/book_open.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/book_open.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/downGreenArrow.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/downGreenArrow.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/downGreenArrow.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/editor-strip.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/editor-strip.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/editor-strip.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/error.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/error.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/error.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/exclamation.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/exclamation.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/exclamation.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/favicon.ico
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/favicon.ico?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/favicon.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/favicon.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/favicon.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/filter.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/filter.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/filter.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/information.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/information.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/information.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki-icons.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki-icons.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki-icons.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki-strip.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki-strip.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki-strip.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki_logo.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki_logo.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki_logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki_logo_s.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki_logo_s.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/jspwiki_logo_s.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/note.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/note.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/note.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/out.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/out.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/out.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/personal.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/personal.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/personal.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/preview.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/preview.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/preview.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/progress.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/progress.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/progress.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/resize-horizontal.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/resize-horizontal.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/resize-horizontal.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/search.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/search.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/search.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close_hover.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close_hover.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/slimbox_close_hover.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sortable.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sortable.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sortable.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sorted_down.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sorted_down.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sorted_down.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sorted_up.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sorted_up.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/sorted_up.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/spin.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/spin.gif?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/spin.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/tip.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/tip.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/tip.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/xml.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/xml.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/xml.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/xmlCoffeeCup.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/xmlCoffeeCup.png?rev=1499500&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/xmlCoffeeCup.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/index.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/index.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/index.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,53 @@
+Title: Apache JSPWiki (Incubating)
+
+## Welcome to Apache JSPWiki
+
+Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
+and built around standard J2EE components (Java, servlets, JSP).
+
+Some of its features include:
+
+ * WikiMarkup/Structured Text
+ * File attachments
+ * Templates support
+ * Data storage through your choice of three 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
+
+ * **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.
+
+## Disclaimer
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+While incubation status is not necessarily a reflection of the completeness or
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+[JIRA]: https://issues.apache.org/jira/browse/JSPWIKI
+[Apache JSPWiki 2.9.1-incubating release]: general/downloads.html
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,257 @@
+Title: How to Release
+
+## How to Release
+
+[TOC]
+
+<div style="clear:both;">
+(most of the content grabbed/adapted from MRUnit site)
+</div>
+
+
+## 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 incubator unix
+group on people.apache.org <!--and the jspwiki deployer role for Nexus-->
+ 4. Copy the modified KEYS file to the release folder
+/www/www.apache.org/dist/incubator/jspwiki on people.apache.org and ensure it
+has 0664 permissions.
+
+<!---
+ 5. Add the following to your Maven settings.xml file:
+
+ <servers>
+ <server>
+ <id>apache.releases.https</id>
+ <username>APACHE-ID</username>
+ <password>APACHE-PASSWORD</password>
+ </server>
+ </servers>
+-->
+It is 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
+
+ 1. Generate release notes
+
+
+<!-- TODO
+ What exactly do we want to do here?
+ Completing the details makes only sense once we're a TLP and thus not dependent from externs anymore.
+ At the moment, we can only "release" in JIRA after being sure the IPMC release vote succeeded, but at that time, the artifacts have already been created.
+
+
+ 1. Update ReleaseNotes with [new release notes from JIRA][], select the
+version and set the style to Text
+ 2. Commit the updated ReleaseNotes with message: "Preparing for release
+X.Y.Z-incubating"
+-->
+
+<!---
+ 2. Create a branch (only required for the first release in a series (X.Y.0))
+
+ 1. Create a branch for the X.Y release series
+
+ svn copy https://svn.apache.org/repos/asf/incubator/jspwiki/trunk \
+ https://svn.apache.org/repos/asf/incubator/jspwiki/branches/jspwiki-X.Y -m "Branching for X.Y releases"
+
+ 2. Bump the version number in trunk and commit (the update-versions script
+mangles the whitespace in the root XML element):
+
+ sed -i "" -e "s/X.Y.0-incubating-SNAPSHOT/X.Y+1.0-incubating-SNAPSHOT/" pom.xml
+
+ 3. Checkout the release branch:
+
+ svn checkout https://svn.apache.org/repos/asf/incubator/jspwiki/branches/jspwiki-X.Y
+
+ 3. Remove -SNAPSHOT from the release branch and commit
+
+ sed -i "" -e "s/X.Y.Z-incubating-SNAPSHOT/X.Y.Z-incubating/" pom.xml
+
+ 4. Deploy to Nexus Staging Repository
+
+ 1. Deploy artifact:
+
+ mvn clean deploy -Psign
+
+ 2. Verify licenses in target/rat.txt
+
+ 3. Login to <https://repository.apache.org> and select Staging Repositories
+on the left under Build Promotion.
+ 4. Select org.apache.jspwiki from the list of repositories, select the
+current repository and delete any asc.md5/asc.sha1 files. Then click Close
+using "Apache JSPWiki X.Y.Z-incubating" as the description to allow others
+to see the repository.
+-->
+ 2. Deploy source and binary distributions
+
+ 1. Build JSPWiki using Maven:
+
+ mvn clean install -Pintegration-tests
+
+ 2. Generate the src & bin distributions using Ant:
+
+ ant clean signeddist
+
+ 3. Copy the src distribution file and checksums to people.apache.org,
+excluding the asc.md5/asc.sha1 files:
+
+ scp target/*.tar.gz* username@people.apache.org:~/public_html/jspwiki-X.Y.Z-incubating-candidate-$RC
+
+<!---
+ 3. Generate the bin distribution:
+
+ mvn clean assembly:single gpg:sign checksum:artifacts -Pdist-bin
+
+ 4. Copy the bin distribution file and checksums to people.apache.org,
+excluding the asc.md5/asc.sha1 files:
+
+ rm target/*asc.*
+ scp target/*.tar.gz* username@people.apache.org:~/public_html/jspwiki-X.Y.Z-incubating-candidate-$RC
+-->
+ 3. Tag the release candidate:
+
+ svn copy https://svn.apache.org/repos/asf/incubator/jspwiki/branches/jspwiki-X.Y/ \
+ https://svn.apache.org/repos/asf/incubator/jspwiki/tags/release-X.Y.Z-incubating/ -m "jspwiki X.Y.Z-incubating release."
+
+## Run a vote
+
+Send the following to jspwiki-dev@incubator.apache.org and
+general@incubator.apache.org:
+
+<!---
+ Subject: [VOTE] Release JSPWiki version X.Y.Z-incubating
+
+ This is an incubator release for Apache JSPWiki, version X.Y.Z-incubating.
+
+ It fixes the following issues:
+ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=<REPLACE>
+
+ *** Please download, test and vote by [3 working days after sending].
+
+ Note that we are voting upon the source (tag), binaries are provided for convenience.
+
+ Source and binary files:
+ http://people.apache.org/~<REPLACE>/jspwiki-X.Y.Z-incubating-candidate-$RC
+
+ Maven staging repo:
+ https://repository.apache.org/content/repositories/orgapachejspwiki-<REPLACE>/
+
+ The tag to be voted upon:
+ http://svn.apache.org/repos/asf/incubator/jspwiki/tags/release-X.Y.Z-incubating/
+
+ JSPWiki's KEYS file containing PGP keys we use to sign the release:
+ http://www.apache.org/dist/incubator/jspwiki/KEYS
+-->
+
+ Subject: [VOTE] Release JSPWiki version X.Y.Z-incubating
+
+ This is an incubator release for Apache JSPWiki, version X.Y.Z-incubating.
+
+ It fixes the following issues:
+ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=<REPLACE>
+
+ *** Please download, test and vote by [3 working days after sending].
+
+ Note that we are voting upon the source (tag), binaries are provided for convenience.
+
+ Source and binary files:
+ http://people.apache.org/~<REPLACE>/jspwiki-X.Y.Z-incubating-candidate-$RC
+
+ The tag to be voted upon:
+ http://svn.apache.org/repos/asf/incubator/jspwiki/tags/release-X.Y.Z-incubating/
+
+ JSPWiki's KEYS file containing PGP keys we use to sign the release:
+ http://www.apache.org/dist/incubator/jspwiki/KEYS
+
+Note that the Incubator PMC needs to vote upon the release after a successful
+PPMC vote 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-incubating artifacts"
+-->
+ 1. Publish src and bin distributions to the [mirrors][]:
+
+ ssh people.apache.org
+ VERSION=X.Y.Z
+ PREVIOUS_VERSION=X.Y.Z
+ CANDIDATE=C
+ cp -r ~/public_html/jspwiki-$VERSION-incubating-candidate-$CANDIDATE \
+ /www/www.apache.org/dist/incubator/jspwiki/jspwiki-$VERSION-incubating
+ cd /www/www.apache.org/dist/incubator/jspwiki
+ chgrp -R incubator jspwiki-$VERSION-incubating
+ chmod -R g+w jspwiki-$VERSION-incubating
+ rm -r /www/www.apache.org/dist/incubator/jspwiki/jspwiki-$PREVIOUS_VERSION-incubating # remove older versions
+
+ The last line is to remove the previous version, since only the most recent
+version on a particular branch should be in the dist directory. Older versions
+are [archived][] automatically.
+
+ 2. Wait 24 hours for mirrors to sync
+ 3. Post the javadoc to the site:
+
+ 1. Create the javadoc:
+
+ mvn javadoc:javadoc
+
+ 2. Copy javadocs to https://svn.apache.org/repos/infra/websites/production/jspwiki/documentation/javadocs/X.Y.Z-incubating
+ 3. Add a link to index.html of the javadoc in the documentation/javadoc.mdtext page
+
+ 4. 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
+
+Send the following from an apache.org address to announce@apache.org,
+jspwiki-user@incubator.apache.org, jspwiki-dev@incubator.apache.org:
+
+ Subject: [ANNOUNCE] Apache JSPWiki X.Y.Z-incubating released
+
+ The Apache JSPWiki team is pleased to announce the release of JSPWiki
+ X.Y.Z-incubating from the Apache Incubator.
+
+ This is the <REPLACE> release of Apache JSPWiki, a feature-rich and
+ extensible WikiWiki engine built around the standard J2EE components.
+
+ The release is available here:
+ http://www.apache.org/dyn/closer.cgi/incubator/jspwiki/
+
+ The full change log is available here:
+ https://issues.apache.org/jira/browse/jspwiki/fixforversion/<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://incubator.apache.org/jspwiki/
+
+ The Apache JSPWiki Team
+
+## Add the next release to JIRA
+
+ 1. Add the [next version number to JIRA][]
+ 2. Mark the released version as "released" with a release date
+
+
+[PGP code signing keys]: http://www.apache.org/dev/release-signing.html#generate
+[KEYS file]: http://svn.apache.org/repos/asf/incubator/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/
+
+[new release notes from JIRA]: https://issues.apache.org/jira/secure/ConfigureReleaseNote.jspa?projectId=12310732
+
+[archived]: http://archive.apache.org/dist/incubator/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
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,4 @@
+Title: Incubator reports
+
+ * See <a href="http://svn.apache.org/repos/asf/incubator/jspwiki/board/"
+class="external">http://svn.apache.org/repos/asf/incubator/jspwiki/board/</a>.
\ No newline at end of file
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/sitemap.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/sitemap.html?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/sitemap.html (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/sitemap.html Wed Jul 3 18:07:22 2013
@@ -0,0 +1,2 @@
+{% include "single_narrative.html" %}
+
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/path.pm?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/path.pm (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/path.pm Wed Jul 3 18:07:22 2013
@@ -0,0 +1,39 @@
+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.
+
+
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/view.pm?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/view.pm (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/lib/view.pm Wed Jul 3 18:07:22 2013
@@ -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 .= "$_/";
+ $_ ||= "Incubator";
+ push @rv, qq(<a href="$relpath">\u$_</a>);
+ }
+ return join " » ", @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.
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1 @@
+JSPWiki v2.10.0-svn-15
\ No newline at end of file
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext Wed Jul 3 18:07:22 2013
@@ -0,0 +1,42 @@
+**General**
+
+ * [Home](/jspwiki/index.html)
+ * [Downloads](/jspwiki/general/downloads.html)
+ * [News](/jspwiki/general/news.html)
+ * <a href="http://www.apache.org/licenses/" class="external">License</a>
+
+**Documentation**
+
+ * <a href="http://doc.jspwiki.org" class="external">Doc Wiki</a>
+ * <a href="http://people.apache.org/~metskem/JSPWiki/javadoc/" class="external">JavaDoc</a>
+
+**Community**
+
+ * [Get Involved](/jspwiki/community/get_involved.html)
+ * [Mailing Lists](/jspwiki/community/mailing_lists.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>
+ * <a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a>
+ * [People](/jspwiki/community/people.html)
+
+**Development**
+
+ * <a href="http://svn.apache.org/viewvc/incubator/jspwiki/" class="external">Browse Source</a>
+ * [Get and Build Source](/jspwiki/development/source_and_guide.html)
+ * <a href="https://builds.apache.org/job/JSPWiki/" class="external">Jenkins CI</a>
+ * <a href="https://analysis.apache.org/dashboard/index/139724" class="external">Sonar Analysis</a>
+ * [Edit Website](/jspwiki/development/edit_website.html)
+ * <a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co" class="external">Change Log</a>
+
+**PPMC**
+
+ * <a href="http://incubator.apache.org/projects/jspwiki.html" class="external">Incubation Status</a>
+ * [How to Release](/jspwiki/ppmc/how_to_release.html)
+ * [Incubator Reports](/jspwiki/ppmc/incubator_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>
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/single_narrative.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/single_narrative.html?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/single_narrative.html (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/single_narrative.html Wed Jul 3 18:07:22 2013
@@ -0,0 +1 @@
+{% extends "skeleton.html" %}
Added: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html Wed Jul 3 18:07:22 2013
@@ -0,0 +1,118 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://www.jspwiki.org"><head>
+ <title>{% block title %}{{ headers.title }}{% endblock %}</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <link rel="stylesheet" type="text/css" media="screen, projection, print" href="/jspwiki/css/jspwiki.css">
+ <link rel="stylesheet" type="text/css" media="print" href="/jspwiki/css/jspwiki_print.css">
+ <link rel="alternate stylesheet" type="text/css" href="/jspwiki/css/jspwiki_print.css" title="Print friendly">
+ <link rel="alternate stylesheet" type="text/css" href="/jspwiki/css/jspwiki.css" title="Standard">
+ <link rel="shortcut icon" type="image/x-icon" href="/jspwiki/images/favicon.ico">
+ <link rel="icon" type="image/x-icon" href="/jspwiki/images/favicon.ico">
+</head>
+<body class="view">
+<div id="wikibody" class="fav-left">
+ <div id="header">
+ <!-- <div class="titlebox"></div> -->
+ <div class="applicationlogo">
+ <a href="">Main</a>
+ </div>
+
+ <div class="companylogo"></div>
+
+ <div class="userbox">
+ <a href="http://incubator.apache.org" alt="Apache Incubator">
+ <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" id="asf-logo" style="width: 180px; height: 45px;">
+ </a>
+ <div class="clearbox"></div>
+ </div>
+
+ {% block title %}{% if headers.title %}
+ <div class="pagename">
+ {{ headers.title }}
+ </div>
+ {% endif %}{% endblock %}
+
+ <div class="breadcrumbs">{{ breadcrumbs|safe }}</div>
+ </div>
+
+ <div id="content">
+ <div id="page">
+ <div id="actionsTop" class="pageactions">
+ <ul>
+ <li>
+ <a href="http://www.apache.org/foundation/" class="action edit" accesskey="f" title="The Foundation [f]">
+ <span class="accesskey">F</span>oundation
+ </a>
+ </li>
+ <li>
+ <a href="http://projects.apache.org" class="action edit" accesskey="p" title="The Projects [p]">
+ <span class="accesskey">P</span>rojects
+ </a>
+ </li>
+ <li>
+ <a href="http://people.apache.org" class="action edit" accesskey="e" title="The People [e]">
+ P<span class="accesskey">e</span>ople
+ </a>
+ </li>
+ <li>
+ <a href="http://www.apache.org/foundation/getinvolved.html" class="action edit" accesskey="i" title="Get Involved [i]">
+ Get <span class="accesskey">I</span>nvolved
+ </a>
+ </li>
+ <li>
+ <a title="Download [ d ]" class="action edit" accesskey="d" href="http://www.apache.org/dyn/closer.cgi">
+ <span class="accesskey">D</span>ownload
+ </a>
+ </li>
+ <li href="#" id="morebutton">
+ <a href="http://www.apache.org/foundation/sponsorship.html" accesskey="s" class="action edit" title="Support Apache [ s ]">
+ <span class="accesskey">S</span>upport Apache
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="tabmenu">
+ <a class="activetab" id="menu-pagecontent" accesskey="J" href="/jspwiki/index.html">
+ <span class="accesskey">J</span>SPWiki
+ </a>
+ <!-- <a id="menu-attach" accesskey="a"><span class="accesskey">A</span>ttach</a>
+ <a id="menu-info" href="http://www.jspwiki.org/PageInfo.jsp?page=Main" accesskey="i"><span class="accesskey">I</span>nfo</a> -->
+ </div>
+
+ <div class="tabs">
+ <div id="pagecontent">
+ {% block content %}{{ content|markdown }}{% endblock %}
+ </div>
+ <div style="clear:both;"></div>
+ </div>
+ <div id="actionsBottom" class="pageactions">
+ <a href="#top" class="action quick2top" title="Ir al principio">«</a>
+ </div>
+
+ </div>
+
+ <div id="favorites">
+ <div class="leftmenu">
+ {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
+ </div>
+ <div class="leftmenufooter">
+ <br /><hr>
+ </div>
+ <div class="wikiversion">
+ {% filter markdown %}{% include "release.mdtext" %}{% endfilter %}
+ </div>
+ </div>
+
+ <div class="clearbox"></div>
+ </div>
+
+ <div id="footer">
+ <div class="copyright">
+ Copyright © 2012 The Apache Software Foundation, Licensed under
+ the <a href="http://www.apache.org/licenses/LICENSE-2.0" class="external">Apache License, Version 2.0</a>.
+ <br />Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+</div>
+</body></html>
\ No newline at end of file
Added: incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/SiteGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/SiteGeneratorTest.java?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/SiteGeneratorTest.java (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/SiteGeneratorTest.java Wed Jul 3 18:07:22 2013
@@ -0,0 +1,302 @@
+/*
+ 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.
+ */
+package org.apache.wiki.site;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.log4j.Logger;
+import org.apache.wiki.Release;
+
+
+/**
+ * Generates the following site's pages:
+ *
+ * <ul>
+ * <li><code>release.mdtext</code>: used at the end of the sidebar; displays JSPWiki version</li>
+ * <li><code>changelog.mdtext</code>: prettifies the Changelog file and turns it into Markdown syntax</li>
+ * <li><code>translations.mdtext</code>: shows the % completed of the different translations' status</li>
+ * </ul>
+ *
+ * This test file assumes you've checked out both app and site trunk following this structure:
+ * <pre>
+ * ./ [http://svn.apache.org/repos/asf/incubator/jspwiki]
+ * ./trunk [http://svn.apache.org/repos/asf/incubator/jspwiki/trunk]
+ * ./site/trunk [http://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk]
+ * </pre>
+ *
+ * Once you've run this test you should be able to commit the site's changes. Hopefully,
+ * the CI job will publish the site later on (only if the build is successful, that is)
+ */
+public class SiteGeneratorTest extends TestCase
+{
+
+ private static final Logger LOG = Logger.getLogger( SiteGeneratorTest.class );
+
+ private static final String BASE_FILE_NAME = "./src/site/trunk/";
+
+ private static final String I18N_BASE = "/src/main/resources/";
+ private static final String I18N_CORE = I18N_BASE + "CoreResources.properties";
+ private static final String I18N_TEMPLATE = I18N_BASE + "templates/default.properties";
+ private static final String I18N_PLUGIN = I18N_BASE + "plugin/PluginResources.properties";
+
+ private static final Pattern p = Pattern.compile("JSPWIKI\\-([0-9]+)");
+
+ /**
+ * Generates site's pages from source content.
+ */
+ public void testGenerateSiteFiles()
+ {
+ generateReleaseFile();
+ generateI18nStatusFile();
+ generateChangelogFile();
+ }
+
+ /**
+ * generates <code>release.mdtext</code>; used at the end of the sidebar, displays JSPWiki version.
+ */
+ void generateReleaseFile()
+ {
+ String file = BASE_FILE_NAME + "templates/release.mdtext";
+ String content = "JSPWiki v" + Release.VERSTR;
+ write( file, content );
+ }
+
+ /**
+ * generates <code>translations.mdtext</code>; shows the % completed of the different translations' status.
+ */
+ void generateI18nStatusFile()
+ {
+ String file = BASE_FILE_NAME + "content/jspwiki/development/translations.mdtext";
+ StringBuilder sb = new StringBuilder( "Title: Translation status\n\n" );
+ sb.append( "## I18n current status\n" );
+
+ String[] locales = new String[] { "de", "es", "fi", "fr", "it", "nl", "pt_BR", "ru", "zh_CN" };
+ for( String locale : locales )
+ {
+ generateI18nStatusForGivenLocale( sb, locale );
+ }
+ write( file, sb.toString() );
+ }
+
+ /**
+ * generates the translation status related to a given locale.
+ *
+ * @param sb current content.
+ * @param i18n given locale.
+ */
+ void generateI18nStatusForGivenLocale( StringBuilder sb, String i18n )
+ {
+ sb.append( "\n### **" ).append( i18n ).append( " locale**\n" );
+ try
+ {
+ generateI18nStatusFromFile( sb, i18n, I18N_CORE );
+ generateI18nStatusFromFile( sb, i18n, I18N_TEMPLATE );
+ generateI18nStatusFromFile( sb, i18n, I18N_PLUGIN );
+ }
+ catch (IOException e)
+ {
+ LOG.error( e.getMessage(), e );
+ }
+ }
+
+ /**
+ * generates the translation status related to one of the i18n files, for a given locale.
+ *
+ * @param sb current content
+ * @param i18n given locale
+ * @param file i18n file to examine
+ */
+ void generateI18nStatusFromFile( StringBuilder sb, String i18n, String file ) throws IOException
+ {
+ String i18nFile = StringUtils.replace( file, ".properties", "_" + i18n + ".properties" );
+ Map< String, Integer > diff = TranslationsCheck.diff( file, i18nFile );
+ int dup = TranslationsCheck.detectDuplicates( i18nFile );
+ sb.append( " * " ).append( i18nFile ).append( "\n" )
+ .append( " * Missing: " ).append( diff.get( "missing" ) ).append( "\n" )
+ .append( " * Outdated: " ).append( diff.get( "outdated" ) ).append( "\n" )
+ .append( " * Duplicated: " ).append( dup ).append( "\n\n" );
+ TranslationsCheck.clearDuplicates();
+ }
+
+ /**
+ * generates <code>changelog.mdtext</code>; prettifies the ChangeLog file and turns it into Markdown syntax.
+ */
+ void generateChangelogFile()
+ {
+ String file = BASE_FILE_NAME + "content/jspwiki/development/changelog.mdtext";
+ StringBuilder sb = new StringBuilder( "Title: Changelog\n\n" );
+ List< String > links = new ArrayList< String >();
+ try
+ {
+ @SuppressWarnings( { "unchecked", "cast" } )
+ List< String > lines = ( List< String > )FileUtils.readLines( new File( "../ChangeLog" ) );
+ for( String line : lines )
+ {
+ parseChangeLogLine( line, sb, links );
+ }
+ }
+ catch( IOException e )
+ {
+ LOG.error( e.getMessage(), e );
+ }
+
+ append( links, sb );
+ write( file, sb.toString() );
+ }
+
+ /**
+ * generates the content for a given line. If the line begins with a date it's assumed to be a
+ * header, if it's not, then is a regular line.
+ *
+ * @param line given line.
+ * @param sb current content.
+ * @param links collection of links, to be able to print JIRA links later on.
+ */
+ void parseChangeLogLine( String line, StringBuilder sb, List< String > links )
+ {
+ if( lineBeginsWithDate( line ) )
+ {
+ sb.append( "#### " ).append( line ).append( "\n" );
+ }
+ else
+ {
+ parseRegularLine( line, sb, links );
+ }
+ }
+
+ /**
+ * generates the content for a <em>regular</em> line. Initial blank space from ChangeLog is
+ * removed and JIRA id's are replaced by regular Markdown links and stored on the collection
+ * of links.
+ *
+ * @param line given line.
+ * @param sb current content.
+ * @param links collection of links, to be able to print JIRA links later on.
+ */
+ void parseRegularLine( String line, StringBuilder sb, List< String > links )
+ {
+ line = StringUtils.replace( line, " ", StringUtils.EMPTY );
+ Matcher m = p.matcher( line );
+ while( m.find() )
+ {
+ String replace = StringUtils.replace( m.group( 0 ), "JSPWIKI-", "[JSPWIKI " );
+ replace += "][JIRA-" + StringUtils.replace( m.group( 0 ), "JSPWIKI-", StringUtils.EMPTY ) + "]";
+ links.add( "JIRA-" + StringUtils.replace( m.group( 0 ), "JSPWIKI-", StringUtils.EMPTY ) );
+ line = m.replaceFirst( replace );
+ m = p.matcher( line );
+ }
+ sb.append( line ).append( "\n" );
+ }
+
+ /**
+ * checks if a given line begins with a date or not.
+ *
+ * @param line given line.
+ * @return {@code true} if it does, {@code false} otherwise.
+ */
+ boolean lineBeginsWithDate( String line )
+ {
+ boolean begins = false;
+ try
+ {
+ DateUtils.parseDate( StringUtils.substring( line, 0, 10 ),
+ new String[]{ "yyyy-mm-dd", "yyyy/mm/dd" } );
+ begins = true;
+ }
+ catch (ParseException e)
+ {
+ LOG.info( "Not a date, so it's not a heading" );
+ }
+ return begins;
+ }
+
+ /**
+ * appends the collection of links to the generated content so far.
+ *
+ * @param links collection of links.
+ * @param sb generated content so far.
+ */
+ void append( List< String > links, StringBuilder sb )
+ {
+ for( String link : links )
+ {
+ sb.append( " [" ).append( link )
+ .append( "]: https://issues.apache.org/jira/browse/" )
+ .append( StringUtils.replace( link, "JIRA", "JSPWIKI" ) )
+ .append( "\n" );
+ }
+ }
+
+ /**
+ * Writes the file with the given content.
+ *
+ * @param filename where to write.
+ * @param content what to write.
+ */
+ void write( String filename, String content )
+ {
+ BufferedOutputStream bos = null;
+ try
+ {
+ LOG.info( "Attempting to write " + filename );
+ File file = new File( filename );
+ if( !file.exists() )
+ {
+ file.createNewFile();
+ }
+ FileOutputStream fos = new FileOutputStream( file );
+ bos = new BufferedOutputStream( fos );
+ bos.write( content.getBytes() );
+ }
+ catch( IOException e )
+ {
+ LOG.error( e.getMessage(), e );
+ }
+ finally
+ {
+ if( bos != null )
+ {
+ try
+ {
+ bos.flush();
+ bos.close();
+ }
+ catch( IOException e )
+ {
+ LOG.error( e.getMessage(), e );
+ }
+ }
+ }
+ }
+
+}
Added: incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/TranslationsCheck.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/TranslationsCheck.java?rev=1499500&view=auto
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/TranslationsCheck.java (added)
+++ incubator/jspwiki/trunk/jspwiki-site/src/test/java/org/apache/wiki/site/TranslationsCheck.java Wed Jul 3 18:07:22 2013
@@ -0,0 +1,225 @@
+/*
+ * Licensed 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.
+ */
+package org.apache.wiki.site;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeSet;
+
+import org.apache.wiki.Release;
+
+/**
+ * Simple utility that shows you a sorted list of property differences between
+ * the 'default en' and a given i18n file. It also warns if there are any duplicates.
+ * <p>
+ * The first argument is the language, and it is mandatory.
+ * The second argument is the path. If the path is not defined, uses current path (.)
+ * <p>
+ * For example (if you're compiling your classes to "classes"):
+ * <code>
+ * java -cp classes TranslationsCheck fi
+ * </code>
+ *
+ */
+public class TranslationsCheck
+{
+ private static final TreeSet<String> allProps = new TreeSet<String>(); // sorted, no duplicates
+ private static final TreeSet<String> duplProps = new TreeSet<String>();
+
+ // Change these to your settings...
+ static String base = "../jspwiki-war";
+ static String suffix = null;
+
+ public static void main( String[] args ) throws IOException
+ {
+ if( args.length == 0 )
+ {
+ System.out.println("Usage: java TranslationsCheck <language> [<path>]");
+ System.out.println("Example: java TranslationsCheck nl jspwiki-war/src/main/resources]");
+ return;
+ }
+
+ suffix = args[0];
+
+ if( args.length >= 2 )
+ {
+ base = args[1];
+ }
+
+ System.out.println("Using code base " + Release.VERSTR);
+ System.out.println("Internationalization property file differences between 'default en' and '"
+ + suffix + "' following:\n");
+
+ try
+ {
+ diff("/CoreResources.properties", "/CoreResources_" + suffix + ".properties");
+ detectDuplicates("/CoreResources_" + suffix + ".properties");
+ }
+ catch( FileNotFoundException e )
+ {
+ System.err.println("Unable to locate "+"/CoreResources_" + suffix + ".properties");
+ }
+
+ try
+ {
+ diff("/templates/default.properties", "/templates/default_" + suffix + ".properties");
+ detectDuplicates("/templates/default_" + suffix + ".properties");
+ }
+ catch( FileNotFoundException e )
+ {
+ System.err.println("Unable to locate "+"/templates/default_" + suffix + ".properties");
+ }
+
+ try
+ {
+ diff("/plugin/PluginResources.properties", "/plugin/PluginResources_" + suffix + ".properties");
+
+ detectDuplicates("/plugin/PluginResources_" + suffix + ".properties");
+
+ System.out.println("Duplicates overall (two or more occurences):");
+ System.out.println("--------------------------------------------");
+ Iterator< String > iter = duplProps.iterator();
+ if (duplProps.size() == 0) {
+ System.out.println("(none)");
+ } else {
+ while( iter.hasNext() ) {
+ System.out.println(iter.next());
+ }
+ }
+ System.out.println();
+ }
+ catch( FileNotFoundException e )
+ {
+ System.err.println("Unable to locate "+"/plugin/PluginResources_" + suffix + ".properties");
+ }
+
+ System.out.println("NOTE: Please remember that dependent on the usage of these i18n files, outdated " +
+ "properties maybe should not be deleted, because they may be used by previous releases. " +
+ "Moving them to a special section in the file may be the better solution.");
+ }
+
+ public static Map< String, Integer > diff(String source1, String source2) throws FileNotFoundException, IOException
+ {
+ int missing = 0, outdated = 0;
+ // Standard Properties
+ Properties p1 = new Properties();
+ p1.load(new FileInputStream(new File(base + source1)));
+
+ Properties p2 = new Properties();
+ p2.load(new FileInputStream(new File(base + source2)));
+
+ String msg = "Checking " + source2 + "...";
+ System.out.println(msg);
+
+ Iterator< String > iter = sortedNames(p1).iterator();
+ while( iter.hasNext() )
+ {
+ String name = iter.next();
+ String value = p1.getProperty(name);
+
+ if (p2.get(name) == null)
+ {
+ missing++;
+ if (missing == 1)
+ {
+ System.out.println("\nMissing:");
+ System.out.println("--------");
+ }
+ System.out.println(name + " = " + value);
+ }
+ }
+ if (missing > 0)
+ {
+ System.out.println();
+ }
+
+ iter = sortedNames(p2).iterator();
+ while (iter.hasNext())
+ {
+ String name = iter.next();
+ String value = p2.getProperty(name);
+
+ if (p1.get(name) == null)
+ {
+ outdated++;
+ if (outdated == 1)
+ {
+ System.out.println("\nOutdated or superfluous:");
+ System.out.println("------------------------");
+ }
+ System.out.println(name + " = " + value);
+ }
+ }
+ if (outdated > 0)
+ {
+ System.out.println();
+ }
+
+ Map< String, Integer > diff = new HashMap< String, Integer >( 2 );
+ diff.put( "missing", missing );
+ diff.put( "outdated", outdated );
+ return diff;
+ }
+
+ private static List<String> sortedNames(Properties p)
+ {
+ List<String> list = new ArrayList<String>();
+ @SuppressWarnings("unchecked")
+ Enumeration< String > iter = ( Enumeration< String > )p.propertyNames();
+ while (iter.hasMoreElements())
+ {
+ list.add( iter.nextElement() );
+ }
+
+ Collections.sort(list);
+ return list;
+ }
+
+ public static int detectDuplicates(String source) throws IOException
+ {
+ Properties p = new Properties();
+ p.load(new FileInputStream(new File(base + source)));
+
+ @SuppressWarnings("unchecked")
+ Enumeration< String > iter = ( Enumeration< String > )p.propertyNames();
+ String currentStr;
+ while (iter.hasMoreElements())
+ {
+ currentStr = iter.nextElement();
+ if (!allProps.add(currentStr))
+ duplProps.add(currentStr);
+ }
+ return duplProps.size();
+ }
+
+ /**
+ * Allows reuse from {@link org.apache.wiki.site.SiteGeneratorTest}
+ */
+ public static void clearDuplicates()
+ {
+ allProps.clear();
+ duplProps.clear();
+ }
+
+}
Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1499500&r1=1499499&r2=1499500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Wed Jul 3 18:07:22 2013
@@ -29,11 +29,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jspwiki-war</artifactId>
- <name>Apache JSPWiki (Incubating)</name>
+ <name>Apache JSPWiki (Incubating) Main War</name>
<packaging>war</packaging>
- <description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
- and built around standard J2EE components (Java, servlets, JSP).</description>
- <url>http://incubator.apache.org/jspwiki/</url>
<dependencies>
<dependency>
@@ -242,6 +239,13 @@
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <attachClasses>true</attachClasses>
+ </configuration>
+ </plugin>
+
<!-- Compress certain CSS and JS files using the YUICompressor
(http://alchim.sourceforge.net/yuicompressor-maven-plugin/)
-->
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1499500&r1=1499499&r2=1499500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Wed Jul 3 18:07:22 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "14";
+ public static final String BUILD = "15";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/mvn_cheat-sheet.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/mvn_cheat-sheet.txt?rev=1499500&r1=1499499&r2=1499500&view=diff
==============================================================================
--- incubator/jspwiki/trunk/mvn_cheat-sheet.txt (original)
+++ incubator/jspwiki/trunk/mvn_cheat-sheet.txt Wed Jul 3 18:07:22 2013
@@ -34,5 +34,5 @@ mvn javadoc:javadoc : creates javado
mvn sonar:sonar : generates a Sonar report. Expects a Sonar server running at http://localhost:9000/ See:
http://mojo.codehaus.org/sonar-maven-plugin/plugin-info.html
http://docs.codehaus.org/display/SONAR/Get+started+in+2+minutes
-cd jspwiki-war; mvn test -Dtest=SiteGeneratorTest: Checks all language resource files for missing or
+cd jspwiki-site; mvn test -Dtest=SiteGeneratorTest: Checks all language resource files for missing or
unused translations.