You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/07/06 00:21:43 UTC

svn commit: r1500155 [3/3] - in /incubator/jclouds/site-content/documentation: devguides/using-eclipse/ quickstart/aws/ quickstart/azure-storage/ quickstart/bluelock/ quickstart/chef/ quickstart/cloudsigma/ quickstart/filesystem/ quickstart/go-grid/ qu...

Modified: incubator/jclouds/site-content/documentation/userguide/compute/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/compute/index.html?rev=1500155&r1=1500154&r2=1500155&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/compute/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/compute/index.html Fri Jul  5 22:21:42 2013
@@ -147,8 +147,11 @@ Here's how to perform common commands.</
 
 <p>Here, you specify the particular service you wish to manage and get a reference to ComputeService.</p>
 
-<div class="highlight"><pre><code class="java"><span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> 
-    <span class="k">new</span> <span class="nf">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;terremark&quot;</span><span class="o">,</span> <span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">);</span>
+<div class="highlight"><pre><code class="java"><span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;trmk-ecloud&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 
 <span class="n">ComputeService</span> <span class="n">computeService</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getComputeService</span><span class="o">();</span>
 </code></pre></div>
@@ -347,12 +350,19 @@ If you'd like to have credentials persis
 <div class="highlight"><pre><code class="java"><span class="c1">// set the location of the filesystem you wish to persist credentials to</span>
 <span class="n">props</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">FilesystemConstants</span><span class="o">.</span><span class="na">PROPERTY_BASEDIR</span><span class="o">,</span> <span class="s">&quot;/var/gogrid&quot;</span><span class="o">);</span>
 
-<span class="n">blobContext</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;filesystem&quot;</span><span class="o">,</span> <span class="s">&quot;foo&quot;</span><span class="o">,</span> <span class="s">&quot;bar&quot;</span><span class="o">,</span> <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span><span class="n">of</span><span class="o">(),</span> <span class="n">props</span><span class="o">);</span>
+<span class="n">blobContext</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;filesystem&quot;</span><span class="o">)</span>
+                 <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="s">&quot;foo&quot;</span><span class="o">,</span> <span class="s">&quot;bar&quot;</span><span class="o">)</span>
+                 <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">props</span><span class="o">)</span>
+                 <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 
 <span class="n">credentialsMap</span> <span class="o">=</span> <span class="n">blobContext</span><span class="o">.</span><span class="na">createInputStreamMap</span><span class="o">(</span><span class="s">&quot;credentials&quot;</span><span class="o">);</span>
 
-<span class="n">computeContext</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;gogrid&quot;</span><span class="o">,</span> <span class="n">secret</span><span class="o">,</span> <span class="n">apiKey</span><span class="o">,</span>
-         <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">CredentialStoreModule</span><span class="o">(</span><span class="n">credentialsMap</span><span class="o">)));</span>
+<span class="n">computeContext</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;gogrid&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">apiKey</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">CredentialStoreModule</span><span class="o">(</span><span class="n">credentialsMap</span><span class="o">),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
@@ -433,8 +443,11 @@ enterprise configuration module.  Here's
 
 <div class="highlight"><pre><code class="java"><span class="n">Properties</span> <span class="n">overrides</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
 <span class="n">Set</span><span class="o">&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">wiring</span> <span class="o">=</span> <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">(),</span> <span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span> <span class="k">new</span> <span class="n">EnterpriseConfigurationModule</span><span class="o">());</span>
-<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;terremark&quot;</span><span class="o">,</span> <span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">,</span>
-             <span class="n">wiring</span><span class="o">,</span> <span class="n">overrides</span><span class="o">);</span>
+<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;trmk-ecloud&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">wiring</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
@@ -597,36 +610,30 @@ without parameters (ex. <code>templateBu
 <table>
 <thead>
 <tr>
-<th></th>
 <th> <em>provider</em> </th>
 <th> <em>default template</em> </th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td></td>
 <td> vcloud/bluelock-vcdirector </td>
-<td> osFamily(UBUNTU).os64Bit(true) |</td>
+<td> osFamily(UBUNTU).os64Bit(true) </td>
 </tr>
 <tr>
-<td></td>
 <td> trmk-vcloudexpress </td>
-<td> osFamily(UBUNTU).osDescriptionMatches(".<em>JeOS.</em>").os64Bit(true) |</td>
+<td> osFamily(UBUNTU).osDescriptionMatches(".<em>JeOS.</em>").os64Bit(true) </td>
 </tr>
 <tr>
-<td></td>
 <td> trmk-ecloud </td>
-<td> osFamily(CENTOS).os64Bit(true) |</td>
+<td> osFamily(CENTOS).os64Bit(true) </td>
 </tr>
 <tr>
-<td></td>
 <td> ec2 </td>
-<td> osFamily(AMZN_LINUX).os64Bit(true) |</td>
+<td> osFamily(AMZN_LINUX).os64Bit(true) </td>
 </tr>
 <tr>
-<td></td>
 <td> gogrid </td>
-<td> osFamily(CENTOS).imageNameMatches(".<em>w/ None.</em>") |</td>
+<td> osFamily(CENTOS).imageNameMatches(".<em>w/ None.</em>") </td>
 </tr>
 </tbody>
 </table>

Modified: incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html?rev=1500155&r1=1500154&r2=1500155&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/google-app-engine/index.html Fri Jul  5 22:21:42 2013
@@ -79,8 +79,14 @@ There are only a couple things you need 
 <div class="highlight"><pre><code class="java"> 
 <span class="n">modules</span> <span class="o">=</span> <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">AsyncGoogleAppEngineConfigurationModule</span><span class="o">());</span>
 <span class="c1">// note if you are using &lt;= beta-9, providers will be ec2 and s3</span>
-<span class="n">compute</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">,</span> <span class="n">accesskey</span><span class="o">,</span> <span class="n">secret</span><span class="o">,</span> <span class="n">modules</span><span class="o">);</span>
-<span class="n">blobStore</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-s3&quot;</span><span class="o">,</span> <span class="n">accesskey</span><span class="o">,</span> <span class="n">secret</span><span class="o">,</span> <span class="n">modules</span><span class="o">);</span>
+<span class="n">blobStoreContext</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-s3&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accesskey</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">modules</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<span class="n">computeContext</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accesskey</span><span class="o">,</span> <span class="n">sceret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">modules</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
@@ -100,8 +106,14 @@ Google App Engine config only when runni
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">&quot;aws-s3.identity&quot;</span><span class="o">,</span><span class="s">&quot;accessKey&quot;</span><span class="o">);</span>
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">&quot;aws-s3.credential&quot;</span><span class="o">,</span><span class="s">&quot;secret&quot;</span><span class="o">);</span>
 
-<span class="n">compute</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">,</span> <span class="n">overrides</span><span class="o">);</span>
-<span class="n">blobStore</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-s3&quot;</span><span class="o">,</span> <span class="n">overrides</span><span class="o">);</span>
+<span class="n">blobStore</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-s3&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accesskey</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+<span class="n">compute</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accesskey</span><span class="o">,</span> <span class="n">sceret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
@@ -168,9 +180,11 @@ googlestorage.credential=secret
          <span class="n">properties</span> <span class="o">=</span> <span class="n">loadJCloudsProperties</span><span class="o">(</span><span class="s">&quot;local&quot;</span><span class="o">,</span><span class="n">servletContextEvent</span><span class="o">);</span>
       <span class="o">}</span>
       <span class="n">servletContextEvent</span><span class="o">.</span><span class="na">getServletContext</span><span class="o">().</span><span class="na">setAttribute</span><span class="o">(</span><span class="s">&quot;blobstore&quot;</span><span class="o">,</span>
-         <span class="k">new</span> <span class="nf">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span>
-            <span class="n">properties</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="s">&quot;jclouds.blobstore&quot;</span><span class="o">),</span> <span class="n">properties</span><span class="o">)</span>
-         <span class="o">).</span><span class="na">getBlobStore</span><span class="o">();</span>
+                <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="n">properties</span><span class="o">.</span><span class="na">getProperty</span><span class="o">(</span><span class="s">&quot;jclouds.blobstore&quot;</span><span class="o">))</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accesskey</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">properties</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">getBlobStore</span><span class="o">();</span>
       <span class="kd">super</span><span class="o">.</span><span class="na">contextInitialized</span><span class="o">(</span><span class="n">servletContextEvent</span><span class="o">);</span>
    <span class="o">}</span>
 
@@ -259,9 +273,12 @@ You do not have luxury to synchronously 
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">PROPERTY_TIMEOUT_SCRIPT_COMPLETE</span><span class="o">,</span> <span class="s">&quot;25000&quot;</span><span class="o">);</span>
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">PROPERTY_TIMEOUT_PORT_OPEN</span><span class="o">,</span> <span class="s">&quot;25000&quot;</span><span class="o">);</span>
 
-<span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">()</span>
-      <span class="o">.</span><span class="na">createContext</span><span class="o">(</span><span class="n">service</span><span class="o">,</span> <span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">,</span> <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
-            <span class="k">new</span> <span class="nf">AsyncGoogleAppEngineConfigurationModule</span><span class="o">()),</span> <span class="n">overrides</span><span class="o">);</span>
+<span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="n">service</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+                                  <span class="k">new</span> <span class="nf">AsyncGoogleAppEngineConfigurationModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 

Modified: incubator/jclouds/site-content/documentation/userguide/terremark/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/terremark/index.html?rev=1500155&r1=1500154&r2=1500155&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/terremark/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/terremark/index.html Fri Jul  5 22:21:42 2013
@@ -453,7 +453,12 @@ The list of available networks is in the
 
 <div class="highlight"><pre><code class="java"><span class="n">Properties</span> <span class="n">overrides</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">VCloudConstants</span><span class="o">.</span><span class="na">PROPERTY_VCLOUD_DEFAULT_NETWORK</span><span class="o">,</span> <span class="s">&quot;10.1.1.160/27&quot;</span><span class="o">);</span>
-<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;trmk-ecloud&quot;</span><span class="o">,</span><span class="n">USER</span> <span class="o">,</span><span class="n">PASSWORD</span><span class="o">,</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">()),</span> <span class="n">overrides</span><span class="o">);</span>
+<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;trmk-ecloud&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">USER</span><span class="o">,</span> <span class="n">PASSWORD</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 

Modified: incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html?rev=1500155&r1=1500154&r2=1500155&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html Fri Jul  5 22:21:42 2013
@@ -122,20 +122,21 @@ ec2 across all 4 regions. We now by defa
    <span class="c1">// choose only amazon images that are ebs-backed</span>
    <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">AWSEC2Constants</span><span class="o">.</span><span class="na">PROPERTY_EC2_AMI_QUERY</span><span class="o">,</span>
                          <span class="s">&quot;owner-id=137112412989;state=available;image-type=machine;root-device-type=ebs&quot;</span><span class="o">);</span>
-   <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">,</span> <span class="n">access</span><span class="o">,</span> <span class="n">secret</span><span class="o">,</span>
-            <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="nf">of</span><span class="o">(</span><span class="k">new</span> <span class="n">SshjSshClientModule</span><span class="o">()),</span> <span class="n">overrides</span><span class="o">)</span>
+   <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">access</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
 <h4>Properties to set cluster compute images</h4>
 
 <p>Cluster compute images are assigned the following default query, corresponding to the property key constant AWSEC2Constants.PROPERTY_EC2_CC_AMI_QUERY
-```</p>
-
-<pre><code>virtualization-type=hvm;architecture=x86_64;owner-id=137112412989,099720109477;hypervisor=xen;state=available;image-type=machine;root-device-type=ebs
-</code></pre>
-
-<p>```
+<code>
+    virtualization-type=hvm;architecture=x86_64;owner-id=137112412989,099720109477;hypervisor=xen;state=available;image-type=machine;root-device-type=ebs
+</code>
 In order to save time, we only look for cluster compute images in regions that support them.  In order to change the default for this, affect the property PROPERTY_EC2_CC_REGIONS, currently set to "us-east-1"</p>
 
 <h3>Lazy Image Fetching</h3>
@@ -159,7 +160,7 @@ We now provide the option to lazy-fetch 
 </code></pre></div>
 
 
-<h4>Release 1.1.0 and above</h4>
+<h4>Release 1.1.0 to 1.5.x</h4>
 
 <div class="highlight"><pre><code class="java">   <span class="n">Properties</span> <span class="n">overrides</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
 
@@ -175,6 +176,26 @@ We now provide the option to lazy-fetch 
 </code></pre></div>
 
 
+<h4>Release 1.6.0 and above</h4>
+
+<div class="highlight"><pre><code class="java">   <span class="n">Properties</span> <span class="n">overrides</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
+
+   <span class="c1">// set AMI queries to nothing</span>
+   <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">AWSEC2Constants</span><span class="o">.</span><span class="na">PROPERTY_EC2_AMI_QUERY</span><span class="o">,</span> <span class="s">&quot;&quot;</span><span class="o">);</span>
+   <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">AWSEC2Constants</span><span class="o">.</span><span class="na">PROPERTY_EC2_CC_AMI_QUERY</span><span class="o">,</span> <span class="s">&quot;&quot;</span><span class="o">);</span>
+
+   <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accessid</span><span class="o">,</span> <span class="n">secretkey</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+
+   <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getComputeService</span><span class="o">().</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">imageId</span><span class="o">(</span>
+            <span class="s">&quot;ami-ccb35ea5&quot;</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
+</code></pre></div>
+
+
 <h3>Private Images</h3>
 
 <p>Amazon EC2 has the concept of private-but-shared amis - images that were bundled on
@@ -202,7 +223,7 @@ managing image curation, and others usin
 </code></pre></div>
 
 
-<h4>Release 1.1.0 and above</h4>
+<h4>Releases 1.1.0 through 1.5.x</h4>
 
 <div class="highlight"><pre><code class="java"><span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
 
@@ -218,6 +239,26 @@ managing image curation, and others usin
 </code></pre></div>
 
 
+<h4>Release 1.6.0 and abovex</h4>
+
+<div class="highlight"><pre><code class="java"><span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
+
+<span class="c1">//have a myFavoriteOwner - the user ID of the owner of the image.</span>
+<span class="n">props</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">EC2Constants</span><span class="o">.</span><span class="na">PROPERTY_EC2_AMI_QUERY</span><span class="o">,</span> <span class="s">&quot;owner-id=137112412989,063491364108,099720109477,411009282317,&quot;</span><span class="o">+</span><span class="n">myFavoriteOwner</span><span class="o">+</span><span class="s">&quot;;state=available;image-type=machine&quot;</span><span class="o">);</span>
+
+<span class="c1">// or.. you can remove the owner part of the query, but this will take forever on amazon&#39;s ec2 service</span>
+<span class="n">props</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">EC2Constants</span><span class="o">.</span><span class="na">PROPERTY_EC2_AMI_QUERY</span><span class="o">,</span> <span class="s">&quot;state=available;image-type=machine&quot;</span><span class="o">);</span>
+
+
+<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">access</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">props</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
+</code></pre></div>
+
+
 <p>You can then create nodes using the templateBuilder.imageId() method.</p>
 
 <h4>Parsing private images</h4>
@@ -335,15 +376,18 @@ OsFamily.UNRECOGNIZED, with no image ver
 <span class="c1">// your owner id</span>
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="n">EC2Constants</span><span class="o">.</span><span class="na">PROPERTY_EC2_AMI_OWNERS</span><span class="o">,</span> <span class="s">&quot;123123123213123&quot;</span><span class="o">);</span>
 
-<span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="n">provider</span><span class="o">,</span> <span class="n">ImmutableSet</span>
-         <span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">(),</span> <span class="k">new</span> <span class="n">AbstractModule</span><span class="o">(){</span>
+<span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-ec2&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">access</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">overrides</span><span class="o">(</span><span class="n">overrides</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">AbstractModule</span><span class="o">(){</span>
 
             <span class="nd">@Override</span>
             <span class="kd">protected</span> <span class="kt">void</span> <span class="nf">configure</span><span class="o">()</span> <span class="o">{</span>
                <span class="n">bind</span><span class="o">(</span><span class="n">AWSEC2ReviseParsedImage</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">to</span><span class="o">(</span><span class="n">FooAWSEC2ReviseParsedImage</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-            <span class="o">}</span>
-            
-         <span class="o">}),</span> <span class="n">overrides</span><span class="o">);</span>
+            <span class="o">})))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
@@ -428,7 +472,9 @@ spot request goes through, but perhaps t
 <p>You can then use the !CloudWatchClient to get statistics on your nodes.</p>
 
 <div class="highlight"><pre><code class="java"><span class="n">RestContext</span><span class="o">&lt;</span><span class="n">CloudWatchClient</span><span class="o">,</span> <span class="n">CloudWatchAsyncClient</span><span class="o">&gt;</span> <span class="n">cloudWatchContext</span> <span class="o">=</span>
-       <span class="k">new</span> <span class="nf">RestContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;cloudwatch&quot;</span><span class="o">,</span>  <span class="n">accessid</span><span class="o">,</span> <span class="n">secretkey</span><span class="o">);</span>
+              <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;cloudwatch&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">access</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">build</span><span class="o">();</span>
 
 <span class="n">String</span> <span class="n">region</span> <span class="o">=</span> <span class="n">node</span><span class="o">.</span><span class="na">getLocation</span><span class="o">().</span><span class="na">getParent</span><span class="o">().</span><span class="na">getId</span><span class="o">();</span>
 

Modified: incubator/jclouds/site-content/documentation/userguide/using-maven/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-maven/index.html?rev=1500155&r1=1500154&r2=1500155&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/using-maven/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/using-maven/index.html Fri Jul  5 22:21:42 2013
@@ -82,7 +82,9 @@
 
 <p>This assumes you are only interested in Basic BlobStore commands, like below:</p>
 
-<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="n">provider</span><span class="o">,</span> <span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">);</span>
+<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="n">provider</span><span class="o">)</span>
+                 <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">)</span>
+                 <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">InputStream</span><span class="o">&gt;</span> <span class="n">map</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">createInputStreamMap</span><span class="o">(</span><span class="s">&quot;adrian.home&quot;</span><span class="o">);</span>
   <span class="c1">// do work</span>
 <span class="n">context</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
@@ -116,7 +118,9 @@ or that you are in an environment that c
 
 <p>Then, you'd substitute the correct credentials and such here:</p>
 
-<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;aws-s3&quot;</span><span class="o">,</span> <span class="n">accessKey</span><span class="o">,</span> <span class="n">secret</span><span class="o">);</span>
+<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;aws-s3&quot;</span><span class="o">)</span>
+                 <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">accessKey</span><span class="o">,</span> <span class="n">secret</span><span class="o">)</span>
+                 <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
@@ -125,8 +129,11 @@ or that you are in an environment that c
 <p>There is no change to the api, in order to switch your code to use <code>URLFetchService</code> from within GAE.<br/>
 However, you do have to configure your connection differently:</p>
 
-<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="n">provider</span><span class="o">,</span> <span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">,</span> 
-                <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span><span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">AsyncGoogleAppEngineConfigurationModule</span><span class="o">()));</span>
+<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="n">provider</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+                                  <span class="k">new</span> <span class="nf">AsyncGoogleAppEngineConfigurationModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 
@@ -149,8 +156,10 @@ However, you do have to configure your c
 
 <p>jclouds will by default use JDK logging.  To switch to log4J or slf4j, you have to add a logging module to your configuration code:</p>
 
-<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BlobStoreContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="n">provider</span><span class="o">,</span> <span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">,</span> 
-                                        <span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span><span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">()));</span>
+<div class="highlight"><pre><code class="java"><span class="n">BlobStoreContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="n">provider</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">identity</span><span class="o">,</span> <span class="n">credential</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">BlobStoreContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </code></pre></div>
 
 

Modified: incubator/jclouds/site-content/documentation/userguide/vmware-vcloud/index.html
URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/vmware-vcloud/index.html?rev=1500155&r1=1500154&r2=1500155&view=diff
==============================================================================
--- incubator/jclouds/site-content/documentation/userguide/vmware-vcloud/index.html (original)
+++ incubator/jclouds/site-content/documentation/userguide/vmware-vcloud/index.html Fri Jul  5 22:21:42 2013
@@ -63,7 +63,6 @@ We also provide tools that make developi
 <table>
 <thead>
 <tr>
-<th></th>
 <th> <em>Company</em> </th>
 <th> <em>Offering</em> </th>
 <th> <em>Provider in jclouds</em> </th>
@@ -72,32 +71,28 @@ We also provide tools that make developi
 </thead>
 <tbody>
 <tr>
-<td></td>
 <td> <img src="http://www.vmware.com/files/images/vam/img-terremark.gif"> </td>
 <td> <a href="http://vcloudexpress.terremark.com/blog.aspx">vCloud Express</a> </td>
 <td> trmk-vcloudexpress </td>
-<td> 0.8a-ext1.6 |</td>
+<td> 0.8a-ext1.6 </td>
 </tr>
 <tr>
-<td></td>
 <td> <img src="http://www.vmware.com/files/images/vam/img-terremark.gif"></td>
 <td> <a href="http://www.terremark.com/services/cloudcomputing/theenterprisecloud.aspx">Enterprise Cloud</a> </td>
 <td> trmk-ecloud </td>
-<td> 0.8b-ext2.3 |</td>
+<td> 0.8b-ext2.3 </td>
 </tr>
 <tr>
-<td></td>
 <td> <img src="http://www.vmware.com/files/images/vam/img-bluelock.gif"> </td>
 <td> <a href="http://www.bluelock.com/bluelock-cloud-hosting/virtual-cloud-enterprise/">vCloud Enterprise</a></td>
 <td> bluelock-vcdirector </td>
-<td> 1.0 | </td>
+<td> 1.0 </td>
 </tr>
 <tr>
-<td></td>
 <td> <a href="http://www.stratogen.net/products/vmware-hosting.html"><img src="http://www.stratogen.net/images/footerlogo.gif"></a> </td>
 <td> <a href="http://www.stratogen.net/products/vmware-hosting.html">VMware Hosting</a></td>
 <td> stratogen-vcloud-mycloud </td>
-<td> 1.0 |</td>
+<td> 1.0 </td>
 </tr>
 </tbody>
 </table>
@@ -106,7 +101,7 @@ We also provide tools that make developi
 <h2>Obtaining a context to vCloud</h2>
 
 <p>Once you have jclouds libraries loaded, the easiest way to get started is to use the
-<code>*ComputeServiceContextFactory</code>.  This takes your username and password and gives you a context
+<code>*ContextBuilder</code>.  This takes your username and password and gives you a context
 to either get a portable cloud computing interface (<code>getComputeService()</code> ), or the direct vCloud API ( <code>getProviderContext().getApi()</code> ).</p>
 
 <ul>
@@ -115,8 +110,11 @@ to either get a portable cloud computing
 
 
 <div class="highlight"><pre><code class="java"><span class="c1">// add the ssh module, if you are using ComputeService, otherwise leave it out</span>
-<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;trmk-vcloudexpress&quot;</span><span class="o">,</span> 
-            <span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">,</span> <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JshSshClientModule</span><span class="o">()));</span>
+<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;trmk-vcloudexpress&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">email</span><span class="o">,</span> <span class="n">password</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
  
 <span class="c1">// use context to obtain vcloud objects with terremark vCloud express extensions</span>
 <span class="n">RestContext</span><span class="o">&lt;</span><span class="n">TerremarkVCloudExpressClient</span><span class="o">,</span> <span class="n">TerremarkVCloudExpressAsyncClient</span><span class="o">&gt;</span>  <span class="n">providerContext</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getProviderContext</span><span class="o">();</span>
@@ -129,8 +127,11 @@ to either get a portable cloud computing
 
 
 <div class="highlight"><pre><code class="java"><span class="c1">// add the ssh module, if you are using ComputeService, otherwise leave it out</span>
-<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;trmk-ecloud&quot;</span><span class="o">,</span> 
-                                    <span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">,</span> <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JshSshClientModule</span><span class="o">()));</span>
+<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;trmk-ecloud&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">email</span><span class="o">,</span> <span class="n">password</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 
 <span class="c1">// use context to obtain vcloud objects with terremark eCloud extensions</span>
 <span class="n">RestContext</span><span class="o">&lt;</span><span class="n">TerremarkECloudClient</span><span class="o">,</span> <span class="n">TerremarkECloudAsyncClient</span><span class="o">&gt;</span>  <span class="n">providerContext</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getProviderContext</span><span class="o">();</span>
@@ -143,8 +144,11 @@ to either get a portable cloud computing
 
 
 <div class="highlight"><pre><code class="java"><span class="c1">// add the ssh module, if you are using ComputeService, otherwise leave it out</span>
-<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;bluelock-vcdirector&quot;</span><span class="o">,</span>
-                            <span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">,</span> <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JshSshClientModule</span><span class="o">()));</span>
+<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;bluelock-vcdirector&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 
 <span class="n">RestContext</span><span class="o">&lt;</span><span class="n">VCloudClient</span><span class="o">,</span> <span class="n">VCloudAsyncClient</span><span class="o">&gt;</span> <span class="n">providerContext</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getProviderContext</span><span class="o">();</span>
 </code></pre></div>
@@ -157,7 +161,11 @@ to either get a portable cloud computing
 
 <div class="highlight"><pre><code class="java">                                                                                                                                                                      
       <span class="c1">// add the ssh module, if you are using ComputeService, otherwise leave it out                                                                                     </span>
-      <span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;stratogen-vcloud-mycloud&quot;</span><span class="o">,</span> <span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">,</span> <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JshSshClientModule</span><span class="o">()));</span>
+      <span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;stratogen-vcloud-mycloud&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
                                                                                                                                                                          
       <span class="n">RestContext</span><span class="o">&lt;</span><span class="n">VCloudClient</span><span class="o">,</span> <span class="n">VCloudAsyncClient</span><span class="o">&gt;</span> <span class="n">providerContext</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getProviderContext</span><span class="o">();</span>                                                                       
 </code></pre></div>
@@ -172,8 +180,11 @@ to either get a portable cloud computing
 <span class="n">overrides</span><span class="o">.</span><span class="na">setProperty</span><span class="o">(</span><span class="s">&quot;vcloud.endpoint&quot;</span><span class="o">,</span> <span class="s">&quot;https://****/api&quot;</span><span class="o">);</span>
 
 <span class="c1">// add the ssh module, if you are using ComputeService, otherwise leave it out</span>
-<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ComputeServiceContextFactory</span><span class="o">().</span><span class="na">createContext</span><span class="o">(</span><span class="s">&quot;vcloud&quot;</span><span class="o">,</span> <span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">,</span>
-                    <span class="n">ImmutableSet</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span> <span class="k">new</span> <span class="n">JshSshClientModule</span><span class="o">()),</span> <span class="n">overrides</span><span class="o">);</span>
+<span class="n">ComputeServiceContext</span> <span class="n">context</span> <span class="o">=</span> <span class="n">ContextBuilder</span><span class="o">.</span><span class="na">newBuilder</span><span class="o">(</span><span class="s">&quot;vcloud&quot;</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="n">user</span><span class="o">,</span> <span class="n">password</span><span class="o">)</span>
+                      <span class="o">.</span><span class="na">modules</span><span class="o">(</span><span class="n">ImmutableSet</span><span class="o">.&lt;</span><span class="n">Module</span><span class="o">&gt;</span> <span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">(),</span>
+                                                        <span class="k">new</span> <span class="nf">SshjSshClientModule</span><span class="o">()))</span>
+                      <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">ComputeServiceContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 
 <span class="n">RestContext</span><span class="o">&lt;</span><span class="n">VCloudClient</span><span class="o">,</span> <span class="n">VCloudAsyncClient</span><span class="o">&gt;</span> <span class="n">providerContext</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getProviderContext</span><span class="o">();</span>
 </code></pre></div>