Author: gk
Date: Fri May 17 08:29:00 2019
New Revision: 1859419
URL: http://svn.apache.org/viewvc?rev=1859419&view=rev
Log:
- update wiki references
- fix archetype example links
Modified:
turbine/site/src/site/site.xml
turbine/site/xdocs/board-reports.xml
turbine/site/xdocs/common/documentation.xml
turbine/site/xdocs/common/wiki.xml
turbine/site/xdocs/examples.xml
turbine/site/xdocs/how-to-help.xml
Modified: turbine/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/site/src/site/site.xml?rev=1859419&r1=1859418&r2=1859419&view=diff
==============================================================================
--- turbine/site/src/site/site.xml (original)
+++ turbine/site/src/site/site.xml Fri May 17 08:29:00 2019
@@ -49,11 +49,11 @@
<menu name="Shortcuts to Turbine Documentation">
<item name="Turbine Blog"
href="https://blogs.apache.org/turbine/"/>
- <item name="Turbine Wiki Home"
href="http://wiki.apache.org/turbine/"/>
- <item name="Frequently Asked Questions (FAQ)"
href="http://wiki.apache.org/turbine/Turbine2/FAQ"/>
- <item name="Tutorial"
href="http://wiki.apache.org/turbine/Turbine2/Tutorial"/>
- <item name="User's Guide"
href="http://wiki.apache.org/turbine/Turbine2/UsersGuide"/>
- <item name="Development"
href="https://wiki.apache.org/turbine/Turbine5"/>
+ <item name="Turbine Wiki Home"
href="https://cwiki.apache.org/confluence/display/TURBINE/"/>
+ <item name="Frequently Asked Questions (FAQ)"
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+FAQ"/>
+ <item name="Tutorial"
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial"/>
+ <item name="User's Guide"
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide"/>
+ <item name="Development"
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine5"/>
</menu>
<menu name="Events">
Modified: turbine/site/xdocs/board-reports.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/board-reports.xml?rev=1859419&r1=1859418&r2=1859419&view=diff
==============================================================================
--- turbine/site/xdocs/board-reports.xml (original)
+++ turbine/site/xdocs/board-reports.xml Fri May 17 08:29:00 2019
@@ -67,7 +67,7 @@ required to report monthly for the first
<li><a href="reports/report-2013-08.html">August 2013 Report</a></li>
</ul>
-<p>Find Reports after 2013 in <a
href="https://wiki.apache.org/turbine/BoardReports";>Turbine Wiki Board
Reports</a>.
+<p>Find Reports after 2013 in <a
href="https://cwiki.apache.org/confluence/display/TURBINE/BoardReports";>Turbine
Wiki Board Reports</a>.
</p>
</section>
Modified: turbine/site/xdocs/common/documentation.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/common/documentation.xml?rev=1859419&r1=1859418&r2=1859419&view=diff
==============================================================================
--- turbine/site/xdocs/common/documentation.xml (original)
+++ turbine/site/xdocs/common/documentation.xml Fri May 17 08:29:00 2019
@@ -58,14 +58,14 @@
<ul>
<li>Based on a simple sample application</li>
<li>Should most likely involve META</li>
- <li>Currently in the wiki at <a
href="http://wiki.apache.org/turbine/Turbine2/Tutorial";>Turbine2/Tutorial</a></li>
+ <li>Currently in the wiki at <a
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Tutorial";>Turbine2/Tutorial</a></li>
<li>When stable, move it to xdoc and prepare a release</li>
</ul>
</li>
<li>
<b>Complete User's Guide</b>
<ul>
- <li>Currently in the wiki at <a
href="http://wiki.apache.org/turbine/Turbine2/UsersGuide";>Turbine2/UsersGuide</a></li>
+ <li>Currently in the wiki at <a
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+UsersGuide";>Turbine2/UsersGuide</a></li>
<li>Eventually in Xdoc, Forrest, or some other format</li>
</ul>
</li>
@@ -81,7 +81,7 @@
<ul>
<li>Future Features and Enhancements</li>
<li>The future of Fulcrum</li>
- <li>Currently in the wiki at <a
href="http://wiki.apache.org/turbine/Turbine2/Development";>Turbine2/Development</a></li>
+ <li>Currently in the wiki at <a
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+Development";>Turbine2/Development</a></li>
</ul>
</li>
</ul>
Modified: turbine/site/xdocs/common/wiki.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/common/wiki.xml?rev=1859419&r1=1859418&r2=1859419&view=diff
==============================================================================
--- turbine/site/xdocs/common/wiki.xml (original)
+++ turbine/site/xdocs/common/wiki.xml Fri May 17 08:29:00 2019
@@ -29,9 +29,9 @@
<section name="The Turbine Wiki">
<p>
-<a href="http://wiki.apache.org/turbine/";>
-http://wiki.apache.org/turbine/
-</a>
+<a href="https://cwiki.apache.org/confluence/display/TURBINE/";>
+https://cwiki.apache.org/confluence/display/TURBINE/
+<+a>
</p>
<p>
Modified: turbine/site/xdocs/examples.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/examples.xml?rev=1859419&r1=1859418&r2=1859419&view=diff
==============================================================================
--- turbine/site/xdocs/examples.xml (original)
+++ turbine/site/xdocs/examples.xml Fri May 17 08:29:00 2019
@@ -27,24 +27,24 @@
<body>
<section name="Example Apps">
-These are some example apps you can download to learn how to work with Turbine.
+These are example apps you can download to learn how to work with Turbine.
<subsection name="Turbine Webapp">
<p>With
- <a
href="https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0";>Turbine
Webapp Archetype</a> one can build fast an example app that demonstrates how
to use Turbine. It also demonstrates Torque integration, Fulcrum Security and
Fulcrum Intake, Fulcrum Json.
+ <a
href="https://gitbox.apache.org/repos/asf/turbine-archetypes.git";>Turbine
Webapp Archetype on Gitbox</a> (<a
href="https://github.com/apache/turbine-archetypes";>on GitHub</a>) one can
build fast an example app that demonstrates how to use Turbine. It also
demonstrates Torque integration, Fulcrum Security and Fulcrum Intake, Fulcrum
Json.
Find more information in the <a
href="https://blogs.apache.org/turbine/";>blog</a> in the <a
href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine";>blog
entry "Maven archetypes for Apache Turbine applications - easier startup with
Turbine"</a>.
</p>
</subsection>
<subsection name="Antelope">
- <p>
+ <p>(TODO: remove or update)
<a href="http://zebra.tigris.org";>Antelope</a> is an example app that
demonstrates how
to use the Zebra workflow engine with Turbine. It also demonstrates
Hibernate integration,
Fulcrum Security, and a form processing engine similar to Intake.
</p>
</subsection>
<subsection name="OSWorkflow Example">
- <p>
+ <p>TODO: remove or update)
<a
href="http://turbine.apache.org/fulcrum/fulcrum-osworkflow-example/index.html";>This</a>
example app shows how to integrate the <a
href="http://www.opensymphony.com/";>OSWorkflow</a> engine
into Turbine. You can click through the various screens following the
progress of your workflow.
Modified: turbine/site/xdocs/how-to-help.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/how-to-help.xml?rev=1859419&r1=1859418&r2=1859419&view=diff
==============================================================================
--- turbine/site/xdocs/how-to-help.xml (original)
+++ turbine/site/xdocs/how-to-help.xml Fri May 17 08:29:00 2019
@@ -65,7 +65,7 @@
project.
</li>
<li>
- The <a href="http://wiki.apache.org/turbine/";>Turbine
+ The <a
href="https://cwiki.apache.org/confluence/display/TURBINE/";>Turbine
Wiki</a> another repository of documentation for the project. It
contains development information, user documentation, how-to
documents,
discussion of new features, etc. Anyone can add new pages and
edit existing
@@ -103,7 +103,7 @@
<p>
You can also contribute to the project by enhancing existing functionality
and/or
adding new functionality. There is a current list of requested features
on the
- <a href="http://wiki.apache.org/turbine/Turbine2/WishList";>
+ <a
href="https://cwiki.apache.org/confluence/display/TURBINE/Turbine2+WishList";>
Apache Wiki</a>. Everyone is encouraged to take part in the discussion,
design, and
implementation.
</p>
