Author: gk
Date: Tue Nov 27 14:48:30 2018
New Revision: 1847550
URL: http://svn.apache.org/viewvc?rev=1847550&view=rev
Log:
- Updating current development version to 5.0
- Provide a little more up-to-date info texts
Modified:
turbine/site/README.txt
turbine/site/src/site/site.xml
turbine/site/xdocs/common/further-reading.xml
turbine/site/xdocs/download.xml
turbine/site/xdocs/further-reading/index.xml
turbine/site/xdocs/index.xml
turbine/site/xdocs/turbine-concepts.xml
turbine/site/xdocs/turbine/index.xml
Modified: turbine/site/README.txt
URL:
http://svn.apache.org/viewvc/turbine/site/README.txt?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/README.txt (original)
+++ turbine/site/README.txt Tue Nov 27 14:48:30 2018
@@ -51,6 +51,7 @@ ok, you can check your .xml files back i
To deploy the site execute:
mvn site-deploy
+
To do this you need an account on the people.apache.org machine!!
- after deployment check/cleanup local deployment path as defined in
turbine.site.cache. By default it's in user.home/turbine-sites/site.
Modified: turbine/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/site/src/site/site.xml?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/src/site/site.xml (original)
+++ turbine/site/src/site/site.xml Tue Nov 27 14:48:30 2018
@@ -68,7 +68,7 @@
</menu>
<menu name="Turbine Development">
- <item name="Turbine 4.1"
href="/turbine/development/turbine-4.1/index.html"/>
+ <item name="Turbine 5.0"
href="/turbine/development/turbine-5.0/index.html"/>
</menu>
<menu name="Turbine Sub Projects">
Modified: turbine/site/xdocs/common/further-reading.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/common/further-reading.xml?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/xdocs/common/further-reading.xml (original)
+++ turbine/site/xdocs/common/further-reading.xml Tue Nov 27 14:48:30 2018
@@ -36,13 +36,13 @@
</p>
<p>
- <a href="http://portals.apache.org/jetspeed-1/";>Jetspeed</a> is an open
source
- portal engine built on top of the Turbine web application framework. Use
- Jetspeed to develop a ready-to-go portal solution with open technology.
+ <a href="http://portals.apache.org/jetspeed-1/";>Jetspeed 1</a> is an open
source
+ portal engine built on top of the Turbine web application framework. It was
used
+ to develop a ready-to-go portal solution with open technology.
</p>
<p>
- Turbine uses <a href="http://logging.apache.org/log4j/";>Log4j</a> for a
+ Turbine uses <a href="https://logging.apache.org/log4j/2.x/";>Log4j2</a> for a
logging framework. No more commenting System.out.println()'s in your code!
</p>
Modified: turbine/site/xdocs/download.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/download.xml?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/xdocs/download.xml (original)
+++ turbine/site/xdocs/download.xml Tue Nov 27 14:48:30 2018
@@ -29,9 +29,9 @@
<section name="Getting Started With Turbine">
<p>
The best way to get started with Turbine is to use the
- Maven Archetypes. See the <a
href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine";>blog
post</a>
+ Maven Archetypes, find it on <a
href="https://github.com/apache/turbine-archetypes"; title="Turbine Maven
Archetype on GitHub">GitHub</a>. You might interested in the <a
href="https://github.com/apache/turbine-archetypes/tree/docker";>Docker branch
(in development)</a> as well. See also the <a
href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine";>blog
post</a>
in the <a href="https://blogs.apache.org/turbine/";>Turbine Blog</a> for
- usage information.
+ usage information.
</p>
</section>
Modified: turbine/site/xdocs/further-reading/index.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/further-reading/index.xml?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/xdocs/further-reading/index.xml (original)
+++ turbine/site/xdocs/further-reading/index.xml Tue Nov 27 14:48:30 2018
@@ -74,7 +74,7 @@
<subsection name="Related Apache Projects">
<ul>
<li>
- <a href="http://velocity.apache.org/engine/";>Velocity</a> - A view
+ <a href="http://velocity.apache.org/engine/";>Velocity 2</a> - A view
technology comparable to JSP) that Turbine officially supports. Many
Turbine developers feel Velocity is an excellent alternative
to JSP for web application development.
@@ -85,18 +85,18 @@
Jetspeed to develop a ready-to-go portal solution with open technology.
</li>
<li>
- <a href="http://logging.apache.org/log4j/docs/index.html";>Log4j</a> -
A standard logging
+ <a href="https://logging.apache.org/log4j/2.x/";>Log4j2</a> - A
standard logging
framework used by Turbine and many other projects.
No more commenting System.out.println()'s in your code!
</li>
<li>
- <a href="http://maven.apache.org";>Maven</a> - A Java
+ <a href="http://maven.apache.org";>Maven 3</a> - A Java
project management and project comprehension tool. Maven is based on
the
concept of a project object model (POM) in that all the artifacts
produced
by Maven are a result of consulting a well defined model for your
project.
</li>
<li>
- <a href="http://db.apache.org/torque/";>Torque</a> - A persistence
layer.
+ <a href="http://db.apache.org/torque/";>Torque 4</a> - A persistence
layer.
Torque includes a generator to generate all the database resources
required
by your application and includes a runtime environment to run the
generated
classes.
Modified: turbine/site/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/index.xml?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/xdocs/index.xml (original)
+++ turbine/site/xdocs/index.xml Tue Nov 27 14:48:30 2018
@@ -98,8 +98,8 @@
via <strong>XML</strong> all the stages for processing a request.
</li>
- <li><a href="turbine/development/turbine-4.1/">Turbine 4.1</a> is
- the shape of things to come...
+ <li><strong><a href="turbine/development/turbine-5.0/">Turbine
5.0</a></strong> is
+ the shape of things to come, which is currently in development: Servlet
3.1, Java 8, Log4J2, Velocity 2 ...
</li>
</ul>
</p>
Modified: turbine/site/xdocs/turbine-concepts.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/turbine-concepts.xml?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/xdocs/turbine-concepts.xml (original)
+++ turbine/site/xdocs/turbine-concepts.xml Tue Nov 27 14:48:30 2018
@@ -34,6 +34,11 @@ the Apache Software Foundation. Any serv
Specification 2.4 or better can be used to run your Turbine
application.</p>
+<p>We offer an easy-to use development environment using some <a
href="http://maven.apache.org/";>Maven</a>-Archetypes to quickly
+start developing Turbine applications. See the
+<a
href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine";>blog
post</a>
+in the <a href="https://blogs.apache.org/turbine/";>Turbine Blog</a> for usage
information or <a href="https://github.com/apache/turbine-archetypes/";>Turbine
Archetype Readme on GitHub</a>.. If you want use Docker as developing
environment, checkout <a
href="https://github.com/apache/turbine-archetypes/tree/docker";> docker
branch</a>, which is currently in experimental stage.</p>
+
<p>We offer an easy-to use development environment using some <a
href="http://maven.apache.org/";>Maven</a>-Archetypes to quickly
start developing Turbine applications. See the
@@ -55,9 +60,9 @@ developer.</p>
href="http://www.hibernate.org/";>Hibernate</a> are also
supported.</li>
<li>HTML Form Validation using the Turbine provided
"Intake"-Service.</li>
- <li>Logging - Turbine uses <a
href="http://commons.apache.org/logging/";>Commons Logging</a> and supports a
wide range of logging
+ <li>Logging - Turbine 5.0 uses <a
href="https://logging.apache.org/log4j/2.x/";>Log4J2</a> with activated <a
href="https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/index.html";>SLF4J-Binding</a>.
Internal <a href="http://commons.apache.org/logging/";>Commons Logging</a> is
propagated using <a
href="https://www.slf4j.org/legacy.html";>jcl-over-slf4j</a>. Turbine 4.x and
previous versions supported a wide range of logging
frameworks like <a href="http://logging.apache.org/log4j/docs/";>Log4J</a>,
jdk14 or simple file logging</li>
- <li>Service based framework, using <a
href="http://avalon.apache.org/";>Avalon</a> compatible components in Turbine
2.4 and beyond.</li>
+ <li>Service based framework, using <a
href="http://avalon.apache.org/";>Avalon</a> compatible components in Turbine
2.4 and beyond. Although this framework is stable it's not yet maintained
anymore, and we may change it in the near future.</li>
</ul>
@@ -132,10 +137,9 @@ any changes.
</p>
<p>
-Turbine comes with a number of Services. These are bundled when using
-<a href="turbine-2.3/">Turbine-2.3</a> or available separately as <a
-href="http://avalon.apache.org/";>Avalon</a> components from the <a
-href="fulcrum/">Fulcrum</a> project.
+Turbine comes with a number of Services. These are bundled when using greater
+<a href="turbine-2.3/">Turbine-2.3</a>. Find out more about <a
+href="fulcrum/">Fulcrum</a> project!
</p>
<p>Here is a brief overview of the some of the Services:</p>
@@ -148,13 +152,15 @@ href="fulcrum/">Fulcrum</a> project.
XML files.</li>
<li>UploadService - Manages file uploads from HTML widgets.</li>
- <li>XSLTService - Transforms XML documents with XSLT
- stylesheets. This service can cache compiled stylesheets for extra
- performance.</li>
-
<li>SecurityService - Manages users and permissions for
Turbine. Turbine has a user, group, role, permission system which uses
a database layer or LDAP as its backend.</li>
+
+ <li>JSONService - Provides a layer to Jackson 2 or Gson JSON bindings, which
might be used for filtering or application wide settings.</li>
+
+ <li>XSLTService - Transforms XML documents with XSLT
+ stylesheets. This service can cache compiled stylesheets for extra
+ performance.</li>
</ul>
</section>
Modified: turbine/site/xdocs/turbine/index.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/turbine/index.xml?rev=1847550&r1=1847549&r2=1847550&view=diff
==============================================================================
--- turbine/site/xdocs/turbine/index.xml (original)
+++ turbine/site/xdocs/turbine/index.xml Tue Nov 27 14:48:30 2018
@@ -36,7 +36,7 @@
<li><a href="turbine-4.0/">Apache Turbine 4.0</a> - Current 4.0
Development tree</li>
<li><a href="turbine-4.0-M2/">Apache Turbine 4.0 Milestone 2</a></li>
<li><a href="turbine-4.0-M1/">Apache Turbine 4.0 Milestone 1</a></li>
- <li><a href="development/turbine-4.1/">Apache Turbine 4.1-SNAPSHOT</a> -
Current 4.1 Development tree</li>
+ <li><a href="development/turbine-5.0/">Apache Turbine 5.0-SNAPSHOT</a> -
Current 5.0 Development tree</li>
</ul>
</subsection>
