Author: buildbot
Date: Wed Jun  5 09:47:07 2013
New Revision: 864492

Log:
Staging update by buildbot for aries

Modified:
    websites/staging/aries/trunk/content/   (props changed)
    
websites/staging/aries/trunk/content/documentation/ariesprogrammingmodel.html

Propchange: websites/staging/aries/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun  5 09:47:07 2013
@@ -1 +1 @@
-1489759
+1489774

Modified: 
websites/staging/aries/trunk/content/documentation/ariesprogrammingmodel.html
==============================================================================
--- 
websites/staging/aries/trunk/content/documentation/ariesprogrammingmodel.html 
(original)
+++ 
websites/staging/aries/trunk/content/documentation/ariesprogrammingmodel.html 
Wed Jun  5 09:47:07 2013
@@ -268,29 +268,45 @@
             <!-- Content -->
             <div class="wiki-content"><p><a 
name="AriesProgrammingModel-AriesProgrammingModel"></a></p>
 <h1 id="aries-programming-model">Aries Programming Model</h1>
-<p>The programming model use in Apache Aries is described in sections under 
each module, here are links:</p>
-<ol>
-<li>
-<p>Application </p>
+<p>Aries facilitates OSGi and Enterprise OSGi development by proving a variety 
of tools and programming models that can be
+useful for OSGi bundles and applications. This includes technology that 
implements or extends Enterprise OSGi specifications
+as well as Apache Aries-specific technology.</p>
+<p>The following components can be found in Apache Aries:</p>
 <ul>
-<li>
-<p><a href="/modules/applications.html">Application introduction</a></p>
-</li>
-<li>
-<p><a href="application-dependencies.html">Application module overview</a></p>
-</li>
+<li><a href="/modules/blueprint.html">Blueprint</a> (OSGi spec chapter 
121)</li>
+<li><a href="/modules/blueprintannotation.html">Blueprint annotations</a></li>
+<li><a href="/modules/blueprintweb.html">Blueprint web</a></li>
+<li><a href="/modules/blueprintnoosgi.html">Blueprint without osgi</a></li>
+<li>Subsystems (OSGi spec chapter 134)</li>
+<li><a href="/modules/transactionsproject.html">Transactions support</a> (OSGi 
spec chapter 123)</li>
+<li><a href="/modules/jpaproject.html">JPA support</a> (OSGi spec chapter 
127)</li>
+<li><a href="/modules/jmx.html">JMX support</a> (OSGi spec chapter 124)</li>
+<li><a href="/modules/jndiproject.html">JNDI support</a> (OSGi spec chapter 
126)</li>
+<li>EJB support</li>
+<li><a href="/modules/spi-fly.html">Service Loader Mediator</a> (OSGi spec 
chapter 133)</li>
+<li>Web Application URL Handler (OSGi spec section 128.4)</li>
+</ul>
+<p>Additional components:</p>
+<ul>
+<li>Quiesce manager</li>
+<li>Proxy support</li>
+<li>Aries utils</li>
+<li>Aries test support</li>
+</ul>
+<p>Build tools:</p>
+<ul>
+<li><a href="/modules/ebamavenpluginproject.html">esa-maven-plugin</a></li>
+<li>maven versioning plugin</li>
+</ul>
+<h2 id="obsolete">Obsolete</h2>
+<p>This section list technology that can be found in Apache Aries but has 
since been superseded by other technology.</p>
+<ul>
+<li>Application (superseded by Subsystems)<ul>
+<li><a href="/modules/applications.html">Application introduction</a></li>
+<li><a href="application-dependencies.html">Application module 
overview</a></li>
 </ul>
 </li>
-<li>
-<p><a href="/modules/blueprint.html">Blueprint</a></p>
-</li>
-<li>
-<p><a href="/modules/transactionsproject.html">Transactions</a></p>
-</li>
-<li>
-<p><a href="/modules/jpaproject.html">JPA</a></p>
-</li>
-</ol></div>
+</ul></div>
             <!-- Content -->
           </td>
         </tr>


Reply via email to