You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2012/10/13 09:59:01 UTC
svn commit: r1397801 - in /incubator/jspwiki/site/trunk: content/jspwiki/
content/jspwiki/community/ content/jspwiki/development/
content/jspwiki/general/ templates/
Author: metskem
Date: Sat Oct 13 07:59:00 2012
New Revision: 1397801
URL: http://svn.apache.org/viewvc?rev=1397801&view=rev
Log:
JSPWIKI-748 website updates provided by Glen Mazza
Added:
incubator/jspwiki/site/trunk/content/jspwiki/general/news.mdtext
Removed:
incubator/jspwiki/site/trunk/content/jspwiki/general/history.mdtext
Modified:
incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext
incubator/jspwiki/site/trunk/content/jspwiki/community/mailing_lists.mdtext
incubator/jspwiki/site/trunk/content/jspwiki/community/people.mdtext
incubator/jspwiki/site/trunk/content/jspwiki/development/edit_website.mdtext
incubator/jspwiki/site/trunk/content/jspwiki/development/source_and_guide.mdtext
incubator/jspwiki/site/trunk/content/jspwiki/general/downloads.mdtext
incubator/jspwiki/site/trunk/content/jspwiki/index.mdtext
incubator/jspwiki/site/trunk/templates/sidenav.mdtext
Modified: incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext Sat Oct 13 07:59:00 2012
@@ -8,9 +8,8 @@ ideas on how you could improve us are:
new plugin or a filter.
* Contribute to the web design - we all like the software to look better and
be more logical
- * Help maintain the documentation wiki - we need people who fight against
-spammers and keep the documentation in a logical order. Even a few edits a
-week will be of a big help!
+ * Help improve the Apache JSPWiki website - We use the Apache CMS for our
+website, [patches][] welcome.
* File bugs - despite our best efforts, we are not perfect.
* Contribute hard code into the trunk - just take a moment to familiarize
yourself with the the coding guidelines and you'll be fine.
@@ -20,8 +19,7 @@ in a large project like this. Our JIRA i
triaging, and clarification and all that stuff.
The point really is that despite your skill levels at coding or the time you
-can afford to put into helping us, there's something you can always do! Five
-minutes per week of deleting wikispam is five minutes for someone else to spend
-in improving the software.
+can afford to put into helping us, there's always something you can do!
-[mailing lists]: mailing_lists.html
\ No newline at end of file
+[mailing lists]: mailing_lists.html
+[website patches]: ../development/edit_website.html
Modified: incubator/jspwiki/site/trunk/content/jspwiki/community/mailing_lists.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/community/mailing_lists.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/community/mailing_lists.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/community/mailing_lists.mdtext Sat Oct 13 07:59:00 2012
@@ -4,13 +4,9 @@ Title: Mailing lists
The jspwiki-user mailing list is hosted at Apache. You can join it by sending
an e-mail to <js...@incubator.apache.org>. You can also browse
-the <a class="external"
-href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/">list
-archives</a>.
-
-The <a href="http://www.ecyrd.com/pipermail/jspwiki-users/" class="external">
-old list archives</a> are also available. There's also a secondary archive on
-<a href="http://www.nabble.com/JspWiki---User-f2680.html" class="external">
+the list archives on either <a class="external"
+href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/">Apache
+mail archives</a> or <a href="http://www.nabble.com/JspWiki---User-f2680.html" class="external">
Nabble</a>.
## JSPWiki-dev
@@ -23,10 +19,6 @@ list is hosted at Apache, so you join by
<a href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/"
class="external">list archives</a> are also browseable.
-The <a href="http://www.ecyrd.com/pipermail/jspwiki-dev/" class="external">old
-JSPWiki-dev archives</a> are also available, if you want to peruse some
-interesting issues.
-
## JSPWiki-commits
If you subscribe to this list you will get emailed when (a committer) commits
@@ -48,5 +40,3 @@ email address that you originally subscr
* <a href="http://www.jspwiki.org/wiki/IrcChannel" class="external">IrcChannel</a> -
chat live with the developers! The channel is fairly quiet, and most people are
in European timezones, so be patient.
- * JSPWiki <a href="http://blog.jspwiki.org" class="external">weblog</a>.
- * <a href="http://twitter.com/jspwiki" class="external">Twitter</a> page.
\ No newline at end of file
Modified: incubator/jspwiki/site/trunk/content/jspwiki/community/people.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/community/people.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/community/people.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/community/people.mdtext Sat Oct 13 07:59:00 2012
@@ -4,18 +4,20 @@ Title: People
The current JSPWiki committer list:
+ * Dirk Frederickx
+ * Florian Holeczek
* Janne Jalkanen
* Andrew Jaquith
- * Dirk Frederickx
* Harry Metske
- * Florian Holeczek
* Juan Pablo Santos
* Christoph Sauer
As esteemed mentors we have:
- * Craig Russell
+ * Dave Johnson
* Sam Ruby
+ * Craig Russell
+ * Henning Schmiedehausen
And, of course, all the fine people of the jspwiki-dev [mailing list]!
@@ -23,12 +25,12 @@ And, of course, all the fine people of t
The Podling Project Management Committee consists of
- * Janne Jalkanen
- * Andrew Jaquith
* Dirk Frederickx
- * Harry Metske
* Florian Holeczek
- * Juan Pablo Santos
+ * Andrew Jaquith
+ * Janne Jalkanen
+ * Harry Metske
* Craig Russell
+ * Juan Pablo Santos
[mailing list]: mailing_lists.html
\ No newline at end of file
Modified: incubator/jspwiki/site/trunk/content/jspwiki/development/edit_website.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/development/edit_website.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/development/edit_website.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/development/edit_website.mdtext Sat Oct 13 07:59:00 2012
@@ -10,9 +10,9 @@ the Apache Infrastructure pages includin
## Process
1. Commit a change to the website's source [Markdown][] files located in
-<a href="https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk"
-class="external>https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk</a>.
-Before committing test that the site still builds locally by installing the
+<a href="https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk" class="external">
+https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk</a>.
+Before committing, test that the site still builds locally by installing the
[CMS build scripts][] and running:
buildsite/build_site.pl --source-base jspwiki-site --target-base jspwiki-website
Modified: incubator/jspwiki/site/trunk/content/jspwiki/development/source_and_guide.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/development/source_and_guide.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/development/source_and_guide.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/development/source_and_guide.mdtext Sat Oct 13 07:59:00 2012
@@ -8,12 +8,14 @@ Checkout the code using:
svn co http://svn.apache.org/repos/asf/incubator/jspwiki/trunk jspwiki
-There is also an european mirror, so you could also do:
+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.
+
<a class="external" href="http://svn.apache.org/viewvc/incubator/jspwiki/">
Anonymous browser access</a> is also available.
@@ -36,4 +38,5 @@ planned release version as this is used
[Eclipse]: eclipse-jalkanen-codestyle.xml
-[Checkstyle]: jspwiki-checkstyle.xml
\ No newline at end of file
+[Checkstyle]: jspwiki-checkstyle.xml
+[Edit Website]: edit_website.html
Modified: incubator/jspwiki/site/trunk/content/jspwiki/general/downloads.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/general/downloads.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/general/downloads.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/general/downloads.mdtext Sat Oct 13 07:59:00 2012
@@ -3,8 +3,10 @@ Title: Downloads
<span class="error">
There are no Apache Releases yet (see
<a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI-717">
-JSPWIKI-717</a>). However, we are on it.<br/>
-Once this JIRA is closed, the text from below will become true.
+JSPWIKI-717</a>). However, we are working on it.<br/>
+Once this JIRA is closed, the links below will become true. In the meantime,
+an Apache-licensed stable version of JSPWiki can be <a href="http://www.jspwiki.org/wiki/JSPWikiDownload">downloaded</a>
+from the legacy JSPWiki site, or check the [Building][] page to build from the Apache sources.
</span>
Current source and binary distributions are available through the
@@ -17,4 +19,6 @@ 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. -->
\ No newline at end of file
+Nexus</a> repository with the groupId: org.apache.jspwiki and artifactId: jspwiki. -->
+
+[Building]: ../development/building.html
Added: incubator/jspwiki/site/trunk/content/jspwiki/general/news.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/general/news.mdtext?rev=1397801&view=auto
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/general/news.mdtext (added)
+++ incubator/jspwiki/site/trunk/content/jspwiki/general/news.mdtext Sat Oct 13 07:59:00 2012
@@ -0,0 +1,23 @@
+Title: News
+
+## Project News
+
+ * **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
+<a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">JIRA</a>
+ 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.
Modified: incubator/jspwiki/site/trunk/content/jspwiki/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/index.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/index.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/index.mdtext Sat Oct 13 07:59:00 2012
@@ -2,17 +2,16 @@ Title: Apache JSPWiki (Incubating)
## Welcome to Apache JSPWiki
-Apache JSPWiki is the apachified version of JSPWiki, a leading open source
-WikiWiki engine, feature-rich, built around the standard J2EE components (Java,
-servlets, JSP).
+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 3 WikiPage Providers, with the capability to plug new
-ones
+ * 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
@@ -22,10 +21,6 @@ simple to configure
* Page locking to prevent editing conflicts
* Support for Multiple Wikis
-JSPWiki project also has an infrequently updated
-<a href="http://blog.jspwiki.org" class="external">weblog</a> and a
-<a href="http://twitter.com/jspwiki" class="external">Twitter</a> page.
-
## Project status
* **01-May-2012:** New, yet familiar, project website.
Modified: incubator/jspwiki/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/templates/sidenav.mdtext?rev=1397801&r1=1397800&r2=1397801&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/templates/sidenav.mdtext (original)
+++ incubator/jspwiki/site/trunk/templates/sidenav.mdtext Sat Oct 13 07:59:00 2012
@@ -2,7 +2,7 @@
* [Home](/jspwiki/index.html)
* [Downloads](/jspwiki/general/downloads.html)
- * [History](/jspwiki/general/history.html)
+ * [News](/jspwiki/general/news.html)
* <a href="http://www.apache.org/licenses/" class="external">License</a>
**Documentation**
@@ -15,7 +15,7 @@
* [Get Involved](/jspwiki/community/get_involved.html)
* [Mailing Lists](/jspwiki/community/mailing_lists.html)
* <a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a>
- * <a href="http://www.jspwiki.org" class="external">Main Wiki</a>
+ * <a href="http://www.jspwiki.org" class="external">Legacy Site</a>
* <a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a>
* [People](/jspwiki/community/people.html)