vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r845507 [13/17] - in /websites/staging/vcl/trunk/content: ./ confluence_export/
Date Tue, 08 Jan 2013 16:38:17 GMT
Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.1.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.1.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.1.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,503 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.1</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.1</h1>
+    <p><a name="VCL2.1-TableofContents"></a></p>
+<h2 id="table-of-contents">Table of Contents</h2>
+<ul>
+<li><a href="#VCL2.1-Downloadlinks">Download links</a></li>
+<li><a href="#VCL2.1-ReleaseNotes">Release Notes</a>
+         * <a href="#VCL2.1-I.IntroandDescription">I. Intro and Description</a>
+         * <a href="#VCL2.1-II.VCLRoadmap">II. VCL Roadmap</a>
+         * <a href="#VCL2.1-III.GettingInvolvedintheASFVCLCommunity">III. Getting Involved in the ASF VCL Community</a>
+         * <a href="#VCL2.1-IV.HowtoSubmitBugsandFeatureRequests">IV. How to Submit Bugs and Feature Requests</a></li>
+<li><a href="#VCL2.1-ChangeLog">Change Log</a>
+         * <a href="#VCL2.1-Sub-task">Sub-task</a>
+         * <a href="#VCL2.1-Bug">Bug</a>
+         * <a href="#VCL2.1-Improvement">Improvement</a>
+         * <a href="#VCL2.1-NewFeature">New Feature</a>
+         * <a href="#VCL2.1-Task">Task</a></li>
+</ul>
+<p><a name="VCL2.1-Downloadlinks"></a></p>
+<h2 id="download-links">Download links</h2>
+<p>Please make sure to download VCL from an mirror server. The following link
+will automatically select one for you that should be close to you. After
+downloading it <em>make sure</em> you verify it with MD5 or SHA1 sums <em>AND</em> the
+GPG signature (sums and signature files should be downloaded directly from
+Apache, not from mirrors).</p>
+<p><a href="http://www.apache.org/dyn/closer.cgi/incubator/vcl/apache-VCL-2.1-incubating.tar.bz2">Download ASF VCL 2.1</a>
+<a href="http://www.apache.org/dist/incubator/vcl/apache-VCL-2.1-incubating.tar.bz2.asc">GPG Signature</a>
+<a href="http://www.apache.org/dist/incubator/vcl/apache-VCL-2.1-incubating.tar.bz2.md5">MD5 Sum</a>
+<a href="http://www.apache.org/dist/incubator/vcl/apache-VCL-2.1-incubating.tar.bz2.sha1">SHA1 Sum</a>
+<a href="http://www.apache.org/dist/incubator/vcl/KEYS">VCL KEYS file</a></p>
+<p>Run the following command to verify the MD5 sum. You should get the same
+number that is in apache-VCL-2.1-incubating.tar.bz2.md5:
+md5sum apache-VCL-2.1-incubating.tar.bz2</p>
+<p>Similarly, Run the following command to verify the SHA1 sum. You should get
+the same number that is in apache-VCL-2.1-incubating.tar.bz2.sha1:
+sha1sum apache-VCL-2.1-incubating.tar.bz2</p>
+<p>To verify the GPG signature (you'll need to have <a href="http://www.gnupg.org/">GnuPG</a>
+ installed):
+1. download and import the VCL KEYS file:
+gpg --import KEYS
+1. download the GPG Signature to the same location as the release file
+1. from the directory containing both the release file and the GPG
+signature, run
+gpg --verify apache-VCL-2.1-incubating.tar.bz2.asc</p>
+<p><a name="VCL2.1-ReleaseNotes"></a></p>
+<h2 id="release-notes">Release Notes</h2>
+<p><a name="VCL2.1-I.IntroandDescription"></a></p>
+<h4 id="i-intro-and-description">I. Intro and Description</h4>
+<p>VCL, Virtual Computing Lab. The VCL can be many things, first and foremost
+it is an open-source system used to dynamically provision and broker remote
+access to a dedicated compute environment for an end-user. The provisioned
+computers are typically housed in a data center and may be physical blade
+servers, traditional rack mounted servers, or virtual machines. VCL can
+also broker access to standalone machines such as a lab computers on a
+university campus.</p>
+<p>One of the primary goals of VCL is to deliver a dedicated compute
+environment to a user for a limited time through a web interface. This
+compute environment can range from something as simple as a virtual machine
+running productivity software to a machine room blade running high end
+software (i.e. a CAD, GIS, statistical package or an Enterprise level
+application) to a cluster of interconnected physical (bare metal) compute
+nodes.</p>
+<p>Also using the scheduling API it can be used to automate the provisioning
+of servers in a server farm or HPC cluster. </p>
+<p>The release supports provisioning nodes using xCAT 1.3, xCAT 2.1, vmware
+server 1.x, ESX standard Server using the toolkit the vmware-cmd on the esx
+host, ESXi using the vmware toolkit.</p>
+<p><a name="VCL2.1-II.VCLRoadmap"></a></p>
+<h4 id="ii-vcl-roadmap">II. VCL Roadmap</h4>
+<p>VCL 2.1 (this release)
+<em> completed modularization of vcld
+</em> xCAT 2.1 support
+<em> Shibboleth authentication
+</em> VMWare management via VMWare toolkit
+<em> ESXi with thin provisioning on a NetApp
+</em> Only supports xCAT 1.3 and xCAT 2.1 versions</p>
+<p>VCL 2.2
+<em> support for xCAT 2.3 or later versions
+</em> -improve cluster reservations- {color:#ff0000}VMWare Free Server
+2.x{color} {color:#000000}(changed after 2.1 release){color}
+* improve block reservations(rename to block allocations)</p>
+<p>VCL 2.3
+<em> Service deployments
+</em> power management
+* -VMWare Free Server 2.x- {color:#ff0000}improve cluster
+reservations{color} {color:#000000}(changed after 2.1 release){color}</p>
+<p>VCL 2.4
+<em> improve hypervisor support
+</em> dynamic provisioning of host servers
+* possibly XEN or KVM</p>
+<p>VCL 2.5
+* develop tools for managing both system and user storage</p>
+<p>With each release, we'll be working toward making VCL easier to install. As
+part of our move to development at the Apache Software Foundation, it is an
+obvious goal to create a community of users and more developers around VCL.
+Bringing in more developers should become easier as VCL becomes easier to
+install.</p>
+<p><a name="VCL2.1-III.GettingInvolvedintheASFVCLCommunity"></a></p>
+<h4 id="iii-getting-involved-in-the-asf-vcl-community">III. Getting Involved in the ASF VCL Community</h4>
+<p>There are five ways to become involved in the ASF VCL community.</p>
+<ul>
+<li>
+<p>Join the mailing lists and participate in discussion. There are two
+mailing lists: vcl-user@incubator.apache.org
+vcl-dev@incubator.apache.org
+To join vcl-user, send an empty message to
+<a href="mailto:vcl-user-subscribe@incubator.apache.org|click-to-subscribe.html">vcl-user-subscribe@incubator.apache.org</a>
+. To join vcl-dev, send an empty
+message to <a href="mailto:vcl-dev-subscribe@incubator.apache.org|click-to-subscribe.html">vcl-dev-subscribe@incubator.apache.org</a>
+.</p>
+</li>
+<li>
+<p>Submit bug reports and feature requests to our JIRA bug tracking system.
+See section IV below for more information on doing this.</p>
+</li>
+<li>
+<p>Create documentation on our Confluence site. Create an account at <a href="http://cwiki.apache.org/confluence/display/VCL/Index">http://cwiki.apache.org/confluence/display/VCL/Index</a>
+ and just start adding content. (Note to current community: We should
+create a page explaining the layout so new people will know where to add
+content better.)</p>
+</li>
+<li>
+<p>Submit patches through the vcl-dev mailing list and via the JIRA bug
+tracking system. Once you have become familiar with VCL, you can begin
+assisting with the development of it by picking a JIRA issue to fix or by
+adding a feature needed at your site. Then, contribute a patch of your
+changes through the JIRA tracking system and send a message to the vcl-dev
+list explaining what you have done.</p>
+</li>
+<li>
+<p>Become an official committer to the project. Once you have shown that you
+have a good grasp of the project by submitting patches, you can further
+join the development work by submitting a contributor license agreement
+(CLA) to ASF and having a committer account created to directly contribute
+code to the project.</p>
+</li>
+</ul>
+<p><a name="VCL2.1-IV.HowtoSubmitBugsandFeatureRequests"></a></p>
+<h4 id="iv-how-to-submit-bugs-and-feature-requests">IV. How to Submit Bugs and Feature Requests</h4>
+<p>If you find a bug, please submit a bug report to our JIRA bug tracking
+system at <a href="http://issues.apache.org/jira/browse/VCL">http://issues.apache.org/jira/browse/VCL</a>
+ (you will need to set up an account there if you haven't already done so -
+it's free to anyone). Also, we would appreciate it if you mentioned that
+you filed a bug on the vcl-dev list to make sure we don't miss it.</p>
+<p>If you would like to requrest a new feature, you can also submit that in
+the same way through JIRA (just select "New Feature" or "Improvement" as
+the Issue Type). Again, it would be helpful if you mentioned that you filed
+a feature
+request on the vcl-dev list.</p>
+<p>After you have created a JIRA issue, you have the option to vote on it to
+help us know how to prioritize issues. You can also "watch" the issue to
+see when activity related to it is submitted.</p>
+<p><a name="VCL2.1-ChangeLog"></a></p>
+<h2 id="change-log">Change Log</h2>
+<p><a name="VCL2.1-Sub-task"></a></p>
+<h4 id="sub-task">Sub-task</h4>
+<ul>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-67">VCL-67</a>
+] -         Allow OS, provisioning engine, and other module objects to
+access each other</li>
+</ul>
+<p><a name="VCL2.1-Bug"></a></p>
+<h4 id="bug">Bug</h4>
+<ul>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-14">VCL-14</a>
+] -         xCAT.pm's capture_monitor output always displays "attempt
+1/80"</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-26">VCL-26</a>
+] -         get_reservation_remote_ip subroutine redefined warning</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-34">VCL-34</a>
+] -         When adding computers, missing requirement for the
+provisioning module</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-51">VCL-51</a>
+] -         user groups that have a name that is a number cause problems
+on the privilege page</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-54">VCL-54</a>
+] -         disable LDAP referrals for all LDAP connections to handle
+firewalls</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-55">VCL-55</a>
+] -         processBulkComputerInput in computers.php not always setting
+startpripaddress, endpripaddress, startmac</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-61">VCL-61</a>
+] -         blockrequest and the reload state</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-62">VCL-62</a>
+] -         Calls to _rpower in Windows.pm cause reservation processes to
+die</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-64">VCL-64</a>
+] -         EmptyRecycleBin.exe utility causes problems during image
+capture</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-69">VCL-69</a>
+] -         Unknown column 'af.shibonly' in 'field list'</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-71">VCL-71</a>
+] -         Reservation processes being killed unexpectedly</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-73">VCL-73</a>
+] -         new.pm::computer_not_being_used hangs occasionally</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-74">VCL-74</a>
+] -         Reservation may fail if user's UID value is null</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-75">VCL-75</a>
+] -         Bug in Perl 5.8.0 causes exit status to be reported
+incorrectly</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-76">VCL-76</a>
+] -         form tags outside of td tags on Edit Image Profiles page</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-79">VCL-79</a>
+] -         error in how the end time for schedule times is computed</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-81">VCL-81</a>
+] -         Image retrieval does not verify if it was successful</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-85">VCL-85</a>
+] -         watchInFlight error appears if image description contains
+special characters</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-88">VCL-88</a>
+] -         vclreload account assumed to match the default affiliation</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-90">VCL-90</a>
+] -         Image reservation for sub-image with "nousercheckout" flag set</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-91">VCL-91</a>
+] -         edit reservation allows saving/updaing image for cluster
+reservations</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-96">VCL-96</a>
+] -         &lt; and &gt; in user's passwords not handled properly</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-101">VCL-101</a>
+] -         forimaging flag causes wrong user when imaging linux in
+reserved.pm</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-103">VCL-103</a>
+] -         vclreload account has invalid curiculumid</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-108">VCL-108</a>
+] -         apostrophe in image name causes AJAX updates to privilege page
+to break</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-109">VCL-109</a>
+] -         viewing requests from timetable not using continuations</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-111">VCL-111</a>
+] -         missing default values for vmtype table</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-119">VCL-119</a>
+] -         Reservations insert log.ending = EOR when they shouldn't</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-126">VCL-126</a>
+] -         get_new_dbh() doesn't return correct value if different
+database is specified</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-129">VCL-129</a>
+] -         LockerWrtUser doesn't work with usernames containing
+underscores</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-131">VCL-131</a>
+] -         utils getdynamicaddress routine - bad regex</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-136">VCL-136</a>
+] -         missing perlpackage for id 6 in module table</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-143">VCL-143</a>
+] -         need to drop allowing new reservations to take priority over
+reload reservations</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-151">VCL-151</a>
+] -         apostrophe in last name can cause an error when adding user to
+database</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-166">VCL-166</a>
+] -         Windows firewall subs not catching "Object already exists" in
+netsh.exe output</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-167">VCL-167</a>
+] -         run_ssh_command not catching host key differs warning messages</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-172">VCL-172</a>
+] -         xCAT21.pm - xcat database is locked at dbdimp.c error</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-186">VCL-186</a>
+] -         Windows images losing default gateway</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-187">VCL-187</a>
+] -         Ubuntu.pm - not  completed</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-191">VCL-191</a>
+] -         path changes in vshpere SDK vmware perl toolkit</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-207">VCL-207</a>
+] -         Predictive reload modules not accounting for machines in block
+computers table</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-213">VCL-213</a>
+] -         Bug in retrieve_image sub in vmware.pm and xCAT.pm calls next
+instead of return</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-218">VCL-218</a>
+] -         vmware.pm may delete image being captured by cleanup process</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-226">VCL-226</a>
+] -         Windows reboot fails - processing another action error</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-238">VCL-238</a>
+] -         Linux.pm  pre-capture routine not shuting down OS</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-240">VCL-240</a>
+] -         utils.pm - insert_reload_request</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-246">VCL-246</a>
+] -         READY flag check for VMware and xCAT is being thrown off by
+other processes running on machines</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-247">VCL-247</a>
+] -         computer with shortname  only in database not being reloaded
+after being used</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-263">VCL-263</a>
+] -         Linux.pm - add default vcl user group</li>
+</ul>
+<p><a name="VCL2.1-Improvement"></a></p>
+<h4 id="improvement">Improvement</h4>
+<ul>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-3">VCL-3</a>
+] -         clean up database</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-6">VCL-6</a>
+] -         update healthcheck.pl to use modularized code</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-15">VCL-15</a>
+] -         modify blockrequest module to use frontend API for scheduling</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-20">VCL-20</a>
+] -         Configuration of sshd port for image retrieval</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-23">VCL-23</a>
+] -         Modularize Windows OS code</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-63">VCL-63</a>
+] -         Remove critical notification if image is configured with a
+user group containing 0 members</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-65">VCL-65</a>
+] -         Remove pagefile from all drives during image capture</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-72">VCL-72</a>
+] -         die and warning signals are not handled by the backend code</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-84">VCL-84</a>
+] -         Prevent users from starting create image until computer is in
+inuse state</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-105">VCL-105</a>
+] -         an image cannot have itself as a subimage</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-106">VCL-106</a>
+] -         mail notifications notify routine</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-107">VCL-107</a>
+] -         User email notifications</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-110">VCL-110</a>
+] -         2 second deley in vcld may cause problems with imaging</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-112">VCL-112</a>
+] -         Provide access to image affiliation data via DataStructure.pm</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-115">VCL-115</a>
+] -         allow user groups with the same name but different
+affiliations</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-118">VCL-118</a>
+] -         Add delay to run_ssh_command() &amp; run_scp_command() retry
+attempts</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-120">VCL-120</a>
+] -         Add subroutine to set IE's runonce registry keys so user isn't
+presented with it</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-124">VCL-124</a>
+] -         locally affiliated users need a way to change their password</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-128">VCL-128</a>
+] -         Update reclaim.pm</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-132">VCL-132</a>
+] -         vcld check_time</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-156">VCL-156</a>
+] -         insert current_image.txt file on kickstart based nodes</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-157">VCL-157</a>
+] -         Add support for xCAT 2.1 partimage format</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-173">VCL-173</a>
+] -         add power_off,power_on,power_reset,power_status routines to
+xCAT21 module</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-175">VCL-175</a>
+] -         Set virtual switch 0 from database value for VMware GSX</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-176">VCL-176</a>
+] -         Prevent vmware.pm from looping 15 times before checking ssh
+during load</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-177">VCL-177</a>
+] -         Remove Windows OS post-load configuration tasks from vmware.pm</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-183">VCL-183</a>
+] -         DataStructure.pm contains duplicate subroutines:
+get_computer_private_ip and get_computer_private_ip_address</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-184">VCL-184</a>
+] -         Update database schema for 2.1 release</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-185">VCL-185</a>
+] -         Modularize Linux OS Code</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-188">VCL-188</a>
+] -         Document Windows tools dependencies</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-190">VCL-190</a>
+] -         Add time configuration and synchronization commands to Windows
+post_load</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-205">VCL-205</a>
+] -         allow esx provisioing module to set MAC addresses</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-212">VCL-212</a>
+] -         Add code to set SysprepStatus registry keys for Windows 6</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-217">VCL-217</a>
+] -         xcat modules - Throttle control</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-228">VCL-228</a>
+] -         Windows image capture fails to delete user profiles because
+file is open</li>
+</ul>
+<p><a name="VCL2.1-NewFeature"></a></p>
+<h4 id="new-feature">New Feature</h4>
+<ul>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-1">VCL-1</a>
+] -         xCAT 2.0 module</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-4">VCL-4</a>
+] -         add support for Shibboleth authentication</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-7">VCL-7</a>
+] -         modify healthcheck.pl to monitor vms</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-18">VCL-18</a>
+] -         allow dynamic change of predictive loading module</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-19">VCL-19</a>
+] -         add configuration of v2 fields for management nodes</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-21">VCL-21</a>
+] -         add check for existance of image libraries</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-29">VCL-29</a>
+] -         author an ESX and ESX 3i provisioning module (using netboot)</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-33">VCL-33</a>
+] -         add user group management to XML RPC API</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-78">VCL-78</a>
+] -         API for backend to allocate computers for block reservations
+via the frontend</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-123">VCL-123</a>
+] -         add Ubuntu Support using the new OS Module framework</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-209">VCL-209</a>
+] -         create a page that will test for required php modules and
+correct configuration</li>
+</ul>
+<p><a name="VCL2.1-Task"></a></p>
+<h4 id="task">Task</h4>
+<ul>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-70">VCL-70</a>
+] -         Create a basic helloworld.pm provisioning module</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-95">VCL-95</a>
+] -         Set Subversion properties for files in repository</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-135">VCL-135</a>
+] -         remove all references to ncsu</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-198">VCL-198</a>
+] -         Release tasks</li>
+<li>[<a href="https://issues.apache.org/jira/browse/VCL-264">VCL-264</a>
+] -         VCL 2.1 RC2 todo items</li>
+</ul>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.2-installation.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.2-installation.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.2-installation.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.2 Installation</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.2 Installation</h1>
+    <p>Steps to install VCL:</p>
+<ol>
+<li>Download and verify a release file. Follow instructions on the <a href="vcl-2.2.html">VCL 2.2 release page</a></li>
+<li><a href="2.2-database-configuration.html">Install the database portion of VCL</a></li>
+<li><a href="2.2-web-code-installation.html">Install the web code</a></li>
+<li><a href="2.2-management-node-installation.html">Install the Management Node code</a></li>
+</ol>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---adding-ldap-authentication.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---adding-ldap-authentication.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---adding-ldap-authentication.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,209 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.2.1 - Adding LDAP Authentication</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.2.1 - Adding LDAP Authentication</h1>
+    <p><a name="VCL2.2.1-AddingLDAPAuthentication-PrerequisitesforyourLDAPserver:"></a></p>
+<h3 id="prerequisites-for-your-ldap-server">Prerequisites for your LDAP server:</h3>
+<ul>
+<li>SSL should be enabled on your LDAP server</li>
+<li>An LDAP&nbsp;account that can look up a user's first and last names, user
+id, and email address (email address is optional) - this will be referred
+to as 'vcllookup' on this page. You can skip this step if anonymous binds
+are enabled on your LDAP server and an anonymous bind will be able to look
+up userids, names, and email addresses.</li>
+<li>If your LDAP server is behind a&nbsp;firewall, you will need to allow
+your VCL web server to access tcp port 636 on your LDAP server</li>
+</ul>
+<p><a name="VCL2.2.1-AddingLDAPAuthentication-PrerequisitesforyourVCLwebserver:"></a></p>
+<h3 id="prerequisites-for-your-vcl-web-server">Prerequisites for your VCL web server:</h3>
+<ul>
+<li><em>php-ldap</em> needs to be installed</li>
+<li>If your LDAP server's SSL certificate is self-signed, your VCL web server
+needs to have the root CA certificate that was used to sign the LDAP server
+certificate installed. On CentOS, information about the certificate needs
+to be added to /etc/pki/tls/certs/ca-bundle.crt - this <a href="adding-ldap-authentication^convert_crt_for_ldapssl.html">script</a>
+ will take as input a file containing the base64 encoded certificate and
+generate the lines that need to be added to the ca-bundle.crt file.</li>
+<li>After adding the certificate, restart httpd:
+{tip}
+service httpd restart
+{tip}</li>
+<li>You can verify that the certificate is properly installed using this
+command:
+{tip}
+openssl s_client -showcerts -CAfile /etc/pki/tls/certs/ca-bundle.crt
+-connect your.ldap.server.here:636
+{tip}
+If you see "Verify return code: 0 (ok)" at the end of the output then it is
+installed correctly. If you see a different return code, then you'll need
+to troubleshoot the problem.</li>
+<li>
+<p>You may need to add a line to <em>/etc/openldap/ldap.conf</em> to point to the
+ca-bundle.crt file. If so, add the following:</p>
+<p>TLS_CACERT /etc/pki/tls/certs/ca-bundle.crt</p>
+</li>
+</ul>
+<p><a name="VCL2.2.1-AddingLDAPAuthentication-AddingLDAPAuthenticationtotheWebCode"></a></p>
+<h3 id="adding-ldap-authentication-to-the-web-code">Adding LDAP Authentication to the Web Code</h3>
+<ul>
+<li>You will need to manually add an entry to the affiliation table in the
+VCL database. Choose a name for the affiliation. This will be appended to
+all userids for the affiliation to distinguish them from other affiliations
+you may configure later. Initials or a short name of your organization are
+a good idea. The affiliation name&nbsp;cannot contain spaces. Use the
+following to add the affiliation, replacing 'EXAMPLE' with the name you
+chose. Take note of the id from the 2nd SQL statement as you will need it
+later. It is the numerical id for this affiliation.
+{tip}
+mysql vcl
+{tip}
+{tip}
+INSERT INTO affiliation (name) VALUES ('EXAMPLE');
+{tip}
+{tip}
+SELECT id FROM affiliation WHERE name = 'EXAMPLE';
+{tip}
+{tip}
+exit
+{tip}</li>
+<li>Edit <em>conf.php</em> and search for "EXAMPLE1 LDAP"</li>
+<li>Uncomment the "EXAMPLE1 LDAP" section by removing the '/<em>' before it and
+the '</em>/' at the end of 'to use this login mechanism'</li>
+<li>Change 'EXAMPLE1 LDAP' to something to match your location, for example
+at NCSU, it is 'NCSU LDAP'. This string is what users will see where they
+select the authentication mechanism to use when logging in.</li>
+<li>Modify the following fields:
+<strong> <em>server</em> - this is the hostname of your LDAP server</strong> <em>binddn</em> - typically, you'll want to use the base DN of your LDAP
+server; for Active Directory, this is usually dc= for each of your domain
+name components. For example, your your domain name was ad.example.org, it
+would be "dc=ad,dc=example,dc=org"
+<strong> <em>userid</em> - this is a string that is added to the userid a user enters
+on the login page. Place a '%s' where the entered userid should go. Some
+examples are:
+<strong><em> %s@example.org
+</em></strong> %s@ad.example.org</strong><em> uid=%s,ou=accounts,dc=example,dc=org'
+<strong> <em>unityid</em> - this is the ldap field that contains a user's login id (for
+Active Directory, this is usually sAMAccountName)</strong> </em>firstname<em> - this is the ldap field that contains a user's first name
+<strong> <em>lastname</em> - this is the ldap field that contains a user's last name</strong> </em>email<em> - this is the ldap field that contains a user's email address
+<strong> <em>defaultemail</em> - if an email address is not provided by the ldap
+server, this will be appended to the end of the userid to create an email
+address. In this case, email notifications will be disabled by default.</strong> </em>masterlogin<em> - this is the vcllookup account referred to in the
+"Prerequisites for your LDAP server" section - comment out this line if
+using anonymous binds
+<strong> <em>masterpwd</em> - password for the masterlogin account - comment out this
+line if using anonymous binds</strong> </em>affiliationid<em> - this is the id from the SELECT statement in the first
+step
+</em><em> </em>help* - this is some text that will show up on the page where users
+select the authentication method explaining why they would select this
+option</li>
+<li>Uncomment the <em>require_once</em> line for <em>ldapauth.php</em> toward the bottom of
+the file</li>
+</ul>
+<p><a name="VCL2.2.1-AddingLDAPAuthentication-TweakifyourLDAPserverhasusersinmultiplecontainers"></a></p>
+<h3 id="tweak-if-your-ldap-server-has-users-in-multiple-containers">Tweak if your LDAP server has users in multiple containers</h3>
+<p>If your LDAP server has users in multiple containers, then the full DN for
+each user must be looked up before doing a bind to the LDAP server to
+authenticate the user. In this case, you'll need to modify
+authentication.php.
+<em> Edit </em>authenciation.php<em>
+</em> Search for "ldapLogin"
+<em> Search for "EXAMPLE1 LDAP" in the function
+</em> Uncomment the block of code it is contained in by removing the '/<em>' at the beginning of the line containing 'EXAMPLE1 LDAP', and removing the '</em>/' at the end of the else that is before '$ldapuser = sprintf($authMechs[](.html)
+['userid'], $userid);'
+<em> change 'EXAMPLE1 LDAP' to match what you changed it to in step 3
+</em> Look for the line containing 'cn=$userid'. If you use 'cn' to look up
+userids in your LDAP server, the line is fine as is. If you use something
+else, such as 'uid', change 'cn' to 'uid' or whatever is used on your LDAP
+server.
+* Save the file</p>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---further-steps-if-using-vmware.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---further-steps-if-using-vmware.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---further-steps-if-using-vmware.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,389 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.2.1 - Further Steps if Using VMware</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.2.1 - Further Steps if Using VMware</h1>
+    <p>If you are using standalone VMware servers (i.e. ones that VCL did not
+deploy using xCAT), you first need to add the VMWare servers; then, you
+need to add the virtual machines. You can either add them individually
+(Adding Individual VMWare Servers/Virtual Machines), or if they have
+sequential hostnames and IP addresses, you can add them all at once (Adding
+Multiple VMWare Servers/Virtual Machines).</p>
+<p>Once you have added at least one computer, you can get to the "Add Single
+Computer" page by going to Manage Computers-&gt;Edit Computer Information and
+clicking Add. You can get to the "Add Multiple Computers" page by doing the
+same thing but checking the "Add Multiple" checkbox.</p>
+<p><a name="VCL2.2.1-FurtherStepsifUsingVMware-AddingIndividualVMwareServers"></a></p>
+<h3 id="adding-individual-vmware-servers">Adding Individual VMware Servers</h3>
+<ol>
+<li>Click <em>Manage Computers</em></li>
+<li>Select the <em>Add Single Computer</em> radio button</li>
+<li>Click <em>Submit</em></li>
+<li>Fill in the following:</li>
+<li>
+<ul>
+<li><em>Hostname</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>IP Address</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>State</em> - vmhostinuse
+{note}Double-check this because you will not be able to change it
+later{note}</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Owner</em> - <a href="mailto:admin@local.html">admin@Local</a></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>RAM</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Processor Speed</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Network Speed</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Type</em> - blade</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Provisioning Engine</em> - xCAT 2.x Provisioning</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Click the checkbox under <em>allcomputers</em></li>
+</ul>
+</li>
+<li>Click <em>Confirm Computer</em></li>
+<li>Click <em>Submit</em></li>
+<li>Select a <em>VM Host Profile</em> these VMware hosts will use.&nbsp; See the <a href="vcl:vmware-configuration.html">VCL:VMware Configuration</a>
+&nbsp;page for more information about VM Host Profiles.&nbsp;
+{info}You can modify the VM Host Profile later if needed{info}</li>
+<li>Click Add Computer
+{info}The computer you just added isn't listed after clicking Submit. This
+is not a problem.{info}</li>
+</ol>
+<p><a name="VCL2.2.1-FurtherStepsifUsingVMware-AddingMultipleVMWareServers"></a></p>
+<h3 id="adding-multiple-vmware-servers">Adding Multiple VMWare Servers</h3>
+<ol>
+<li>Click <em>Manage Computers</em></li>
+<li>Select the <em>Add Multiple Computers</em> radio button</li>
+<li>Click <em>Submit</em></li>
+<li>Fill in the following:</li>
+<li>
+<ul>
+<li><em>Hostname</em> - the hostnames of all the computers must have a numerical
+part that is sequential, use a % as a placeholder where that part would be</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Start value</em> - the first number of the numerical part of the hostname</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>End value</em> - the last number of the numerical part of the hostname</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Start IP Address</em> - if using static public addresses, the IP addresses
+must be sequential; enter the first address here; if using DHCP, just enter
+something like 1.1.1.1</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>End IP address</em> - the last IP address of the sequence; if using DHCP,
+you'll need to enter something that would work out to the last address
+relative to <em>Start IP Address</em> (i.e. if adding 3 computers, use 1.1.1.1 for
+start and 1.1.1.3 for end)</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>State</em> - vmhostinuse
+{note}Double-check this because you will not be able to change it
+later{note}</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Owner</em> - owner of the computer</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>RAM</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Processor Speed</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Network Speed</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Type</em> - blade</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Provisioning Engine</em> - xCAT 2.x</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Check <em>allComputers</em></li>
+</ul>
+</li>
+<li>Click <em>Confirm Computers</em></li>
+<li>Click <em>Submit</em></li>
+<li>Select a <em>VM Host Profile</em> these VMware hosts will use. See the <a href="vcl:vmware-configuration.html">VCL:VMware Configuration</a>
+&nbsp;page for more information about VM Host Profiles.&nbsp;
+{info}You can modify the VM Host Profile later if needed{info}</li>
+<li>Click <em>Add Computers</em></li>
+</ol>
+<p><a name="VCL2.2.1-FurtherStepsifUsingVMware-AddingVirtualMachines"></a></p>
+<h3 id="adding-virtual-machines">Adding Virtual Machines</h3>
+<ol>
+<li>Click <em>Manage Computers</em></li>
+<li>Select the <em>Add Multiple Computers</em> radio button</li>
+<li>Click <em>Submit</em></li>
+<li>Fill in the following:</li>
+<li>
+<ul>
+<li><em>Hostname</em> - the hostnames of all the computers must have a numerical
+part that is sequential, use a % as a placeholder where that part would be</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Start value</em> - the first number of the numerical part of the hostname</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>End value</em> - the last number of the numerical part of the hostname</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Start IP Address</em> - if using static public addresses, the IP addresses
+must be sequential; enter the first address here; if using DHCP, just enter
+something like 1.1.1.1</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>End IP address</em> - the last IP address of the sequence; if using DHCP,
+you'll need to enter something that would work out to the last address
+relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
+start and 1.1.1.3 for end)</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Start private IP Address</em> - similar to Start IP Address, but for the
+private side</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>End private IP Address</em> - similar to the End IP Address but for the
+private side</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Start MAC Address</em> - if mac addresses are sequential, with the first
+one being the private MAC address for the first computer, the second one
+being the public MAC address for the first computer, the third one being
+the private MAC address of the second computer, etc, you can enter the
+first one here and then have the option of generating data to add to your
+dhcpd.conf file later in the process.
+{note}For VMware virtual machines, the MAC addresses you choose must be in
+the range {color:#008000}{<em>}00:50:56:00:00:00{</em>}{color}
+{color:#008000}-{color}{color:#008000}{<em>}00:50:56:3F:FF:FF{</em>}{color}.
+Pay special attention to the upper bound of this range.
+{color:#ff0000}{<em>}00:50:56:40:00:00{</em>}{color} {color:#ff0000}-{color}
+{color:#ff0000}{<em>}00:50:56:FF:FF:FF{</em>}{color} are <em>NOT</em> valid VMware
+virtual machines.{note}</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>State</em> - maintenance</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Owner</em> - owner of the computer</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>RAM</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Processor Speed</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Network Speed</em></li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Type</em> - virtualmachine</li>
+</ul>
+</li>
+<li>
+<ul>
+<li><em>Provisioning Engine</em> - VMware</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Check <em>All VM Computers</em> and <em>newvmimages</em></li>
+</ul>
+</li>
+<li>Click <em>Confirm Computers</em></li>
+<li>Click <em>Submit</em></li>
+<li>If you filled in the private address fields and the Start MAC Address,
+you can now enter the private IP address of the management node that will
+be handling these virtual machines to generate information to add to your
+dhcpd.conf file.</li>
+</ol>
+<p><a name="VCL2.2.1-FurtherStepsifUsingVMware-AssignaVMtoaVirtualHost"></a></p>
+<h3 id="assign-a-vm-to-a-virtual-host">Assign a VM to a Virtual Host</h3>
+<ol>
+<li>Click <em>Virtual Hosts</em></li>
+<li>On the <em>VM Hosts</em> tab, select the virtual host server added previously.</li>
+<li>Click <em>Configure Host</em>, You should see VM limit set to a number along
+with the vm profile, two columns of VM's assigned to host and Unassigned
+VMs.</li>
+<li>Adjust the VM limit to the desired number of vms you would like to run on
+this host. Warning please consult your hypervisor documentation for
+the&nbsp;recommended number of virtual machines to run concurrently for
+your virtual server configuration.</li>
+<li>Select the virtual machine nodes from the Unassigned VMs: column.&nbsp;</li>
+<li>Click Add.</li>
+</ol>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---further-steps-if-using-xcat.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---further-steps-if-using-xcat.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1---further-steps-if-using-xcat.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,193 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.2.1 - Further steps if using xCAT</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.2.1 - Further steps if using xCAT</h1>
+    <p>You can initially add individual computers or multiple computers all
+together. After you have added at least one computer, you will need to go
+to Manage Computers -&gt; Edit Computer Information to additional ones.</p>
+<p><a name="VCL2.2.1-FurtherstepsifusingxCAT-AddingIndividualComputers"></a></p>
+<h3 id="adding-individual-computers">Adding Individual Computers</h3>
+<ol>
+<li>click "Manage Computers"</li>
+<li>select the "Add Single Computer" radio button</li>
+<li>click Submit</li>
+<li>fill in Hostname, IP Address, owner (admin@Local), RAM, Proc Speed,
+Network Speed, select "blade" for Type, select "xCAT 2.x Provisioning" for
+"Provisioning Engine", and click the checkbox under "allcomputers", and
+"newimages"</li>
+<li>click Confirm Computer</li>
+<li>click Submit (don't worry about the fact that the computer you just added
+isn't listed after clicking Submit)</li>
+<li>after you've configured your image library and your management node has
+started checking in, you should be able to make a reservation</li>
+</ol>
+<p><a name="VCL2.2.1-FurtherstepsifusingxCAT-AddingMultipleComputers"></a></p>
+<h3 id="adding-multiple-computers">Adding Multiple Computers</h3>
+<ol>
+<li>click "Manage Computers"</li>
+<li>select the "Add Multiple Computers" radio button</li>
+<li>click Submit</li>
+<li>fill in</li>
+<li>
+<ul>
+<li>Hostname - the hostnames of all the computers must have a numerical part
+that is sequential, use a % as a placeholder where that part would be</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Start value - the first number of the numerical part of the hostname</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>End value - the last number of the numerical part of the hostname</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Start IP Address - if using static public addresses, the IP addresses
+must be sequential; enter the first address here; if using DHCP, just enter
+something like 1.1.1.1</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>End IP address - the last IP address of the sequence; if using DHCP,
+you'll need to enter something that would work out to the last address
+relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
+start and 1.1.1.3 for end)</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Owner - owner of the computer</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>RAM</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Processor Speed</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Network Speed</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Type - blade</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>Provisioning Engine - xCAT 2.x</li>
+</ul>
+</li>
+<li>
+<ul>
+<li>check allComputers and newimages</li>
+</ul>
+</li>
+<li>click Confirm Computer</li>
+<li>click Submit (don't worry about the fact that the computers you just
+added aren't listed after clicking Submit)</li>
+<li>after you've configured your image library and your management node has
+started checking in, you should be able to make a reservation</li>
+</ol>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-database-installation.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-database-installation.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-database-installation.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.2.1 Database Installation</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.2.1 Database Installation</h1>
+    <p>{excerpt:hidden=true}How to install MySQL Server, create the VCL database,
+and import the VCL database schema{excerpt}</p>
+<p><a name="VCL2.2.1DatabaseInstallation-Install&ConfiguretheDatabase"></a></p>
+<h1 id="install-configure-the-database">Install &amp; Configure the Database</h1>
+<ol>
+<li>h2. Download &amp; Extract the Apache VCL Source</li>
+<li>
+<h1 id="if-you-have-not-already-done-so-download-and-the-apache-vcl-source-to">If you have not already done so, download and the Apache VCL source to</h1>
+the database server:
+{tip}wget
+{nolink:http://www.apache.org/dist/incubator/vcl/apache-VCL-2.2.1-incubating.tar.bz2}{tip}</li>
+<li>
+<h1 id="extract-the-files">Extract the files:</h1>
+{tip}tar -jxvf apache-VCL-2.2.1-incubating.tar.bz2{tip}</li>
+<li>h2. Install MySQL Server</li>
+<li>
+<h1 id="install-mysql-server-5x-tipyum-install-mysql-server-45ytip">Install MySQL Server 5.x: {tip}yum install mysql-server -y{tip}</h1>
+</li>
+<li>
+<h1 id="configure-the-mysql-daemon-mysqld-to-start-automatically">Configure the MySQL daemon (mysqld) to start automatically:</h1>
+{tip}/sbin/chkconfig --level 345 mysqld on{tip}</li>
+<li>
+<h1 id="start-the-mysql-daemon">Start the MySQL daemon:</h1>
+{tip}/sbin/service mysqld start{tip}</li>
+<li>
+<h1 id="make-surewzxhzdk4thewzxhzdk5firewallwzxhzdk6on-the-database-server-is">Make sure&nbsp;the&nbsp;firewall&nbsp;on the database server is</h1>
+configured to allow traffic from the web server and management node servers
+to connect to the MySQL&nbsp;daemon TCP port: <em>3306</em>.&nbsp; See the
+firewall documentation for more information. {info}man iptables{info}</li>
+<li>h2. Create&nbsp;the VCL Database</li>
+<li>
+<h1 id="run-the-mysql-command-line-client-tipmysqltip">Run the MySQL command-line client: {tip}mysql{tip}</h1>
+</li>
+<li>
+<h1 id="create-a-database">Create a database:</h1>
+{tip}CREATE DATABASE vcl;{tip}</li>
+<li>
+<h1 id="create-a-user-with-select-insert-update-delete-and-create-temporary">Create a user with SELECT, INSERT, UPDATE, DELETE, and CREATE TEMPORARY</h1>
+TABLES privileges on the database you just created:
+{tip}GRANT SELECT,INSERT,UPDATE,DELETE,CREATE TEMPORARY TABLES ON vcl.* TO
+'<em>vcluser</em>'@'localhost' IDENTIFIED BY '<em>vcluserpassword</em>';{tip}
+{note}Replace <em>vcluser</em> and <em>vcluserpassword</em> with that of the user you
+want to use to connect to the database{note}
+{info}The GRANT command will automatically create the user if it doesn't
+already exist{info}</li>
+<li>
+<h1 id="exit-the-mysql-command-line-client-tipexittip">Exit the MySQL command-line client: {tip}exit{tip}</h1>
+</li>
+<li>
+<h1 id="import-the-vclsql-file-into-the-database">Import the vcl.sql file into the database:</h1>
+{tip}mysql vcl &lt; apache-VCL-2.2.1-incubating/mysql/vcl.sql{tip}
+{info}The <em>vcl.sql</em> file is included in the <em>mysql</em> directory within the
+Apache VCL&nbsp;source code{info}</li>
+<li>h2. Install &amp; Configure phpMyAdmin (Optional):
+{excerpt-include:VCL 2.2.1 phpMyAdmin Installation &amp;
+Configuration|nopanel=true}
+To install phpMyAdmin, follow the instructions on: <a href="vcl:vcl-2.2.1-phpmyadmin-installation-&amp;-configuration.html">VCL:VCL 2.2.1 phpMyAdmin Installation &amp; Configuration</a></li>
+</ol>
+<hr />
+<p>Next step: <a href="vcl:vcl-2.2.1-web-code-installation.html">VCL:VCL 2.2.1 Web Code Installation</a></p>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-installation.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-installation.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-installation.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.2.1 Installation</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.2.1 Installation</h1>
+    <p><a name="VCL2.2.1Installation-Install&Configure:"></a></p>
+<h3 id="install-configure">Install &amp; Configure:</h3>
+<ol>
+<li><a href="vcl:vcl-2.2.1-installation#database.html">Database</a></li>
+<li><a href="vcl:vcl-2.2.1-installation#web.html">Web Components</a></li>
+<li><a href="vcl:vcl-2.2.1-installation#managementnode.html">Management Node Components</a></li>
+</ol>
+<hr />
+<p>{anchor:Database}
+{include:VCL 2.2.1 Database Installation}</p>
+<hr />
+<p>{anchor:Web}
+{include:VCL 2.2.1 Web Code Installation}</p>
+<hr />
+<p>{anchor:ManagementNode}
+{include:VCL 2.2.1 Management Node Installation}</p>
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>

Added: websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-management-node-installation.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-management-node-installation.html (added)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.2.1-management-node-installation.html Tue Jan  8 16:38:15 2013
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+  <link href="/css/code.css" rel="stylesheet" type="text/css">
+  <title>Apache VCL - VCL 2.2.1 Management Node Installation</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="sitetitle">
+    <table width="100%" border="0" cellspacing="0" cellpadding="5">
+      <tr>
+         <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+         <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+      </tr>
+    </table>
+  </div>
+
+  <div id="navigation"> 
+  <ul>
+<li>Information<ul>
+<li><a href="/info/about.html">What is VCL?</a></li>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/info/use-cases.html">Use Cases</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+<li><a href="/info/faq.html">FAQ</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a><ul>
+<li><a href="/docs/using-vcl.html">Using VCL</a></li>
+<li><a href="/docs/image-creation.html">Image Creation</a></li>
+<li><a href="/docs/administration.html">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+<li><a href="/docs/deployment-planning.html">Deployment Planning</a></li>
+</ul>
+</li>
+<li><a href="/comm/index.html">Community</a><ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/comm/index.html#how-do-i-join-the-project">How can I Join</a></li>
+<li><a href="/comm/wiki.html">Wiki</a></li>
+<li><a href="/dev/index.html">Development</a><ul>
+<li><a href="/dev/jira.html">Issue Tracking</a></li>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a><ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+</li>
+</ul>
+  </div>
+  
+  <div id="content">
+    <h1 class="title">VCL 2.2.1 Management Node Installation</h1>
+    
+  </div>
+  
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+  
+</body>
+</html>



Mime
View raw message