Modified: incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html?rev=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html (original) +++ incubator/jclouds/site-content/documentation/userguide/using-abiquo/index.html Thu Jun 13 18:42:02 2013 @@ -41,7 +41,6 @@ <li><a href="/documentation/">Documentation</a></li> <li><a href="/documentation/community/">Community</a></li> <li><a href="/documentation/devguides/">Development</a></li> -<li><a href="/news/">News</a></li> <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> </ul> @@ -62,7 +61,8 @@ <span class="o">.</span><span class="na">endpoint</span><span class="o">(</span><span class="s">"http://localhost/api"</span><span class="o">)</span> <span class="o">.</span><span class="na">credentials</span><span class="o">(</span><span class="s">"user"</span><span class="o">,</span> <span class="s">"password"</span><span class="o">)</span> <span class="o">.</span><span class="na">buildView</span><span class="o">(</span><span class="n">AbiquoContext</span><span class="o">.</span><span class="na">class</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <h2>Context root services</h2> @@ -76,7 +76,8 @@ <span class="c1">// Get access to the cloud API</span> <span class="n">CloudService</span> <span class="n">cloud</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getCloudService</span><span class="o">()</span> <span class="n">List</span><span class="o"><</span><span class="n">VirtualMachine</span><span class="o">></span> <span class="n">vms</span> <span class="o">=</span> <span class="n">cloud</span><span class="o">.</span><span class="na">listVirtualMachines</span><span class="o">()</span> -</code></pre></div> +</code></pre> +</div> <h2>Using the domain objects to perform operations</h2> @@ -94,7 +95,8 @@ <span class="n">datacenter</span><span class="o">.</span><span class="na">update</span><span class="o">();</span> <span class="c1">// Delete the datacenter </span> <span class="n">datacenter</span><span class="o">.</span><span class="na">delete</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <h2>A more complete example</h2> @@ -117,7 +119,8 @@ <span class="o">{</span> <span class="n">context</span><span class="o">.</span><span class="na">close</span><span class="o">();</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <h1>The Administration API by example</h1> @@ -162,7 +165,8 @@ <span class="c1">// At this point the compute infrastructure is ready and users will be able to start</span> <span class="c1">// deploying virtual machines</span> -</code></pre></div> +</code></pre> +</div> <h2>Configuring the storage infrastructure</h2> @@ -206,7 +210,8 @@ <span class="c1">// At this point the infrastructure is ready with one storage tier and users will be</span> <span class="c1">// able to create volumes on demand.</span> -</code></pre></div> +</code></pre> +</div> <h2>Configuring the network infrastructure</h2> @@ -265,7 +270,8 @@ <span class="c1">// At this point the infrastructure is ready with a public network that can be used by anyone, and an external</span> <span class="c1">// and unmanaged network that have been assigned to a tenant.</span> -</code></pre></div> +</code></pre> +</div> <p>The default network creation enables all IP addresses inside the network range. To customize this, and disable a set of IPs so they cannot be used, or to put them in quarantine, you can iterate the available IPs and update them accordingly as shown in the example:</p> @@ -276,7 +282,8 @@ <span class="n">publicIp</span><span class="o">.</span><span class="na">setAvailable</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span> <span class="n">publicIp</span><span class="o">.</span><span class="na">update</span><span class="o">();</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <h2>Managing tenants</h2> @@ -317,7 +324,8 @@ <span class="c1">// At this point, the new Enterprise is created and ready to begin consuming the resources</span> <span class="c1">// of the cloud</span> -</code></pre></div> +</code></pre> +</div> <h1>The Cloud API by example</h1> @@ -379,7 +387,8 @@ <span class="c1">// At this point the virtual infrastructure is ready and users will be able to start</span> <span class="c1">// deploying virtual machines</span> -</code></pre></div> +</code></pre> +</div> <h2>Deploying virtual machines</h2> @@ -415,7 +424,8 @@ <span class="c1">// At this point a deployment job has been started asynchronously and the </span> <span class="c1">// virtual machine will be deployed in the background</span> -</code></pre></div> +</code></pre> +</div> <h3>Monitoring virtual machine deployments</h3> @@ -435,7 +445,8 @@ <span class="c1">// At this point the deployment has finished and the virtual machine will provide detailed</span> <span class="c1">// information about the status of the deployment.</span> -</code></pre></div> +</code></pre> +</div> <h4>Deploy a virtual machine and wait asynchronously</h4> @@ -456,7 +467,8 @@ <span class="c1">// Handle timeout here</span> <span class="o">}</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <p>Once the handler has been defined, it only needs to be registered to start receiving events. It will receive <strong>ALL</strong> events from all objects, so if you only want to handle the events of a particular object, make sure to check against the <strong>event.getTarget()</strong> method in your handler code to ensure you are handling the right event.</p> @@ -476,14 +488,16 @@ <span class="c1">// The 'monitor' method will not block and the program execution will continue</span> <span class="c1">// normally. Events will be dispatched to handlers when the monitor completes, fails</span> <span class="c1">// or reaches timeout.</span> -</code></pre></div> +</code></pre> +</div> <p>Do not forget to <strong>unregister</strong> your handler so you stop receiving events when you are done. This can be done by invoking the monitoring service as follows:</p> <div class="highlight"><pre><code class="java"><span class="n">VirtualMachineMonitor</span> <span class="n">monitor</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="na">getMonitoringService</span><span class="o">().</span><span class="na">getVirtualMachineMonitor</span><span class="o">();</span> <span class="n">monitor</span><span class="o">.</span><span class="na">unregister</span><span class="o">(</span><span class="n">handler</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <p>You may want to unregister the handler inside the event handler methods. There is no limitation on that. Feel free to code your handlers however you like.</p> @@ -529,7 +543,8 @@ <span class="c1">// At this point the virtual machine is configured with an additional 2GB hard</span> <span class="c1">// disk, and a 20GB additional persistent iscsi volume.</span> -</code></pre></div> +</code></pre> +</div> <h2>Configuring networking in virtual machines</h2> @@ -564,7 +579,7 @@ <span class="n">Datacenter</span> <span class="n">datacenter</span> <span class="o">=</span> <span class="n">vdc</span><span class="o">.</span><span class="na">getDatacenter</span><span class="o">();</span> <span class="n">ExternalNetwork</span> <span class="n">extNet</span> <span class="o">=</span> <span class="n">enterprise</span><span class="o">.</span><span class="na">findExternalNetwork</span><span class="o">(</span><span class="n">datacenter</span><span class="o">,</span> - <span class="n">NetworkPredicates</span><span class="o">.<</span><span class="n">ExternalIp</span><span class="o">></span> <span class="nf">name</span><span class="o">(</span><span class="s">"ExternalNetwork"</span><span class="o">));</span> + <span class="n">NetworkPredicates</span><span class="o">.<</span><span class="n">ExternalIp</span><span class="o">></span> <span class="n">name</span><span class="o">(</span><span class="s">"ExternalNetwork"</span><span class="o">));</span> <span class="n">ExternalIp</span> <span class="n">extIp</span> <span class="o">=</span> <span class="n">extNet</span><span class="o">.</span><span class="na">listUnusedIps</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="mi">0</span><span class="o">);</span> <span class="c1">// Get an unused public IP from the public network</span> @@ -572,7 +587,7 @@ <span class="c1">// Get a private IP from the privateNetwork</span> <span class="n">PrivateNetwork</span> <span class="n">privNet</span> <span class="o">=</span> <span class="n">vdc</span><span class="o">.</span><span class="na">findPrivateNetwork</span><span class="o">(</span> - <span class="n">NetworkPredicates</span><span class="o">.<</span><span class="n">PrivateIp</span><span class="o">></span> <span class="nf">name</span><span class="o">(</span><span class="s">"PrivateNetwork"</span><span class="o">));</span> + <span class="n">NetworkPredicates</span><span class="o">.<</span><span class="n">PrivateIp</span><span class="o">></span> <span class="n">name</span><span class="o">(</span><span class="s">"PrivateNetwork"</span><span class="o">));</span> <span class="n">PrivateIp</span> <span class="n">privIp</span> <span class="o">=</span> <span class="n">privNet</span><span class="o">.</span><span class="na">listUnusedIps</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="mi">0</span><span class="o">);</span> <span class="c1">// At this point we have everything we need to attach the IPs to the virtual machine.</span> @@ -582,7 +597,8 @@ <span class="n">vm</span><span class="o">.</span><span class="na">setNics</span><span class="o">(</span><span class="n">ips</span><span class="o">);</span> <span class="c1">// At this point we have the virtual machine with the IP addresses attached to it.</span> -</code></pre></div> +</code></pre> +</div> <h3>Configuring the default gateway</h3> @@ -596,7 +612,8 @@ <span class="c1">// Option 2: Configure the network when configuring the NICs</span> <span class="n">PublicNetwork</span> <span class="n">gateway</span> <span class="o">=</span> <span class="n">pubIp</span><span class="o">.</span><span class="na">getNetwork</span><span class="o">();</span> <span class="n">vm</span><span class="o">.</span><span class="na">setNics</span><span class="o">(</span><span class="n">gateway</span><span class="o">,</span> <span class="n">extIp</span><span class="o">,</span> <span class="n">pubIp</span><span class="o">,</span> <span class="n">privIp</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <h3>Attaching IPs from unmanaged networks</h3> @@ -606,15 +623,16 @@ <p>To do that, we can call the <strong>setNics</strong> method providing as many unmanaged networks as we want, to indicate that an IP address in each network (or many IP addresses if an unmanaged network is provided more than once) must be attached to the virtual machine.</p> <div class="highlight"><pre><code class="java"><span class="n">Unmanagednetwork</span> <span class="n">unmanagedNet</span> <span class="o">=</span> <span class="n">enterprise</span><span class="o">.</span><span class="na">findUnmanagedNetwork</span><span class="o">(</span><span class="n">datacenter</span><span class="o">,</span> - <span class="n">NetworkPredicates</span><span class="o">.<</span><span class="n">UnmanagedIp</span><span class="o">></span> <span class="nf">name</span><span class="o">(</span><span class="s">"UnmanagedNetwork"</span><span class="o">));</span> + <span class="n">NetworkPredicates</span><span class="o">.<</span><span class="n">UnmanagedIp</span><span class="o">></span> <span class="n">name</span><span class="o">(</span><span class="s">"UnmanagedNetwork"</span><span class="o">));</span> <span class="n">List</span><span class="o"><</span><span class="n">UnmanagedNetwork</span><span class="o">></span> <span class="n">unmanagedNicsFromNet</span> <span class="o">=</span> - <span class="n">Lists</span><span class="o">.<</span><span class="n">UnmanagedNetwork</span><span class="o">></span> <span class="nf">newArrayList</span><span class="o">(</span><span class="n">unmanagedNet</span><span class="o">);</span> + <span class="n">Lists</span><span class="o">.<</span><span class="n">UnmanagedNetwork</span><span class="o">></span> <span class="n">newArrayList</span><span class="o">(</span><span class="n">unmanagedNet</span><span class="o">);</span> <span class="c1">// This will attach the IPs provided in the first list, and the corresponding</span> <span class="c1">// unmanaged IPs from the given unmanaged networks.</span> <span class="n">vm</span><span class="o">.</span><span class="na">setNics</span><span class="o">(</span><span class="n">ips</span><span class="o">,</span> <span class="n">unmanagedNicsFromNet</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <h1>Miscellaneous examples</h1> @@ -698,7 +716,8 @@ <span class="o">}</span> <span class="o">}</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <h3>VmEventHandler.java</h3> @@ -801,7 +820,8 @@ <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Terminating monitoring thread"</span><span class="o">);</span> <span class="o">}</span> <span class="o">}</span> -</code></pre></div> +</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=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html (original) +++ incubator/jclouds/site-content/documentation/userguide/using-ec2/index.html Thu Jun 13 18:42:02 2013 @@ -41,7 +41,6 @@ <li><a href="/documentation/">Documentation</a></li> <li><a href="/documentation/community/">Community</a></li> <li><a href="/documentation/devguides/">Development</a></li> -<li><a href="/news/">News</a></li> <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> </ul> @@ -94,7 +93,8 @@ if you need this, you'll have to revise <div class="highlight"><pre><code class="java"><span class="c1">// use the m1 small with amazon linux</span> <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">compute</span><span class="o">.</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">hardwareId</span><span class="o">(</span><span class="n">InstanceType</span><span class="o">.</span><span class="na">M1_SMALL</span><span class="o">).</span><span class="na">osFamily</span><span class="o">(</span><span class="n">OsFamily</span><span class="o">.</span><span class="na">AMZN_LINUX</span><span class="o">).</span><span class="na">build</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <p>In order to match an Ubuntu, or CentOs image, you'll need to see the Image Parsing section.</p> @@ -112,7 +112,8 @@ ec2 across all 4 regions. We now by defa <span class="c1">// pick version 10.04 of ubuntu from canonical</span> <span class="n">Template</span> <span class="n">template</span> <span class="o">=</span> <span class="n">compute</span><span class="o">.</span><span class="na">templateBuilder</span><span class="o">().</span><span class="na">hardwareId</span><span class="o">(</span><span class="n">InstanceType</span><span class="o">.</span><span class="na">M1_SMALL</span><span class="o">)</span> <span class="o">.</span><span class="na">osVersionMatches</span><span class="o">(</span><span class="s">"10.04"</span><span class="o">).</span><span class="na">imageDescriptionMatches</span><span class="o">(</span><span class="s">"ubuntu-images"</span><span class="o">).</span><span class="na">osFamily</span><span class="o">(</span><span class="n">OsFamily</span><span class="o">.</span><span class="na">UBUNTU</span><span class="o">).</span><span class="na">build</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <h3>Image Filters [v1.1.0+]</h3> @@ -124,8 +125,9 @@ ec2 across all 4 regions. We now by defa <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">"owner-id=137112412989;state=available;image-type=machine;root-device-type=ebs"</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">"aws-ec2"</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">.<</span><span class="n">Module</span><span class="o">></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> -</code></pre></div> + <span class="n">ImmutableSet</span><span class="o">.<</span><span class="n">Module</span><span class="o">></span> <span class="n">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> +</code></pre> +</div> <h4>Properties to set cluster compute images</h4> @@ -157,7 +159,8 @@ We now provide the option to lazy-fetch <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">"ami-ccb35ea5"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <h4>Release 1.1.0 and above</h4> @@ -173,7 +176,8 @@ We now provide the option to lazy-fetch <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">"ami-ccb35ea5"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <h3>Private Images</h3> @@ -199,8 +203,9 @@ managing image curation, and others usin <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">"aws-ec2"</span><span class="o">,</span> <span class="s">"accesss"</span><span class="o">,</span> <span class="s">"secret"</span><span class="o">,</span> - <span class="n">ImmutableSet</span><span class="o">.<</span><span class="n">Module</span><span class="o">></span> <span class="nf">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">()),</span> <span class="n">props</span><span class="o">);</span> -</code></pre></div> + <span class="n">ImmutableSet</span><span class="o">.<</span><span class="n">Module</span><span class="o">></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">props</span><span class="o">);</span> +</code></pre> +</div> <h4>Release 1.1.0 and above</h4> @@ -215,8 +220,9 @@ managing image curation, and others usin <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">"aws-ec2"</span><span class="o">,</span> <span class="s">"accesss"</span><span class="o">,</span> <span class="s">"secret"</span><span class="o">,</span> - <span class="n">ImmutableSet</span><span class="o">.<</span><span class="n">Module</span><span class="o">></span> <span class="nf">of</span><span class="o">(</span><span class="k">new</span> <span class="n">JschSshClientModule</span><span class="o">()),</span> <span class="n">props</span><span class="o">);</span> -</code></pre></div> + <span class="n">ImmutableSet</span><span class="o">.<</span><span class="n">Module</span><span class="o">></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">props</span><span class="o">);</span> +</code></pre> +</div> <p>You can then create nodes using the templateBuilder.imageId() method.</p> @@ -278,7 +284,8 @@ OsFamily.UNRECOGNIZED, with no image ver <span class="n">builder</span><span class="o">.</span><span class="na">defaultCredentials</span><span class="o">(</span><span class="k">new</span> <span class="n">Credentials</span><span class="o">(</span><span class="s">"foo-user"</span><span class="o">,</span> <span class="s">"password"</span><span class="o">));</span> <span class="o">}</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <h4>Create a test for your parser</h4> @@ -327,7 +334,8 @@ OsFamily.UNRECOGNIZED, with no image ver <span class="o">}</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <h4>Instruct jclouds to use your parser</h4> @@ -345,7 +353,8 @@ OsFamily.UNRECOGNIZED, with no image ver <span class="o">}</span> <span class="o">}),</span> <span class="n">overrides</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <h4>Use your image version</h4> @@ -353,7 +362,8 @@ OsFamily.UNRECOGNIZED, with no image ver <p>jclouds will now pick the lexicographic highest version, as it now can parse your images.</p> <div class="highlight"><pre><code class="java"><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">imageVersionMatches</span><span class="o">(</span><span class="s">"1.1.0.*"</span><span class="o">).</span><span class="na">build</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <h2>ComputeService API extensions</h2> @@ -368,7 +378,8 @@ We now allow you to control this a bit t <div class="highlight"><pre><code class="java"> <span class="n">options</span><span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="n">AWSEC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">spotPrice</span><span class="o">(</span><span class="mf">0.3f</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <p>AWSEC2ComputeServiceLiveTest.testExtendedOptionsAndLogin() uses the spot price option on the portable interface.</p> @@ -385,7 +396,8 @@ spot request goes through, but perhaps t <div class="highlight"><pre><code class="java"><span class="c1">// specify your own groups which already have the correct rules applied</span> <span class="n">template</span><span class="o">.</span><span class="na">getOptions</span><span class="o">().</span><span class="na">as</span><span class="o">(</span><span class="n">EC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">securityGroups</span><span class="o">(</span><span class="n">group1</span><span class="o">,</span> <span class="n">group2</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <h3>Key Pairs</h3> @@ -395,7 +407,8 @@ spot request goes through, but perhaps t <span class="c1">// if your image doesn't use keypairs (ex enstratus), skip creating one</span> <span class="n">template</span><span class="o">.</span><span class="na">getOptions</span><span class="o">().</span><span class="na">as</span><span class="o">(</span><span class="n">EC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">noKeyPair</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <h3>VPC</h3> @@ -408,7 +421,8 @@ spot request goes through, but perhaps t <span class="n">Set</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">NodeMetadata</span><span class="o">></span> <span class="n">nodes</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">runNodesInGroup</span><span class="o">(</span><span class="n">group</span><span class="o">,</span> <span class="mi">1</span><span class="o">,</span> <span class="n">options</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <p>You can also checkout <code>EC2ComputeServiceListTest.testExtendedOptionsWithSubnetId()</code></p> @@ -423,7 +437,8 @@ spot request goes through, but perhaps t <span class="n">options</span><span class="o">.</span><span class="na">as</span><span class="o">(</span><span class="n">EC2TemplateOptions</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">enableMonitoring</span><span class="o">();</span> <span class="n">Set</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">NodeMetadata</span><span class="o">></span> <span class="n">monitoredNodes</span> <span class="o">=</span> <span class="n">compute</span><span class="o">.</span><span class="na">runNodesInGroup</span><span class="o">(</span><span class="n">group</span><span class="o">,</span> <span class="mi">1</span><span class="o">,</span> <span class="n">options</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <p>You can then use the !CloudWatchClient to get statistics on your nodes.</p> @@ -435,7 +450,8 @@ spot request goes through, but perhaps t <span class="n">Set</span><span class="o"><</span><span class="n">Datapoint</span><span class="o">></span> <span class="n">datapoints</span> <span class="o">=</span> <span class="n">monitoringContext</span><span class="o">.</span><span class="na">getApi</span><span class="o">().</span><span class="na">getMetricStatisticsInRegion</span><span class="o">(</span><span class="n">region</span><span class="o">,</span> <span class="s">"CPUUtilization"</span><span class="o">,</span> <span class="n">before</span><span class="o">,</span> <span class="k">new</span> <span class="n">Date</span><span class="o">(),</span> <span class="mi">60</span><span class="o">,</span> <span class="s">"Average"</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <h2>GovCloud</h2> @@ -445,7 +461,8 @@ For EC2:</p> <div class="highlight"><pre><code class="java"><span class="kd">public</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">GOV_CLOUD_ENDPOINT</span> <span class="o">=</span> <span class="s">"https://ec2.us-gov-west-1.amazonaws.com"</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">"aws-ec2.endpoint"</span><span class="o">,</span> <span class="n">GOV_CLOUD_ENDPOINT</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <p>You can find GovCloud endpoints for other services here: 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=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/documentation/userguide/using-maven/index.html (original) +++ incubator/jclouds/site-content/documentation/userguide/using-maven/index.html Thu Jun 13 18:42:02 2013 @@ -41,7 +41,6 @@ <li><a href="/documentation/">Documentation</a></li> <li><a href="/documentation/community/">Community</a></li> <li><a href="/documentation/devguides/">Development</a></li> -<li><a href="/news/">News</a></li> <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> </ul> @@ -87,7 +86,8 @@ <span class="n">Map</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">InputStream</span><span class="o">></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">"adrian.home"</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> -</code></pre></div> +</code></pre> +</div> <p>This also assumes that you do not have heavy-duty needs that warrant connection-pooling or NIO, @@ -100,7 +100,8 @@ or that you are in an environment that c <span class="nt"><artifactId></span>jclouds-blobstore<span class="nt"></artifactId></span> <span class="nt"><version></span>1.2.1<span class="nt"></version></span> <span class="nt"></dependency></span> -</code></pre></div> +</code></pre> +</div> <p>Using the above, you will gain access to the provider named <code>transient</code>. Note that this is in-memory. Typically, you will instead want to add dependencies on a specific provider of resources like those for S3:</p> @@ -110,7 +111,8 @@ or that you are in an environment that c <span class="nt"><artifactId></span>aws-s3<span class="nt"></artifactId></span> <span class="nt"><version></span>1.2.1<span class="nt"></version></span> <span class="nt"></dependency></span> -</code></pre></div> +</code></pre> +</div> <p>Noting that you could alternatively ask for all of our supported blobstores using the dependency <code>jclouds-allblobstore</code> instead.</p> @@ -118,7 +120,8 @@ 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">"aws-s3"</span><span class="o">,</span> <span class="n">accessKey</span><span class="o">,</span> <span class="n">secret</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <h3>BlobStore from Google App Engine</h3> @@ -128,7 +131,8 @@ However, you do have to configure your c <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">.<</span><span class="n">Module</span><span class="o">></span><span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">AsyncGoogleAppEngineConfigurationModule</span><span class="o">()));</span> -</code></pre></div> +</code></pre> +</div> <p>Here are the dependencies needed to use google's UrlFetchService::</p> @@ -143,7 +147,8 @@ However, you do have to configure your c <span class="nt"><artifactId></span>jclouds-gae<span class="nt"></artifactId></span> <span class="nt"><version></span>1.2.1<span class="nt"></version></span> <span class="nt"></dependency></span> -</code></pre></div> +</code></pre> +</div> <h3>Logging</h3> @@ -152,7 +157,8 @@ However, you do have to configure your c <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">.<</span><span class="n">Module</span><span class="o">></span><span class="n">of</span><span class="o">(</span><span class="k">new</span> <span class="n">Log4JLoggingModule</span><span class="o">()));</span> -</code></pre></div> +</code></pre> +</div> <p>Here are the dependencies for BlobStore and log4j logging:</p> @@ -167,7 +173,8 @@ However, you do have to configure your c <span class="nt"><artifactId></span>jclouds-log4j<span class="nt"></artifactId></span> <span class="nt"><version></span>1.2.1<span class="nt"></version></span> <span class="nt"></dependency></span> -</code></pre></div> +</code></pre> +</div> <p>The log categories are set to package names, so plan on assigning <code>org.jclouds</code> appropriately in your log4j.xml.</p> @@ -193,7 +200,8 @@ so that your credentials can be used for <span class="nt"><test.provider.credential></span>password,secret,etc<span class="nt"></test.provider.credential></span> <span class="nt"></properties></span> <span class="nt"></profile></span> -</code></pre></div> +</code></pre> +</div> <p>Here is an example of a complete <em>settings.xml</em> file you can save to the ~/.m2 directory, just remember to add your personal credentials:</p> @@ -214,7 +222,8 @@ so that your credentials can be used for <span class="nt"></profile></span> <span class="nt"></profiles></span> <span class="nt"></settings></span> -</code></pre></div> +</code></pre> +</div> <h3>Testing SSH drivers</h3> @@ -234,7 +243,8 @@ so that your credentials can be used for <span class="nt"><test.ssh.password></span>LOCAL_SSH_PASSWORD<span class="nt"></test.ssh.password></span> <span class="nt"></properties></span> <span class="nt"></profile></span> -</code></pre></div> +</code></pre> +</div> <p>Here is an example of a complete <em>settings.xml</em> file you can save to the ~/.m2 directory, just remember to change the ssh credentials:</p> @@ -253,7 +263,8 @@ so that your credentials can be used for <span class="nt"></profile></span> <span class="nt"></profiles></span> <span class="nt"></settings></span> -</code></pre></div> +</code></pre> +</div> Modified: incubator/jclouds/site-content/documentation/userguide/using-s3/index.html URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/using-s3/index.html?rev=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/documentation/userguide/using-s3/index.html (original) +++ incubator/jclouds/site-content/documentation/userguide/using-s3/index.html Thu Jun 13 18:42:02 2013 @@ -41,7 +41,6 @@ <li><a href="/documentation/">Documentation</a></li> <li><a href="/documentation/community/">Community</a></li> <li><a href="/documentation/devguides/">Development</a></li> -<li><a href="/news/">News</a></li> <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> </ul> Modified: incubator/jclouds/site-content/documentation/userguide/vmware-vcloud-director/index.html URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/documentation/userguide/vmware-vcloud-director/index.html?rev=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/documentation/userguide/vmware-vcloud-director/index.html (original) +++ incubator/jclouds/site-content/documentation/userguide/vmware-vcloud-director/index.html Thu Jun 13 18:42:02 2013 @@ -41,7 +41,6 @@ <li><a href="/documentation/">Documentation</a></li> <li><a href="/documentation/community/">Community</a></li> <li><a href="/documentation/devguides/">Development</a></li> -<li><a href="/news/">News</a></li> <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> </ul> @@ -78,7 +77,8 @@ vAppTemplateApi = context.getApi().getVA vdcApi = context.getApi().getVdcApi(); vmApi = context.getApi().getVmApi(); networkApi = context.getApi().getNetworkApi(); -</code></pre></div> +</code></pre> +</div> <p>Each one of them allows you to access the API functionalities of any vCloud Director subsystem.</p> @@ -92,7 +92,8 @@ Starting from a vApp template, in fact, <span class="o">.</span><span class="na">name</span><span class="o">(</span><span class="n">name</span><span class="o">(</span><span class="s">"vApp-"</span><span class="o">))</span> <span class="o">.</span><span class="na">instantiationParams</span><span class="o">(</span><span class="n">instantiationParams</span><span class="o">())</span> <span class="o">.</span><span class="na">build</span><span class="o">());</span> -</code></pre></div> +</code></pre> +</div> <p>where instantiationParams() are in charge to create a 'vAppNetwork' attached to the orgNetwork 'networkURI':</p> @@ -135,13 +136,15 @@ Starting from a vApp template, in fact, <span class="k">return</span> <span class="n">networkConfiguration</span><span class="o">;</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <p>Or you can always recompose an existing vApp</p> <div class="highlight"><pre><code class="java"><span class="n">vAppApi</span><span class="o">.</span><span class="na">recompose</span><span class="o">(</span><span class="n">vApp</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">params</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <p>where 'params' are RecomposeVAppParams.</p> 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=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/documentation/userguide/vmware-vcloud/index.html (original) +++ incubator/jclouds/site-content/documentation/userguide/vmware-vcloud/index.html Thu Jun 13 18:42:02 2013 @@ -41,7 +41,6 @@ <li><a href="/documentation/">Documentation</a></li> <li><a href="/documentation/community/">Community</a></li> <li><a href="/documentation/devguides/">Development</a></li> -<li><a href="/news/">News</a></li> <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> </ul> @@ -121,7 +120,8 @@ to either get a portable cloud computing <span class="c1">// use context to obtain vcloud objects with terremark vCloud express extensions</span> <span class="n">RestContext</span><span class="o"><</span><span class="n">TerremarkVCloudExpressClient</span><span class="o">,</span> <span class="n">TerremarkVCloudExpressAsyncClient</span><span class="o">></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> +</code></pre> +</div> <ul> @@ -135,7 +135,8 @@ to either get a portable cloud computing <span class="c1">// use context to obtain vcloud objects with terremark eCloud extensions</span> <span class="n">RestContext</span><span class="o"><</span><span class="n">TerremarkECloudClient</span><span class="o">,</span> <span class="n">TerremarkECloudAsyncClient</span><span class="o">></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> +</code></pre> +</div> <ul> @@ -148,7 +149,8 @@ to either get a portable cloud computing <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">RestContext</span><span class="o"><</span><span class="n">VCloudClient</span><span class="o">,</span> <span class="n">VCloudAsyncClient</span><span class="o">></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> +</code></pre> +</div> <ul> @@ -161,7 +163,8 @@ to either get a portable cloud computing <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">"stratogen-vcloud-mycloud"</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">RestContext</span><span class="o"><</span><span class="n">VCloudClient</span><span class="o">,</span> <span class="n">VCloudAsyncClient</span><span class="o">></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> +</code></pre> +</div> <ul> @@ -177,7 +180,8 @@ to either get a portable cloud computing <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">RestContext</span><span class="o"><</span><span class="n">VCloudClient</span><span class="o">,</span> <span class="n">VCloudAsyncClient</span><span class="o">></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> +</code></pre> +</div> <h2>Portability</h2> @@ -187,7 +191,8 @@ to either get a portable cloud computing <div class="highlight"><pre><code class="text">// get a synchronous object to use for manipulating vcloud objects CommonVCloudClient client = context.getApi() -</code></pre></div> +</code></pre> +</div> <p>If you are interacting with Terremark, you can cast to <code>VCloudExpressClient</code> and <code>VCloudExpressAsyncClient</code> @@ -208,7 +213,8 @@ to use the common features between eClou <span class="c1">// note that vcloud 0.8 vApp template is not compatible with 1.0. </span> <span class="c1">// Use VCloudExpressVAppTemplate in that case</span> <span class="n">VCloudExpressVAppTemplate</span> <span class="n">vAppTemplate</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">getVAppTemplate</span><span class="o">(</span><span class="n">item</span><span class="o">.</span><span class="na">getEntity</span><span class="o">().</span><span class="na">getHref</span><span class="o">());</span> -</code></pre></div> +</code></pre> +</div> <h3>Instantiate, deploy, and powerOn a vApp template in vCloud 0.8 (Terremark)</h3> @@ -238,7 +244,8 @@ to use the common features between eClou <span class="c1">// block until poweron task shows success</span> <span class="k">if</span> <span class="o">(!</span><span class="n">taskTester</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span><span class="n">onTask</span><span class="o">.</span><span class="na">getHref</span><span class="o">()))</span> <span class="k">throw</span> <span class="k">new</span> <span class="nf">Exception</span><span class="o">(</span><span class="s">"could not turn on "</span><span class="o">+</span><span class="n">vApp</span><span class="o">.</span><span class="na">getHref</span><span class="o">());</span> -</code></pre></div> +</code></pre> +</div> <h3>Instantiate, deploy, and powerOn a vApp template in vCloud 1.0</h3> @@ -262,7 +269,8 @@ to transition to powerOn state from inst <span class="c1">// block until task shows success</span> <span class="k">if</span> <span class="o">(!</span><span class="n">taskTester</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span><span class="n">task</span><span class="o">.</span><span class="na">getHref</span><span class="o">())</span> <span class="k">throw</span> <span class="k">new</span> <span class="nf">Exception</span><span class="o">(</span><span class="s">"could not deploy and powerOn "</span><span class="o">+</span><span class="n">vApp</span><span class="o">.</span><span class="na">getHref</span><span class="o">());</span> -</code></pre></div> +</code></pre> +</div> <h3>Getting vApp details</h3> @@ -277,7 +285,8 @@ to transition to powerOn state from inst <span class="c1">// for vCloud 1.0 based services</span> <span class="n">vApp</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">getVApp</span><span class="o">(</span><span class="n">vApp</span><span class="o">.</span><span class="na">getHref</span><span class="o">());</span> -</code></pre></div> +</code></pre> +</div> <h3>Closing the context</h3> @@ -285,7 +294,8 @@ to transition to powerOn state from inst <p>The context object uses threads and other resources. When you are finished, close it.</p> <div class="highlight"><pre><code class="java"> <span class="n">context</span><span class="o">.</span><span class="na">close</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <h3>vApp Templates</h3> @@ -311,7 +321,8 @@ No.</p></li> <span class="n">VCloudExpressVApp</span> <span class="n">app</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">getVApp</span><span class="o">(</span><span class="n">item</span><span class="o">.</span><span class="na">getHref</span><span class="o">());</span> <span class="o">}</span> <span class="o">}</span> -</code></pre></div> +</code></pre> +</div> <ul> @@ -333,7 +344,8 @@ Get a reference to the vApp object and q <span class="c1">// be careful as you may have multiple disks</span> <span class="kt">int</span> <span class="n">kbDisk</span> <span class="o">=</span> <span class="o">(</span><span class="kt">int</span><span class="o">)</span> <span class="n">find</span><span class="o">(</span><span class="n">hardware</span><span class="o">.</span><span class="na">getResourceAllocations</span><span class="o">(),</span> <span class="n">resourceType</span><span class="o">(</span><span class="n">ResourceType</span><span class="o">.</span><span class="na">DISK_DRIVE</span><span class="o">)).</span><span class="na">getVirtualQuantity</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <ul> @@ -353,7 +365,8 @@ Get a reference to the vApp object and q <span class="c1">// be careful as you may have multiple disks</span> <span class="kt">int</span> <span class="n">kbDisk</span> <span class="o">=</span> <span class="o">(</span><span class="kt">int</span><span class="o">)</span> <span class="n">find</span><span class="o">(</span><span class="n">vApp</span><span class="o">.</span><span class="na">getResourceAllocations</span><span class="o">(),</span> <span class="n">resourceType</span><span class="o">(</span><span class="n">ResourceType</span><span class="o">.</span><span class="na">DISK_DRIVE</span><span class="o">)).</span><span class="na">getVirtualQuantity</span><span class="o">();</span> -</code></pre></div> +</code></pre> +</div> <ul> @@ -371,7 +384,8 @@ Get a reference to the vApp object and q <span class="n">String</span> <span class="n">newName</span> <span class="o">=</span> <span class="s">"clone of "</span><span class="o">+</span><span class="n">sourceVApp</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span> <span class="n">Task</span> <span class="n">task</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">cloneVAppInVDC</span><span class="o">(</span><span class="n">vdc</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">sourceVApp</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">newName</span><span class="o">);</span> -</code></pre></div> +</code></pre> +</div> <ul> @@ -389,7 +403,8 @@ Get a reference to the vApp object and q <span class="n">String</span> <span class="n">newName</span> <span class="o">=</span> <span class="s">"clone of "</span><span class="o">+</span><span class="n">sourceVApp</span><span class="o">.</span><span class="na">getName</span><span class="o">();</span> <span class="n">Task</span> <span class="n">task</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">cloneVAppInVDC</span><span class="o">(</span><span class="n">vdc</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">sourceVApp</span><span class="o">.</span><span class="na">getHref</span><span class="o">(),</span> <span class="n">newName</span><span class="o">,</span> <span class="n">deploy</span><span class="o">().</span><span class="na">powerOn</span><span class="o">());</span> -</code></pre></div> +</code></pre> +</div> Modified: incubator/jclouds/site-content/index.html URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/index.html?rev=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/index.html (original) +++ incubator/jclouds/site-content/index.html Thu Jun 13 18:42:02 2013 @@ -51,10 +51,9 @@ </div> </div> <div id="menu" class="index_page"> - <li><a href="/news/">News</a></li> <li><a href="https://twitter.com/jclouds";>Twitter</a></li> <li><a href="https://github.com/jclouds";>GitHub</a></li> - <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> + <li><a href="http://incubator.apache.org/projects/jclouds.html";>Contact</a></li> </div> <div id="footer"> <p>Copyright © 2011 <a href="http://www.apache.org";>The Apache Software Foundation</a>. All Rights Reserved.</p> Modified: incubator/jclouds/site-content/news/index.html URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/news/index.html?rev=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/news/index.html (original) +++ incubator/jclouds/site-content/news/index.html Thu Jun 13 18:42:02 2013 @@ -41,7 +41,6 @@ <li><a href="/documentation/">Documentation</a></li> <li><a href="/documentation/community/">Community</a></li> <li><a href="/documentation/devguides/">Development</a></li> -<li><a href="/news/">News</a></li> <li><a href="http://groups.google.com/group/jclouds";>Contact</a></li> </ul> Modified: incubator/jclouds/site-content/style/style.css URL: http://svn.apache.org/viewvc/incubator/jclouds/site-content/style/style.css?rev=1492807&r1=1492806&r2=1492807&view=diff ============================================================================== --- incubator/jclouds/site-content/style/style.css (original) +++ incubator/jclouds/site-content/style/style.css Thu Jun 13 18:42:02 2013 @@ -1,4 +1,3 @@ - body { font-family: 'Varela Round', sans-serif; font-size:.68em; @@ -137,8 +136,8 @@ margin-right:auto; } #menu.index_page li { - padding-left: 130px; - padding-right: 75px; + padding-left: 175px; + padding-right: 100px; } #menu.index_page a { @@ -336,4 +335,4 @@ float:right; span.news p{ clear:both; } -} \ No newline at end of file +}
