You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/02/18 22:32:20 UTC

svn commit: r1072157 - in /turbine/core/trunk: ./ src/java/org/apache/turbine/pipeline/ src/site/ xdocs/ xdocs/howto/ xdocs/services/

Author: tv
Date: Fri Feb 18 21:32:19 2011
New Revision: 1072157

URL: http://svn.apache.org/viewvc?rev=1072157&view=rev
Log:
- Update jakarta-links
- Update documentation
- Update info on site deployment

Removed:
    turbine/core/trunk/build.properties
    turbine/core/trunk/xdocs/services/cache-service.xml
    turbine/core/trunk/xdocs/services/component-service.xml
    turbine/core/trunk/xdocs/services/crypto-service.xml
    turbine/core/trunk/xdocs/services/factory-service.xml
    turbine/core/trunk/xdocs/services/intake-service.xml
    turbine/core/trunk/xdocs/services/localization-service.xml
    turbine/core/trunk/xdocs/services/logging-service.xml
    turbine/core/trunk/xdocs/services/mimetype-service.xml
    turbine/core/trunk/xdocs/services/pool-service.xml
    turbine/core/trunk/xdocs/services/resources-service.xml
    turbine/core/trunk/xdocs/services/upload-service.xml
    turbine/core/trunk/xdocs/services/xmlrpc-service.xml
    turbine/core/trunk/xdocs/services/xslt-service.xml
Modified:
    turbine/core/trunk/README.txt
    turbine/core/trunk/pom.xml
    turbine/core/trunk/src/java/org/apache/turbine/pipeline/package.html
    turbine/core/trunk/src/site/site.xml
    turbine/core/trunk/xdocs/changes.xml
    turbine/core/trunk/xdocs/getting-started.xml
    turbine/core/trunk/xdocs/how-to-build.xml
    turbine/core/trunk/xdocs/how-to-help.xml
    turbine/core/trunk/xdocs/howto/index.xml
    turbine/core/trunk/xdocs/howto/jsp-howto.xml
    turbine/core/trunk/xdocs/howto/services-howto.xml
    turbine/core/trunk/xdocs/howto/velocity-site-howto.xml
    turbine/core/trunk/xdocs/index.xml
    turbine/core/trunk/xdocs/model2+1.xml
    turbine/core/trunk/xdocs/pullmodel.xml
    turbine/core/trunk/xdocs/services/index.xml

Modified: turbine/core/trunk/README.txt
URL: http://svn.apache.org/viewvc/turbine/core/trunk/README.txt?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/README.txt (original)
+++ turbine/core/trunk/README.txt Fri Feb 18 21:32:19 2011
@@ -39,10 +39,10 @@ target/     This is a temporary director
 In order to get started with Turbine, you must build it first.
 Turbine uses Maven for its build environment.  You can find installation
 information about Maven online at http://maven.apache.org/ .
-Once Maven has been installed, just type 'maven'.  The default behavior is to
+Once Maven has been installed, just type 'mvn package'.  The default behavior is to
 compile, run the unit tests, and build the jar.  Some other useful goals:
 
-maven site:generate   - generate the site documention
+mvn site   - generate the site documention
 
 As of Turbine 2.3, you must also have the Torque plugin for Maven installed
 to build Turbine.  Information on how to install the plugin is available

Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Fri Feb 18 21:32:19 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache</groupId>
      <artifactId>apache</artifactId>
-     <version>4</version>
+     <version>7</version>
   </parent>
   <groupId>org.apache.turbine</groupId>
   <artifactId>turbine</artifactId>
@@ -44,14 +44,14 @@
 
   <distributionManagement>
     <repository>
-      <id>default</id>
+      <id>apache.dist</id>
       <name>Default Repository</name>
       <url>${turbine.deployment.protocol}://people.apache.org/www/www.apache.org/dist/turbine/releases/</url>
     </repository>
     <site>
-      <id>default</id>
+      <id>apache.website</id>
       <name>Default Site</name>
-      <url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org</url>
+      <url>${turbine.deployment.protocol}://people.apache.org/www/turbine.apache.org/turbine/development/turbine-4.0</url>
     </site>
   </distributionManagement>
 

Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/package.html?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/package.html Fri Feb 18 21:32:19 2011
@@ -60,7 +60,7 @@
 
 <p>
   Please direct all comments, fixes, and enhancements to the
-  <a href="mailto:turbine-dev@jakarta.apache.org">development list</a>.
+  <a href="mailto:dev@turbine.apache.org">development list</a>.
 </p>
 
 </body>

Modified: turbine/core/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/site/site.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/src/site/site.xml (original)
+++ turbine/core/trunk/src/site/site.xml Fri Feb 18 21:32:19 2011
@@ -18,7 +18,7 @@
  under the License.
 -->
 
-<project name="Turbine"
+<project name="Apache Turbine"
         href="http://turbine.apache.org/">
 
   <bannerLeft>
@@ -30,8 +30,8 @@
   <bannerRight>
     <src>/images/logo.gif</src>
   </bannerRight>
-
-  <version position="right"/>
+  <publishDate format="dd MMMM yyyy" position="left" />
+  <version position="left" />
   
   <body>
     <links>
@@ -109,5 +109,7 @@
       <item name="Todo"                  href="/todo.html"/>
     </menu>
 
+    <menu ref="reports" inherit="bottom" />
+
   </body>
 </project>

Modified: turbine/core/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes.xml (original)
+++ turbine/core/trunk/xdocs/changes.xml Fri Feb 18 21:32:19 2011
@@ -25,6 +25,12 @@
 
   <body>
     <release version="4.0-M1" date="in Subversion">
+      <action type="update" dev="tv">
+        Move to Java-5 generics.
+      </action>
+      <action type="update" dev="ludwig">
+        Move to Java-5 generics.
+      </action>
       <action type="fix" dev="tv" issue="TRB-80" due-to="Georg Kallidis">
         TurbineURI was using the deprecated encode methods of URLEncoder.
       </action>

Modified: turbine/core/trunk/xdocs/getting-started.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/getting-started.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/getting-started.xml (original)
+++ turbine/core/trunk/xdocs/getting-started.xml Fri Feb 18 21:32:19 2011
@@ -130,7 +130,7 @@ TurbineConfig object.
 <section name="Further Questions and Comments">
 <p>
 If you have further questions or comments, please send them to the <a
-href="http://jakarta.apache.org/site/mail.html">Turbine Mailing list</a>.
+href="http://turbine.apache.org/contact.html">Turbine Mailing lists</a>.
 </p>
 </section>
 

Modified: turbine/core/trunk/xdocs/how-to-build.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/how-to-build.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/how-to-build.xml (original)
+++ turbine/core/trunk/xdocs/how-to-build.xml Fri Feb 18 21:32:19 2011
@@ -29,49 +29,20 @@
 <section name="How to build Turbine">
 
 <p>
-  Turbine is built using the <a href="http://maven.apache.org/">Maven</a> build
+  Turbine is built using the <a href="http://maven.apache.org/">Maven-2</a> build
   tool.  So to get started you should download and install Maven.
 </p>
 
 <p>
-  There are three major components to the core Turbine codebase.  They are the Turbine
-  server itself, a Maven plugin to make working Turbine easier, and an implementation
-  of the Schedule and Security services that uses Torque to generate object mapping classes
-  for the database backend.
-</p>
-
-<p>
-  To build these three projects, from the Turbine home directory just run 'maven' and by
-  default each of these projects will be compiled, test cases run, and jar files created.
-  This will also install the artifacts into your local Maven repository as well.
+  To build Turbine, from the Turbine home directory just run 'mvn install' the project
+  will be compiled, test cases run, and jar files created.
+  This will also install the artifact into your local Maven repository as well.
 </p>
 <p>
-  To build the site documentation, run <code>maven multiproject:site</code>, and this will build
-  the site documenation for all the projects, and aggregate them together.
+  To build the site documentation, run <code>mvn site</code>, and this will build
+  the site documentation for the project.
 </p>
 
 </section>
-
-
-
-<section name="Extension Details">
-
-<subsection name="Maven Plugin for Turbine">
-<p>
-  You can then go into your local repostory and take the jar file called <code>maven-turbine-plugin-XX.jar</code>
-  and place it in your maven plugins directory.  Make sure to delete any existing onces.  Then run <code>maven -g</code>
-  and you will see the turbine goals.  For more information see the <a href="maven-turbine-plugin/index.html">site docs</a> for the Maven plugin.
-</p>
-</subsection>
-
-<subsection name="Torque Impl">
-<p>
-  The Torque implementations for the Schedule and Security services where broken out into seperate Maven
-  projects in the Extensions directory because they require a codegeneration step before compiling the
-  source code.  Additioanlly, these services should implement an API defined by the main services Interface.
-  This way, over time, other backend implementations of the Schedule and Security services can be added.
-</p>
-</subsection>
-</section>
 </body>
 </document>

Modified: turbine/core/trunk/xdocs/how-to-help.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/how-to-help.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/how-to-help.xml (original)
+++ turbine/core/trunk/xdocs/how-to-help.xml Fri Feb 18 21:32:19 2011
@@ -38,7 +38,7 @@
 
 <p>
   It is always possible to take ownership of any portion of the project. The way
-  to do this is to post a message to the turbine-dev mailing list.  Just explain
+  to do this is to post a message to the turbine-developer mailing list.  Just explain
   what you are wanting to work on or any ideas that you might have on the subject.
 </p>
 
@@ -52,18 +52,18 @@
             in the xdocs directory in the source distribution.  To submit additional
             documentation in this form or patches to existing documentation, please
             create an issue is the
-            <a href="http://issues.apache.org/scarab/issues">issue tracking system</a>
+            <a href="https://issues.apache.org/jira/browse/TRB">issue tracking system</a>
             and attach the patch files (or new files).
         </li>
         <li>
-            Mailing list - The archives of turbine-user@jakarta.apache.org and
-            turbine-dev@jakarta-apache.org are an excellent source of information
+            Mailing list - The archives of user@turbine.apache.org and
+            dev@turbine.apache.org are an excellent source of information
             for the project.  Answering questions that are asked on the mailing list
             or simply posting information that might be of use to other Turbine users
             would be very welcome contribution to the project.
         </li>
         <li>
-            The <a href="http://wiki.apache.org/turbine/">Jakarta Turbine
+            The <a href="http://wiki.apache.org/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
@@ -74,8 +74,8 @@
             The javadocs are another very important form of documentation for the project.
             Changes to this form of documentation should be in the form of patches.  To submit
             them, create a new issue in the
-            <a href="http://issues.apache.org/scarab/issues">issue tracking system</a>
-            and attach your patch(s).
+            <a href="https://issues.apache.org/jira/browse/TRB">issue tracking system</a>
+            and attach your patch(es).
         </li>
     </ul>
     The documentation is probably the easiest area for anyone to contribute in.  If you are
@@ -92,8 +92,8 @@
 
 <p>
     If you do discover a defect in the Turbine product, please create a defect issue in
-    the <a href="http://issues.apache.org/scarab/issues">issue tracking system</a> clearly
-    discribing the problem.  If you can take the time to track down the source of the problem,
+    the <a href="https://issues.apache.org/jira/browse/TRB">issue tracking system</a> clearly
+    describing the problem.  If you can take the time to track down the source of the problem,
     it would certainly help speed the process of getting it corrected.  Of course, actually
     fixing the problem and attaching a patch to the issue would be greatly appreciated.
 </p>
@@ -101,8 +101,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">Jakarta
-    Turbine Wiki</a>.  Everyone is encouraged to take part in the discussion, design, and
+    <a href="http://wiki.apache.org/turbine/Turbine2/WishList">Turbine Wiki</a>.  Everyone is encouraged to take part in the discussion, design, and
     implementation.
 </p>
 

Modified: turbine/core/trunk/xdocs/howto/index.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/index.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/index.xml (original)
+++ turbine/core/trunk/xdocs/howto/index.xml Fri Feb 18 21:32:19 2011
@@ -32,7 +32,7 @@
         <li><a href="action-event-howto.html">Action Events Howto</a></li>
         <li><a href="configuration-howto.html">Configuration Howto</a></li>
         <li><a href="extend-user-howto.html">Extend User Howto</a></li>
-        <li><a href="intake-howto.html">Intake Howto</a></li>
+        <li><a href="/fulcrum/fulcrum-intake/howto.html">Intake Howto</a></li>
         <li><a href="jsp-howto.html">JSP Howto</a></li>
         <li><a href="migrate-from-2_1-howto.html">Migrating from 2.1 to 2.2</a></li>
         <li><a href="migrate-from-2_2-howto.html">Migrating from 2.2 to 2.3</a></li>

Modified: turbine/core/trunk/xdocs/howto/jsp-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/jsp-howto.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/jsp-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/jsp-howto.xml Fri Feb 18 21:32:19 2011
@@ -33,11 +33,11 @@ It is quite possible to use JSP with Tur
 need to tweak the existing configuration in the
 TurbineResources.properties file as described below. This is an evolving
 document, if there are still errors in this configuration, <a
-href="http://jakarta.apache.org/site/mail.html">please subscribe to the
+href="http://turbine.apache.org/contact.html">please subscribe to the
 Turbine Users list and let us know</a>. Also note that this file is
 checked into Turbine's CVS tree under xdocs/jsp-configuration.xml. We
 appreciate all <a
-href="http://jakarta.apache.org/site/source.html">patches and
+href="https://issues.apache.org/jira/browse/TRB">patches and
 contributions</a> that improve this document.
 </p>
 

Modified: turbine/core/trunk/xdocs/howto/services-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/services-howto.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/services-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/services-howto.xml Fri Feb 18 21:32:19 2011
@@ -72,7 +72,7 @@ services.MyServiceName.earlyInit = true
          <li>
            Your Service will be instantiated exactly once. So it must be
            threadsafe and must not use class global variables for
-           session-dependend information.
+           session-dependent information.
          </li>
          <li>
            You should provide an init() method which is called when your

Modified: turbine/core/trunk/xdocs/howto/velocity-site-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/velocity-site-howto.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/velocity-site-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/velocity-site-howto.xml Fri Feb 18 21:32:19 2011
@@ -47,8 +47,8 @@ re-usable.
 <p>
 Knowledge of how Velocity works and what a Velocity Context object is
 are required for understanding this documentation. This documentation also
-assumes that you are using a Servlet API 2.2 and higher serlvet engine
-such as <a href="http://jakarta.apache.org/tomcat/">Tomcat</a> because
+assumes that you are using a Servlet API 2.2 and higher servlet engine
+such as <a href="http://tomcat.apache.org/">Tomcat</a> because
 we are now targeting towards using WAR archives. Although, this should
 work with older servlet engines as well...it just may be slightly harder
 for you to setup. You should also be familiar with the rest of the Turbine
@@ -160,7 +160,7 @@ role_editor.vm maps to Role_editor.class
 The result will be a fully formed HTML document with the <em>$hello</em>
 replaced with the value: "this is a test...". If you want to make the URI
 above shorter or easier to read, you could simply re-write things using
-<a href="http://www.apache.org/docs/mod/mod_rewrite.html">mod_rewrite</a>.
+<a href="http://httpd.apache.org/docs/current/mod/mod_rewrite.html">mod_rewrite</a>.
 For example, by removing the "<em>/servlet/Turbine/template</em>" portion
 of the URI.
 </p>
@@ -228,7 +228,7 @@ always do a security check before displa
 this is that all you need to do to add security to your screen is to simply
 subclass this class instead of VelocityScreen. There is also no need
 to remember to call super() since the doBuild() method will be called for
-you automaticially by Turbine. You can start to see how Turbine is simply
+you automatically by Turbine. You can start to see how Turbine is simply
 an extension of the servlet framework itself. For example, the Servlet
 Engine will call HttpServlet's service() method for you, just like Turbine
 will call your doBuild() method for you. Tight integration with tools like

Modified: turbine/core/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/index.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/index.xml (original)
+++ turbine/core/trunk/xdocs/index.xml Fri Feb 18 21:32:19 2011
@@ -160,7 +160,7 @@ the current Turbine code.
 
 <ul>
     <li>
-        We have a <a href="http://jakarta.apache.org/site/mail.html">Turbine mailing
+        We have a <a href="http://turbine.apache.org/contact.html">Turbine mailing
         lists</a> for discussion.</li>
     <li>
         You can also access the <a href="cvs-usage.html">Turbine SVN

Modified: turbine/core/trunk/xdocs/model2+1.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/model2%2B1.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/model2+1.xml (original)
+++ turbine/core/trunk/xdocs/model2+1.xml Fri Feb 18 21:32:19 2011
@@ -36,7 +36,7 @@
 ]]></source>
 
 <p>
-Turbine follows the MVC desing pattern.
+Turbine follows the MVC design pattern.
 </p>
 <p>
 <ul>
@@ -53,8 +53,8 @@ addition due to way actions are used (he
 </p>
 
 <p>
-Turbine does not directly support the Hierachical MVC pattern, but
-it cout be used this way by defining multiple module and template
+Turbine does not directly support the Hierarchical MVC pattern, but
+it could be used this way by defining multiple module and template
 paths (would impact performance). Note that in the HMVC each MVC
 instance is self-contained and separable from the rest.
 </p>
@@ -104,7 +104,7 @@ Oh yea...one more reason for the +1...
 </p>
 
 <p>
-It is the Apache <a href="http://jakarta.apache.org/guidelines/decisions.html">voting style</a>. :-)
+It is the Apache <a href="http://jakarta.apache.org/site/decisions.html">voting style</a>. :-)
 </p>
 
 <p>

Modified: turbine/core/trunk/xdocs/pullmodel.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/pullmodel.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/pullmodel.xml (original)
+++ turbine/core/trunk/xdocs/pullmodel.xml Fri Feb 18 21:32:19 2011
@@ -144,7 +144,7 @@ they have missed the boat on this in one
 
 <p>
 Comments are appreciated. Please post them to the Turbine
-<a href="http://jakarta.apache.org/site/mail.html">mailing list</a>.
+<a href="http://turbine.apache.org/contact.html">mailing list</a>.
 </p>
 
 </section>

Modified: turbine/core/trunk/xdocs/services/index.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/services/index.xml?rev=1072157&r1=1072156&r2=1072157&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/services/index.xml (original)
+++ turbine/core/trunk/xdocs/services/index.xml Fri Feb 18 21:32:19 2011
@@ -57,10 +57,7 @@ Service.
 
 <p>
 The services available with Turbine can be found in the
-org.apache.turbine.services package. <strong>Please note that the
-[TODO]'s below simply mean that these services need more complete
-documentation, it does not mean that they are still waiting to be
-implemented.</strong>
+org.apache.turbine.services package.
 </p>
 
 <ul>
@@ -75,41 +72,14 @@ Scheduled Jobs to be loaded.
 <a href="avalon-component-service.html">Avalon Component Service</a>
 <br/>
 Initializes external components which implement the Avalon lifecycle
-interface, e.g. Torque.
+interface, e.g. Torque or other Avalon Services.
 </li>
 
 <li>
-<a href="crypto-service.html">Crypto Service</a>
+<a href="jsonrpc-service.html">JSON-RPC Service</a>
 <br/>
-Provides encryption algorithms like MD5 and SHA message digests as well as old-fashioned Unix crypt.
-</li>
-
-<li>
-<a href="cache-service.html">Cache Service</a>
-<br/>
-Provides a persistant Object Storage mechanism within your application.
-</li>
-
-<li>
-<a href="component-service.html">Component Service</a>
-<br/>
-Initializes external components which implement the Stratum lifecycle
-interface, e.g. Torque and Fulcrum.  Any new components will use the
-Avalon lifecycle and thus the Avalon Component Service.
-</li>
-
-<li>
-<a href="factory-service.html">Factory Service</a>
-<br/>
-A Service for the instantiation of objects with either the specified loaders or
-default class loaders.
-</li>
-
-<li>
-<a href="intake-service.html">Intake Service</a>
-<br/>
-A service that provides input validation along with a standard
-parameter naming framework.
+The JSON-RPC Service supports JavaScript to Java AJAX communications using
+<a href="http://oss.metaparadigm.com/jsonrpc/">JSON-RPC-Java</a>.
 </li>
 
 <li>
@@ -120,40 +90,12 @@ Turbine Layout/Navigations and Screen st
 </li>
 
 <li>
-<a href="localization-service.html">Localization Service</a>
-<br/>
-The single point of access to all localization resources.
-</li>
-
-<li>
-<a href="logging-service.html">Logging Service</a>
-<br/>
-The Logging Service has been removed and replaced with a commons-logging
-and log4j combination. Here you find some information how to use this
-in Turbine.
-</li>
-
-<li>
-<a href="mimetype-service.html">MimeType Service</a>
-<br/>
-The service maintains the mappings between MIME types and corresponding file
-name extensions as well as between locales and character encoding.
-</li>
-
-<li>
 <a href="naming-service.html">Naming Service</a>
 <br/>
 Provides JNDI naming contexts.
 </li>
 
 <li>
-<a href="pool-service.html">Pool Service</a>
-<br/>
-A service for the pooling of instantiated Objects, allowing for the recycling
-and disposal of Objects in the pool.
-</li>
-
-<li>
 <a href="pull-service.html">Pull Service</a>
 <br/>
 Manages the creation of application tools that are available to all templates
@@ -162,13 +104,6 @@ scope or persistant scope within your ap
 </li>
 
 <li>
-<a href="resources-service.html">Resources Service</a>
-<br/>
-The Resources Service has been removed and replaced with commons-configuration. You
-find some explanation how to use commons-configuration here.
-</li>
-
-<li>
 <a href="rundata-service.html">RunData Service</a>
 <br/>
 Is the Service which manages the higher level operations surrounding
@@ -218,17 +153,15 @@ generated peers to access the required s
 </li>
 
 <li>
-<a href="uniqueid-service.html">Unique ID Service</a>
+<a href="ui-service.html">UI Service</a>
 <br/>
-Allows for the creation of Context unique and pseudo random identifiers.
+The UI (User Interface) Service provides for application skinning.
 </li>
 
 <li>
-<a href="upload-service.html">Upload Service</a>
+<a href="uniqueid-service.html">Unique ID Service</a>
 <br/>
-This service manages multipart/form-data POST requests, storing them
-temporarily in memory or locally. The resultant Objects can be manipulated through
-a FileItem Object.
+Allows for the creation of Context unique and pseudo random identifiers.
 </li>
 
 <li>
@@ -238,26 +171,76 @@ a FileItem Object.
 the Turbine Layout/Navigations and Screen structure.
 </li>
 
+</ul>
+
+<p>
+For more information on the Services Package, view the package.html Package
+Documentation in the Javadocs or in Turbine CVS.
+</p>
+
+</section>
+<section name="Avalon Services">
+<p>
+Turbine supports different types of component models. Turbine Services can implement
+TurbineServiceProvider to add component managers to the service repository. By default, Turbine
+uses an Avalon component manager for these purposes.
+</p>
+
+<ul>
+<li>
+<a href="/fulcrum/fulcrum-crypto/">Crypto Service</a>
+<br/>
+Provides encryption algorithms like MD5 and SHA message digests as well as old-fashioned Unix crypt.
+</li>
+
+<li>
+<a href="/fulcrum/fulcrum-cache/">Cache Service</a>
+<br/>
+Provides different cache implementations for non-persistent Object Storage within your application.
+</li>
+
+<li>
+<a href="/fulcrum/fulcrum-localization/">Localization Service</a>
+<br/>
+The single point of access to all localization resources.
+</li>
+
 <li>
-<a href="xmlrpc-service.html">XML-RPC Service</a>
+<a href="/fulcrum/fulcrum-mimetype/">MimeType Service</a>
+<br/>
+The service maintains the mappings between MIME types and corresponding file
+name extensions as well as between locales and character encoding.
+</li>
+
+<li>
+<a href="/fulcrum/fulcrum-pool/">Pool Service</a>
+<br/>
+A service for the pooling of instantiated Objects, allowing for the recycling
+and disposal of Objects in the pool.
+</li>
+
+<li>
+<a href="/fulcrum/fulcrum-upload/">Upload Service</a>
+<br/>
+This service manages multipart/form-data POST requests, storing them
+temporarily in memory or locally. The resultant Objects can be manipulated through
+a FileItem Object.
+</li>
+
+<li>
+<a href="/fulcrum/fulcrum-xmlrpc/">XML-RPC Service</a>
 <br/>
 This service manages xml-rpc calls to a remote Server.
 </li>
 
 <li>
-<a href="xslt-service.html">XSLT Service</a>
+<a href="/fulcrum/fulcrum-xslt/">XSLT Service</a>
 <br/>
 The service which  is used to transform XML with an XSLT stylesheet.
 </li>
 
 </ul>
 
-<p>
-For more information on the Services Package, view the package.html Package
-Documentation in the Javadocs or in Turbine CVS.
-</p>
-
 </section>
-
 </body>
 </document>