Author: davidb
Date: Wed Jul 13 13:38:07 2011
New Revision: 792638
Log:
Publishing merge to aries site by davidb
Modified:
websites/production/aries/ (props changed)
websites/production/aries/content/index.html
websites/production/aries/content/modules/spi-fly.html
Propchange: websites/production/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 13 13:38:07 2011
@@ -1 +1 @@
-/websites/staging/aries/trunk:782169-790374
+/websites/staging/aries/trunk:782169-792637
Modified: websites/production/aries/content/index.html
==============================================================================
--- websites/production/aries/content/index.html (original)
+++ websites/production/aries/content/index.html Wed Jul 13 13:38:07 2011
@@ -264,14 +264,14 @@ proposal document on the <a href="http:/
pages which guides you through how to build the Aries code, provides
sample applications and describes how to set up an environment in which to
run the consuming application.</p>
-<p>Aries provides enterprise OSGi componentry such as the Blueprint container
+<p>The Aries project provides enterprise OSGi componentry such as the
Blueprint container
and projects to integrate enterprise technologies such as JTA, JNDI and JPA
into an OSGi environment to make these available to OSGi bundles. Some
Aries components, such as the Aries Blueprint container, require nothing
more than an OSGi framework (such as Equinox or Felix) to run on; others
are intended to be integrated into application server or integration
-runtimes such as ServiceMix or Geronimo.</p>
-<p>Continuous builds of Aries are available for download from <a
href="http://builds.apache.org/hudson/job/Aries/";>http://builds.apache.org/hudson/job/Aries/</a></p></div>
+runtimes such as Apache ServiceMix or Apache Geronimo.</p>
+<p>Continuous builds of the Aries project are available for download from <a
href="http://builds.apache.org/hudson/job/Aries/";>http://builds.apache.org/hudson/job/Aries/</a></p></div>
<!-- Content -->
</td>
</tr>
Modified: websites/production/aries/content/modules/spi-fly.html
==============================================================================
--- websites/production/aries/content/modules/spi-fly.html (original)
+++ websites/production/aries/content/modules/spi-fly.html Wed Jul 13 13:38:07
2011
@@ -250,9 +250,11 @@
<div class="wiki-content"><h1 id="spi-fly">SPI-Fly</h1>
<p>This page describes the SPI Fly component.
The SPI Fly component is aimed at providing general support for the JRE SPI
-mechanism (including the usage of META-INF/services) in OSGi.</p>
+mechanism (including the usage of <tt>java.util.ServiceLoader</tt> and
<tt>META-INF/services</tt>) in OSGi.</p>
+<p>There are currently standardization efforts ongoing in the OSGi Alliance
for which the SPI-Fly project is a prototype.
+For more information, see RFC 167 in the OSGi Enterprise 4.4 EA draft: <a
href="http://www.osgi.org/download/osgi-early-draft-2011-05.pdf";>http://www.osgi.org/download/osgi-early-draft-2011-05.pdf</a></p>
<p>The code can be found in
-http://svn.apache.org/repos/asf/incubator/aries/trunk/spi-fly</p>
+<a
href="http://svn.apache.org/repos/asf/incubator/aries/trunk/spi-fly";>http://svn.apache.org/repos/asf/incubator/aries/trunk/spi-fly</a></p>
<p>Currently the implementation does the following:</p>
<p>Providers:</p>
<ul>
