You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/06/15 16:15:27 UTC

svn commit: r1493363 - in /incubator/jspwiki/site/trunk: content/jspwiki/community/ content/jspwiki/development/ content/jspwiki/ppmc/ templates/

Author: gmazza
Date: Sat Jun 15 14:15:26 2013
New Revision: 1493363

URL: http://svn.apache.org/r1493363
Log:
Website updates due to Mavenization.

Removed:
    incubator/jspwiki/site/trunk/content/jspwiki/development/building.mdtext
    incubator/jspwiki/site/trunk/content/jspwiki/development/translations.mdtext
Modified:
    incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext
    incubator/jspwiki/site/trunk/content/jspwiki/development/source_and_guide.mdtext
    incubator/jspwiki/site/trunk/content/jspwiki/ppmc/how_to_release.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=1493363&r1=1493362&r2=1493363&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/community/get_involved.mdtext Sat Jun 15 14:15:26 2013
@@ -14,6 +14,10 @@ website, [patches][] welcome.  
   * Contribute hard code into the trunk - just take a moment to familiarize 
 yourself with the the coding guidelines and you'll be fine.
   * Participate on the mailing list and encourage others to do the stuff above
+  * Help maintain JSPWiki's language translations - Please search "SiteGeneratorTest"
+on <a href="https://builds.apache.org/job/JSPWiki/lastBuild/console">Jenkins' last JSPWiki
+build</a> for a list of missing strings for each language.  Translations can be supplied via
+our issue tracker.
   * Co-ordinate things - there's a whole lot of stuff that needs co-ordination 
 in a large project like this. Our JIRA is filled with issues that need 
 triaging, and clarification and all that stuff.

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=1493363&r1=1493362&r2=1493363&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 Jun 15 14:15:26 2013
@@ -2,7 +2,8 @@ Title: Source and Guide
 
 ## Source
 
-JSPWiki source code is maintained using Apache Subversion.
+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:
 
@@ -16,15 +17,18 @@ Change http to https if you are a develo
 
 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.
-
 ## Developer Guide
 
+Building:
+
+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/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/src/main/config/dev/jspwiki-checkstyle.xml?view=co&content-type=text%2Fplain">Checkstyle</a> formatters.
+  * 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:
@@ -39,4 +43,5 @@ planned release version as this is used 
 
 
 [Edit Website]: edit_website.html
+[Release Page]: ../ppmc/how_to_release.mdtext
 

Modified: incubator/jspwiki/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext?rev=1493363&r1=1493362&r2=1493363&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext (original)
+++ incubator/jspwiki/site/trunk/content/jspwiki/ppmc/how_to_release.mdtext Sat Jun 15 14:15:26 2013
@@ -89,11 +89,15 @@ to see the repository.
 -->
   2. Deploy source and binary distributions
 
-    1. Generate the src & bin distributions:
+    1. Build JSPWiki using Maven:
+
+            mvn clean install -Pintegration-tests
+
+    2. Generate the src & bin distributions using Ant:
 
             ant clean signeddist
 
-    2. Copy the src distribution file and checksums to people.apache.org,
+    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
@@ -200,7 +204,7 @@ are [archived][] automatically.
 
     1. Create the javadoc:
 
-            ant 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

Modified: incubator/jspwiki/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/trunk/templates/sidenav.mdtext?rev=1493363&r1=1493362&r2=1493363&view=diff
==============================================================================
--- incubator/jspwiki/site/trunk/templates/sidenav.mdtext (original)
+++ incubator/jspwiki/site/trunk/templates/sidenav.mdtext Sat Jun 15 14:15:26 2013
@@ -14,20 +14,18 @@
 
   * [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="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.jspwiki.org" class="external">Legacy Site</a>
   * <a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a>
   * [People](/jspwiki/community/people.html)
 
 **Development**
 
-  * [Source and Guide](/jspwiki/development/source_and_guide.html)
-  * [Building](/jspwiki/development/building.html)
-  * <a href="https://issues.apache.org/jira/browse/JSPWIKI#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap*panel" class="external">Road Map</a>
-  * <a href="https://builds.apache.org/job/JSPWiki/" class="external">CI build</a>
-  * <a href="https://analysis.apache.org/dashboard/index/110730" class="external">Sonar Analysis</a>
+  * <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)
-  * [Translation status](/jspwiki/development/translations.html)
   * [Changelog](/jspwiki/development/changelog.html)
 
 **PPMC**