You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by as...@apache.org on 2011/08/07 23:00:53 UTC

svn commit: r1154768 - in /incubator/whirr/trunk: CHANGES.txt src/site/site.xml src/site/xdoc/configuration-guide.xml src/site/xdoc/contrib/ src/site/xdoc/index.xml

Author: asavu
Date: Sun Aug  7 21:00:53 2011
New Revision: 1154768

URL: http://svn.apache.org/viewvc?rev=1154768&view=rev
Log:
WHIRR-257. Remove outdated Python contrib (Tom White via asavu)

Removed:
    incubator/whirr/trunk/src/site/xdoc/contrib/
Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/src/site/site.xml
    incubator/whirr/trunk/src/site/xdoc/configuration-guide.xml
    incubator/whirr/trunk/src/site/xdoc/index.xml

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1154768&r1=1154767&r2=1154768&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Sun Aug  7 21:00:53 2011
@@ -43,6 +43,8 @@ Trunk (unreleased changes)
 
     WHIRR-354. Upgrade to jclouds 1.1.0 (Adrian Cole via asavu)
 
+    WHIRR-257. Remove outdated Python contrib (Tom White via asavu)
+
   BUG FIXES
 
     WHIRR-315. Temporary override Providers#withIds until jclouds 

Modified: incubator/whirr/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/src/site/site.xml?rev=1154768&r1=1154767&r2=1154768&view=diff
==============================================================================
--- incubator/whirr/trunk/src/site/site.xml (original)
+++ incubator/whirr/trunk/src/site/site.xml Sun Aug  7 21:00:53 2011
@@ -74,17 +74,5 @@
       <item name="Javadoc" href="apidocs/index.html"/>
     </menu>
 
-    <menu name="Python Contrib Documentation">
-      <item name="Installation" href="contrib/python/installation.html"/>
-      <item name="Configuring and Running" href="contrib/python/configuring-and-running.html"/>
-      <item name="Launching a Cluster" href="contrib/python/launching-a-cluster.html"/>
-      <item name="Using Persistent Clusters" href="contrib/python/using-persistent-clusters.html"/>
-      <item name="Running MapReduce Jobs" href="contrib/python/running-mapreduce-jobs.html"/>
-      <item name="Terminating a Cluster" href="contrib/python/terminating-a-cluster.html"/>
-      <item name="Automatically Shutting Down a Cluster" href="contrib/python/automatically-shutting-down-a-cluster.html"/>
-      <item name="Using Command Line Options" href="contrib/python/using-command-line-options.html"/>
-      <item name="Running ZooKeeper" href="contrib/python/running-zookeeper.html"/>
-    </menu>
-
   </body>
 </project>

Modified: incubator/whirr/trunk/src/site/xdoc/configuration-guide.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/src/site/xdoc/configuration-guide.xml?rev=1154768&r1=1154767&r2=1154768&view=diff
==============================================================================
--- incubator/whirr/trunk/src/site/xdoc/configuration-guide.xml (original)
+++ incubator/whirr/trunk/src/site/xdoc/configuration-guide.xml Sun Aug  7 21:00:53 2011
@@ -595,197 +595,5 @@ xsi:schemaLocation="http://maven.apache.
         <td>Warning: clusters do not run behind a firewall.</td>
       </tr>
     </table>
-    <p>
-      <a name="comparison-with-python"></a>
-    </p>
-    <section name="Comparison with Python"></section>
-    <p>See 
-    <a href="contrib/python/using-command-line-options.html">Using Command Line Options</a>.</p>
-    <table border="0">
-      <tr valign="top">
-        <th>
-          <b>Python</b>
-        </th>
-        <th>
-          <b>Java</b>
-        </th>
-        <th>
-          <b>Notes</b>
-        </th>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>config-dir</tt>
-        </td>
-        <td>
-          <tt>whirr.config</tt>
-        </td>
-        <td></td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>service</tt>
-        </td>
-        <td>
-          <tt>whirr.service-name</tt>
-        </td>
-        <td></td>
-      </tr>
-      <tr valign="top">
-        <td>none</td>
-        <td>
-          <tt>whirr.cluster-name</tt>
-        </td>
-        <td>Specified as a positional argument on the Python CLI.</td>
-      </tr>
-      <tr valign="top">
-        <td>none</td>
-        <td>
-          <tt>whirr.instance-templates</tt>
-        </td>
-        <td>Specified as a positional arguments on the Python CLI.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>cloud-provider</tt>
-        </td>
-        <td>
-          <tt>whirr.provider</tt>
-        </td>
-        <td></td>
-      </tr>
-      <tr valign="top">
-        <td>none</td>
-        <td>
-          <tt>whirr.identity</tt>
-        </td>
-        <td>Specified using environment variables for Python. E.g. 
-        <tt>AWS_ACCESS_KEY_ID</tt>, 
-        <tt>RACKSPACE_KEY</tt></td>
-      </tr>
-      <tr valign="top">
-        <td>none</td>
-        <td>
-          <tt>whirr.credential</tt>
-        </td>
-        <td>Specified using environment variables for Python. E.g. 
-        <tt>AWS_ACCESS_KEY_ID</tt>, 
-        <tt>RACKSPACE_SECRET</tt></td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>private-key</tt>
-        </td>
-        <td>
-          <tt>whirr.private-key-file</tt>
-        </td>
-        <td></td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>public-key</tt>
-        </td>
-        <td>
-          <tt>whirr.public-key-file</tt>
-        </td>
-        <td></td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>client-cidr</tt>
-        </td>
-        <td>
-          <tt>whirr.client-cidrs</tt>
-        </td>
-        <td>Python's 
-        <tt>client-cidr</tt>option may be repeated multiple times, whereas Java's 
-        <tt>whirr.client-cidrs</tt>contains comma-separated CIDRs.</td>
-      </tr>
-      <tr valign="top">
-        <td>none</td>
-        <td>
-          <tt>whirr.run-url-base</tt>
-        </td>
-        <td>Specified using 
-        <tt>user-data-file</tt>in Python.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>image-id</tt>
-        </td>
-        <td>
-          <tt>whirr.image-id</tt>
-        </td>
-        <td></td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>instance-type</tt>
-        </td>
-        <td>
-          <tt>whirr.hardware-id</tt>
-        </td>
-        <td></td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>availability-zone</tt>
-        </td>
-        <td>
-          <tt>whirr.location-id</tt>
-        </td>
-        <td>Location is more general than availability zone.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>security-group</tt>
-        </td>
-        <td>none</td>
-        <td>Amazon-specific. However, Amazon users may wish to start a cluster in
-        additional security groups, which isn't currently supported in Java.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>env</tt>
-        </td>
-        <td>none</td>
-        <td>May not be needed in Java with runurls.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>user-data-file</tt>
-        </td>
-        <td>none</td>
-        <td>Amazon-specific. Use runurls.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>key-name</tt>
-        </td>
-        <td>none</td>
-        <td>Amazon-specific. Jclouds generates a new key for clusters.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>user-packages</tt>
-        </td>
-        <td>none</td>
-        <td>Implement by allowing arbitrary runurls.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>auto-shutdown</tt>
-        </td>
-        <td>none</td>
-        <td>Implement by allowing arbitrary runurls.</td>
-      </tr>
-      <tr valign="top">
-        <td>
-          <tt>ssh-options</tt>
-        </td>
-        <td>none</td>
-        <td>Jclouds handles SSH, so not needed in Java.</td>
-      </tr>
-    </table>
   </body>
 </document>

Modified: incubator/whirr/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/src/site/xdoc/index.xml?rev=1154768&r1=1154767&r2=1154768&view=diff
==============================================================================
--- incubator/whirr/trunk/src/site/xdoc/index.xml (original)
+++ incubator/whirr/trunk/src/site/xdoc/index.xml Sun Aug  7 21:00:53 2011
@@ -128,8 +128,8 @@ xsi:schemaLocation="http://maven.apache.
     Apache Hadoop</a> for running Hadoop clusters on EC2. Later the scripts were 
     <a class="externalLink" href="https://issues.apache.org/jira/browse/WHIRR-3">ported to
     Python</a> for extra features (such as EBS support) and a wider range of cloud providers. These
-    Python scripts are available today in Whirr under 
-    <i>contrib/python</i>.</p>
+    Python scripts are no longer supported, but can be found in the 0.5.0 release and the
+    <i>contrib-python</i> SVN branch.</p>
     <p>In May 2010 the 
     <a class="externalLink" href="http://incubator.apache.org/whirr">Apache Whirr
     Incubator</a> project was started to give a home to the existing work that had been done, but