You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by bu...@apache.org on 2013/07/08 16:35:00 UTC

svn commit: r868825 [4/5] - in /websites/staging/aries/trunk/content: ./ community/ development/ documentation/ documentation/tools/ documentation/tutorials/ downloads/ downloads/archived-releases/0.1-incubating/ downloads/archived-releases/0.2-incubat...

Modified: websites/staging/aries/trunk/content/downloads/ariestrader-1.0.0.html
==============================================================================
--- websites/staging/aries/trunk/content/downloads/ariestrader-1.0.0.html (original)
+++ websites/staging/aries/trunk/content/downloads/ariestrader-1.0.0.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -280,15 +283,14 @@ that it is no longer required for you to
 Derby version included in the sample is fully leveraged internally in the
 sample and therefore no additional Derby installation is required. 
 However, there are steps required to initialize the Database from within
-the sample itself (see instructions below).<br />
-</p>
+the sample itself (see instructions below).  </p>
 <hr />
 <p><a name="AriesTrader-CreatingtheOSGiplatform(equinox-test-harness)forAriesTrader"></a></p>
 <h3 id="creating-the-osgi-platform-equinox-test-harness-for-ariestrader">Creating the OSGi platform (equinox-test-harness) for AriesTrader</h3>
 <p>Download and unzip the source zip for the <a href="aries:downloads.html">latest release</a>
  of Aries Samples and build the equinox-test-harness module under
 ariestrader:</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">-</span><span class="n">incubating</span><span class="sr">/ariestrader/</span><span class="n">assemblies</span><span class="o">/</span><span class="n">equinox</span><span class="o">-</span><span class="n">test</span><span class="o">-</span><span class="n">harness</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">incubating</span><span class="o">/</span><span class="n">ariestrader</span><span class="o">/</span><span class="n">assemblies</span><span class="o">/</span><span class="n">equinox</span><span class="o">-</span><span class="n">test</span><span class="o">-</span><span class="n">harness</span>
 <span class="n">mvn</span> <span class="n">install</span>
 </pre></div>
 
@@ -305,20 +307,18 @@ Directions are provided here:  <a href="
 <p><a name="AriesTrader-StartingtheEquinoxTestHarnesstoruntheAriesTradersample"></a></p>
 <h3 id="starting-the-equinox-test-harness-to-run-the-ariestrader-sample">Starting the Equinox Test Harness to run the AriesTrader sample</h3>
 <p>AriesTrader needs a test harness to run in.  For this purpose we are using
-an Equinox assembly that pulls in all of the necessary dependencies.<br />
-</p>
+an Equinox assembly that pulls in all of the necessary dependencies.  </p>
 <p>The first task is to start the Apache Aries modules in an OSGi framework
 using the Eclipse Equinox test harness</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">-</span><span class="n">incubating</span><span class="sr">/ariestrader/</span><span class="n">assemblies</span><span class="sr">/equinox-test-harness/</span><span class="n">target</span>
-<span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">osgi</span><span class="o">-</span><span class="mf">3.5.0</span><span class="o">.</span><span class="n">v20090520</span><span class="o">.</span><span class="n">jar</span> <span class="o">-</span><span class="n">console</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">incubating</span><span class="o">/</span><span class="n">ariestrader</span><span class="o">/</span><span class="n">assemblies</span><span class="o">/</span><span class="n">equinox</span><span class="o">-</span><span class="n">test</span><span class="o">-</span><span class="n">harness</span><span class="o">/</span><span class="n">target</span>
+<span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">osgi</span><span class="o">-</span>3<span class="p">.</span>5<span class="p">.</span>0<span class="p">.</span><span class="n">v20090520</span><span class="p">.</span><span class="n">jar</span> <span class="o">-</span><span class="n">console</span>
 </pre></div>
 
 
 <p>The OSGi console should start up, the 'ss' command should show the active
 bundles but the AriesTrader application is not yet installed (with the
 exception of the ariestrader derby datasource which is started with the
-test harness for convenience).<br />
-</p>
+test harness for convenience).  </p>
 <p><a name="AriesTrader-InstallingAriesTraderintheEquinoxTestHarness"></a></p>
 <h3 id="installing-ariestrader-in-the-equinox-test-harness">Installing AriesTrader in the Equinox Test Harness</h3>
 <p>To install the AriesTrader application simply copy the eba for AriesTrader
@@ -328,13 +328,13 @@ copied into the target directory as part
 harness. </p>
 <p>When using the "JDBC" only AriesTrader configuration which supports only
 jdbc persistence:</p>
-<div class="codehilite"><pre><span class="n">cp</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">aries</span><span class="o">.</span><span class="n">samples</span><span class="o">.</span><span class="n">ariestrader</span><span class="o">.</span><span class="n">jdbc</span><span class="o">-*.</span><span class="n">eba</span> <span class="n">load</span><span class="o">/</span>
+<div class="codehilite"><pre><span class="n">cp</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">samples</span><span class="p">.</span><span class="n">ariestrader</span><span class="p">.</span><span class="n">jdbc</span><span class="o">-*</span><span class="p">.</span><span class="n">eba</span> <span class="n">load</span><span class="o">/</span>
 </pre></div>
 
 
 <p>When using the "All" AriesTrader configuration which supports all currently
 available persistence modes:</p>
-<div class="codehilite"><pre><span class="n">cp</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">aries</span><span class="o">.</span><span class="n">samples</span><span class="o">.</span><span class="n">ariestrader</span><span class="o">.</span><span class="n">all</span><span class="o">-*.</span><span class="n">eba</span> <span class="n">load</span><span class="o">/</span>
+<div class="codehilite"><pre><span class="n">cp</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">samples</span><span class="p">.</span><span class="n">ariestrader</span><span class="p">.</span><span class="n">all</span><span class="o">-*</span><span class="p">.</span><span class="n">eba</span> <span class="n">load</span><span class="o">/</span>
 </pre></div>
 
 
@@ -355,8 +355,7 @@ selection.</p>
 <em> JDBC persistence
 </em> JPA application managed entity manager persistence
 * JPA container managed entity managers using declarative transaction
-support<br />
-</p>
+support  </p>
 <p>By default, the sample starts with JDBC persistence.  To select another
 persistence mechanism see the directions under "Accessing and using the
 AriesTrader sample. </p>
@@ -377,8 +376,7 @@ step through a trading scenario with eac
 <h3 id="about-the-ariestrader-sample">About the AriesTrader Sample</h3>
 <p>The AriesTrader sample is a modified version of the Apache Geronimo
 DayTrader sample.  It has been somewhat simplified and reorganized to
-support the Apache Aries programming model.<br />
-</p>
+support the Apache Aries programming model.  </p>
 <p>The AriesTrader sample bundles are organized like this:</p>
 <p><img alt="at2" src="ariesTraderOverview2.png" /></p></div>
             <!-- Content -->

Modified: websites/staging/aries/trunk/content/downloads/blogsample-1.0.0.html
==============================================================================
--- websites/staging/aries/trunk/content/downloads/blogsample-1.0.0.html (original)
+++ websites/staging/aries/trunk/content/downloads/blogsample-1.0.0.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -285,7 +288,7 @@ blog-datasource) as indicated in the com
 <h3 id="create-the-osgi-platform-for-the-blog-sample">Create the OSGi platform for the Blog sample</h3>
 <p>Download and unzip the source zip for the <a href="/downloads/currentrelease.html">latest release</a>
  of Aries Samples and build the blog-assembly module:</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span><span class="mf">1.0.0</span><span class="sr">/blog/</span><span class="n">blog</span><span class="o">-</span><span class="n">assembly</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">/</span><span class="n">blog</span><span class="o">/</span><span class="n">blog</span><span class="o">-</span><span class="n">assembly</span>
 <span class="n">mvn</span> <span class="n">install</span>
 </pre></div>
 
@@ -295,19 +298,19 @@ dependencies.</p>
 <p><a name="BlogSample-RunningtheBlogsample"></a></p>
 <h3 id="running-the-blog-sample_1">Running the Blog sample</h3>
 <p>Build the JPA based Blog sample application (.eba file) from the <a href="/downloads/currentrelrease.html">latest release</a></p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span><span class="mf">1.0.0</span><span class="sr">/blog/</span><span class="n">blog</span><span class="o">-</span><span class="n">jpa</span><span class="o">-</span><span class="n">eba</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">/</span><span class="n">blog</span><span class="o">/</span><span class="n">blog</span><span class="o">-</span><span class="n">jpa</span><span class="o">-</span><span class="n">eba</span>
 <span class="n">mvn</span> <span class="n">install</span>
 </pre></div>
 
 
 <p>. Change directory to the blog-assembly target directory:</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span><span class="mf">1.0.0</span><span class="sr">/blog-sample/</span><span class="n">blog</span><span class="o">-</span><span class="n">assembly</span><span class="o">/</span><span class="n">target</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">samples</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">/</span><span class="n">blog</span><span class="o">-</span><span class="n">sample</span><span class="o">/</span><span class="n">blog</span><span class="o">-</span><span class="n">assembly</span><span class="o">/</span><span class="n">target</span>
 </pre></div>
 
 
 <p>now start Aries in an OSGi framework (we're using Eclipse Equinox in this
 case)</p>
-<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">org</span><span class="o">.</span><span class="n">eclipse</span><span class="o">.</span><span class="n">osgi</span><span class="o">-</span><span class="mf">3.7.0</span><span class="o">.</span><span class="n">v20110613</span><span class="o">.</span><span class="n">jar</span> <span class="o">-</span><span class="n">console</span>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">org</span><span class="p">.</span><span class="n">eclipse</span><span class="p">.</span><span class="n">osgi</span><span class="o">-</span>3<span class="p">.</span>7<span class="p">.</span>0<span class="p">.</span><span class="n">v20110613</span><span class="p">.</span><span class="n">jar</span> <span class="o">-</span><span class="n">console</span>
 </pre></div>
 
 

Modified: websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/testresults.html
==============================================================================
--- websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/testresults.html (original)
+++ websites/staging/aries/trunk/content/downloads/ct/0.2-incubating/testresults.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/downloads/ct/0.3/testresults.html
==============================================================================
--- websites/staging/aries/trunk/content/downloads/ct/0.3/testresults.html (original)
+++ websites/staging/aries/trunk/content/downloads/ct/0.3/testresults.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/downloads/currentrelease.html
==============================================================================
--- websites/staging/aries/trunk/content/downloads/currentrelease.html (original)
+++ websites/staging/aries/trunk/content/downloads/currentrelease.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/downloads/testresults.html
==============================================================================
--- websites/staging/aries/trunk/content/downloads/testresults.html (original)
+++ websites/staging/aries/trunk/content/downloads/testresults.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/index.html
==============================================================================
--- websites/staging/aries/trunk/content/index.html (original)
+++ websites/staging/aries/trunk/content/index.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/modules/applications.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/applications.html (original)
+++ websites/staging/aries/trunk/content/modules/applications.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -273,16 +276,14 @@ together provide a coherent business fun
 consist of modules of many different types.  For example, a Aries
 application providing Web banking might consist of bundles with Web content
 (Web Application Bundles), bundles with Blueprint contexts, and bundles
-with JPA entities and persistence configuration (Persistence Bundles).<br />
-</p>
+with JPA entities and persistence configuration (Persistence Bundles).  </p>
 <p>An Aries application isolates the OSGi services offered by its contained
 modules so that they are not visible outside the application unless
 explicitly configured to be exported from the application. Aries
 applications have several ways of accepting workloads: an Aries
 applications may include Web bundles for processing HTTP workloads; it may
 export one or more of the services offered by its contained modules to
-other Aries applications or for distribution as a Web service.<br />
-</p>
+other Aries applications or for distribution as a Web service.  </p>
 <p>With the isolation runtime, each Aries application runs in its own isolated
 OSGi framework instance with its own OSGi service registry. Bundles in one
 Aries application cannot see bundles, services, or packages that are
@@ -295,13 +296,14 @@ isolated framework instances of the OSGi
 <h2 id="structure-of-an-aries-application">Structure of an Aries application</h2>
 <p>An Aries application is packaged as a zip file with a '.eba' suffix. Its
 structure is as follows:</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Sample Aries application structure</B></DIV><DIV class="codeContent panelContent">
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Sample Aries application structure</B></DIV><DIV class="codeContent panelContent">
     META-INF/APPLICATION.MF<br>
     bundle1.jar<br>
     bundle2.jar<br>
     bundle3.jar<br>
 </DIV>
-</DIV></p>
+</DIV>
+
 <p>The file must contain either an APPLICATION.MF with at least one bundle
 listed in its Application-Content header (see below), or at least one
 bundle 'by value' within the .eba. No 'by value' bundles are required if a
@@ -319,7 +321,7 @@ located at META-INF/APPLICATION.MF and d
 application level. The manifest enumerates the modules that comprise the
 Aries application along with any OSGi services exported from, or referenced
 by, those modules.  The following is an example of an Aries manifest:</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>APPLICATION.MF</B></DIV><DIV class="codeContent panelContent">
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>APPLICATION.MF</B></DIV><DIV class="codeContent panelContent">
     Manifest-Version: 1.0<br>
     Application-ManifestVersion: 1.0<br>
     Application-Name: Bank Account<br>
@@ -335,7 +337,8 @@ by, those modules.  The following is an 
     Application-ImportService:<br>
 com.mybank.security.UserAuthService;filter="(security=strong)"<br>
 </DIV>
-</DIV></p>
+</DIV>
+
 <p>The manifest headers are as follows:</p>
 <ul>
 <li>Manifest-Version - a version number for the manifest format.</li>
@@ -387,7 +390,7 @@ bundles that fully satisfy an applicatio
 recorded in DEPLOYMENT.MF will be loaded into the runtime each time the
 application is installed. A DEPLOYMENT.MF file will be generated if one
 does not exist, or honoured if provided. Here's an example:</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>DEPLOYMENT.MF</B></DIV><DIV class="codeContent panelContent">
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>DEPLOYMENT.MF</B></DIV><DIV class="codeContent panelContent">
     Manifest-Version: 1.0<br>
     Application-Version: 1.0<br>
     Application-SymbolicName: com.mybank.account.app<br>
@@ -400,7 +403,8 @@ does not exist, or honoured if provided.
     Import-Package: com.mybank.account.admin.login;version="1.0.1";bundle-symbolic-name="com.mybank.account.admin";bundle-version="[1.0.1,1.0.1]",com.mybank.account.delivery.bycar;version="[1.0.0,2.0.0)",javax.servlet;version="2.5.0"<br>
     Deployed-Use-Bundle: com.mybank.account.admin;deployed-version=1.0.1<br>
 </DIV>
-</DIV></p>
+</DIV>
+
 <p>The manifest headers are as follows:</p>
 <ul>
 <li>Manifest-Version - a version number for the manifest format.</li>

Modified: websites/staging/aries/trunk/content/modules/blueprint.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/blueprint.html (original)
+++ websites/staging/aries/trunk/content/modules/blueprint.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -353,16 +356,19 @@ the exact type. </p>
 example, the <em>class</em> attribute specifies the name of the Java class to
 instantiate. The Blueprint Container will create the <em>Account</em> object by
 passing <em>1</em> as the argument to the constructor. </p>
-<div class="codehilite"><pre>   <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Account</span> <span class="o">{</span>      
-       <span class="kd">public</span> <span class="nf">Account</span><span class="o">(</span><span class="kt">long</span> <span class="n">number</span><span class="o">)</span> <span class="o">{</span>
-          <span class="o">...</span>
-       <span class="o">}</span>
-       <span class="o">...</span>
-   <span class="o">}</span>
-
-   <span class="o">&lt;</span><span class="n">bean</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;accountOne&quot;</span> <span class="n">class</span><span class="o">=</span><span class="s">&quot;org.apache.aries.simple.Account&quot;</span><span class="o">&gt;</span>
-       <span class="o">&lt;</span><span class="n">argument</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;1&quot;</span><span class="o">/&gt;</span>
-   <span class="o">&lt;/</span><span class="n">bean</span><span class="o">&gt;</span>
+<div class="codehilite"><pre>   :::java
+   public class Account {      
+       public Account(long number) {
+          ...
+       }
+       ...
+   }
+
+
+
+   <span class="nt">&lt;bean</span> <span class="na">id=</span><span class="s">&quot;accountOne&quot;</span> <span class="na">class=</span><span class="s">&quot;org.apache.aries.simple.Account&quot;</span><span class="nt">&gt;</span>
+       <span class="nt">&lt;argument</span> <span class="na">value=</span><span class="s">&quot;1&quot;</span><span class="nt">/&gt;</span>
+   <span class="nt">&lt;/bean&gt;</span>
 </pre></div>
 
 
@@ -378,6 +384,8 @@ pass 2 as the argument to create the Acc
        }
    }
 
+
+
    <span class="nt">&lt;bean</span> <span class="na">id=</span><span class="s">&quot;accountTwo&quot;</span>
     <span class="na">class=</span><span class="s">&quot;org.apache.aries.simple.StaticAccountFactory&quot;</span> 
      <span class="na">factory-method=</span><span class="s">&quot;createAccount&quot;</span><span class="nt">&gt;</span>   
@@ -448,12 +456,16 @@ example <em>accountOne</em> is injected 
        }
    }
 
+
+
    public class Currency {  
        public Currency() {
       ...
        }
    }
 
+
+
    <span class="nt">&lt;bean</span> <span class="na">id=</span><span class="s">&quot;accountOne&quot;</span> <span class="na">class=</span><span class="s">&quot;org.apache.aries.simple.Account&quot;</span><span class="nt">&gt;</span>
        <span class="nt">&lt;property</span> <span class="na">name=</span><span class="s">&quot;currency&quot;</span> <span class="na">ref=</span><span class="s">&quot;currency&quot;</span> <span class="nt">/&gt;</span>
    <span class="nt">&lt;/bean&gt;</span>
@@ -471,17 +483,19 @@ in the OSGi service registry. </p>
 can be specified using the <em>interface</em> attribute:</p>
 <div class="codehilite"><pre>   <span class="n">public</span> <span class="n">class</span> <span class="n">AccountImpl</span> <span class="n">implements</span> <span class="n">Account</span> <span class="p">{</span>      
        <span class="n">public</span> <span class="n">Account</span><span class="p">()</span> <span class="p">{</span>
-      <span class="o">...</span>
+      <span class="p">...</span>
        <span class="p">}</span>
        <span class="n">public</span> <span class="n">void</span> <span class="n">setCurrency</span><span class="p">(</span><span class="n">Currency</span> <span class="n">currency</span><span class="p">)</span> <span class="p">{</span>
-      <span class="o">...</span>
+      <span class="p">...</span>
        <span class="p">}</span>
    <span class="p">}</span>
 
-   <span class="o">&lt;</span><span class="n">service</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;serviceOne&quot;</span> <span class="nb">ref</span><span class="o">=</span><span class="s">&quot;account&quot;</span>
-    <span class="n">interface</span><span class="o">=</span><span class="s">&quot;org.apache.aries.simple.Account&quot;</span> <span class="o">/&gt;</span>
 
-   <span class="o">&lt;</span><span class="n">bean</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;account&quot;</span> <span class="n">class</span><span class="o">=</span><span class="s">&quot;org.apache.aries.simple.AccountImpl&quot;</span> <span class="o">/&gt;</span>
+
+   <span class="o">&lt;</span><span class="n">service</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">serviceOne</span>&quot; <span class="n">ref</span><span class="p">=</span>&quot;<span class="n">account</span>&quot;
+    <span class="n">interface</span><span class="p">=</span>&quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">Account</span>&quot; <span class="o">/&gt;</span>
+
+   <span class="o">&lt;</span><span class="n">bean</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">account</span>&quot; <span class="n">class</span><span class="p">=</span>&quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">AccountImpl</span>&quot; <span class="o">/&gt;</span>
 </pre></div>
 
 
@@ -496,9 +510,9 @@ element as follows:</p>
 <p>The interfaces under which a service is registered can be determined by
 Blueprint using <em>auto-export</em>.  The following registers the service under
 all the bean's interfaces:</p>
-<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">service</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;serviceOne&quot;</span> <span class="nb">ref</span><span class="o">=</span><span class="s">&quot;account&quot;</span> <span class="n">auto</span><span class="o">-</span><span class="n">export</span><span class="o">=</span><span class="s">&quot;interfaces&quot;</span> <span class="o">/&gt;</span>
+<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">service</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">serviceOne</span>&quot; <span class="n">ref</span><span class="p">=</span>&quot;<span class="n">account</span>&quot; <span class="n">auto</span><span class="o">-</span><span class="n">export</span><span class="p">=</span>&quot;<span class="n">interfaces</span>&quot; <span class="o">/&gt;</span>
 
-   <span class="o">&lt;</span><span class="n">bean</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;account&quot;</span> <span class="n">class</span><span class="o">=</span><span class="s">&quot;org.apache.aries.simple.AccountImpl&quot;</span> <span class="o">/&gt;</span>
+   <span class="o">&lt;</span><span class="n">bean</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">account</span>&quot; <span class="n">class</span><span class="p">=</span>&quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">AccountImpl</span>&quot; <span class="o">/&gt;</span>
 </pre></div>
 
 
@@ -537,8 +551,8 @@ multiple matches.  When choosing between
 service will be returned ahead of the lower.  The default ranking value is
 0. Service ranking is specified using the <em>ranking</em> attributes as
 follows:</p>
-<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">service</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;serviceFive&quot;</span> <span class="nb">ref</span><span class="o">=</span><span class="s">&quot;account&quot;</span> <span class="n">auto</span><span class="o">-</span><span class="n">export</span><span class="o">=</span><span class="s">&quot;all-classes&quot;</span>
-    <span class="n">ranking</span><span class="o">=</span><span class="s">&quot;3&quot;</span> <span class="o">/&gt;</span>
+<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">service</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">serviceFive</span>&quot; <span class="n">ref</span><span class="p">=</span>&quot;<span class="n">account</span>&quot; <span class="n">auto</span><span class="o">-</span><span class="n">export</span><span class="p">=</span>&quot;<span class="n">all</span><span class="o">-</span><span class="n">classes</span>&quot;
+    <span class="n">ranking</span><span class="p">=</span>&quot;3&quot; <span class="o">/&gt;</span>
 </pre></div>
 
 
@@ -565,10 +579,10 @@ object to remain the same while the back
 replaced with another service. Calls on a proxy that does not have a
 backing service will block until a service becomes available or a timeout
 occurs at which point a ServiceUnavailableException will be thrown.</p>
-<div class="codehilite"><pre>   <span class="n">try</span> <span class="p">{</span>
-      <span class="n">balance</span> <span class="o">=</span> <span class="n">account</span><span class="o">.</span><span class="n">getBalance</span><span class="p">();</span>
-   <span class="p">}</span> <span class="n">catch</span> <span class="p">(</span><span class="n">ServiceUnavailableException</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
-      <span class="o">...</span>
+<div class="codehilite"><pre>   <span class="k">try</span> <span class="p">{</span>
+      <span class="n">balance</span> <span class="p">=</span> <span class="n">account</span><span class="p">.</span><span class="n">getBalance</span><span class="p">();</span>
+   <span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="n">ServiceUnavailableException</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+      <span class="p">...</span>
    <span class="p">}</span>
 </pre></div>
 
@@ -577,22 +591,22 @@ occurs at which point a ServiceUnavailab
 minutes).  This value can be changed on a per bundle basis using directives
 on the Bundle-SymbolicName.  The following switches the timeout off
 completely (the default is true):</p>
-<div class="codehilite"><pre>   <span class="n">Bundle</span><span class="o">-</span><span class="n">SymbolicName:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">aries</span><span class="o">.</span><span class="n">simple</span><span class="o">.</span><span class="n">account</span><span class="p">;</span>
-    <span class="n">blueprint</span><span class="o">.</span><span class="n">graceperiod:</span><span class="o">=</span><span class="n">false</span>
+<div class="codehilite"><pre>   <span class="n">Bundle</span><span class="o">-</span><span class="n">SymbolicName</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">account</span><span class="p">;</span>
+    <span class="n">blueprint</span><span class="p">.</span><span class="n">graceperiod</span><span class="p">:=</span><span class="n">false</span>
 </pre></div>
 
 
 <p>The following sets the timeout to 10000 milliseconds (10 seconds):</p>
-<div class="codehilite"><pre>   <span class="n">Bundle</span><span class="o">-</span><span class="n">SymbolicName:</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">aries</span><span class="o">.</span><span class="n">simple</span><span class="o">.</span><span class="n">account</span><span class="p">;</span>
-    <span class="n">blueprint</span><span class="o">.</span><span class="n">graceperiod:</span><span class="o">=</span><span class="n">false</span><span class="p">;</span> <span class="n">blueprint</span><span class="o">.</span><span class="n">timeout</span><span class="o">=</span><span class="mi">10000</span><span class="p">;</span>
+<div class="codehilite"><pre>   <span class="n">Bundle</span><span class="o">-</span><span class="n">SymbolicName</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">account</span><span class="p">;</span>
+    <span class="n">blueprint</span><span class="p">.</span><span class="n">graceperiod</span><span class="p">:=</span><span class="n">false</span><span class="p">;</span> <span class="n">blueprint</span><span class="p">.</span><span class="n">timeout</span><span class="p">=</span>10000<span class="p">;</span>
 </pre></div>
 
 
 <p>The timeout can also be set on an individual reference using the
 <em>timeout</em> attribute.    The following sets the timeout for the account
 reference to 20000 milliseconds (20 seconds).</p>
-<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">reference</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;accountRef&quot;</span> <span class="n">timeout</span><span class="o">=</span><span class="s">&quot;20000&quot;</span>
-    <span class="n">interface</span><span class="o">=</span><span class="s">&quot;org.apache.aries.simple.Account&quot;</span> <span class="o">/&gt;</span>
+<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">reference</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">accountRef</span>&quot; <span class="n">timeout</span><span class="p">=</span>&quot;20000&quot;
+    <span class="n">interface</span><span class="p">=</span>&quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">Account</span>&quot; <span class="o">/&gt;</span>
 </pre></div>
 
 
@@ -614,15 +628,15 @@ if their service becomes unavailable.</p
 <p>The following example shows a reference-list that returns a list of service
 objects (proxies).  This is the default value for the <em>member-type</em>
 attribute</p>
-<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">reference</span><span class="o">-</span><span class="n">list</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;accountRefs&quot;</span> <span class="n">member</span><span class="o">-</span><span class="n">type</span><span class="o">=</span><span class="s">&quot;service-object&quot;</span>
-    <span class="n">interface</span><span class="o">=</span><span class="s">&quot;org.apache.aries.simple.Account&quot;</span> <span class="o">/&gt;</span>
+<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">reference</span><span class="o">-</span><span class="n">list</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">accountRefs</span>&quot; <span class="n">member</span><span class="o">-</span><span class="n">type</span><span class="p">=</span>&quot;<span class="n">service</span><span class="o">-</span><span class="n">object</span>&quot;
+    <span class="n">interface</span><span class="p">=</span>&quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">Account</span>&quot; <span class="o">/&gt;</span>
 </pre></div>
 
 
 <p>The following shows an example of a reference-list that returns a list of
 ServiceReferences:</p>
-<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">reference</span><span class="o">-</span><span class="n">list</span> <span class="n">id</span><span class="o">=</span><span class="s">&quot;accountRefs&quot;</span> <span class="n">member</span><span class="o">-</span><span class="n">type</span><span class="o">=</span><span class="s">&quot;service-reference&quot;</span>
-    <span class="n">interface</span><span class="o">=</span><span class="s">&quot;org.apache.aries.simple.Account&quot;</span> <span class="o">/&gt;</span>
+<div class="codehilite"><pre>   <span class="o">&lt;</span><span class="n">reference</span><span class="o">-</span><span class="n">list</span> <span class="n">id</span><span class="p">=</span>&quot;<span class="n">accountRefs</span>&quot; <span class="n">member</span><span class="o">-</span><span class="n">type</span><span class="p">=</span>&quot;<span class="n">service</span><span class="o">-</span><span class="n">reference</span>&quot;
+    <span class="n">interface</span><span class="p">=</span>&quot;<span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">aries</span><span class="p">.</span><span class="n">simple</span><span class="p">.</span><span class="n">Account</span>&quot; <span class="o">/&gt;</span>
 </pre></div>
 
 

Modified: websites/staging/aries/trunk/content/modules/blueprintannotation.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/blueprintannotation.html (original)
+++ websites/staging/aries/trunk/content/modules/blueprintannotation.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -286,15 +289,15 @@ sample is also provided in trunk/bluepri
 <p><a name="BlueprintAnnotation-@InjectAnnotation"></a></p>
 <h3 id="inject-annotation">@Inject Annotation</h3>
 <p>@Inject annotation can be used to inject fields or methods.</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;bar&quot;</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">bar</span>&quot;<span class="p">)</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">Bar</span> <span class="p">{</span>
 
-    <span class="nv">@Inject</span><span class="p">(</span><span class="n">value</span><span class="o">=</span><span class="s">&quot;Hello FooBar&quot;</span><span class="p">)</span>
+    <span class="p">@</span><span class="n">Inject</span><span class="p">(</span><span class="n">value</span><span class="p">=</span>&quot;<span class="n">Hello</span> <span class="n">FooBar</span>&quot;<span class="p">)</span>
     <span class="n">private</span> <span class="n">String</span> <span class="n">value</span><span class="p">;</span>
 
-    <span class="nv">@Inject</span><span class="p">(</span><span class="nb">ref</span><span class="o">=</span><span class="s">&quot;blueprintBundleContext&quot;</span><span class="p">)</span>
+    <span class="p">@</span><span class="n">Inject</span><span class="p">(</span><span class="n">ref</span><span class="p">=</span>&quot;<span class="n">blueprintBundleContext</span>&quot;<span class="p">)</span>
     <span class="n">private</span> <span class="n">BundleContext</span> <span class="n">context</span><span class="p">;</span>
-    <span class="o">...</span>
+    <span class="p">...</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -307,13 +310,13 @@ auto generate one in the future.  Option
 activation, dependsOn, description, scope, factoryRef, factoryMethod and
 args of the bean.</p>
 <p>* Example of using args property for the @Bean annotation.</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;accountOne&quot;</span><span class="p">,</span> <span class="n">args</span><span class="o">=</span><span class="nv">@Arg</span><span class="p">(</span><span class="n">value</span><span class="o">=</span><span class="s">&quot;1&quot;</span><span class="p">))</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">accountOne</span>&quot;<span class="p">,</span> <span class="n">args</span><span class="p">=@</span><span class="n">Arg</span><span class="p">(</span><span class="n">value</span><span class="p">=</span>&quot;1&quot;<span class="p">))</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">Account</span> <span class="p">{</span>
 
     <span class="n">private</span> <span class="n">long</span> <span class="n">accountNumber</span><span class="p">;</span>
 
     <span class="n">public</span> <span class="n">Account</span><span class="p">(</span><span class="n">long</span> <span class="n">number</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">this</span><span class="o">.</span><span class="n">accountNumber</span> <span class="o">=</span> <span class="n">number</span><span class="p">;</span>
+    <span class="n">this</span><span class="p">.</span><span class="n">accountNumber</span> <span class="p">=</span> <span class="n">number</span><span class="p">;</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -321,13 +324,13 @@ args of the bean.</p>
 
 <p>* Example of using factoryMethod and args properties for the @Bean
 annotation</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;accountTwo&quot;</span><span class="p">,</span>
-      <span class="n">factoryMethod</span><span class="o">=</span><span class="s">&quot;createAccount&quot;</span><span class="p">,</span>
-      <span class="n">args</span> <span class="o">=</span> <span class="nv">@Arg</span><span class="p">(</span><span class="n">value</span><span class="o">=</span><span class="s">&quot;2&quot;</span><span class="p">))</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">accountTwo</span>&quot;<span class="p">,</span>
+      <span class="n">factoryMethod</span><span class="p">=</span>&quot;<span class="n">createAccount</span>&quot;<span class="p">,</span>
+      <span class="n">args</span> <span class="p">=</span> <span class="p">@</span><span class="n">Arg</span><span class="p">(</span><span class="n">value</span><span class="p">=</span>&quot;2&quot;<span class="p">))</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">StaticAccountFactory</span> <span class="p">{</span>
 
     <span class="n">public</span> <span class="n">static</span> <span class="n">Account</span> <span class="n">createAccount</span><span class="p">(</span><span class="n">long</span> <span class="n">number</span><span class="p">)</span> <span class="p">{</span>
-    <span class="k">return</span> <span class="k">new</span> <span class="n">Account</span><span class="p">(</span><span class="n">number</span><span class="p">);</span>
+    <span class="k">return</span> <span class="n">new</span> <span class="n">Account</span><span class="p">(</span><span class="n">number</span><span class="p">);</span>
      <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -335,18 +338,18 @@ annotation</p>
 
 <p>* Example of using factoryRef, factoryMethod, and args properties for the
 @Bean annotation</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;accountThree&quot;</span><span class="p">,</span>
-      <span class="n">factoryRef</span><span class="o">=</span><span class="s">&quot;accountFactory&quot;</span><span class="p">,</span>
-      <span class="n">factoryMethod</span><span class="o">=</span><span class="s">&quot;createAccount&quot;</span><span class="p">,</span>
-      <span class="n">args</span><span class="o">=</span><span class="nv">@Arg</span><span class="p">(</span><span class="n">value</span><span class="o">=</span><span class="s">&quot;3&quot;</span><span class="p">))</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">accountThree</span>&quot;<span class="p">,</span>
+      <span class="n">factoryRef</span><span class="p">=</span>&quot;<span class="n">accountFactory</span>&quot;<span class="p">,</span>
+      <span class="n">factoryMethod</span><span class="p">=</span>&quot;<span class="n">createAccount</span>&quot;<span class="p">,</span>
+      <span class="n">args</span><span class="p">=@</span><span class="n">Arg</span><span class="p">(</span><span class="n">value</span><span class="p">=</span>&quot;3&quot;<span class="p">))</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">NewAccount</span> <span class="p">{</span>
 
     <span class="n">private</span> <span class="n">long</span> <span class="n">accountNumber</span><span class="p">;</span>
 
     <span class="n">public</span> <span class="n">NewAccount</span><span class="p">(</span><span class="n">long</span> <span class="n">number</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">this</span><span class="o">.</span><span class="n">accountNumber</span> <span class="o">=</span> <span class="n">number</span><span class="p">;</span>
+    <span class="n">this</span><span class="p">.</span><span class="n">accountNumber</span> <span class="p">=</span> <span class="n">number</span><span class="p">;</span>
     <span class="p">}</span>
-    <span class="o">...</span>
+    <span class="p">...</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -356,15 +359,15 @@ annotation</p>
 <p>If you want to register a bean as a service, you can use @Service
 annotation to do so.  You can specify ranking, autoExport, interfaces,
 serviceProperties and registrationListeners for the service.</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;foo&quot;</span><span class="p">)</span>
-<span class="nv">@Service</span><span class="p">(</span><span class="n">autoExport</span><span class="o">=</span><span class="s">&quot;all-classes&quot;</span><span class="p">,</span>
-    <span class="n">serviceProperties</span> <span class="o">=</span>
-<span class="nv">@ServiceProperty</span><span class="p">(</span><span class="n">key</span><span class="o">=</span><span class="s">&quot;blueprint.annotation.sample&quot;</span><span class="p">,</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;true&quot;</span><span class="p">),</span>
-    <span class="n">registerationListeners</span> <span class="o">=</span>
-<span class="nv">@RegistrationListener</span><span class="p">(</span><span class="nb">ref</span><span class="o">=</span><span class="s">&quot;fooRegistrationListener&quot;</span><span class="p">),</span> 
-    <span class="n">ranking</span><span class="o">=</span><span class="mi">0</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">foo</span>&quot;<span class="p">)</span>
+<span class="p">@</span><span class="n">Service</span><span class="p">(</span><span class="n">autoExport</span><span class="p">=</span>&quot;<span class="n">all</span><span class="o">-</span><span class="n">classes</span>&quot;<span class="p">,</span>
+    <span class="n">serviceProperties</span> <span class="p">=</span>
+<span class="p">@</span><span class="n">ServiceProperty</span><span class="p">(</span><span class="n">key</span><span class="p">=</span>&quot;<span class="n">blueprint</span><span class="p">.</span><span class="n">annotation</span><span class="p">.</span><span class="n">sample</span>&quot;<span class="p">,</span> <span class="n">value</span><span class="p">=</span>&quot;<span class="n">true</span>&quot;<span class="p">),</span>
+    <span class="n">registerationListeners</span> <span class="p">=</span>
+<span class="p">@</span><span class="n">RegistrationListener</span><span class="p">(</span><span class="n">ref</span><span class="p">=</span>&quot;<span class="n">fooRegistrationListener</span>&quot;<span class="p">),</span> 
+    <span class="n">ranking</span><span class="p">=</span>0<span class="p">)</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">Foo</span> <span class="n">implements</span> <span class="n">Serializable</span> <span class="p">{</span>
-   <span class="o">...</span>
+   <span class="p">...</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -373,20 +376,20 @@ serviceProperties and registrationListen
 @RegistrationListener annotation.  @Register can be used to annotate the
 register-method for the registration listener and @Unregister annotation
 can be used on the unregister-method for the registration listener.</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;fooRegistrationListener&quot;</span><span class="p">)</span>
-<span class="nv">@RegistrationListener</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">fooRegistrationListener</span>&quot;<span class="p">)</span>
+<span class="p">@</span><span class="n">RegistrationListener</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">FooRegistrationListener</span> <span class="p">{</span>
 
-    <span class="nv">@Register</span>
+    <span class="p">@</span><span class="n">Register</span>
     <span class="n">public</span> <span class="n">void</span> <span class="n">serviceRegistered</span><span class="p">(</span><span class="n">Serializable</span> <span class="n">foo</span><span class="p">,</span> <span class="n">Map</span> <span class="n">props</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="n">out</span><span class="o">.</span><span class="n">println</span><span class="p">(</span><span class="s">&quot;Service registration notification: &quot;</span> <span class="o">+</span> <span class="n">foo</span> <span class="o">+</span> <span class="s">&quot;</span>
-<span class="s">    &quot;</span> <span class="o">+</span> <span class="n">props</span><span class="p">);</span>
+    <span class="n">System</span><span class="p">.</span><span class="n">out</span><span class="p">.</span><span class="n">println</span><span class="p">(</span>&quot;<span class="n">Service</span> <span class="n">registration</span> <span class="n">notification</span><span class="p">:</span> &quot; <span class="o">+</span> <span class="n">foo</span> <span class="o">+</span> &quot;
+    &quot; <span class="o">+</span> <span class="n">props</span><span class="p">);</span>
     <span class="p">}</span>
 
-    <span class="nv">@Unregister</span>
+    <span class="p">@</span><span class="n">Unregister</span>
     <span class="n">public</span> <span class="n">void</span> <span class="n">serviceUnregistered</span><span class="p">(</span><span class="n">Foo</span> <span class="n">foo</span><span class="p">,</span> <span class="n">Map</span> <span class="n">props</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">System</span><span class="o">.</span><span class="n">out</span><span class="o">.</span><span class="n">println</span><span class="p">(</span><span class="s">&quot;Service unregistration notification: &quot;</span> <span class="o">+</span> <span class="n">foo</span> <span class="o">+</span>
-    <span class="s">&quot; &quot;</span> <span class="o">+</span> <span class="n">props</span><span class="p">);</span>
+    <span class="n">System</span><span class="p">.</span><span class="n">out</span><span class="p">.</span><span class="n">println</span><span class="p">(</span>&quot;<span class="n">Service</span> <span class="n">unregistration</span> <span class="n">notification</span><span class="p">:</span> &quot; <span class="o">+</span> <span class="n">foo</span> <span class="o">+</span>
+    &quot; &quot; <span class="o">+</span> <span class="n">props</span><span class="p">);</span>
     <span class="p">}</span>
 
 <span class="p">}</span>
@@ -396,36 +399,34 @@ can be used on the unregister-method for
 <p><a name="BlueprintAnnotation-@Reference,@ReferenceList,@ReferenceListenerAnnotations"></a></p>
 <h3 id="reference-referencelist-referencelistener-annotations">@Reference, @ReferenceList, @ReferenceListener Annotations</h3>
 <p>For a bean that you want to act as a ReferenceListener, you can use
-@ReferenceListener to annotate the bean class. <br />
-</p>
+@ReferenceListener to annotate the bean class.   </p>
 <p>For the service that you want to inject the reference, you can use the
 @Inject and @Reference annotation, with the id, serviceInterface, timeout
-and referenceListeners properties specified for the reference. <br />
-</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;bindingListener&quot;</span><span class="p">)</span>
-<span class="nv">@ReferenceListener</span>
+and referenceListeners properties specified for the reference.   </p>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">bindingListener</span>&quot;<span class="p">)</span>
+<span class="p">@</span><span class="n">ReferenceListener</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">BindingListener</span> <span class="p">{</span>
 
-    <span class="nv">@Inject</span> <span class="nv">@Reference</span> <span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;ref2&quot;</span><span class="p">,</span> 
-        <span class="n">serviceInterface</span> <span class="o">=</span> <span class="n">InterfaceA</span><span class="o">.</span><span class="n">class</span><span class="p">,</span>
-        <span class="n">timeout</span><span class="o">=</span><span class="mi">100</span><span class="p">,</span>
-<span class="n">referenceListeners</span><span class="o">=</span><span class="nv">@ReferenceListener</span><span class="p">(</span><span class="nb">ref</span><span class="o">=</span><span class="s">&quot;bindingListener&quot;</span><span class="p">))</span>
+    <span class="p">@</span><span class="n">Inject</span> <span class="p">@</span><span class="n">Reference</span> <span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">ref2</span>&quot;<span class="p">,</span> 
+        <span class="n">serviceInterface</span> <span class="p">=</span> <span class="n">InterfaceA</span><span class="p">.</span><span class="n">class</span><span class="p">,</span>
+        <span class="n">timeout</span><span class="p">=</span>100<span class="p">,</span>
+<span class="n">referenceListeners</span><span class="p">=@</span><span class="n">ReferenceListener</span><span class="p">(</span><span class="n">ref</span><span class="p">=</span>&quot;<span class="n">bindingListener</span>&quot;<span class="p">))</span>
     <span class="n">private</span> <span class="n">InterfaceA</span> <span class="n">a</span><span class="p">;</span>
-    <span class="o">...</span>
-    <span class="nv">@Init</span>
+    <span class="p">...</span>
+    <span class="p">@</span><span class="n">Init</span>
     <span class="n">public</span> <span class="n">void</span> <span class="n">init</span><span class="p">()</span> <span class="p">{</span>
     <span class="p">}</span>
 
-    <span class="nv">@Bind</span>
-    <span class="n">public</span> <span class="n">void</span> <span class="nb">bind</span><span class="p">(</span><span class="n">InterfaceA</span> <span class="n">a</span><span class="p">,</span> <span class="n">Map</span> <span class="n">props</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">this</span><span class="o">.</span><span class="n">a</span> <span class="o">=</span> <span class="n">a</span><span class="p">;</span>
-    <span class="n">this</span><span class="o">.</span><span class="n">props</span> <span class="o">=</span> <span class="n">props</span><span class="p">;</span>
+    <span class="p">@</span><span class="n">Bind</span>
+    <span class="n">public</span> <span class="n">void</span> <span class="n">bind</span><span class="p">(</span><span class="n">InterfaceA</span> <span class="n">a</span><span class="p">,</span> <span class="n">Map</span> <span class="n">props</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">this</span><span class="p">.</span><span class="n">a</span> <span class="p">=</span> <span class="n">a</span><span class="p">;</span>
+    <span class="n">this</span><span class="p">.</span><span class="n">props</span> <span class="p">=</span> <span class="n">props</span><span class="p">;</span>
     <span class="p">}</span>
 
-    <span class="nv">@Unbind</span>
+    <span class="p">@</span><span class="n">Unbind</span>
     <span class="n">public</span> <span class="n">void</span> <span class="n">unbind</span><span class="p">(</span><span class="n">InterfaceA</span> <span class="n">a</span><span class="p">,</span> <span class="n">Map</span> <span class="n">props</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">this</span><span class="o">.</span><span class="n">a</span> <span class="o">=</span> <span class="n">null</span><span class="p">;</span>
-    <span class="n">this</span><span class="o">.</span><span class="n">props</span> <span class="o">=</span> <span class="n">null</span><span class="p">;</span>
+    <span class="n">this</span><span class="p">.</span><span class="n">a</span> <span class="p">=</span> <span class="n">null</span><span class="p">;</span>
+    <span class="n">this</span><span class="p">.</span><span class="n">props</span> <span class="p">=</span> <span class="n">null</span><span class="p">;</span>
     <span class="p">}</span>
 
 <span class="p">}</span>
@@ -435,16 +436,16 @@ and referenceListeners properties specif
 <p>@ReferenceList is very similar as @Reference, except that the timeout
 property is not supported in @ReferenceList, while the memberType property
 is supported in @ReferenceList.  This is same as the blueprint XML schema.</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;listBindingListener&quot;</span><span class="p">)</span>
-<span class="nv">@ReferenceListener</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">listBindingListener</span>&quot;<span class="p">)</span>
+<span class="p">@</span><span class="n">ReferenceListener</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">ListBindingListener</span> <span class="p">{</span>
 
-    <span class="nv">@Inject</span> <span class="nv">@ReferenceList</span> <span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;ref-list&quot;</span><span class="p">,</span> 
-        <span class="n">serviceInterface</span> <span class="o">=</span> <span class="n">InterfaceA</span><span class="o">.</span><span class="n">class</span><span class="p">,</span>
+    <span class="p">@</span><span class="n">Inject</span> <span class="p">@</span><span class="n">ReferenceList</span> <span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">ref</span><span class="o">-</span><span class="n">list</span>&quot;<span class="p">,</span> 
+        <span class="n">serviceInterface</span> <span class="p">=</span> <span class="n">InterfaceA</span><span class="p">.</span><span class="n">class</span><span class="p">,</span>
 
-<span class="n">referenceListeners</span><span class="o">=</span><span class="nv">@ReferenceListener</span><span class="p">(</span><span class="nb">ref</span><span class="o">=</span><span class="s">&quot;listBindingListener&quot;</span><span class="p">))</span>
+<span class="n">referenceListeners</span><span class="p">=@</span><span class="n">ReferenceListener</span><span class="p">(</span><span class="n">ref</span><span class="p">=</span>&quot;<span class="n">listBindingListener</span>&quot;<span class="p">))</span>
     <span class="n">private</span> <span class="n">InterfaceA</span> <span class="n">a</span><span class="p">;</span>
-    <span class="o">...</span>
+    <span class="p">...</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -454,11 +455,11 @@ is supported in @ReferenceList.  This is
 <p>@Blueprint annotation can be used on any class to annotate the global
 property of the blueprint bundle, such as defaultActivation,
 defaultTimeout, defaultAvailability.</p>
-<div class="codehilite"><pre><span class="nv">@Blueprint</span><span class="p">(</span><span class="n">defaultActivation</span><span class="o">=</span><span class="s">&quot;eager&quot;</span><span class="p">,</span> <span class="n">defaultTimeout</span><span class="o">=</span><span class="mi">300</span><span class="p">,</span>
-<span class="n">defaultAvailability</span><span class="o">=</span><span class="s">&quot;optional&quot;</span><span class="p">)</span>
-<span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;bar&quot;</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Blueprint</span><span class="p">(</span><span class="n">defaultActivation</span><span class="p">=</span>&quot;<span class="n">eager</span>&quot;<span class="p">,</span> <span class="n">defaultTimeout</span><span class="p">=</span>300<span class="p">,</span>
+<span class="n">defaultAvailability</span><span class="p">=</span>&quot;<span class="n">optional</span>&quot;<span class="p">)</span>
+<span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">bar</span>&quot;<span class="p">)</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">Bar</span> <span class="p">{</span>
-    <span class="o">...</span>
+    <span class="p">...</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -469,12 +470,12 @@ defaultTimeout, defaultAvailability.</p>
 The blueprint annotation service will recognize it as a type converter if
 it implements the <em>org.osgi.service.blueprint.container.Converter</em>
 interface</p>
-<div class="codehilite"><pre><span class="nv">@Bean</span><span class="p">(</span><span class="n">id</span><span class="o">=</span><span class="s">&quot;converter1&quot;</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">Bean</span><span class="p">(</span><span class="n">id</span><span class="p">=</span>&quot;<span class="n">converter1</span>&quot;<span class="p">)</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">DateTypeConverter</span> <span class="n">implements</span> <span class="n">Converter</span> <span class="p">{</span>
 
-    <span class="nv">@Inject</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;format&quot;</span><span class="p">,</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;yyyy.MM.dd&quot;</span><span class="p">)</span>
+    <span class="p">@</span><span class="n">Inject</span><span class="p">(</span><span class="n">name</span><span class="p">=</span>&quot;<span class="n">format</span>&quot;<span class="p">,</span> <span class="n">value</span><span class="p">=</span>&quot;<span class="n">yyyy</span><span class="p">.</span><span class="n">MM</span><span class="p">.</span><span class="n">dd</span>&quot;<span class="p">)</span>
     <span class="n">DateFormat</span> <span class="n">dateFormat</span><span class="p">;</span>
-    <span class="o">...</span>
+    <span class="p">...</span>
 <span class="p">}</span>
 </pre></div>
 

Modified: websites/staging/aries/trunk/content/modules/blueprintnoosgi.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/blueprintnoosgi.html (original)
+++ websites/staging/aries/trunk/content/modules/blueprintnoosgi.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -273,17 +276,17 @@
 <p><a name="BlueprintNoOSGi-HowToUse"></a></p>
 <h2 id="how-to-use-blueprint-no-osgi">How to use Blueprint No-OSGi</h2>
 <p>Just create the blueprint container giving the urls of the xml descriptors</p>
-<div class="codehilite"><pre><span class="n">BlueprintContainerImpl</span> <span class="n">container</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlueprintContainerImpl</span><span class="p">(</span><span class="n">classLoader</span><span class="p">,</span> <span class="n">resourcePaths</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">BlueprintContainerImpl</span> <span class="n">container</span> <span class="p">=</span> <span class="n">new</span> <span class="n">BlueprintContainerImpl</span><span class="p">(</span><span class="n">classLoader</span><span class="p">,</span> <span class="n">resourcePaths</span><span class="p">);</span>
 </pre></div>
 
 
 <p>You can then access the instantiated beans using the blueprint api</p>
-<div class="codehilite"><pre><span class="n">Foo</span> <span class="n">foo</span> <span class="o">=</span> <span class="p">(</span><span class="n">Foo</span><span class="p">)</span> <span class="n">container</span><span class="o">.</span><span class="n">getComponentInstance</span><span class="p">(</span><span class="s">&quot;foo&quot;</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">Foo</span> <span class="n">foo</span> <span class="p">=</span> <span class="p">(</span><span class="n">Foo</span><span class="p">)</span> <span class="n">container</span><span class="p">.</span><span class="n">getComponentInstance</span><span class="p">(</span>&quot;<span class="n">foo</span>&quot;<span class="p">);</span>
 </pre></div>
 
 
 <p>When you're done with the container, you need to destroy it</p>
-<div class="codehilite"><pre><span class="n">container</span><span class="o">.</span><span class="n">destroy</span><span class="p">();</span>
+<div class="codehilite"><pre><span class="n">container</span><span class="p">.</span><span class="n">destroy</span><span class="p">();</span>
 </pre></div>
 
 
@@ -291,8 +294,7 @@
 <h2 id="limitations">Limitations</h2>
 <p>The Blueprint No-OSGi module has limitations due to the fact that OSGi is not available.
 The use of <reference/> and <reference-list/> and <service/> elements are not supported.</p>
-<p><a name="BlueprintNoOSGi-Configuraiton"></a>  <br />
-</p>
+<p><a name="BlueprintNoOSGi-Configuraiton"></a>    </p>
 <h2 id="configuring-blueprint-through-properties">Configuring blueprint through properties</h2>
 <p>Blueprint beans can be configured using the variable substitutions.
 You need to declare the ext namespace and add the property placeholder bean in your blueprint xml</p>

Modified: websites/staging/aries/trunk/content/modules/blueprintweb.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/blueprintweb.html (original)
+++ websites/staging/aries/trunk/content/modules/blueprintweb.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -289,8 +292,7 @@
 </pre></div>
 
 
-<p><a name="BlueprintWeb-Configuraiton"></a> <br />
-</p>
+<p><a name="BlueprintWeb-Configuraiton"></a>   </p>
 <h2 id="configuring-blueprint-through-properties">Configuring blueprint through properties</h2>
 <p>Blueprint beans can be configured using the variable substitutions.
 You need to declare the ext namespace and add the property placeholder bean in your blueprint xml</p>

Modified: websites/staging/aries/trunk/content/modules/ebamavenpluginproject.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/ebamavenpluginproject.html (original)
+++ websites/staging/aries/trunk/content/modules/ebamavenpluginproject.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/modules/esamavenpluginproject.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/esamavenpluginproject.html (original)
+++ websites/staging/aries/trunk/content/modules/esamavenpluginproject.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/modules/jmx.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/jmx.html (original)
+++ websites/staging/aries/trunk/content/modules/jmx.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>

Modified: websites/staging/aries/trunk/content/modules/jndiproject.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/jndiproject.html (original)
+++ websites/staging/aries/trunk/content/modules/jndiproject.html Mon Jul  8 14:34:58 2013
@@ -244,6 +244,9 @@
         <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
+        <a href="/modules/esamavenpluginproject.html">ESA Maven Plugin </a> 
+    </div>
+    <div class="menuitem">
         <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
@@ -285,7 +288,7 @@ access the service registry.</p>
 <h2 id="osgiservice">osgi:service</h2>
 <p>The osgi:service lookup scheme is defined by the JNDI Service Specification
 and follows the scheme:</p>
-<div class="codehilite"><pre><span class="err">osgi:service/&lt;interface&gt;[/&lt;filter&gt;](/&lt;filter&gt;.html)</span>
+<div class="codehilite"><pre><span class="n">osgi</span><span class="o">:</span><span class="n">service</span><span class="sr">/&lt;interface&gt;[/&lt;filter&gt;](/</span><span class="o">&lt;</span><span class="n">filter</span><span class="o">&gt;.</span><span class="n">html</span><span class="o">)</span>
 </pre></div>
 
 
@@ -293,36 +296,36 @@ and follows the scheme:</p>
 javax.jms.ConnectionFactory. The filter allows selection based on the
 properties of the service.</p>
 <p>This example:</p>
-<div class="codehilite"><pre><span class="n">Context</span> <span class="n">ctx</span> <span class="o">=</span> <span class="k">new</span> <span class="n">InitialContext</span><span class="p">();</span>
+<div class="codehilite"><pre><span class="n">Context</span> <span class="n">ctx</span> <span class="p">=</span> <span class="n">new</span> <span class="n">InitialContext</span><span class="p">();</span>
 
-<span class="n">Runnable</span> <span class="n">r</span> <span class="o">=</span> <span class="p">(</span><span class="n">Runnable</span><span class="p">)</span><span class="n">ctx</span><span class="o">.</span><span class="n">lookup</span><span class="p">(</span><span class="s">&quot;osgi:service/java.lang.Runnable&quot;</span><span class="p">);</span>
+<span class="n">Runnable</span> <span class="n">r</span> <span class="p">=</span> <span class="p">(</span><span class="n">Runnable</span><span class="p">)</span><span class="n">ctx</span><span class="p">.</span><span class="n">lookup</span><span class="p">(</span>&quot;<span class="n">osgi</span><span class="p">:</span><span class="n">service</span><span class="o">/</span><span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">Runnable</span>&quot;<span class="p">);</span>
 </pre></div>
 
 
 <p>is equivalent to this code written to the OSGi service registry API.</p>
-<div class="codehilite"><pre><span class="n">BundleContext</span> <span class="n">ctx</span> <span class="o">=</span> <span class="n">getABundleContext</span><span class="p">();</span>
-<span class="n">ServiceReference</span> <span class="nb">ref</span> <span class="o">=</span> <span class="n">ctx</span><span class="o">.</span><span class="n">getServiceReference</span><span class="p">(</span><span class="s">&quot;java.lang.Runnable&quot;</span><span class="p">);</span>
-<span class="k">if</span> <span class="p">(</span><span class="nb">ref</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">Runnable</span> <span class="n">r</span> <span class="o">=</span> <span class="n">ctx</span><span class="o">.</span><span class="n">getService</span><span class="p">(</span><span class="nb">ref</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">BundleContext</span> <span class="n">ctx</span> <span class="p">=</span> <span class="n">getABundleContext</span><span class="p">();</span>
+<span class="n">ServiceReference</span> <span class="n">ref</span> <span class="p">=</span> <span class="n">ctx</span><span class="p">.</span><span class="n">getServiceReference</span><span class="p">(</span>&quot;<span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">Runnable</span>&quot;<span class="p">);</span>
+<span class="k">if</span> <span class="p">(</span><span class="n">ref</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">Runnable</span> <span class="n">r</span> <span class="p">=</span> <span class="n">ctx</span><span class="p">.</span><span class="n">getService</span><span class="p">(</span><span class="n">ref</span><span class="p">);</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>Lets say you wanted to filter for a Runnable with a property called <em>fred</em>
 which was mapped to <em>wilma</em>. You could write</p>
-<div class="codehilite"><pre><span class="n">Context</span> <span class="n">ctx</span> <span class="o">=</span> <span class="k">new</span> <span class="n">InitialContext</span><span class="p">();</span>
+<div class="codehilite"><pre><span class="n">Context</span> <span class="n">ctx</span> <span class="p">=</span> <span class="n">new</span> <span class="n">InitialContext</span><span class="p">();</span>
 
-<span class="n">Runnable</span> <span class="n">r</span> <span class="o">=</span>
-<span class="p">(</span><span class="n">Runnable</span><span class="p">)</span><span class="n">ctx</span><span class="o">.</span><span class="n">lookup</span><span class="p">(</span><span class="s">&quot;osgi:service/java.lang.Runnable/(fred=wilma)&quot;</span><span class="p">);</span>
+<span class="n">Runnable</span> <span class="n">r</span> <span class="p">=</span>
+<span class="p">(</span><span class="n">Runnable</span><span class="p">)</span><span class="n">ctx</span><span class="p">.</span><span class="n">lookup</span><span class="p">(</span>&quot;<span class="n">osgi</span><span class="p">:</span><span class="n">service</span><span class="o">/</span><span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">Runnable</span><span class="o">/</span><span class="p">(</span><span class="n">fred</span><span class="p">=</span><span class="n">wilma</span><span class="p">)</span>&quot;<span class="p">);</span>
 </pre></div>
 
 
 <p>which is equivalent to:</p>
-<div class="codehilite"><pre><span class="n">BundleContext</span> <span class="n">ctx</span> <span class="o">=</span> <span class="n">getABundleContext</span><span class="p">();</span>
-<span class="n">ServiceReference</span><span class="o">[]</span><span class="p">(</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
- <span class="n">refs</span> <span class="o">=</span> <span class="n">ctx</span><span class="o">.</span><span class="n">getServiceReference</span><span class="p">(</span><span class="s">&quot;java.lang.Runnable&quot;</span><span class="p">,</span> <span class="s">&quot;(fred=wilma)&quot;</span><span class="p">);</span>
-<span class="k">if</span> <span class="p">(</span><span class="n">refs</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-  <span class="n">Runnable</span> <span class="n">r</span> <span class="o">=</span> <span class="n">ctx</span><span class="o">.</span><span class="n">getService</span><span class="p">(</span><span class="n">refs</span><span class="p">[</span><span class="n">refs</span><span class="o">.</span><span class="nb">length</span> <span class="o">-</span> <span class="mi">1</span><span class="p">](</span><span class="n">refs</span><span class="o">.</span><span class="nb">length</span><span class="o">---</span><span class="mi">1</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="n">BundleContext</span> <span class="n">ctx</span> <span class="p">=</span> <span class="n">getABundleContext</span><span class="p">();</span>
+<span class="n">ServiceReference</span><span class="p">[](.</span><span class="n">html</span><span class="p">)</span>
+ <span class="n">refs</span> <span class="p">=</span> <span class="n">ctx</span><span class="p">.</span><span class="n">getServiceReference</span><span class="p">(</span>&quot;<span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">Runnable</span>&quot;<span class="p">,</span> &quot;<span class="p">(</span><span class="n">fred</span><span class="p">=</span><span class="n">wilma</span><span class="p">)</span>&quot;<span class="p">);</span>
+<span class="k">if</span> <span class="p">(</span><span class="n">refs</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
+  <span class="n">Runnable</span> <span class="n">r</span> <span class="p">=</span> <span class="n">ctx</span><span class="p">.</span><span class="n">getService</span><span class="p">(</span><span class="n">refs</span><span class="p">[</span><span class="n">refs</span><span class="p">.</span><span class="nb">length</span> <span class="o">-</span> 1<span class="p">](</span><span class="n">refs</span><span class="p">.</span><span class="nb">length</span><span class="o">---</span>1<span class="p">.</span><span class="n">html</span><span class="p">)</span>
 <span class="p">);</span>
 </pre></div>