onami-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1433627 [9/9] - in /incubator/onami/site/spi: ./ apidocs/assets/ apidocs/reference/ apidocs/reference/org/apache/onami/spi/ apidocs/reference/org/apache/onami/spi/binder/ cobertura/ xref-test/ xref-test/org/apache/onami/spi/ xref/ xref/org...
Date Tue, 15 Jan 2013 20:45:36 GMT
Modified: incubator/onami/site/spi/xref/org/apache/onami/spi/ServiceLoaderModule.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/org/apache/onami/spi/ServiceLoaderModule.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/org/apache/onami/spi/ServiceLoaderModule.html (original)
+++ incubator/onami/site/spi/xref/org/apache/onami/spi/ServiceLoaderModule.html Tue Jan 15 20:45:34 2013
@@ -30,143 +30,173 @@
 <a class="jxr_linenumber" name="20" href="#20">20</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="21" href="#21">21</a>  
 <a class="jxr_linenumber" name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> java.lang.String.format;
-<a class="jxr_linenumber" name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> com.google.inject.Key.get;
-<a class="jxr_linenumber" name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> com.google.inject.internal.util.$Preconditions.checkArgument;
-<a class="jxr_linenumber" name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> com.google.inject.multibindings.Multibinder.newSetBinder;
-<a class="jxr_linenumber" name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> java.lang.Thread.currentThread;
-<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.onami.spi.ServiceLoader.load;
-<a class="jxr_linenumber" name="28" href="#28">28</a>  
-<a class="jxr_linenumber" name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> java.lang.annotation.Annotation;
-<a class="jxr_linenumber" name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
-<a class="jxr_linenumber" name="31" href="#31">31</a>  
-<a class="jxr_linenumber" name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.onami.spi.binder.AnnotatedServiceBuilder;
+<a class="jxr_linenumber" name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> java.lang.Thread.currentThread;
+<a class="jxr_linenumber" name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.onami.spi.ServiceLoader.load;
+<a class="jxr_linenumber" name="25" href="#25">25</a>  
+<a class="jxr_linenumber" name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> java.lang.annotation.Annotation;
+<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
+<a class="jxr_linenumber" name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedList;
+<a class="jxr_linenumber" name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="30" href="#30">30</a>  
+<a class="jxr_linenumber" name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> javax.inject.Qualifier;
+<a class="jxr_linenumber" name="32" href="#32">32</a>  
 <a class="jxr_linenumber" name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.onami.spi.binder.FromClassLoaderBuilder;
-<a class="jxr_linenumber" name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.onami.spi.binder.ServiceBuilder;
-<a class="jxr_linenumber" name="35" href="#35">35</a>  
-<a class="jxr_linenumber" name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> com.google.inject.AbstractModule;
-<a class="jxr_linenumber" name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> com.google.inject.Binder;
-<a class="jxr_linenumber" name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> com.google.inject.Key;
-<a class="jxr_linenumber" name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> com.google.inject.ProvisionException;
-<a class="jxr_linenumber" name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> com.google.inject.multibindings.Multibinder;
-<a class="jxr_linenumber" name="41" href="#41">41</a>  
-<a class="jxr_linenumber" name="42" href="#42">42</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="43" href="#43">43</a>  <em class="jxr_javadoccomment"> * A Google Guice {@code Module} to simplify the task of</em>
-<a class="jxr_linenumber" name="44" href="#44">44</a>  <em class="jxr_javadoccomment"> * binding Services to Providers using the SPI pattern.</em>
-<a class="jxr_linenumber" name="45" href="#45">45</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="46" href="#46">46</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/onami/spi/ServiceLoaderModule.html">ServiceLoaderModule</a>
-<a class="jxr_linenumber" name="47" href="#47">47</a>      <strong class="jxr_keyword">extends</strong> AbstractModule
-<a class="jxr_linenumber" name="48" href="#48">48</a>  {
-<a class="jxr_linenumber" name="49" href="#49">49</a>  
-<a class="jxr_linenumber" name="50" href="#50">50</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="51" href="#51">51</a>  <em class="jxr_javadoccomment">     * EDSL to bind Services to Providers using the SPI pattern.</em>
-<a class="jxr_linenumber" name="52" href="#52">52</a>  <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="53" href="#53">53</a>  <em class="jxr_javadoccomment">     * @param service The type of the service to be loaded.</em>
-<a class="jxr_linenumber" name="54" href="#54">54</a>  <em class="jxr_javadoccomment">     * @return the chained EDSL builder.</em>
-<a class="jxr_linenumber" name="55" href="#55">55</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="56" href="#56">56</a>      <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> &lt;S&gt; <a href="../../../../org/apache/onami/spi/binder/FromClassLoaderBuilder.html">FromClassLoaderBuilder</a> bindService( Class&lt;S&gt; service )
-<a class="jxr_linenumber" name="57" href="#57">57</a>      {
-<a class="jxr_linenumber" name="58" href="#58">58</a>          checkArgument( service != <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"Impossible to bind null service class!"</span> );
-<a class="jxr_linenumber" name="59" href="#59">59</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> DefaultServiceBuilder&lt;S&gt;( service, binder() );
-<a class="jxr_linenumber" name="60" href="#60">60</a>      }
-<a class="jxr_linenumber" name="61" href="#61">61</a>  
-<a class="jxr_linenumber" name="62" href="#62">62</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="63" href="#63">63</a>  <em class="jxr_javadoccomment">     * EDSL for SPI implementation.</em>
-<a class="jxr_linenumber" name="64" href="#64">64</a>  <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="65" href="#65">65</a>  <em class="jxr_javadoccomment">     * @param &lt;S&gt; The type of the service to be loaded.</em>
-<a class="jxr_linenumber" name="66" href="#66">66</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="67" href="#67">67</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> DefaultServiceBuilder&lt;S&gt;
-<a class="jxr_linenumber" name="68" href="#68">68</a>          <strong class="jxr_keyword">implements</strong> <a href="../../../../org/apache/onami/spi/binder/FromClassLoaderBuilder.html">FromClassLoaderBuilder</a>
-<a class="jxr_linenumber" name="69" href="#69">69</a>      {
-<a class="jxr_linenumber" name="70" href="#70">70</a>  
-<a class="jxr_linenumber" name="71" href="#71">71</a>          <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Class&lt;S&gt; service;
-<a class="jxr_linenumber" name="72" href="#72">72</a>  
-<a class="jxr_linenumber" name="73" href="#73">73</a>          <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Binder binder;
-<a class="jxr_linenumber" name="74" href="#74">74</a>  
-<a class="jxr_linenumber" name="75" href="#75">75</a>          <strong class="jxr_keyword">private</strong> ClassLoader classLoader;
-<a class="jxr_linenumber" name="76" href="#76">76</a>  
-<a class="jxr_linenumber" name="77" href="#77">77</a>          <strong class="jxr_keyword">private</strong> Key&lt;S&gt; bindingKey;
-<a class="jxr_linenumber" name="78" href="#78">78</a>  
-<a class="jxr_linenumber" name="79" href="#79">79</a>          <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/onami/spi/ServiceLoaderModule.html">DefaultServiceBuilder</a>( Class&lt;S&gt; service, Binder binder )
-<a class="jxr_linenumber" name="80" href="#80">80</a>          {
-<a class="jxr_linenumber" name="81" href="#81">81</a>              <strong class="jxr_keyword">this</strong>.service = service;
-<a class="jxr_linenumber" name="82" href="#82">82</a>              <strong class="jxr_keyword">this</strong>.binder = binder;
-<a class="jxr_linenumber" name="83" href="#83">83</a>  
-<a class="jxr_linenumber" name="84" href="#84">84</a>              bindingKey = get( service );
-<a class="jxr_linenumber" name="85" href="#85">85</a>              classLoader = currentThread().getContextClassLoader();
-<a class="jxr_linenumber" name="86" href="#86">86</a>          }
+<a class="jxr_linenumber" name="34" href="#34">34</a>  
+<a class="jxr_linenumber" name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> com.google.inject.AbstractModule;
+<a class="jxr_linenumber" name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> com.google.inject.BindingAnnotation;
+<a class="jxr_linenumber" name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> com.google.inject.ProvisionException;
+<a class="jxr_linenumber" name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> com.google.inject.binder.AnnotatedBindingBuilder;
+<a class="jxr_linenumber" name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> com.google.inject.binder.LinkedBindingBuilder;
+<a class="jxr_linenumber" name="40" href="#40">40</a>  
+<a class="jxr_linenumber" name="41" href="#41">41</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="42" href="#42">42</a>  <em class="jxr_javadoccomment"> * A Google Guice {@code Module} to simplify the task of</em>
+<a class="jxr_linenumber" name="43" href="#43">43</a>  <em class="jxr_javadoccomment"> * binding Services to Providers using the SPI pattern.</em>
+<a class="jxr_linenumber" name="44" href="#44">44</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="45" href="#45">45</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/onami/spi/ServiceLoaderModule.html">ServiceLoaderModule</a>
+<a class="jxr_linenumber" name="46" href="#46">46</a>      <strong class="jxr_keyword">extends</strong> AbstractModule
+<a class="jxr_linenumber" name="47" href="#47">47</a>  {
+<a class="jxr_linenumber" name="48" href="#48">48</a>  
+<a class="jxr_linenumber" name="49" href="#49">49</a>      <strong class="jxr_keyword">private</strong> List&lt;ServiceInfo&lt;?&gt;&gt; services = <strong class="jxr_keyword">new</strong> LinkedList&lt;ServiceInfo&lt;?&gt;&gt;();
+<a class="jxr_linenumber" name="50" href="#50">50</a>  
+<a class="jxr_linenumber" name="51" href="#51">51</a>      @Override
+<a class="jxr_linenumber" name="52" href="#52">52</a>      <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">void</strong> configure()
+<a class="jxr_linenumber" name="53" href="#53">53</a>      {
+<a class="jxr_linenumber" name="54" href="#54">54</a>          <strong class="jxr_keyword">if</strong> ( !services.isEmpty() )
+<a class="jxr_linenumber" name="55" href="#55">55</a>          {
+<a class="jxr_linenumber" name="56" href="#56">56</a>              <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalStateException( <span class="jxr_string">"Re-entry is not allowed."</span> );
+<a class="jxr_linenumber" name="57" href="#57">57</a>          }
+<a class="jxr_linenumber" name="58" href="#58">58</a>  
+<a class="jxr_linenumber" name="59" href="#59">59</a>          configureServices();
+<a class="jxr_linenumber" name="60" href="#60">60</a>  
+<a class="jxr_linenumber" name="61" href="#61">61</a>          <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="62" href="#62">62</a>          {
+<a class="jxr_linenumber" name="63" href="#63">63</a>              <strong class="jxr_keyword">for</strong> ( ServiceInfo&lt;?&gt; builder : services )
+<a class="jxr_linenumber" name="64" href="#64">64</a>              {
+<a class="jxr_linenumber" name="65" href="#65">65</a>                  bindService( builder );
+<a class="jxr_linenumber" name="66" href="#66">66</a>              }
+<a class="jxr_linenumber" name="67" href="#67">67</a>          }
+<a class="jxr_linenumber" name="68" href="#68">68</a>          <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="69" href="#69">69</a>          {
+<a class="jxr_linenumber" name="70" href="#70">70</a>              services.clear();
+<a class="jxr_linenumber" name="71" href="#71">71</a>          }
+<a class="jxr_linenumber" name="72" href="#72">72</a>      }
+<a class="jxr_linenumber" name="73" href="#73">73</a>  
+<a class="jxr_linenumber" name="74" href="#74">74</a>      <strong class="jxr_keyword">private</strong> &lt;S&gt; <strong class="jxr_keyword">void</strong> bindService( ServiceInfo&lt;S&gt; serviceInfo )
+<a class="jxr_linenumber" name="75" href="#75">75</a>      {
+<a class="jxr_linenumber" name="76" href="#76">76</a>          Class&lt;S&gt; serviceType = serviceInfo.getServiceType();
+<a class="jxr_linenumber" name="77" href="#77">77</a>  
+<a class="jxr_linenumber" name="78" href="#78">78</a>          Iterator&lt;Class&lt;? <strong class="jxr_keyword">extends</strong> S&gt;&gt; servicesIterator = load( serviceType, serviceInfo.getClassLoader() )
+<a class="jxr_linenumber" name="79" href="#79">79</a>                                                          .iterator();
+<a class="jxr_linenumber" name="80" href="#80">80</a>          <strong class="jxr_keyword">boolean</strong> found = false;
+<a class="jxr_linenumber" name="81" href="#81">81</a>          <strong class="jxr_keyword">while</strong> ( servicesIterator.hasNext() )
+<a class="jxr_linenumber" name="82" href="#82">82</a>          {
+<a class="jxr_linenumber" name="83" href="#83">83</a>              <strong class="jxr_keyword">if</strong> ( !found )
+<a class="jxr_linenumber" name="84" href="#84">84</a>              {
+<a class="jxr_linenumber" name="85" href="#85">85</a>                  found = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="86" href="#86">86</a>              }
 <a class="jxr_linenumber" name="87" href="#87">87</a>  
-<a class="jxr_linenumber" name="88" href="#88">88</a>          <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="89" href="#89">89</a>  <em class="jxr_javadoccomment">         * {@inheritDoc}</em>
-<a class="jxr_linenumber" name="90" href="#90">90</a>  <em class="jxr_javadoccomment">         */</em>
-<a class="jxr_linenumber" name="91" href="#91">91</a>          <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/onami/spi/binder/ServiceBuilder.html">ServiceBuilder</a> annotatedWith( Class&lt;? <strong class="jxr_keyword">extends</strong> Annotation&gt; annotationType )
-<a class="jxr_linenumber" name="92" href="#92">92</a>          {
-<a class="jxr_linenumber" name="93" href="#93">93</a>              bindingKey = get( service, annotationType );
-<a class="jxr_linenumber" name="94" href="#94">94</a>              <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="95" href="#95">95</a>          }
-<a class="jxr_linenumber" name="96" href="#96">96</a>  
-<a class="jxr_linenumber" name="97" href="#97">97</a>          <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="98" href="#98">98</a>  <em class="jxr_javadoccomment">         * {@inheritDoc}</em>
-<a class="jxr_linenumber" name="99" href="#99">99</a>  <em class="jxr_javadoccomment">         */</em>
-<a class="jxr_linenumber" name="100" href="#100">100</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/onami/spi/binder/ServiceBuilder.html">ServiceBuilder</a> annotatedWith( Annotation annotation )
-<a class="jxr_linenumber" name="101" href="#101">101</a>         {
-<a class="jxr_linenumber" name="102" href="#102">102</a>             bindingKey = get( service, annotation );
-<a class="jxr_linenumber" name="103" href="#103">103</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="104" href="#104">104</a>         }
-<a class="jxr_linenumber" name="105" href="#105">105</a> 
-<a class="jxr_linenumber" name="106" href="#106">106</a>         <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="107" href="#107">107</a> <em class="jxr_javadoccomment">         * {@inheritDoc}</em>
-<a class="jxr_linenumber" name="108" href="#108">108</a> <em class="jxr_javadoccomment">         */</em>
-<a class="jxr_linenumber" name="109" href="#109">109</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/onami/spi/binder/AnnotatedServiceBuilder.html">AnnotatedServiceBuilder</a> fromClassLoader( ClassLoader classLoader )
-<a class="jxr_linenumber" name="110" href="#110">110</a>         {
-<a class="jxr_linenumber" name="111" href="#111">111</a>             checkArgument( classLoader != <strong class="jxr_keyword">null</strong>,
-<a class="jxr_linenumber" name="112" href="#112">112</a>                            <span class="jxr_string">"Impossible to load Service %s with a null ClassLoader"</span>, service.getName() );
-<a class="jxr_linenumber" name="113" href="#113">113</a>             <strong class="jxr_keyword">this</strong>.classLoader = classLoader;
-<a class="jxr_linenumber" name="114" href="#114">114</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
-<a class="jxr_linenumber" name="115" href="#115">115</a>         }
-<a class="jxr_linenumber" name="116" href="#116">116</a> 
-<a class="jxr_linenumber" name="117" href="#117">117</a>         <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="118" href="#118">118</a> <em class="jxr_javadoccomment">         * {@inheritDoc}</em>
-<a class="jxr_linenumber" name="119" href="#119">119</a> <em class="jxr_javadoccomment">         */</em>
-<a class="jxr_linenumber" name="120" href="#120">120</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> loadingFirstService()
-<a class="jxr_linenumber" name="121" href="#121">121</a>         {
-<a class="jxr_linenumber" name="122" href="#122">122</a>             Iterator&lt;Class&lt;? <strong class="jxr_keyword">extends</strong> S&gt;&gt; servicesIterator = load( service, classLoader ).iterator();
-<a class="jxr_linenumber" name="123" href="#123">123</a>             <strong class="jxr_keyword">if</strong> ( !servicesIterator.hasNext() )
-<a class="jxr_linenumber" name="124" href="#124">124</a>             {
-<a class="jxr_linenumber" name="125" href="#125">125</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ProvisionException( format( <span class="jxr_string">"No Provider found for Service %s"</span>, service.getName() ) );
-<a class="jxr_linenumber" name="126" href="#126">126</a>             }
-<a class="jxr_linenumber" name="127" href="#127">127</a>             binder.bind( bindingKey ).to( servicesIterator.next() );
-<a class="jxr_linenumber" name="128" href="#128">128</a>         }
-<a class="jxr_linenumber" name="129" href="#129">129</a> 
-<a class="jxr_linenumber" name="130" href="#130">130</a>         <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_javadoccomment">         * {@inheritDoc}</em>
-<a class="jxr_linenumber" name="132" href="#132">132</a> <em class="jxr_javadoccomment">         */</em>
-<a class="jxr_linenumber" name="133" href="#133">133</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> loadingAllServices()
-<a class="jxr_linenumber" name="134" href="#134">134</a>         {
-<a class="jxr_linenumber" name="135" href="#135">135</a>             Multibinder&lt;S&gt; multiBinder;
-<a class="jxr_linenumber" name="136" href="#136">136</a> 
-<a class="jxr_linenumber" name="137" href="#137">137</a>             <strong class="jxr_keyword">if</strong> ( bindingKey.getAnnotation() != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="138" href="#138">138</a>             {
-<a class="jxr_linenumber" name="139" href="#139">139</a>                 multiBinder = newSetBinder( binder, service, bindingKey.getAnnotation() );
-<a class="jxr_linenumber" name="140" href="#140">140</a>             }
-<a class="jxr_linenumber" name="141" href="#141">141</a>             <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( bindingKey.getAnnotationType() != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="142" href="#142">142</a>             {
-<a class="jxr_linenumber" name="143" href="#143">143</a>                 multiBinder = newSetBinder( binder, service, bindingKey.getAnnotationType() );
-<a class="jxr_linenumber" name="144" href="#144">144</a>             }
-<a class="jxr_linenumber" name="145" href="#145">145</a>             <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="146" href="#146">146</a>             {
-<a class="jxr_linenumber" name="147" href="#147">147</a>                 multiBinder = newSetBinder( binder, service );
-<a class="jxr_linenumber" name="148" href="#148">148</a>             }
-<a class="jxr_linenumber" name="149" href="#149">149</a> 
-<a class="jxr_linenumber" name="150" href="#150">150</a>             Iterator&lt;Class&lt;? <strong class="jxr_keyword">extends</strong> S&gt;&gt; serviceProviders = load( service, classLoader ).iterator();
-<a class="jxr_linenumber" name="151" href="#151">151</a>             <strong class="jxr_keyword">while</strong> ( serviceProviders.hasNext() )
-<a class="jxr_linenumber" name="152" href="#152">152</a>             {
-<a class="jxr_linenumber" name="153" href="#153">153</a>                 multiBinder.addBinding().to( serviceProviders.next() );
-<a class="jxr_linenumber" name="154" href="#154">154</a>             }
-<a class="jxr_linenumber" name="155" href="#155">155</a>         }
-<a class="jxr_linenumber" name="156" href="#156">156</a> 
-<a class="jxr_linenumber" name="157" href="#157">157</a>     }
+<a class="jxr_linenumber" name="88" href="#88">88</a>              Class&lt;? <strong class="jxr_keyword">extends</strong> S&gt; serviceImplType = servicesIterator.next();
+<a class="jxr_linenumber" name="89" href="#89">89</a>  
+<a class="jxr_linenumber" name="90" href="#90">90</a>              bindService( serviceType, serviceImplType );
+<a class="jxr_linenumber" name="91" href="#91">91</a>          }
+<a class="jxr_linenumber" name="92" href="#92">92</a>  
+<a class="jxr_linenumber" name="93" href="#93">93</a>          <strong class="jxr_keyword">if</strong> ( !found )
+<a class="jxr_linenumber" name="94" href="#94">94</a>          {
+<a class="jxr_linenumber" name="95" href="#95">95</a>              <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ProvisionException( format( <span class="jxr_string">"No Provider found for Service %s"</span>, serviceType.getName() ) );
+<a class="jxr_linenumber" name="96" href="#96">96</a>          }
+<a class="jxr_linenumber" name="97" href="#97">97</a>      }
+<a class="jxr_linenumber" name="98" href="#98">98</a>  
+<a class="jxr_linenumber" name="99" href="#99">99</a>      <strong class="jxr_keyword">private</strong> &lt;S&gt; <strong class="jxr_keyword">void</strong> bindService( Class&lt;S&gt; serviceType, Class&lt;? <strong class="jxr_keyword">extends</strong> S&gt; serviceImplType )
+<a class="jxr_linenumber" name="100" href="#100">100</a>     {
+<a class="jxr_linenumber" name="101" href="#101">101</a>         AnnotatedBindingBuilder&lt;S&gt; annotatedBindingBuilder = bind( serviceType );
+<a class="jxr_linenumber" name="102" href="#102">102</a>         LinkedBindingBuilder&lt;S&gt; linkedBindingBuilder = annotatedBindingBuilder;
+<a class="jxr_linenumber" name="103" href="#103">103</a> 
+<a class="jxr_linenumber" name="104" href="#104">104</a>         dance: <strong class="jxr_keyword">for</strong> ( Annotation annotation : serviceImplType.getAnnotations() )
+<a class="jxr_linenumber" name="105" href="#105">105</a>         {
+<a class="jxr_linenumber" name="106" href="#106">106</a>             Class&lt;? <strong class="jxr_keyword">extends</strong> Annotation&gt; annotationType = annotation.annotationType();
+<a class="jxr_linenumber" name="107" href="#107">107</a> 
+<a class="jxr_linenumber" name="108" href="#108">108</a>             <em class="jxr_comment">/*</em>
+<a class="jxr_linenumber" name="109" href="#109">109</a> <em class="jxr_comment">             * if the serviceImplType is a javax.inject.Qualifier annotation</em>
+<a class="jxr_linenumber" name="110" href="#110">110</a> <em class="jxr_comment">             * or</em>
+<a class="jxr_linenumber" name="111" href="#111">111</a> <em class="jxr_comment">             * if the serviceImplType is a com.google.inject.BindingAnnotation</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a> <em class="jxr_comment">             */</em>
+<a class="jxr_linenumber" name="113" href="#113">113</a>             <strong class="jxr_keyword">if</strong> ( annotationType.isAnnotationPresent( Qualifier.<strong class="jxr_keyword">class</strong> )
+<a class="jxr_linenumber" name="114" href="#114">114</a>                  || annotationType.isAnnotationPresent( BindingAnnotation.<strong class="jxr_keyword">class</strong> ) )
+<a class="jxr_linenumber" name="115" href="#115">115</a>             {
+<a class="jxr_linenumber" name="116" href="#116">116</a>                 linkedBindingBuilder = annotatedBindingBuilder.annotatedWith( annotation );
+<a class="jxr_linenumber" name="117" href="#117">117</a>                 <strong class="jxr_keyword">break</strong> dance;
+<a class="jxr_linenumber" name="118" href="#118">118</a>             }
+<a class="jxr_linenumber" name="119" href="#119">119</a>         }
+<a class="jxr_linenumber" name="120" href="#120">120</a> 
+<a class="jxr_linenumber" name="121" href="#121">121</a>         linkedBindingBuilder.to( serviceImplType );
+<a class="jxr_linenumber" name="122" href="#122">122</a>     }
+<a class="jxr_linenumber" name="123" href="#123">123</a> 
+<a class="jxr_linenumber" name="124" href="#124">124</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">void</strong> configureServices();
+<a class="jxr_linenumber" name="125" href="#125">125</a> 
+<a class="jxr_linenumber" name="126" href="#126">126</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_javadoccomment">     * EDSL to bind Services to Providers using the SPI pattern.</em>
+<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_javadoccomment">     * @param service The type of the service to be loaded.</em>
+<a class="jxr_linenumber" name="130" href="#130">130</a> <em class="jxr_javadoccomment">     * @return the chained EDSL builder.</em>
+<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="132" href="#132">132</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">final</strong> &lt;S&gt; <a href="../../../../org/apache/onami/spi/binder/FromClassLoaderBuilder.html">FromClassLoaderBuilder</a> discover( Class&lt;S&gt; service )
+<a class="jxr_linenumber" name="133" href="#133">133</a>     {
+<a class="jxr_linenumber" name="134" href="#134">134</a>         checkArgument( service != <strong class="jxr_keyword">null</strong>, <span class="jxr_string">"Impossible to bind null service class!"</span> );
+<a class="jxr_linenumber" name="135" href="#135">135</a>         ServiceInfo&lt;S&gt; builder = <strong class="jxr_keyword">new</strong> ServiceInfo&lt;S&gt;( service );
+<a class="jxr_linenumber" name="136" href="#136">136</a>         services.add( builder );
+<a class="jxr_linenumber" name="137" href="#137">137</a>         <strong class="jxr_keyword">return</strong> builder;
+<a class="jxr_linenumber" name="138" href="#138">138</a>     }
+<a class="jxr_linenumber" name="139" href="#139">139</a> 
+<a class="jxr_linenumber" name="140" href="#140">140</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="141" href="#141">141</a> <em class="jxr_javadoccomment">     * EDSL for SPI implementation.</em>
+<a class="jxr_linenumber" name="142" href="#142">142</a> <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="143" href="#143">143</a> <em class="jxr_javadoccomment">     * @param &lt;S&gt; The type of the service to be loaded.</em>
+<a class="jxr_linenumber" name="144" href="#144">144</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="145" href="#145">145</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> ServiceInfo&lt;S&gt;
+<a class="jxr_linenumber" name="146" href="#146">146</a>         <strong class="jxr_keyword">implements</strong> <a href="../../../../org/apache/onami/spi/binder/FromClassLoaderBuilder.html">FromClassLoaderBuilder</a>
+<a class="jxr_linenumber" name="147" href="#147">147</a>     {
+<a class="jxr_linenumber" name="148" href="#148">148</a> 
+<a class="jxr_linenumber" name="149" href="#149">149</a>         <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Class&lt;S&gt; serviceType;
+<a class="jxr_linenumber" name="150" href="#150">150</a> 
+<a class="jxr_linenumber" name="151" href="#151">151</a>         <strong class="jxr_keyword">private</strong> ClassLoader classLoader;
+<a class="jxr_linenumber" name="152" href="#152">152</a> 
+<a class="jxr_linenumber" name="153" href="#153">153</a>         <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/onami/spi/ServiceLoaderModule.html">ServiceInfo</a>( Class&lt;S&gt; serviceType )
+<a class="jxr_linenumber" name="154" href="#154">154</a>         {
+<a class="jxr_linenumber" name="155" href="#155">155</a>             <strong class="jxr_keyword">this</strong>.serviceType = serviceType;
+<a class="jxr_linenumber" name="156" href="#156">156</a>             classLoader = currentThread().getContextClassLoader();
+<a class="jxr_linenumber" name="157" href="#157">157</a>         }
 <a class="jxr_linenumber" name="158" href="#158">158</a> 
-<a class="jxr_linenumber" name="159" href="#159">159</a> }
+<a class="jxr_linenumber" name="159" href="#159">159</a>         <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="160" href="#160">160</a> <em class="jxr_javadoccomment">         * {@inheritDoc}</em>
+<a class="jxr_linenumber" name="161" href="#161">161</a> <em class="jxr_javadoccomment">         */</em>
+<a class="jxr_linenumber" name="162" href="#162">162</a>         <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> fromClassLoader( ClassLoader classLoader )
+<a class="jxr_linenumber" name="163" href="#163">163</a>         {
+<a class="jxr_linenumber" name="164" href="#164">164</a>             checkArgument( classLoader != <strong class="jxr_keyword">null</strong>,
+<a class="jxr_linenumber" name="165" href="#165">165</a>                            <span class="jxr_string">"Impossible to load Service %s with a null ClassLoader"</span>, serviceType.getName() );
+<a class="jxr_linenumber" name="166" href="#166">166</a>             <strong class="jxr_keyword">this</strong>.classLoader = classLoader;
+<a class="jxr_linenumber" name="167" href="#167">167</a>         }
+<a class="jxr_linenumber" name="168" href="#168">168</a> 
+<a class="jxr_linenumber" name="169" href="#169">169</a>         <strong class="jxr_keyword">public</strong> Class&lt;S&gt; getServiceType()
+<a class="jxr_linenumber" name="170" href="#170">170</a>         {
+<a class="jxr_linenumber" name="171" href="#171">171</a>             <strong class="jxr_keyword">return</strong> serviceType;
+<a class="jxr_linenumber" name="172" href="#172">172</a>         }
+<a class="jxr_linenumber" name="173" href="#173">173</a> 
+<a class="jxr_linenumber" name="174" href="#174">174</a>         <strong class="jxr_keyword">public</strong> ClassLoader getClassLoader()
+<a class="jxr_linenumber" name="175" href="#175">175</a>         {
+<a class="jxr_linenumber" name="176" href="#176">176</a>             <strong class="jxr_keyword">return</strong> classLoader;
+<a class="jxr_linenumber" name="177" href="#177">177</a>         }
+<a class="jxr_linenumber" name="178" href="#178">178</a> 
+<a class="jxr_linenumber" name="179" href="#179">179</a>     }
+<a class="jxr_linenumber" name="180" href="#180">180</a> 
+<a class="jxr_linenumber" name="181" href="#181">181</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> checkArgument( <strong class="jxr_keyword">boolean</strong> expression, String errorMessagePattern, Object...args )
+<a class="jxr_linenumber" name="182" href="#182">182</a>     {
+<a class="jxr_linenumber" name="183" href="#183">183</a>         <strong class="jxr_keyword">if</strong> ( !expression )
+<a class="jxr_linenumber" name="184" href="#184">184</a>         {
+<a class="jxr_linenumber" name="185" href="#185">185</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException( format( errorMessagePattern, args ) );
+<a class="jxr_linenumber" name="186" href="#186">186</a>         }
+<a class="jxr_linenumber" name="187" href="#187">187</a>     }
+<a class="jxr_linenumber" name="188" href="#188">188</a> 
+<a class="jxr_linenumber" name="189" href="#189">189</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: incubator/onami/site/spi/xref/org/apache/onami/spi/binder/FromClassLoaderBuilder.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/org/apache/onami/spi/binder/FromClassLoaderBuilder.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/org/apache/onami/spi/binder/FromClassLoaderBuilder.html (original)
+++ incubator/onami/site/spi/xref/org/apache/onami/spi/binder/FromClassLoaderBuilder.html Tue Jan 15 20:45:34 2013
@@ -33,18 +33,17 @@
 <a class="jxr_linenumber" name="23" href="#23">23</a>  <em class="jxr_javadoccomment"> * Allows specify the {@code ClassLoader} used to load the Service in the binding.</em>
 <a class="jxr_linenumber" name="24" href="#24">24</a>  <em class="jxr_javadoccomment"> */</em>
 <a class="jxr_linenumber" name="25" href="#25">25</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../../org/apache/onami/spi/binder/FromClassLoaderBuilder.html">FromClassLoaderBuilder</a>
-<a class="jxr_linenumber" name="26" href="#26">26</a>      <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/onami/spi/binder/AnnotatedServiceBuilder.html">AnnotatedServiceBuilder</a>
-<a class="jxr_linenumber" name="27" href="#27">27</a>  {
-<a class="jxr_linenumber" name="28" href="#28">28</a>  
-<a class="jxr_linenumber" name="29" href="#29">29</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="30" href="#30">30</a>  <em class="jxr_javadoccomment">     * Specifies the {@code ClassLoader} used to load the Service in the binding.</em>
-<a class="jxr_linenumber" name="31" href="#31">31</a>  <em class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="32" href="#32">32</a>  <em class="jxr_javadoccomment">     * @param classLoader the {@code ClassLoader} used to load the Service in the binding.</em>
-<a class="jxr_linenumber" name="33" href="#33">33</a>  <em class="jxr_javadoccomment">     * @return the chained EDSL builder.</em>
-<a class="jxr_linenumber" name="34" href="#34">34</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="35" href="#35">35</a>      <a href="../../../../../org/apache/onami/spi/binder/AnnotatedServiceBuilder.html">AnnotatedServiceBuilder</a> fromClassLoader( ClassLoader classLoader );
-<a class="jxr_linenumber" name="36" href="#36">36</a>  
-<a class="jxr_linenumber" name="37" href="#37">37</a>  }
+<a class="jxr_linenumber" name="26" href="#26">26</a>  {
+<a class="jxr_linenumber" name="27" href="#27">27</a>  
+<a class="jxr_linenumber" name="28" href="#28">28</a>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="29" href="#29">29</a>  <em class="jxr_javadoccomment">     * Specifies the {@code ClassLoader} used to load the Service in the binding.</em>
+<a class="jxr_linenumber" name="30" href="#30">30</a>  <em class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="31" href="#31">31</a>  <em class="jxr_javadoccomment">     * @param classLoader the {@code ClassLoader} used to load the Service in the binding.</em>
+<a class="jxr_linenumber" name="32" href="#32">32</a>  <em class="jxr_javadoccomment">     * @return the chained EDSL builder.</em>
+<a class="jxr_linenumber" name="33" href="#33">33</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="34" href="#34">34</a>      <strong class="jxr_keyword">void</strong> fromClassLoader( ClassLoader classLoader );
+<a class="jxr_linenumber" name="35" href="#35">35</a>  
+<a class="jxr_linenumber" name="36" href="#36">36</a>  }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-frame.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-frame.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-frame.html (original)
+++ incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-frame.html Tue Jan 15 20:45:34 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-SPI 0.2-incubating-SNAPSHOT Reference Package org.apache.onami.spi.binder</title>
+		<title>Apache Onami-SPI 1.0.0-incubating-SNAPSHOT Reference Package org.apache.onami.spi.binder</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -16,14 +16,8 @@
 
       	<ul>
       		          	<li>
-            	<a href="AnnotatedServiceBuilder.html" target="classFrame">AnnotatedServiceBuilder</a>
-          	</li>
-          	          	<li>
             	<a href="FromClassLoaderBuilder.html" target="classFrame">FromClassLoaderBuilder</a>
           	</li>
-          	          	<li>
-            	<a href="ServiceBuilder.html" target="classFrame">ServiceBuilder</a>
-          	</li>
           	      	</ul>
 
 	</body>

Modified: incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-summary.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-summary.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-summary.html (original)
+++ incubator/onami/site/spi/xref/org/apache/onami/spi/binder/package-summary.html Tue Jan 15 20:45:34 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-SPI 0.2-incubating-SNAPSHOT Reference Package org.apache.onami.spi.binder</title>
+		<title>Apache Onami-SPI 1.0.0-incubating-SNAPSHOT Reference Package org.apache.onami.spi.binder</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -37,19 +37,9 @@
         	<tbody>
         		            	<tr>
               		<td>
-                		<a href="AnnotatedServiceBuilder.html" target="classFrame">AnnotatedServiceBuilder</a>
-              		</td>
-            	</tr>
-				            	<tr>
-              		<td>
                 		<a href="FromClassLoaderBuilder.html" target="classFrame">FromClassLoaderBuilder</a>
               		</td>
             	</tr>
-				            	<tr>
-              		<td>
-                		<a href="ServiceBuilder.html" target="classFrame">ServiceBuilder</a>
-              		</td>
-            	</tr>
 				        	</tbody>
       	</table>
 		
@@ -72,6 +62,6 @@
         	</ul>
       	</div>
 				<hr />
-		Copyright &#169; 2012 The Apache Software Foundation. All Rights Reserved.
+		Copyright &#169; 2012-2013 The Apache Software Foundation. All Rights Reserved.
 	</body>
 </html>
\ No newline at end of file

Modified: incubator/onami/site/spi/xref/org/apache/onami/spi/package-frame.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/org/apache/onami/spi/package-frame.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/org/apache/onami/spi/package-frame.html (original)
+++ incubator/onami/site/spi/xref/org/apache/onami/spi/package-frame.html Tue Jan 15 20:45:34 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-SPI 0.2-incubating-SNAPSHOT Reference Package org.apache.onami.spi</title>
+		<title>Apache Onami-SPI 1.0.0-incubating-SNAPSHOT Reference Package org.apache.onami.spi</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -19,9 +19,6 @@
             	<a href="AbstractServiceClassIterator.html" target="classFrame">AbstractServiceClassIterator</a>
           	</li>
           	          	<li>
-            	<a href="ServiceLoaderModule.html" target="classFrame">DefaultServiceBuilder</a>
-          	</li>
-          	          	<li>
             	<a href="GuiceServiceLoader.html" target="classFrame">GuiceServiceLoader</a>
           	</li>
           	          	<li>
@@ -31,6 +28,9 @@
             	<a href="PropertyServiceClassIterator.html" target="classFrame">PropertyServiceClassIterator</a>
           	</li>
           	          	<li>
+            	<a href="ServiceLoaderModule.html" target="classFrame">ServiceInfo</a>
+          	</li>
+          	          	<li>
             	<a href="ServiceLoader.html" target="classFrame">ServiceLoader</a>
           	</li>
           	          	<li>

Modified: incubator/onami/site/spi/xref/org/apache/onami/spi/package-summary.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/org/apache/onami/spi/package-summary.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/org/apache/onami/spi/package-summary.html (original)
+++ incubator/onami/site/spi/xref/org/apache/onami/spi/package-summary.html Tue Jan 15 20:45:34 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-SPI 0.2-incubating-SNAPSHOT Reference Package org.apache.onami.spi</title>
+		<title>Apache Onami-SPI 1.0.0-incubating-SNAPSHOT Reference Package org.apache.onami.spi</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -42,22 +42,22 @@
             	</tr>
 				            	<tr>
               		<td>
-                		<a href="ServiceLoaderModule.html" target="classFrame">DefaultServiceBuilder</a>
+                		<a href="GuiceServiceLoader.html" target="classFrame">GuiceServiceLoader</a>
               		</td>
             	</tr>
 				            	<tr>
               		<td>
-                		<a href="GuiceServiceLoader.html" target="classFrame">GuiceServiceLoader</a>
+                		<a href="GuiceServiceLoader.html" target="classFrame">ModulesIterator</a>
               		</td>
             	</tr>
 				            	<tr>
               		<td>
-                		<a href="GuiceServiceLoader.html" target="classFrame">ModulesIterator</a>
+                		<a href="PropertyServiceClassIterator.html" target="classFrame">PropertyServiceClassIterator</a>
               		</td>
             	</tr>
 				            	<tr>
               		<td>
-                		<a href="PropertyServiceClassIterator.html" target="classFrame">PropertyServiceClassIterator</a>
+                		<a href="ServiceLoaderModule.html" target="classFrame">ServiceInfo</a>
               		</td>
             	</tr>
 				            	<tr>
@@ -97,6 +97,6 @@
         	</ul>
       	</div>
 				<hr />
-		Copyright &#169; 2012 The Apache Software Foundation. All Rights Reserved.
+		Copyright &#169; 2012-2013 The Apache Software Foundation. All Rights Reserved.
 	</body>
 </html>
\ No newline at end of file

Modified: incubator/onami/site/spi/xref/overview-frame.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/overview-frame.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/overview-frame.html (original)
+++ incubator/onami/site/spi/xref/overview-frame.html Tue Jan 15 20:45:34 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-SPI 0.2-incubating-SNAPSHOT Reference</title>
+		<title>Apache Onami-SPI 1.0.0-incubating-SNAPSHOT Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: incubator/onami/site/spi/xref/overview-summary.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/spi/xref/overview-summary.html?rev=1433627&r1=1433626&r2=1433627&view=diff
==============================================================================
--- incubator/onami/site/spi/xref/overview-summary.html (original)
+++ incubator/onami/site/spi/xref/overview-summary.html Tue Jan 15 20:45:34 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-SPI 0.2-incubating-SNAPSHOT Reference</title>
+		<title>Apache Onami-SPI 1.0.0-incubating-SNAPSHOT Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -24,7 +24,7 @@
 	        </ul>
       	</div>
 		
-		      	<h2>Apache Onami-SPI 0.2-incubating-SNAPSHOT Reference</h2>
+		      	<h2>Apache Onami-SPI 1.0.0-incubating-SNAPSHOT Reference</h2>
 
 		<table class="summary">
         	<thead>
@@ -64,6 +64,6 @@
       	</div>
 		
 		<hr />
-		Copyright &#169; 2012 The Apache Software Foundation. All Rights Reserved.
+		Copyright &#169; 2012-2013 The Apache Software Foundation. All Rights Reserved.
 	</body>
 </html>
\ No newline at end of file



Mime
View raw message