deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [3/5] SITE: CIMI Docs (REST API) and cURL examples
Date Mon, 21 Jan 2013 16:15:22 GMT
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-curl/cimi-curl-machines.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl/cimi-curl-machines.html b/site/output/cimi-curl/cimi-curl-machines.html
new file mode 100644
index 0000000..e4e09cf
--- /dev/null
+++ b/site/output/cimi-curl/cimi-curl-machines.html
@@ -0,0 +1,313 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI cURL Examples - Machine Resources</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+
+  <div class="span8">
+
+    <h3 id="command">cURL examples for CIMI Machine resources</h3>
+
+<ul class="nav nav-pills">
+<li class="active"><a href="#machines" data-toggle="tab">Working with Machines</a></li>
+  <li><a href="#machine-images" data-toggle="tab">Working with MachineImages</a></li>
+  <li><a href="#machine-configs" data-toggle="tab">Working with MachineConfigurations</a></li>
+  <li><a href="#machine-templates" data-toggle="tab">Working with MachineTemplates</a></li>
+  <li><a href="#machine-volumes" data-toggle="tab">Working with Machine Volumes</a></li>
+</ul>
+</div>
+
+  <div class="span4">
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    <a href="../cimi-curl.html">curl for CIMI Resources</a>
+  </li>
+  <ul class="nav nav-list">
+<li class="active"><a href="cimi-curl-machines.html">Machine</a></li>
+    <li><a href="cimi-curl-volumes.html">Volume</a></li>
+    <li><a href="cimi-curl-resource_metadata.html">ResourceMetadata</a></li>
+  </ul>
+<br>
+</ul>
+</div>
+
+</div>
+
+<div class="tab-content">
+
+  <div class="tab-pane active" id="machines">
+
+<hr>
+<h4 id="machines">Working with Machines</h4>
+
+<p>Retrieve the Machine Collection in json format:</p>
+
+<pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machines </pre>
+
+<p>Create a new Machine with the message body in XML format:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -X POST -H "Content-Type: application/xml" -H "Accept: application/xml" -d '&lt;MachineCreate xmlns="http://schemas.dmtf.org/cimi/1"&gt; &lt;name&gt; myMachine1 &lt;/name&gt; &lt;description&gt; my machine description &lt;/description&gt; &lt;machineTemplate&gt; &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-small"&gt; &lt;/machineConfig&gt; &lt;machineImage href="http://localhost:3001/cimi/machine_images/img1"&gt; &lt;/machineImage&gt; &lt;/machineTemplate&gt; &lt;/MachineCreate&gt;'
+</pre>
+
+<p>Alternatively, specifying the message body in JSON:</p>
+<pre>
+ curl -v --user "user:password" -X POST -H "Content-Type: application/json" -H "Accept: application/xml" -d '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineCreate", "name": "myMachine3", "description": "My very first json machine", "machineTemplate": { "machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1.small" }, "machineImage": { "href": "http://localhost:3001/cimi/machine_images/ami-48aa4921" } } }' http://localhost:3001/cimi/machines
+</pre>
+
+<p>Perform a Machine operation - stop - with the message body in XML format:</p>
+
+<pre>
+curl -v -X POST --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -d '&lt;Action xmlns="http://schemas.dmtf.org/cimi/1"&gt;&lt;action&gt; http://http://schemas.dmtf.org/cimi/1/action/stop &lt;/action&gt; &lt;/Action&gt;'  http://localhost:3001/cimi/machines/inst3/stop
+</pre>
+
+<p>Alternatively, specifying the message body in JSON:</p>
+<pre>
+ curl -v -X POST --user "user:password" -H "Accept: application/json" -H "Content-Type: application/json" -d '{"resourceURI": "http://www.dmtf.org/cimi/1/Action", "action":"http://www.dmtf.org/cimi/action/stop"}' http://localhost:3001/cimi/machines/i-5feb7c20/stop
+</pre>
+
+<br><hr>
+</div>
+
+<div class="tab-pane" id="machine-images">
+
+<h4 id="machine-images">Working with Machine Images</h4>
+
+<p>Retrieve the Machine Image Collection:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_images
+</pre>
+
+<p>Create a new Machine Image from an existing Machine, with message body in JSON:</p>
+
+<pre>
+curl --user "mockuser:mockpassword" -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{"resourceURI":"http://schemas.dmtf.org/cimi/1/MachineImage", "name":"new_image","description":"my new machine image","type":"IMAGE", "imageLocation":"http://localhost:3001/cimi/machines/inst1"}' http://localhost:3001/cimi/machine_images
+</pre>
+
+
+<p>Alternatively, specifying the message body in XML:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d "&lt;MachineImage&gt;&lt;name&gt;some_name&lt;/name&gt;&lt;description&gt;my new machine image&lt;/description&gt;&lt;type&gt;IMAGE&lt;/type&gt;&lt;imageLocation&gt;http://localhost:3001/cimi/machines/inst1&lt;/imageLocation&gt;&lt;/MachineImage&gt;" http://localhost:3001/cimi/machine_images
+</pre>
+
+<p>Delete a Machine Image:</p>
+
+<pre>curl -X DELETE --user "user:pass" http://localhost:3001/cimi/machine_images/my_image </pre>
+
+<br><hr>
+</div>
+
+<div class="tab-pane" id="machine-configs">
+
+<h4 id="machine-configs">Working with Machine Configurations</h4>
+
+<p>Retrieve the Machine Configuration Collection:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_configurations
+</pre>
+
+<p>Retrieve a specific Machine Configuration:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_configurations/m1-large
+</pre>
+</div>
+
+
+<div class="tab-pane" id="machine-templates">
+
+<h4>Working with Machine Templates</h4>
+<p>Retrieve the Machine Template Collection:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_templates
+</pre>
+
+<p>Retrieve a specific Machine Template:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_templates/m1-large
+</pre>
+
+<p> Create a Machine Template with XML body: </p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -X POST -d '&lt;MachineTemplateCreate&gt;&lt;name&gt;myXmlTestMachineTemplate1&lt;/name&gt;&lt;description&gt;Description of my MachineTemplate&lt;/description&gt;&lt;property key="test"&gt;value&lt;/property&gt;&lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-xlarge"/&gt;&lt;machineImage href="http://localhost:3001/cimi/machine_images/img3"/&gt;&lt;/MachineTemplateCreate&gt;' -H "Content-Type: application/xml"  -H "Accept: application/xml" http://localhost:3001/cimi/machine_templates
+</pre>
+
+<p> Create a Machine Template with JSON body: </p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -X POST -d '{"resourceURI": "http://schemas.dmtf.org/cimi/1/MachineTemplateCreate","name": "myMachineDemoTemplate","description": "My very loved machine template","machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1-xlarge" },"machineImage": { "href": "http://localhost:3001/cimi/machine_images/img3" },"properties": { "foo": "bar","life": "is life"}}' -H "Content-Type: application/json"  -H "Accept: application/json" http://localhost:3001/cimi/machine_templates
+</pre>
+
+<p> Delete a Machine Template: </p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" -X DELETE http://localhost:3001/cimi/machine_templates/2
+</pre>
+
+</div>
+
+<div class="tab-pane" id="machine-volumes">
+
+<h4>Working with Machine Volumes </h4>
+<p>Retrieve the Machine Volume Collection of a given Machine resource:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/machines/inst1/volumes
+</pre>
+
+<p>Attach a Volume to a Machine, with XML body:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '<machinevolume xmlns="http://schemas.dmtf.org/cimi/1/MachineVolume"><initiallocation> /dev/sdf </initiallocation><volume href="http://localhost:3001/cimi/volumes/vol3"></volume></machinevolume>'  http://localhost:3001/cimi/machines/inst1/volume_attach
+</pre>
+
+<p>Attach a Volume to a Machine, with JSON body:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d '{"resourceURI":"http://schemas.dmtf.org/cimi/1/MachineVolume", "initialLocation": "/dev/sdf", "volume": {"href":"http://localhost:3001/cimi/volumes/vol2"}}' http://localhost:3001/cimi/machines/inst1/volume_attach
+</pre>
+
+<p>Detach a Volume from a Machine:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" -X DELETE http://localhost:3001/cimi/machines/inst1/volumes/vol2
+</pre>
+
+</div>
+</div>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-curl/cimi-curl-resource_metadata.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl/cimi-curl-resource_metadata.html b/site/output/cimi-curl/cimi-curl-resource_metadata.html
new file mode 100644
index 0000000..c06a1ae
--- /dev/null
+++ b/site/output/cimi-curl/cimi-curl-resource_metadata.html
@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI cURL Examples - Resource Metadata Resources</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+
+  <div class="span8">
+
+    <h3 id="command">cURL examples for CIMI Resource Metadata resources</h3>
+
+  </div>
+
+  <div class="span4">
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    <a href="../cimi-curl.html">curl for CIMI Resources</a>
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-curl-machines.html">Machine</a></li>
+    <li><a href="cimi-curl-volumes.html">Volume</a></li>
+    <li class="active"><a href="cimi-curl-resource_metadata.html">ResourceMetadata</a></li>
+  </ul>
+<br>
+</ul>
+</div>
+
+</div>
+
+<p> Retrieve the Resource Metadata collection in xml format:</p><p>
+
+  </p><pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata</pre>
+
+  <p> Retrieve the Resource Metadata resource corresponding to the Cloud Entry Point resource, in json format:</p>
+
+  <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata/cloud_entry_point </pre>
+
+  <p> Retrieve the Resource Metadata resource corresponding to the Machine resource, in xml format:</p>
+
+  <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/json" http://localhost:3001/cimi/resource_metadata/machine </pre>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-curl/cimi-curl-volumes.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl/cimi-curl-volumes.html b/site/output/cimi-curl/cimi-curl-volumes.html
new file mode 100644
index 0000000..d947994
--- /dev/null
+++ b/site/output/cimi-curl/cimi-curl-volumes.html
@@ -0,0 +1,291 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI cURL Examples - Volume Resources</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+
+  <div class="span8">
+
+    <h3 id="command">cURL examples for CIMI Volume resources</h3>
+
+<ul class="nav nav-pills">
+<li class="active"><a href="#volumes" data-toggle="tab">Working with Volumes</a></li>
+  <li><a href="#volume-images" data-toggle="tab">Working with VolumeImages</a></li>
+  <li><a href="#volume-configs" data-toggle="tab">Working with VolumeConfigurations</a></li>
+  <li><a href="#volume-templates" data-toggle="tab">Working with VolumeTemplates</a></li>
+</ul>
+</div>
+
+  <div class="span4">
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    <a href="../cimi-curl.html">curl for CIMI Resources</a>
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-curl-machines.html">Machine</a></li>
+    <li class="active"><a href="cimi-curl-volumes.html">Volume</a></li>
+    <li><a href="cimi-curl-resource_metadata.html">ResourceMetadata</a></li>
+  </ul>
+<br>
+</ul>
+</div>
+
+</div>
+
+<div class="tab-content">
+
+  <div class="tab-pane active" id="volumes">
+
+    <hr>
+<h4>Working with Volumes</h4>
+
+    <p>Retrieve the Volume Collection in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volumes </pre>
+
+    <p>Retrieve a specific Volume in xml format: </p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volumes/volume1 </pre>
+
+    <p>Create Volume - with VolumeConfiguration by reference, XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml" -X POST -d '&lt;VolumeCreate&gt;&lt;name&gt; marios_new_volume &lt;/name&gt; &lt;description&gt; a new volume &lt;/description&gt;&lt;volumeTemplate&gt;&lt;volumeConfig href="http://localhost:3001/cimi/volume_configurations/2"&gt; &lt;/volumeConfig&gt;&lt;/volumeTemplate&gt;&lt;/VolumeCreate&gt;' http://localhost:3001//cimi/volumes
+     </pre>
+
+    <p>Create Volume - with VolumeConfiguration by reference, JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml" -X POST -d '{"name": "marios_new_volume", "description": "a new volume", "volumeTemplate": { "volumeConfig": {"href":"http://localhost:3001/cimi/volume_configurations/2" }}}' http://localhost:3001//cimi/volumes
+    </pre>
+
+    <p>Create Volume - with VolumeConfiguration by value, XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml" -X POST -d '&lt;VolumeCreate&gt;&lt;name&gt; marios_volume &lt;/name&gt;&lt;description&gt; a new volume &lt;/description&gt; &lt;volumeTemplate&gt;&lt;volumeConfig&gt;&lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;&lt;capacity&gt; 1024 &lt;/capacity&gt;&lt;/volumeConfig&gt;&lt;/volumeTemplate&gt; &lt;/VolumeCreate&gt;' http://localhost:3001//cimi/volumes
+    </pre>
+
+    <p>Create Volume - with VolumeConfiguration by value, JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml"  -X POST -d '{"name": "marios_new_volume", "description": "a new volume", "volumeTemplate": { "volumeConfig": {"type":"http://schemas.dmtf.org/cimi/1/mapped", "capacity": 1024 }}}'   http://localhost:3001/cimi/volumes
+    </pre>
+
+    <p>Delete a Volume</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" -X DELETE http://localhost:3001/cimi/volumes/volume94275
+    </pre>
+
+  </div>
+
+  <div class="tab-pane" id="volume-images">
+
+    <hr>
+<h4>Working with Volume Images</h4>
+
+    <p>Retrieve the Volume Image Collection in xml format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volume_images</pre>
+
+    <p>Retrieve a specific Volume Image in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volume_images/vol_image1 </pre>
+
+    <p>Create a Volume Image from an existing Volume, XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '&lt;VolumeImage xmlns="http://schemas.dmtf.org/cimi/1"&gt;&lt;name&gt; my_vol_image &lt;/name&gt;&lt;description&gt; marios first volume image &lt;/description&gt;&lt;imageLocation href="http://localhost:3001/cimi/volumes/vol1"/&gt;&lt;/VolumeImage&gt;' http://localhost:3001/cimi/volume_images
+    </pre>
+
+    <p>Create a Volume Image from an existing Volume, JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d  '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeImage","name": "some_name", "description": "marios first volume image", "imageLocation": { "href": "http://localhost:3001/cimi/volumes/vol1"}}' http://localhost:3001/cimi/volume_images</pre>
+
+    <p>Delete a Volume Image:</p>
+
+    <pre>curl -v -X DELETE --user "mockuser:mockpassword" http://localhost:3001/cimi/volume_images/store_snapshot_1358516615</pre>
+
+  </div>
+
+
+  <div class="tab-pane" id="volume-configs">
+
+    <hr>
+<h4>Working with Volume Configurations</h4>
+
+    <p>Retrieve the Volume Configuration Collection in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volume_configurations </pre>
+
+    <p>Retrieve a specific Volume Configuration in xml format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volume_configurations/volume_config1 </pre>
+
+    <p>Create a new Volume Configuration with XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '&lt;VolumeConfigurationCreate&gt;&lt;name&gt;marios_volume_config&lt;/name&gt;&lt;description&gt;a volume configuration&lt;/description&gt;&lt;format&gt;qcow2&lt;/format&gt;&lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt; &lt;capacity&gt;10&lt;/capacity&gt;&lt;/VolumeConfigurationCreate&gt;' http://localhost:3001/cimi/volume_configurations
+    </pre>
+
+    <p>Create a new Volume Configuration with JSON body:</p>
+
+   <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeConfiguration","name": "marios_volume_config", "description": "a volume configuration", "type": "http://schemas.dmtf.org/cimi/1/mapped", "format": "ext3", "capacity": 11}' http://localhost:3001/cimi/volume_configurations</pre>
+
+    <p>Delete a Volume Configuration:</p>
+
+    <pre>curl -v -X DELETE --user "mockuser:mockpassword" http://localhost:3001/cimi/volume_configurations/4 </pre>
+
+  </div>
+
+
+  <div class="tab-pane" id="volume-templates">
+
+    <hr>
+<h4>Working with Volume Templates</h4>
+
+    <p>Retrieve the Volume Template Collection in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volume_templates </pre>
+
+    <p>Retrieve a specific Volume Template in xml format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volume_templates/vol_template123</pre>
+
+    <p>Create a Volume Template with XML body:</p>
+
+    <pre>curl --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '&lt;VolumeTemplate xmlns="http://schemas.dmtf.org/cimi/1"&gt; &lt;name&gt; marios_vol_template &lt;/name&gt; &lt;description&gt; my first volume template &lt;/description&gt; &lt;volumeConfig href="http://localhost:3001/cimi/volume_configs/1"&gt; &lt;/volumeConfig&gt; &lt;/VolumeTemplate&gt;' http://localhost:3001/cimi/volume_templates</pre>
+
+    <p>Create a Volume Template with JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeTemplate","name": "marios_vol_template", "description": "my first volume template", "volumeConfig": { "href": "http://localhost:3001/cimi/volume_configs/1"} }' http://localhost:3001/cimi/volume_templates </pre>
+
+    <p>Delete a Volume Template:</p>
+
+    <pre>curl -v -X DELETE --user "mockuser:mockpassword" http://localhost:3001/cimi/volume_templates/vol_template123</pre>
+
+  </div>
+</div>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest-collections.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest-collections.html b/site/output/cimi-rest-collections.html
deleted file mode 100644
index c0bf61d..0000000
--- a/site/output/cimi-rest-collections.html
+++ /dev/null
@@ -1,420 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>CIMI Resource Collections - Machine</title>
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le JavaScript -->
-    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
-    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
-    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
-    <script src="/assets/js/application.js" type="text/javascript"></script>
-    <script src="/assets/js/bootstrap-transition.js"></script>
-    <script src="/assets/js/bootstrap-alert.js"></script>
-    <script src="/assets/js/bootstrap-modal.js"></script>
-    <script src="/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="/assets/js/bootstrap-tab.js"></script>
-    <script src="/assets/js/bootstrap-tooltip.js"></script>
-    <script src="/assets/js/bootstrap-popover.js"></script>
-    <script src="/assets/js/bootstrap-button.js"></script>
-    <script src="/assets/js/bootstrap-collapse.js"></script>
-    <script src="/assets/js/bootstrap-carousel.js"></script>
-    <script src="/assets/js/bootstrap-typeahead.js"></script>
-
-    <!-- Le styles -->
-    <link href="/assets/css/bootstrap.css" rel="stylesheet">
-    <link href="/assets/css/application.css" rel="stylesheet">
-    <link rel="shortcut icon" href="/assets/img/favicon.ico">
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
-            alt="Deltacloud API"/></a>
-          <ul class="nav top-nav">
-  <li><a href="/">Home</a></li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/about.html">What is Deltacloud?</a></li>
-      <li><a href="/supported-providers.html">Supported Providers</a></li>
-    </ul>
-  </li>
-  <li><a href="/download.html">Download</a></li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
-      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/usage.html#usingapi">Using API</a></li>
-      <li><a href="/usage.html#clients">Client Libraries</a></li>
-      <li><a href="/command-tools.html">Command Line Tools</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/getting-sources.html">Getting Sources</a></li>
-      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/rest-api.html">REST API</a></li>
-      <li><a href="/drivers.html">Drivers API</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
-      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
-    </ul>
-  </li>
-  <li><a href="/contact.html">Contact</a></li>
-</ul>
-
-        </div>
-      </div>
-
-    </div>
-
-    <div class="container content">
-
-      <p><br></p>
-
-<div class="row">
-  <div class="span9">
-
-<h3 id="cimi-entry-point">CIMI Resources and Collections</h3>
-
-<p> We are continually improving CIMI support in Deltacloud. If you come across any inconsistencies or errors in the Deltacloud CIMI implementation we'll be very glad to <a href="contact.html">hear about them</a>.</p>
-
-<p>
-In the following sections, the textual definitions following the title of each resource (e.g. "Machine") that are rendered in bold and italic type are taken from the CIMI 1.0.1 specification, available from the DMTF <a href="http://dmtf.org/cloud">Cloud Management Initiative</a> (DSP0263).
-</p>
-
-<hr>
-<h3 id="cimi-machine">Machine</h3>
-<p>
-<strong><em>
-An instantiated compute resource that encapsulates both CPU and Memory.
-A Machine Collection resource represents the collection of Machine resources within a Provider
-</em></strong>
-</p>
-
- </div>
-
- <div class="span3">
-
-<ul class="nav nav-list well">
-<li class="nav-header">
-    CIMI REST API
-  </li>
-  <li><a href="cimi-rest.html">Introduction</a></li>
-  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
-  <li><a href="cimi-rest-collections.html">CIMI Resources</a></li>
-    <ul class="nav nav-list">
-<li class="active"><a href="cimi-rest-collections.html">Machine</a></li>
-      <li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
-    </ul>
-</ul>
-</div>
-
-</div>
-
-<ul class="nav nav-pills">
-<li class="active"><a href="#tab1" data-toggle="tab">Retrieve the Machine Collection</a></li>
-  <li><a href="#single-machine" data-toggle="tab">Retrieve a single Machine</a></li>
-  <li><a href="#create-machine" data-toggle="tab">Create a new Machine</a></li>
-  <li><a href="#machine-action" data-toggle="tab">Perform a Machine Operation</a></li>
-</ul><hr><div class="tab-content">
-  <div class="tab-pane active" id="tab1">
-
-<h4>Retrieve the Machine Collection</h4>
-
-Note the 'add' URI of the Machine Collection resource in the example response below. This is the URI that is used for creating a new Machine (adding to the Machine Collection).
-<br><br><p>Example request:</p>
-
-<pre>
-GET /cimi/machines HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Accept: application/xml
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 200 OK
-Content-Type: application/xml
-CIMI-Specification-Version: 1.0.1
-Content-Length: 2293
-ETag: 5c6dc8cfbceeb1f3c610765a4aa600dd
-Cache-Control: max-age=0, private, must-revalidate
-Date: Fri, 28 Dec 2012 11:08:27 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-
-&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1"
-        resourceURI="http://schemas.dmtf.org/cimi/1/MachineCollection"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/machines&lt;/id&gt;
-  &lt;count&gt;2&lt;/count&gt;
-  &lt;Machine&gt;
-    &lt;id&gt;http://localhost:3001/cimi/machines/inst0&lt;/id&gt;
-    &lt;name&gt;Mock Instance With Profile Change&lt;/name&gt;
-    &lt;description&gt;No description set for Machine Mock Instance With Profile Change&lt;/description&gt;
-    &lt;created&gt;2012-12-28T13:08:27+02:00&lt;/created&gt;
-    &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img1&lt;/property&gt;
-    &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
-    &lt;state&gt;STARTED&lt;/state&gt;
-    &lt;cpu&gt;1&lt;/cpu&gt;
-    &lt;memory&gt;12582912&lt;/memory&gt;
-    &lt;disks href="http://localhost:3001/cimi/machines/inst0/disks" /&gt;
-    &lt;volumes href="http://localhost:3001/cimi/machines/inst0/volumes" /&gt;
-    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
-        href="http://localhost:3001/cimi/machines/inst0/restart" /&gt;
-    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
-        href="http://localhost:3001/cimi/machines/inst0/stop" /&gt;
-    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
-        href="http://localhost:3001/cimi/machine_images" /&gt;
-  &lt;/Machine&gt;
-  &lt;Machine&gt;
-    &lt;id&gt;http://localhost:3001/cimi/machines/inst1&lt;/id&gt;
-    &lt;name&gt;MockUserInstance&lt;/name&gt;
-    &lt;description&gt;No description set for Machine MockUserInstance&lt;/description&gt;
-    &lt;created&gt;2012-12-28T13:08:27+02:00&lt;/created&gt;
-    &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img3&lt;/property&gt;
-    &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
-    &lt;state&gt;STARTED&lt;/state&gt;
-    &lt;cpu&gt;1&lt;/cpu&gt;
-    &lt;memory&gt;1782579&lt;/memory&gt;
-    &lt;disks href="http://localhost:3001/cimi/machines/inst1/disks" /&gt;
-    &lt;volumes href="http://localhost:3001/cimi/machines/inst1/volumes" /&gt;
-    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
-        href="http://localhost:3001/cimi/machines/inst1/restart" /&gt;
-    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
-        href="http://localhost:3001/cimi/machines/inst1/stop" /&gt;
-    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
-        href="http://localhost:3001/cimi/machine_images" /&gt;
-  &lt;/Machine&gt;
-  &lt;operation rel="add" href="http://localhost:3001/cimi/machines" /&gt;
-&lt;/Collection&gt;
-
-
-</pre>
-
-  </div>
-  <div class="tab-pane" id="single-machine">
-
-<h4>Retrieve a single Machine</h4>
-
-<p>Example request:</p>
-
-<pre>
-GET /cimi/machines/inst0 HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Accept: application/xml
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 200 OK
-Content-Type: application/xml
-CIMI-Specification-Version: 1.0.1
-Content-Length: 1092
-ETag: 2d57aa01f1a50b2d13c04f0c51f08ab9
-Cache-Control: max-age=0, private, must-revalidate
-Date: Fri, 28 Dec 2012 11:20:28 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-
-&lt;Machine xmlns="http://schemas.dmtf.org/cimi/1"
-          resourceURI="http://schemas.dmtf.org/cimi/1/Machine"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/machines/inst0&lt;/id&gt;
-  &lt;name&gt;Mock Instance With Profile Change&lt;/name&gt;
-  &lt;description&gt;No description set for Machine Mock Instance With Profile Change&lt;/description&gt;
-  &lt;created&gt;2012-12-28T13:20:28+02:00&lt;/created&gt;
-  &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img1&lt;/property&gt;
-  &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
-  &lt;state&gt;STARTED&lt;/state&gt;
-  &lt;cpu&gt;1&lt;/cpu&gt;
-  &lt;memory&gt;12582912&lt;/memory&gt;
-  &lt;disks href="http://localhost:3001/cimi/machines/inst0/disks" /&gt;
-  &lt;volumes href="http://localhost:3001/cimi/machines/inst0/volumes" /&gt;
-  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
-          href="http://localhost:3001/cimi/machines/inst0/restart" /&gt;
-  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
-          href="http://localhost:3001/cimi/machines/inst0/stop" /&gt;
-  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
-          href="http://localhost:3001/cimi/machine_images" /&gt;
-&lt;/Machine&gt;
-
-
-</pre>
-
-  </div>
-
-  <div class="tab-pane" id="create-machine">
-
-<h4>Create a new Machine</h4>
-
-<p>
-The 'add' URI of the Machine Collection is used to create a new Machine. This is returned when retrieving the Machine Collection resource.
-</p>
-
-<p>Example request:</p>
-
-<pre>
-POST /cimi/machines HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Content-Type: application/xml
-Accept: application/xml
-Content-Length: 370
-
-&lt;MachineCreate xmlns="http://schemas.dmtf.org/cimi/1"&gt;
-  &lt;name&gt; myMachine1 &lt;/name&gt;
-  &lt;description&gt; my machine description &lt;/description&gt;
-  &lt;machineTemplate&gt;
-    &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-small"&gt;
-    &lt;/machineConfig&gt;
-    &lt;machineImage href="http://localhost:3001/cimi/machine_images/img1"&gt;
-    &lt;/machineImage&gt;
-  &lt;/machineTemplate&gt;
-&lt;/MachineCreate&gt;
-
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 201 Created
-Content-Type: application/xml
-Location: http://localhost:3001/cimi/machines/inst3
-CIMI-Specification-Version: 1.0.1
-Content-Length: 1030
-ETag: 360992481f1450f9d475f439e5105f9d
-Cache-Control: max-age=0, private, must-revalidate
-Date: Fri, 28 Dec 2012 11:47:58 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-
-&lt;Machine xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/Machine"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/machines/inst3&lt;/id&gt;
-  &lt;name&gt; myMachine1 &lt;/name&gt;
-  &lt;description&gt; my machine description &lt;/description&gt;
-  &lt;created&gt;2012-12-28T13:47:58+02:00&lt;/created&gt;
-  &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img1&lt;/property&gt;
-  &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
-  &lt;state&gt;STARTED&lt;/state&gt;
-  &lt;cpu&gt;1&lt;/cpu&gt;
-  &lt;memory&gt;1782579&lt;/memory&gt;
-  &lt;disks href="http://localhost:3001/cimi/machines/inst3/disks" /&gt;
-  &lt;volumes href="http://localhost:3001/cimi/machines/inst3/volumes" /&gt;
-  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
-          href="http://localhost:3001/cimi/machines/inst3/restart" /&gt;
-  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
-          href="http://localhost:3001/cimi/machines/inst3/stop" /&gt;
-  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
-          href="http://localhost:3001/cimi/machine_images" /&gt;
-&lt;/Machine&gt;
-
-
-</pre>
-
-
-  </div>
-
-
-  <div class="tab-pane" id="machine-action">
-
-<h4>Perform a Machine Operation</h4>
-
-<p>
-The list of Machine operations is returned when the URI of a specific Machine resource is dereferenced. Examples of operations are 'stop', 'restart' and 'capture'. An 'Action' resource is used in the POST message body corresponding to the operation to be executed. The example below shows the 'stop' action.
-</p>
-
-<p>Example request:</p>
-<pre>
-POST /cimi/machines/inst3/stop HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Content-Type: application/xml
-Accept: application/xml
-Content-Length: 125
-
-&lt;Action xmlns="http://schemas.dmtf.org/cimi/1"&gt;
-  &lt;action&gt; http://http://schemas.dmtf.org/cimi/1/action/stop &lt;/action&gt;
-&lt;/Action&gt;
-</pre>
-
-<p>Server response:</p>
-<pre>
-HTTP/1.1 202 Accepted
-CIMI-Specification-Version: 1.0.1
-Content-Length: 0
-Date: Fri, 28 Dec 2012 14:01:43 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-</pre>
-
-
-  </div>
-
-
-</div>
-
-      <footer class="footer">
-        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
-        <div class='row'>
-          <div class='span3'>
-            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
-          </div>
-          <div class='span9'>
-            <strong>Apache Deltacloud</strong> is a top-level project at the <a
-              href="http://www.apache.org">Apache Software Foundation</a>,
-            having graduated from the ASF Incubator in October
-            2011. Through a collaborative and meritocratic development process, Apache
-            projects deliver enterprise-grade, freely available software products that
-            attract large communities of users. 
-          </div>
-        </div>
-      </footer>
-
-    </div> <!-- /container -->
-
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
-
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest-entry-point.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest-entry-point.html b/site/output/cimi-rest-entry-point.html
deleted file mode 100644
index da5bb22..0000000
--- a/site/output/cimi-rest-entry-point.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>CIMI Cloud Entry Point</title>
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le JavaScript -->
-    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
-    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
-    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
-    <script src="/assets/js/application.js" type="text/javascript"></script>
-    <script src="/assets/js/bootstrap-transition.js"></script>
-    <script src="/assets/js/bootstrap-alert.js"></script>
-    <script src="/assets/js/bootstrap-modal.js"></script>
-    <script src="/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="/assets/js/bootstrap-tab.js"></script>
-    <script src="/assets/js/bootstrap-tooltip.js"></script>
-    <script src="/assets/js/bootstrap-popover.js"></script>
-    <script src="/assets/js/bootstrap-button.js"></script>
-    <script src="/assets/js/bootstrap-collapse.js"></script>
-    <script src="/assets/js/bootstrap-carousel.js"></script>
-    <script src="/assets/js/bootstrap-typeahead.js"></script>
-
-    <!-- Le styles -->
-    <link href="/assets/css/bootstrap.css" rel="stylesheet">
-    <link href="/assets/css/application.css" rel="stylesheet">
-    <link rel="shortcut icon" href="/assets/img/favicon.ico">
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
-            alt="Deltacloud API"/></a>
-          <ul class="nav top-nav">
-  <li><a href="/">Home</a></li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/about.html">What is Deltacloud?</a></li>
-      <li><a href="/supported-providers.html">Supported Providers</a></li>
-    </ul>
-  </li>
-  <li><a href="/download.html">Download</a></li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
-      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/usage.html#usingapi">Using API</a></li>
-      <li><a href="/usage.html#clients">Client Libraries</a></li>
-      <li><a href="/command-tools.html">Command Line Tools</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/getting-sources.html">Getting Sources</a></li>
-      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/rest-api.html">REST API</a></li>
-      <li><a href="/drivers.html">Drivers API</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
-      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
-    </ul>
-  </li>
-  <li><a href="/contact.html">Contact</a></li>
-</ul>
-
-        </div>
-      </div>
-
-    </div>
-
-    <div class="container content">
-
-      <p><br></p>
-
-<div class="row">
-  <div class="span9">
-
-<h3 id="cimi-entry-point">The CIMI Cloud Entry Point</h3>
-
-<p>
-<strong><em>The Cloud Entry Point represents the entry point into the cloud defined by the CIMI Model. The Cloud
-Entry Point implements a catalog of resources, such as Systems, System Templates, Machines, Machine
-Templates, etc., that can be queried and browsed by the Consumer.</em></strong>
-</p>
-<p>
-A deltacloud server exposes the CIMI Cloud Entry Point at /cimi/cloudEntryPoint. When dereferencing this URI, the resources listed in the response include only those that are supported by the current deltacloud driver - whether the 'default' driver the server was started with, or that specified with the <a href="drivers.html">X-Deltacloud-Driver</a> header.
-</p>
-
- </div>
-
-  <div class="span3">
-
-<ul class="nav nav-list well">
-<li class="nav-header">
-    CIMI REST API
-  </li>
-  <li><a href="cimi-rest.html">Introduction</a></li>
-  <li class="active"><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
-  <li><a href="cimi-rest-collections.html">CIMI Resources</a></li>
-</ul>
-</div>
-
-</div>
-
-<p>
-Example request:
-</p>
-<pre>
- GET /cimi/cloudEntryPoint HTTP/1.1
- Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
- User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
- Host: localhost:3001
- Accept: application/xml
-</pre>
-
-<p>
-Example response:
-</p>
-
-<pre>
-HTTP/1.1 200 OK
-Content-Type: application/xml
-CIMI-Specification-Version: 1.0.1
-Content-Length: 1754
-ETag: 503bc06f24d1a51eddc62b33b870c70f
-Cache-Control: max-age=0, private, must-revalidate
-Date: Thu, 27 Dec 2012 15:23:23 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-
-&lt;CloudEntryPoint xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/CloudEntryPoint"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/cloudEntryPoint&lt;/id&gt;
-  &lt;name&gt;mock&lt;/name&gt;
-  &lt;description&gt;Cloud Entry Point for the Deltacloud mock driver&lt;/description&gt;
-  &lt;created&gt;2012-12-27T17:23:23+02:00&lt;/created&gt;
-  &lt;baseURI&gt;http://localhost:3001/cimi/&lt;/baseURI&gt;
-  &lt;resourceMetadata href="http://localhost:3001/cimi/resource_metadata" /&gt;
-  &lt;machines href="http://localhost:3001/cimi/machines" /&gt;
-  &lt;machineTemplates href="http://localhost:3001/cimi/machine_templates" /&gt;
-  &lt;machineImages href="http://localhost:3001/cimi/machine_images" /&gt;
-  &lt;credentials href="http://localhost:3001/cimi/credentials" /&gt;
-  &lt;volumes href="http://localhost:3001/cimi/volumes" /&gt;
-  &lt;volumeImages href="http://localhost:3001/cimi/volume_images" /&gt;
-  &lt;networks href="http://localhost:3001/cimi/networks" /&gt;
-  &lt;networkTemplates href="http://localhost:3001/cimi/network_templates" /&gt;
-  &lt;networkPorts href="http://localhost:3001/cimi/network_ports" /&gt;
-  &lt;networkPortTemplates href="http://localhost:3001/cimi/network_port_templates" /&gt;
-  &lt;addresses href="http://localhost:3001/cimi/addresses" /&gt;
-  &lt;addressTemplates href="http://localhost:3001/cimi/address_templates" /&gt;
-  &lt;forwardingGroups href="http://localhost:3001/cimi/forwarding_groups" /&gt;
-  &lt;forwardingGroupTemplates href="http://localhost:3001/cimi/forwarding_group_templates" /&gt;
-  &lt;volumeConfigs href="http://localhost:3001/cimi/volume_configurations" /&gt;
-  &lt;machineConfigs href="http://localhost:3001/cimi/machine_configurations" /&gt;
-  &lt;networkConfigs href="http://localhost:3001/cimi/network_configurations" /&gt;
-  &lt;networkPortConfigs href="http://localhost:3001/cimi/network_port_configurations" /&gt;
-&lt;/CloudEntryPoint&gt;
-</pre>
-
-      <footer class="footer">
-        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
-        <div class='row'>
-          <div class='span3'>
-            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
-          </div>
-          <div class='span9'>
-            <strong>Apache Deltacloud</strong> is a top-level project at the <a
-              href="http://www.apache.org">Apache Software Foundation</a>,
-            having graduated from the ASF Incubator in October
-            2011. Through a collaborative and meritocratic development process, Apache
-            projects deliver enterprise-grade, freely available software products that
-            attract large communities of users. 
-          </div>
-        </div>
-      </footer>
-
-    </div> <!-- /container -->
-
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
-
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest-machine-images.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest-machine-images.html b/site/output/cimi-rest-machine-images.html
deleted file mode 100644
index 5535316..0000000
--- a/site/output/cimi-rest-machine-images.html
+++ /dev/null
@@ -1,357 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>CIMI Resource Collections - Machine Image</title>
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le JavaScript -->
-    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
-    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
-    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
-    <script src="/assets/js/application.js" type="text/javascript"></script>
-    <script src="/assets/js/bootstrap-transition.js"></script>
-    <script src="/assets/js/bootstrap-alert.js"></script>
-    <script src="/assets/js/bootstrap-modal.js"></script>
-    <script src="/assets/js/bootstrap-scrollspy.js"></script>
-    <script src="/assets/js/bootstrap-tab.js"></script>
-    <script src="/assets/js/bootstrap-tooltip.js"></script>
-    <script src="/assets/js/bootstrap-popover.js"></script>
-    <script src="/assets/js/bootstrap-button.js"></script>
-    <script src="/assets/js/bootstrap-collapse.js"></script>
-    <script src="/assets/js/bootstrap-carousel.js"></script>
-    <script src="/assets/js/bootstrap-typeahead.js"></script>
-
-    <!-- Le styles -->
-    <link href="/assets/css/bootstrap.css" rel="stylesheet">
-    <link href="/assets/css/application.css" rel="stylesheet">
-    <link rel="shortcut icon" href="/assets/img/favicon.ico">
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
-            alt="Deltacloud API"/></a>
-          <ul class="nav top-nav">
-  <li><a href="/">Home</a></li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/about.html">What is Deltacloud?</a></li>
-      <li><a href="/supported-providers.html">Supported Providers</a></li>
-    </ul>
-  </li>
-  <li><a href="/download.html">Download</a></li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
-      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/usage.html#usingapi">Using API</a></li>
-      <li><a href="/usage.html#clients">Client Libraries</a></li>
-      <li><a href="/command-tools.html">Command Line Tools</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/getting-sources.html">Getting Sources</a></li>
-      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/rest-api.html">REST API</a></li>
-      <li><a href="/drivers.html">Drivers API</a></li>
-    </ul>
-  </li>
-  <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
-    <ul class="dropdown-menu">
-      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
-      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
-    </ul>
-  </li>
-  <li><a href="/contact.html">Contact</a></li>
-</ul>
-
-        </div>
-      </div>
-
-    </div>
-
-    <div class="container content">
-
-      <p><br></p>
-
-<div class="row">
-  <div class="span9">
-
-<h3 id="cimi-machine-image">Machine Image</h3>
-<p>
-<strong><em>
-This resource represents the information necessary for hardware virtualized resources to create a Machine Instance; it contains configuration data such as startup instructions, including possible combinations of the following items, depending on the 'type' of Machine Image created: the software image, installation software, both a disk image and a set of software and parameters. <br><br>
-A Machine Image Collection resource represents the collection of Machine Image resources within a Provider.
-</em></strong>
-</p>
-
-  </div>
-  <div class="span3">
-
-<ul class="nav nav-list well">
-<li class="nav-header">
-    CIMI REST API
-  </li>
-  <li><a href="cimi-rest.html">Introduction</a></li>
-  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
-  <li><a href="cimi-rest-collections.html">CIMI Resources</a></li>
-    <ul class="nav nav-list">
-<li><a href="cimi-rest-collections.html">Machine</a></li>
-      <li class="active"><a href="cimi-rest-machine-images.html">MachineImage</a></li>
-    </ul>
-</ul>
-</div>
-
-</div>
-
-<ul class="nav nav-pills">
-<li class="active"><a href="#image-collection" data-toggle="tab">Retrieve the Machine Image Collection</a></li>
-  <li><a href="#single-image" data-toggle="tab">Retrieve a single Machine Image</a></li>
-  <li><a href="#create-image" data-toggle="tab">Create or Delete a Machine Image</a></li>
-</ul><hr><div class="tab-content">
-  <div class="tab-pane active" id="image-collection">
-
-<h4>Retrieve the Machine Image Collection</h4>
-
-<p>
-Note the 'add' URI of the Machine Image Collection resource in the example response below. This is the URI that is used for creating a new Machine Image (adding to the Machine Image Collection). This URI is also returned when dereferencing a Machine resource, as the href attribute of the 'capture' operation (when this is possible for the given Machine on the particular Cloud Provider).
-</p>
-
-<p>Example request:</p>
-<pre>
-GET /cimi/machine_images HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Accept: application/xml
-</pre>
-
-<p>Server response:</p>
-<pre>
-HTTP/1.1 200 OK
-Content-Type: application/xml
-CIMI-Specification-Version: 1.0.1
-Content-Length: 1195
-ETag: e2f73ed48eb2abeae77322eea56dfc5d
-Cache-Control: max-age=0, private, must-revalidate
-Date: Fri, 28 Dec 2012 14:23:35 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-
-&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1"
-          resourceURI="http://schemas.dmtf.org/cimi/1/MachineImageCollection"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/machine_images&lt;/id&gt;
-  &lt;count&gt;3&lt;/count&gt;
-  &lt;MachineImage&gt;
-    &lt;id&gt;http://localhost:3001/cimi/machine_images/img1&lt;/id&gt;
-    &lt;name&gt;img1&lt;/name&gt;
-    &lt;description&gt;Fedora 10&lt;/description&gt;
-    &lt;created&gt;2012-12-28T16:23:35+02:00&lt;/created&gt;
-    &lt;state&gt;AVAILABLE&lt;/state&gt;
-    &lt;type&gt;IMAGE&lt;/type&gt;
-    &lt;imageLocation&gt;mock://img1&lt;/imageLocation&gt;
-  &lt;/MachineImage&gt;
-  &lt;MachineImage&gt;
-    &lt;id&gt;http://localhost:3001/cimi/machine_images/img2&lt;/id&gt;
-    &lt;name&gt;img2&lt;/name&gt;
-    &lt;description&gt;Fedora 10&lt;/description&gt;
-    &lt;created&gt;2012-12-28T16:23:35+02:00&lt;/created&gt;
-    &lt;state&gt;AVAILABLE&lt;/state&gt;
-    &lt;type&gt;IMAGE&lt;/type&gt;
-    &lt;imageLocation&gt;mock://img2&lt;/imageLocation&gt;
-  &lt;/MachineImage&gt;
-  &lt;MachineImage&gt;
-    &lt;id&gt;http://localhost:3001/cimi/machine_images/img3&lt;/id&gt;
-    &lt;name&gt;img3&lt;/name&gt;
-    &lt;description&gt;JBoss&lt;/description&gt;
-    &lt;created&gt;2012-12-28T16:23:35+02:00&lt;/created&gt;
-    &lt;state&gt;AVAILABLE&lt;/state&gt;
-    &lt;type&gt;IMAGE&lt;/type&gt;
-    &lt;imageLocation&gt;mock://img3&lt;/imageLocation&gt;
-  &lt;/MachineImage&gt;
-  &lt;operation rel="add" href="http://localhost:3001/cimi/machine_images" /&gt;
-&lt;/Collection&gt;
-</pre>
-
-  </div>
-  <div class="tab-pane" id="single-image">
-
-<h4>Retrieve a single Machine Image</h4>
-
-<p>Example request:</p>
-
-<pre>
-GET /cimi/machine_images/img1 HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Accept: application/xml
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 200 OK
-Content-Type: application/xml
-CIMI-Specification-Version: 1.0.1
-Content-Length: 385
-ETag: 130f8e9592138afc544d65d73039e540
-Cache-Control: max-age=0, private, must-revalidate
-Date: Fri, 28 Dec 2012 14:55:42 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-
-&lt;MachineImage xmlns="http://schemas.dmtf.org/cimi/1"
-          resourceURI="http://schemas.dmtf.org/cimi/1/MachineImage"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/machine_images/img1&lt;/id&gt;
-  &lt;name&gt;img1&lt;/name&gt;
-  &lt;description&gt;Fedora 10&lt;/description&gt;
-  &lt;created&gt;2012-12-28T16:55:42+02:00&lt;/created&gt;
-  &lt;state&gt;AVAILABLE&lt;/state&gt;
-  &lt;type&gt;IMAGE&lt;/type&gt;
-  &lt;imageLocation&gt;mock://img1&lt;/imageLocation&gt;
-&lt;/MachineImage&gt;
-</pre>
-
-  </div>
-
-  <div class="tab-pane" id="create-image">
-
-
-<h4>Create a new Machine Image</h4>
-
-<p>
-The example below shows the creation of a new Machine Image resource from an existing Machine resource. When supported by the Machine and the given Cloud Provider, the href attribute of the serialized Machine resource's 'capture' operation provides the URI to which the request body should be sent with HTTP POST in order to create the new Machine Image. The message body is the representation of the to be created Machine Image resource, with the 'imageLocation' attribute referring to the Machine resource from which the Machine Image is to be created, as shown in the example below:
-</p>
-
-<p>Example request:</p>
-
-<pre>
-POST /cimi/machine_images HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Content-Type: application/xml
-Accept: application/xml
-Content-Length: 188
-&lt;MachineImage&gt;
-  &lt;name&gt;some_name&lt;/name&gt;
-  &lt;description&gt;my new machine_image&lt;/description&gt;
-  &lt;type&gt;IMAGE&lt;/type&gt;
-  &lt;imageLocation&gt;http://localhost:3001/cimi/machines/inst1&lt;/imageLocation&gt;
-&lt;/MachineImage&gt;
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 201 Created
-Content-Type: application/xml
-Location: http://localhost:3001/cimi/machine_images/some_name
-CIMI-Specification-Version: 1.0.1
-Content-Length: 411
-ETag: c929191a65da6564f9f69301d38eb6fc
-Cache-Control: max-age=0, private, must-revalidate
-Date: Fri, 28 Dec 2012 15:10:12 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-
-&lt;MachineImage xmlns="http://schemas.dmtf.org/cimi/1"
-          resourceURI="http://schemas.dmtf.org/cimi/1/MachineImage"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/machine_images/some_name&lt;/id&gt;
-  &lt;name&gt;some_name&lt;/name&gt;
-  &lt;description&gt;my new machine image&lt;/description&gt;
-  &lt;created&gt;2012-12-28T17:10:12+02:00&lt;/created&gt;
-  &lt;state&gt;AVAILABLE&lt;/state&gt;
-  &lt;type&gt;IMAGE&lt;/type&gt;
-  &lt;imageLocation&gt;mock://some_name&lt;/imageLocation&gt;
-&lt;/MachineImage&gt;
-</pre>
-
-<br><hr>
-<h4>Delete a Machine Image</h4>
-
-<p>Example request:</p>
-
-<pre>
-DELETE /cimi/machine_images/some_name HTTP/1.1
-Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
-User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
-Host: localhost:3001
-Accept: application/xml
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 200 OK
-X-Frame-Options: SAMEORIGIN
-X-XSS-Protection: 1; mode=block
-X-Content-Type-Options: nosniff
-Content-Type: text/html;charset=utf-8
-CIMI-Specification-Version: 1.0.1
-Content-Length: 0
-Date: Fri, 28 Dec 2012 15:21:14 GMT
-Connection: keep-alive
-Server: thin 1.5.0 codename Knife
-</pre>
-
-  </div>
-</div>
-
-      <footer class="footer">
-        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
-        <div class='row'>
-          <div class='span3'>
-            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
-          </div>
-          <div class='span9'>
-            <strong>Apache Deltacloud</strong> is a top-level project at the <a
-              href="http://www.apache.org">Apache Software Foundation</a>,
-            having graduated from the ASF Incubator in October
-            2011. Through a collaborative and meritocratic development process, Apache
-            projects deliver enterprise-grade, freely available software products that
-            attract large communities of users. 
-          </div>
-        </div>
-      </footer>
-
-    </div> <!-- /container -->
-
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
-
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest.html b/site/output/cimi-rest.html
index 16afce3..7ea915b 100644
--- a/site/output/cimi-rest.html
+++ b/site/output/cimi-rest.html
@@ -117,13 +117,25 @@ Apache Deltacloud exposes the DMTF <a href="http://dmtf.org/cloud">Cloud Infrast
 
   <div class="span3">
 
+
 <ul class="nav nav-list well">
 <li class="nav-header">
     CIMI REST API
   </li>
   <li class="active"><a href="cimi-rest.html">Introduction</a></li>
-  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
-  <li><a href="cimi-rest-collections.html">CIMI Resources</a></li>
+  <li><a href="cimi-rest/cimi-rest-entry-point.html">Cloud Entry Point</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest/cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+
 </ul>
 </div>
 
@@ -132,6 +144,10 @@ Apache Deltacloud exposes the DMTF <a href="http://dmtf.org/cloud">Cloud Infrast
 This page shows examples of interactions with the CIMI interface exposed by a Deltacloud server. The examples here cover the CIMI resources and collections that are currently supported in Deltacloud; we are constantly improving our CIMI implementation. If you come across any bugs or inconsistencies we'd be very happy to <a href="contact.html">hear about them</a>.
 </p>
 
+<p>
+In the following sections, the textual definitions following the title of each resource (e.g. "Machine") that are rendered in <strong><em>bold and italic type</em></strong> are taken from the CIMI 1.0.1 specification, available from the DMTF <a href="http://dmtf.org/cloud">Cloud Management Initiative</a> (DSP0263).
+</p>
+
 <hr><h3 id="cimi_rest_introduction">Starting Deltacloud with the CIMI interface</h3>
 
 <p>The <strong> –frontends (-f)</strong> flag is used to specify which frontends a deltacloud server should expose:


Mime
View raw message