svn commit: r796117 - in /websites/production/aries: ./ content/modules/blueprint.html content/modules/samples/blog-sample.html content/resources/site.css

[hu...@apache.org]

Author: hughesj
Date: Thu Sep 22 16:04:03 2011
New Revision: 796117

Log:
Publishing merge to aries site by hughesj

Modified:
    websites/production/aries/   (props changed)
    websites/production/aries/content/modules/blueprint.html
    websites/production/aries/content/modules/samples/blog-sample.html
    websites/production/aries/content/resources/site.css

Propchange: websites/production/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 22 16:04:03 2011
@@ -1 +1 @@
-/websites/staging/aries/trunk:782169-795388
+/websites/staging/aries/trunk:782169-796116

Modified: websites/production/aries/content/modules/blueprint.html
==============================================================================
--- websites/production/aries/content/modules/blueprint.html (original)
+++ websites/production/aries/content/modules/blueprint.html Thu Sep 22 16:04:03 2011
@@ -279,14 +279,13 @@ explicitly in the Bundle-Blueprint manif
 <p>Once the extender determines that a bundle is a Blueprint bundle, it
 creates a Blueprint Container on behalf of that bundle. The Blueprint
 Container is responsible for:</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="n">Parsing</span> <span class="n">the</span> <span class="n">Blueprint</span> <span class="n">XML</span> <span class="n">files</span>
-<span class="o">*</span> <span class="n">Instantiating</span> <span class="n">the</span> <span class="n">components</span>
-<span class="o">*</span> <span class="n">Wiring</span> <span class="n">the</span> <span class="n">components</span> <span class="n">together</span>
-<span class="o">*</span> <span class="n">Registering</span> <span class="n">services</span>
-<span class="o">*</span> <span class="n">Looking</span> <span class="n">up</span> <span class="n">service</span> <span class="n">references</span>
-</pre></div>
-
-
+<ul>
+<li>Parsing the Blueprint XML files</li>
+<li>Instantiating the components</li>
+<li>Wiring the components together</li>
+<li>Registering services</li>
+<li>Looking up service references</li>
+</ul>
 <p>During initialization, the Blueprint Container ensures that mandatory
 service references are satisfied, registers all the services into the
 service registry, and creates initial component instances. The Blueprint
@@ -338,15 +337,16 @@ 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>
-<p>public class Account {    <br />
-       public Account(long number) {
-      ...
-       }
-       ...
-   }</p>
-<div class="codehilite"><pre>   <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>
+<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>
 </pre></div>
 
 

Modified: websites/production/aries/content/modules/samples/blog-sample.html
==============================================================================
--- websites/production/aries/content/modules/samples/blog-sample.html (original)
+++ websites/production/aries/content/modules/samples/blog-sample.html Thu Sep 22 16:04:03 2011
@@ -259,7 +259,7 @@
 <hr />
 <p><strong>Note:</strong>
 These instructions are for the current development stream of Aries.
-Instructions for older releases can be found <a href="/downloads/archivedreleases.html">here</a>
+Instructions for older releases can be found <a href="/downloads/archived-releases.html">here</a>
 Instructions for the current release of Aries can be found <a href="/downloads/blogsample-0.3.html">here</a></p>
 <hr />
 <p><a name="BlogSample-CreatetheOSGiplatformfortheBlogsample"></a></p>

Modified: websites/production/aries/content/resources/site.css
==============================================================================
--- websites/production/aries/content/resources/site.css (original)
+++ websites/production/aries/content/resources/site.css Thu Sep 22 16:04:03 2011
@@ -1562,3 +1562,11 @@ div.auto_complete ul strong.highlight {
 .leftnav li a:active {color:white;}
 .leftnav li a:visited {color:white;}
 .leftnav li a:hover {background-color: #3c4672; color:white;}
+
+
+/*******  Java syntax highlighting *********/
+.kd {
+    color: rgc(127,0,85);
+    font-weight: bold;
+    font-family: Lucida Console, Courier New, monospace;
+}
\ No newline at end of file