1.1 --- a/.rootkeys	Thu Jul 10 11:13:53 2003 +0000
     1.2 +++ b/.rootkeys	Thu Jul 10 12:30:31 2003 +0000
     1.3 @@ -11,7 +11,6 @@ 3eca6a96a31IwaKtkEa4jmzwTWlm8Q tools/con
     1.4  3eb781fceEYkUi1XHKf2V0KX7si2JA tools/control/build-cmdline.xml
     1.5  3ec41f7cWCxQ8pdH8ZWqhhv-38qQ1w tools/control/build-web.xml
     1.6  3ec41f7ca6IBXDSe0HVcMPp3PPloOQ tools/control/build.properties
     1.7 -3ec4ebe0g_MI1VqkbbyNB8gt6m0Adg tools/control/docs/empty_dir
     1.8  3eb781fcabCKRogwxJA3-jJKstw9Vg tools/control/domctl.xml
     1.9  3f042c35FzVap5QW0UBPnZ2ZM0l3QA tools/control/src/org/xenoserver/cmdline/CommandParser.java
    1.10  3eb781fdNQvEJW3tNvovjqoN7GlePA tools/control/src/org/xenoserver/cmdline/Main.java
    1.11 @@ -105,9 +104,6 @@ 3ec41f7ef4mVT4vwOEL40MKIzS4EeA tools/con
    1.12  3ec41f7e1-bFRAfSveBhJNc-yQguXQ tools/control/web/tmpl/vd-pv.tmpl
    1.13  3ec41f7e6v7MAKuV03qkOLX94vCGQg tools/control/web/tmpl/vd-vbdc.tmpl
    1.14  3ec41f7eInaxQyoN0zPtGH6O1l0qaA tools/control/web/tmpl/vd-vbdcr.tmpl
    1.15 -3ec41f7e6vb1amZZa0IBdsPkPURj8Q tools/control/web/tmpl/vd-vbdd.tmpl
    1.16 -3ec41f7e678cIPHf9EjP5W6hVcssYA tools/control/web/tmpl/vd-vbdf.tmpl
    1.17 -3ec41f7e0PF1fM5WdSWxgtzcWTV__w tools/control/web/tmpl/vd-vbdfr.tmpl
    1.18  3ec41f7eSe6rb0p4IxLU16czqIaTCA tools/control/web/tmpl/vd-vbdv.tmpl
    1.19  3ec41f7eAYtNdK1Yy-RdGMCcSDNfBA tools/control/web/tmpl/vd-vdc.tmpl
    1.20  3ec41f7eFxwTmuQ8wWMdvVQ5jtiKKA tools/control/web/tmpl/vd-vdcr.tmpl

     2.1 --- a/tools/control/README-web	Thu Jul 10 11:13:53 2003 +0000
     2.2 +++ b/tools/control/README-web	Thu Jul 10 12:30:31 2003 +0000
     2.3 @@ -39,7 +39,6 @@ to run:
     2.4  for development:
     2.5   ## edit xeno.bk/tools/control/build.properties
     2.6   # change manger.url to your xenoserver: mousetrap-0.xeno.cl.cam.ac.uk
     2.7 - # change build.home to your xeno.bk full path 
     2.8   ## to "make install-web" in xeno.bk/tools/control  instead of copying the war file
     2.9   cp $CATALINA_HOME/conf/tomcat-users.xml $CATALINA_HOME/conf/tomcat-users.orig
    2.10   sed -e 's/<tomcat-users>/<tomcat-users>\
  <role rolename="standard"\/>\
  <role rolename="manager"\/>\
  <user username="hobbes" password="tiger" roles="standard,manager"\/>/' $CATALINA_HOME/conf/tomcat-users.orig > $CATALINA_HOME/conf/tomcat-users.xml

     3.1 --- a/tools/control/build-web.xml	Thu Jul 10 11:13:53 2003 +0000
     3.2 +++ b/tools/control/build-web.xml	Thu Jul 10 12:30:31 2003 +0000
     3.3 @@ -109,14 +109,12 @@
     3.4  
     3.5  -->
     3.6  
     3.7 -  <property name="app.name"      value="myapp"/>
     3.8 +  <property name="app.name"      value="xenctl"/>
     3.9    <property name="app.path"      value="/${app.name}"/>
    3.10    <property name="app.version"   value="0.1-dev"/>
    3.11    <property name="build.home"    value="${basedir}/build-web"/>
    3.12    <property name="catalina.home" value="../../../.."/> <!-- UPDATE THIS! -->
    3.13    <property name="dist.home"     value="${basedir}/dist-web"/>
    3.14 -  <property name="docs.home"     value="${basedir}/docs"/>
    3.15 -<!--  <property name="manager.url"   value="http://localhost:8080/manager"/> -->
    3.16    <property name="src.home"      value="${basedir}/src"/>
    3.17    <property name="web.home"      value="${basedir}/web"/>
    3.18  
    3.19 @@ -308,24 +306,16 @@
    3.20  
    3.21    The "dist" target creates a binary distribution of your application
    3.22    in a directory structure ready to be archived in a tar.gz or zip file.
    3.23 -  Note that this target depends on two others:
    3.24 +  Note that this target depends on:
    3.25  
    3.26    * "compile" so that the entire web application (including external
    3.27      dependencies) will have been assembled
    3.28  
    3.29 -  * "javadoc" so that the application Javadocs will have been created
    3.30 -
    3.31  -->
    3.32  
    3.33    <target name="dist" depends="compile"
    3.34     description="Create binary distribution">
    3.35  
    3.36 -    <!-- Copy documentation subdirectories -->
    3.37 -    <mkdir   dir="${dist.home}/docs"/>
    3.38 -    <copy    todir="${dist.home}/docs">
    3.39 -      <fileset dir="${docs.home}"/>
    3.40 -    </copy>
    3.41 -
    3.42      <!-- Create application JAR file -->
    3.43      <jar jarfile="${dist.home}/${app.name}-${app.version}.war"
    3.44           basedir="${build.home}"/>
    3.45 @@ -369,31 +359,6 @@
    3.46    </target>
    3.47  
    3.48  
    3.49 -<!-- ==================== Javadoc Target ================================== -->
    3.50 -
    3.51 -<!--
    3.52 -
    3.53 -  The "javadoc" target creates Javadoc API documentation for the Java
    3.54 -  classes included in your application.  Normally, this is only required
    3.55 -  when preparing a distribution release, but is available as a separate
    3.56 -  target in case the developer wants to create Javadocs independently.
    3.57 -
    3.58 --->
    3.59 -
    3.60 -  <target name="javadoc" depends="compile"
    3.61 -   description="Create Javadoc API documentation">
    3.62 -
    3.63 -    <mkdir          dir="${dist.home}/docs/api"/>
    3.64 -    <javadoc sourcepath="${src.home}"
    3.65 -                destdir="${dist.home}/docs/api"
    3.66 -           packagenames="*">
    3.67 -      <classpath refid="compile.classpath"/>
    3.68 -    </javadoc>
    3.69 -
    3.70 -  </target>
    3.71 -
    3.72 -
    3.73 -
    3.74  <!-- ====================== List Target =================================== -->
    3.75  
    3.76  <!--

     4.1 --- a/tools/control/build.properties	Thu Jul 10 11:13:53 2003 +0000
     4.2 +++ b/tools/control/build.properties	Thu Jul 10 12:30:31 2003 +0000
     4.3 @@ -4,7 +4,4 @@ manager.url=http://<hostname>/manager
     4.4  manager.username=hobbes
     4.5  manager.password=tiger
     4.6  compile.optimize=false
     4.7 -# change <path> to the full path
     4.8 -build.home=<path>/xeno.bk/tools/control/build-xen/build-xen
     4.9 -app.name=xenctl
    4.10  

     6.1 --- a/tools/control/web/tmpl/makefile	Thu Jul 10 11:13:53 2003 +0000
     6.2 +++ b/tools/control/web/tmpl/makefile	Thu Jul 10 12:30:31 2003 +0000
     6.3 @@ -1,9 +1,8 @@
     6.4  src0 = xenostyle.css
     6.5  src1 = index.jsp about.jsp help.jsp vd.jsp \
     6.6         vd-pv.jsp vd-pa.jsp vd-vdv.jsp vd-vdc.jsp vd-vdd.jsp vd-vdr.jsp \
     6.7 -       vd-fv.jsp vd-vbdv.jsp vd-vbdc.jsp vd-vbdd.jsp vd-vbdf.jsp \
     6.8 -       vd-par.jsp vd-vdcr.jsp vd-vddr.jsp vd-vdrr.jsp \
     6.9 -       vd-vbdcr.jsp vd-vbdfr.jsp \
    6.10 +       vd-fv.jsp vd-vbdv.jsp vd-vbdc.jsp \
    6.11 +       vd-par.jsp vd-vdcr.jsp vd-vddr.jsp vd-vdrr.jsp vd-vbdcr.jsp \
    6.12         dom.jsp dom-lis.jsp dom-new.jsp dom-newr.jsp dom-sta.jsp dom-star.jsp \
    6.13         dom-stp.jsp dom-stpr.jsp dom-del.jsp dom-delr.jsp \
    6.14         pd.jsp pd-g.jsp pd-gr.jsp pd-l.jsp pd-r.jsp pd-rr.jsp
    6.15 @@ -13,10 +12,9 @@ target1 = $(target)/index.jsp $(target)/
    6.16            $(target)/vd-pv.jsp $(target)/vd-pa.jsp $(target)/vd-vdv.jsp \
    6.17            $(target)/vd-vdc.jsp $(target)/vd-vdd.jsp $(target)/vd-vdr.jsp \
    6.18            $(target)/vd-fv.jsp $(target)/vd-vbdv.jsp $(target)/vd-vbdc.jsp \
    6.19 -          $(target)/vd-vbdd.jsp $(target)/vd-vbdf.jsp \
    6.20            $(target)/about.jsp $(target)/help.jsp \
    6.21            $(target)/vd-par.jsp $(target)/vd-vdcr.jsp $(target)/vd-vddr.jsp \
    6.22 -          $(target)/vd-vdrr.jsp $(target)/vd-vbdcr.jsp $(target)/vd-vbdfr.jsp \
    6.23 +          $(target)/vd-vdrr.jsp $(target)/vd-vbdcr.jsp \
    6.24            $(target)/dom.jsp $(target)/dom-lis.jsp $(target)/dom-new.jsp \
    6.25            $(target)/dom-newr.jsp $(target)/dom-sta.jsp $(target)/dom-star.jsp \
    6.26            $(target)/dom-stp.jsp $(target)/dom-stpr.jsp \

     7.1 --- a/tools/control/web/tmpl/pd-gr.tmpl	Thu Jul 10 11:13:53 2003 +0000
     7.2 +++ b/tools/control/web/tmpl/pd-gr.tmpl	Thu Jul 10 12:30:31 2003 +0000
     7.3 @@ -51,7 +51,7 @@ Error: No domain specified.<br>
     7.4        {
     7.5  %>
     7.6  output[<%= i %>] =<br>
     7.7 -<%= new CommandPhysicalGrant(d, domain, partitions[i], mode, false).execute() %> <br>
     7.8 +<%= new CommandPhysicalGrant(d, domain, partitions[i], mode, false).executeWeb() %> <br>
     7.9  <%
    7.10        }
    7.11      } catch (NumberFormatException e) {

     8.1 --- a/tools/control/web/tmpl/pd-rr.tmpl	Thu Jul 10 11:13:53 2003 +0000
     8.2 +++ b/tools/control/web/tmpl/pd-rr.tmpl	Thu Jul 10 12:30:31 2003 +0000
     8.3 @@ -30,7 +30,7 @@ Error: No partitions chosen.<br>
     8.4        String partition = partitions[i].substring(partitions[i].indexOf(" ")+1);
     8.5  %>
     8.6  output[<%= i %>] =<br>
     8.7 -<%= new CommandPhysicalRevoke(sc.getDefaults(),domain,partition).execute() %> <br>
     8.8 +<%= new CommandPhysicalRevoke(sc.getDefaults(),domain,partition).executeWeb() %> <br>
     8.9  <%
    8.10      }
    8.11    }

     9.1 --- a/tools/control/web/tmpl/vd-par.tmpl	Thu Jul 10 11:13:53 2003 +0000
     9.2 +++ b/tools/control/web/tmpl/vd-par.tmpl	Thu Jul 10 12:30:31 2003 +0000
     9.3 @@ -40,7 +40,7 @@ Error: chunk size not specified.<br>
     9.4      {
     9.5  %>
     9.6  output[<%= i %>] =<br>
     9.7 -<%= new CommandPartitionAdd(partitions[i], Library.parseSize(size), false).execute() %> <br>
     9.8 +<%= new CommandPartitionAdd(partitions[i], Library.parseSize(size), false).executeWeb() %> <br>
     9.9  <%
    9.10      }
    9.11    }

    10.1 --- a/tools/control/web/tmpl/vd-vbdcr.tmpl	Thu Jul 10 11:13:53 2003 +0000
    10.2 +++ b/tools/control/web/tmpl/vd-vbdcr.tmpl	Thu Jul 10 12:30:31 2003 +0000
    10.3 @@ -57,7 +57,7 @@ Error: No virtual block device number sp
    10.4  output =<br>
    10.5  <%= new CommandVbdCreate(hsrw.getParameter("vd"),
    10.6                                      domain, vbd,
    10.7 -                                     mode).execute()  %>
    10.8 +                                     mode).executeWeb()  %>
    10.9  <%
   10.10      }
   10.11      catch (NumberFormatException e)

    11.1 --- a/tools/control/web/tmpl/vd-vbdd.tmpl	Thu Jul 10 11:13:53 2003 +0000
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,33 +0,0 @@
    11.4 -Delete Virtual Block Devices
    11.5 -SECTION&XenoServers
    11.6 -BREADCRUMB&Virtual Disk Manager&vd.jsp
    11.7 -
    11.8 -<!-- content -->
    11.9 -<img src="pixel.gif" class="block" width="1" height="12">
   11.10 -
   11.11 -<table cellpadding="0" cellspacing="0" border="0">
   11.12 -<tbody>
   11.13 -INCLUDE&vdmenu.tmpl
   11.14 -<td valign="top">
   11.15 -
   11.16 -<table cellpadding="0" cellspacing="0" border="0">
   11.17 -<tbody>
   11.18 -
   11.19 -<tr><td>
   11.20 -Not currently implemented.
   11.21 -</td></tr>
   11.22 -
   11.23 -##WHITESPACE## ##GREYLINE1## ##WHITESPACE##
   11.24 -
   11.25 -</td>
   11.26 -</tbody>
   11.27 -</table>
   11.28 -
   11.29 -</td>
   11.30 -</tbody>
   11.31 -</table>
   11.32 -
   11.33 -
   11.34 -
   11.35 -
   11.36 -<!-- end content -->

    12.1 --- a/tools/control/web/tmpl/vd-vbdf.tmpl	Thu Jul 10 11:13:53 2003 +0000
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,66 +0,0 @@
    12.4 -Flush Virtual Block Devices
    12.5 -SECTION&XenoServers
    12.6 -BREADCRUMB&Virtual Disk Manager&vd.jsp
    12.7 -
    12.8 -<!-- content -->
    12.9 -<img src="pixel.gif" class="block" width="1" height="12">
   12.10 -
   12.11 -<table cellpadding="0" cellspacing="0" border="0">
   12.12 -<tbody>
   12.13 -INCLUDE&vdmenu.tmpl
   12.14 -<td valign="top">
   12.15 -
   12.16 -<form method="post" action="vd-vbdfr.jsp">
   12.17 -<table cellpadding="0" cellspacing="0" border="0">
   12.18 -<tbody>
   12.19 -
   12.20 -<tr><td>
   12.21 -<table cellpadding="2" cellspacing="0" border="0">
   12.22 -<tbody>
   12.23 -  <tr class="vdh"><td>vd key</td><td>dom</td><td>vbd</td><td>mode</td></tr>
   12.24 -
   12.25 -  <%
   12.26 -    for (Iterator i = root.vdm().getVirtualBlockDevices(); i.hasNext();)
   12.27 -    {
   12.28 -      VirtualBlockDevice vbd = (VirtualBlockDevice) i.next();
   12.29 -      VirtualDisk vd = vbd.getVirtualDisk(); 
   12.30 -  %>
   12.31 -    <tr class="vdt">
   12.32 -      <td><%= vd.getKey() %></td>
   12.33 -      <td><%= vbd.getDomain() %></td>
   12.34 -      <td><%= vbd.getVbdNum() %></td>
   12.35 -      <td><%= vbd.getMode().toString() %></td>
   12.36 -    </tr>
   12.37 -  <%
   12.38 -    }
   12.39 -  %>
   12.40 -
   12.41 -</tbody>
   12.42 -</table>
   12.43 -</td></tr>
   12.44 -
   12.45 -##WHITESPACE## ##GREYLINE1## ##WHITESPACE##
   12.46 -
   12.47 -<tr>
   12.48 -  <td><font color="red">Warning, this will remove all virtual block devices</font></td>
   12.49 -</tr>
   12.50 -
   12.51 -<tr>
   12.52 -  <td><input type="submit" value="flush all vbds"></td>
   12.53 -</tr>
   12.54 -
   12.55 -</td>
   12.56 -</tbody>
   12.57 -</table>
   12.58 -
   12.59 -</form>
   12.60 -
   12.61 -
   12.62 -</td>
   12.63 -</tbody>
   12.64 -</table>
   12.65 -
   12.66 -
   12.67 -
   12.68 -
   12.69 -<!-- end content -->

    13.1 --- a/tools/control/web/tmpl/vd-vbdfr.tmpl	Thu Jul 10 11:13:53 2003 +0000
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,32 +0,0 @@
    13.4 -Flush Virtual Block Devices
    13.5 -SECTION&XenoServers
    13.6 -BREADCRUMB&Virtual Disk Manager&vd.jsp
    13.7 -
    13.8 -<!-- content -->
    13.9 -<img src="pixel.gif" class="block" width="1" height="12">
   13.10 -
   13.11 -<table cellpadding="0" cellspacing="0" border="0">
   13.12 -<tbody>
   13.13 -INCLUDE&vdmenu.tmpl
   13.14 -<td valign="top">
   13.15 -
   13.16 -<b>Flush Virtual Block Device Results</b>
   13.17 -<br>
   13.18 -
   13.19 -
   13.20 -<%
   13.21 -  HttpServletRequestWrapper hsrw = new HttpServletRequestWrapper(request);
   13.22 -%>
   13.23 -output = <%= new CommandVbdFlush().execute()  %>
   13.24 -<%
   13.25 -  root.doFlushState();
   13.26 -%>
   13.27 -
   13.28 -</td>
   13.29 -</tbody>
   13.30 -</table>
   13.31 -
   13.32 -
   13.33 -
   13.34 -
   13.35 -<!-- end content -->

    14.1 --- a/tools/control/web/tmpl/vd-vbdv.tmpl	Thu Jul 10 11:13:53 2003 +0000
    14.2 +++ b/tools/control/web/tmpl/vd-vbdv.tmpl	Thu Jul 10 12:30:31 2003 +0000
    14.3 @@ -9,16 +9,26 @@ BREADCRUMB&Virtual Disk Manager&vd.jsp
    14.4  <tbody>
    14.5  INCLUDE&vdmenu.tmpl
    14.6  <td valign="top">
    14.7 -
    14.8 +<%
    14.9 +  CommandVbdList list = new CommandVbdList();
   14.10 +  String output = list.executeWeb();
   14.11 +  VirtualBlockDevice[] vbds = list.vbds();
   14.12 +  if (output != null)
   14.13 +  {
   14.14 +%>
   14.15 +<%= output %>
   14.16 +<%
   14.17 +  } else {
   14.18 +%>
   14.19  <table cellpadding="2" cellspacing="0" border="0">
   14.20  <tbody>
   14.21    <tr class="vdh"><td>dom</td><td>vbd</td><td>mode</td><td>vd key</td><td>vd name</td></tr>
   14.22  
   14.23  
   14.24    <%
   14.25 -    for (Iterator i = root.vdm().getVirtualBlockDevices(); i.hasNext();)
   14.26 +    for (int i=0;i<vbds.length;i++)
   14.27      {
   14.28 -      VirtualBlockDevice vbd = (VirtualBlockDevice) i.next();
   14.29 +      VirtualBlockDevice vbd = vbds[i];
   14.30        VirtualDisk vd = vbd.getVirtualDisk(); 
   14.31    %>
   14.32      <tr class="vdt">
   14.33 @@ -33,6 +43,9 @@ INCLUDE&vdmenu.tmpl
   14.34    %>
   14.35  </tbody>
   14.36  </table>
   14.37 +<%
   14.38 +  }
   14.39 +%>
   14.40  
   14.41  </td>
   14.42  </tbody>

    15.1 --- a/tools/control/web/tmpl/vd-vdcr.tmpl	Thu Jul 10 11:13:53 2003 +0000
    15.2 +++ b/tools/control/web/tmpl/vd-vdcr.tmpl	Thu Jul 10 12:30:31 2003 +0000
    15.3 @@ -64,7 +64,7 @@ Error: expiry time not specified.<br>
    15.4        expiry += System.currentTimeMillis();
    15.5  %>
    15.6  output =<br>
    15.7 -<%= new CommandVdCreate( hsrw.getParameter("name"), Library.parseSize(size), new Date(expiry)).execute() %>
    15.8 +<%= new CommandVdCreate( hsrw.getParameter("name"), Library.parseSize(size), new Date(expiry)).executeWeb() %>
    15.9  <br>
   15.10  <%
   15.11      }

    16.1 --- a/tools/control/web/tmpl/vd-vddr.tmpl	Thu Jul 10 11:13:53 2003 +0000
    16.2 +++ b/tools/control/web/tmpl/vd-vddr.tmpl	Thu Jul 10 12:30:31 2003 +0000
    16.3 @@ -18,7 +18,7 @@ INCLUDE&vdmenu.tmpl
    16.4  
    16.5  vd= <%= hsrw.getParameter("vd") %>
    16.6  
    16.7 -vd= <%= new CommandVdDelete(hsrw.getParameter("vd")).execute() %>
    16.8 +vd= <%= new CommandVdDelete(hsrw.getParameter("vd"),false).executeWeb() %>
    16.9  
   16.10  <%
   16.11    root.doFlushState();

    17.1 --- a/tools/control/web/tmpl/vd-vdrr.tmpl	Thu Jul 10 11:13:53 2003 +0000
    17.2 +++ b/tools/control/web/tmpl/vd-vdrr.tmpl	Thu Jul 10 12:30:31 2003 +0000
    17.3 @@ -56,7 +56,7 @@ Error: expiry time not specified.<br>
    17.4      for (int i = 0; i < vds.length; i++)
    17.5      {
    17.6  %>
    17.7 -vd = <%= new CommandVdRefresh(vds[i], new Date(expiry)).execute() %> <br>
    17.8 +vd = <%= new CommandVdRefresh(vds[i], new Date(expiry)).executeWeb() %> <br>
    17.9  <%
   17.10      }
   17.11    }

    18.1 --- a/tools/control/web/tmpl/vdmenu.tmpl	Thu Jul 10 11:13:53 2003 +0000
    18.2 +++ b/tools/control/web/tmpl/vdmenu.tmpl	Thu Jul 10 12:30:31 2003 +0000
    18.3 @@ -45,12 +45,6 @@
    18.4  <tr>
    18.5    <td class="sidemenu" width="100"><a href="vd-vbdc.jsp">Create</a></td>
    18.6  </tr>
    18.7 -<tr>
    18.8 -  <td class="sidemenu" width="100"><a href="vd-vbdd.jsp">Delete</a></td>
    18.9 -</tr>
   18.10 -<tr>
   18.11 -  <td class="sidemenu" width="100"><a href="vd-vbdf.jsp">Flush</a></td>
   18.12 -</tr>
   18.13  
   18.14  </tbody>
   18.15  </table>