ia64/xen-unstable

changeset 1840:567574707ca9

find changesets by author, revision, files, or words in the commit message
bitkeeper revision 1.1108.2.10 (40fcfc64LO8Ls6RtxlZw1nzzYI_gUQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/local/scratch/tw275/xeno.bk
author tw275@labyrinth.cl.cam.ac.uk
date Tue Jul 20 11:05:08 2004 +0000 (2004-07-20)
parents fd7b2f01d894 5c54a15c092f
children bde2c59c2519 bdb9b919d55e a10feaf36803
files .rootkeys tools/python/setup.py tools/python/xen/xend/sv/HTMLBase.py tools/python/xen/xend/sv/inc/bottom.htm tools/python/xen/xend/sv/inc/top.htm
line diff
     1.1 --- a/.rootkeys	Tue Jul 20 10:41:45 2004 +0000
     1.2 +++ b/.rootkeys	Tue Jul 20 11:05:08 2004 +0000
     1.3 @@ -390,9 +390,7 @@ 40fcefb3qNbAZR5FYGPAZ9sFPVMTDA tools/pyt
     1.4  40fcefb3dgsa24WLk_BJeYQHrDLuOg tools/python/xen/xend/sv/images/seperator-right-highlight.jpg
     1.5  40fcefb3FtiX4Pd2kT8wDlp8u8xRhQ tools/python/xen/xend/sv/images/seperator.jpg
     1.6  40fcefb3yMSrZvApO9ToIi-iQwnchA tools/python/xen/xend/sv/images/xen.png
     1.7 -40fcefb310mW7U0p7JMoBQVnjf76xg tools/python/xen/xend/sv/inc/bottom.htm
     1.8  40fcefb3zGC9XNBkSwTEobCoq8YClA tools/python/xen/xend/sv/inc/style.css
     1.9 -40fcefb4oxovdYkUvExZSkHN0cy_Ow tools/python/xen/xend/sv/inc/top.htm
    1.10  40fcefb4rnaZNjqsBu7A5V2rlLyqRw tools/python/xen/xend/sv/util.py
    1.11  40c9c469LNxLVizOUpOjEaTKKCm8Aw tools/python/xen/xend/sxp.py
    1.12  40d05079aFRp6NQdo5wIh5Ly31c0cg tools/python/xen/xm/__init__.py

     2.1 --- a/tools/python/setup.py	Tue Jul 20 10:41:45 2004 +0000
     2.2 +++ b/tools/python/setup.py	Tue Jul 20 11:05:08 2004 +0000
     2.3 @@ -41,6 +41,7 @@ setup(name            = 'xen',
     2.4                           'xen.util',
     2.5                           'xen.xend',
     2.6                           'xen.xend.server',
     2.7 +                         'xen.xend.sv',
     2.8                           'xen.xm',
     2.9                           ],
    2.10        ext_package = "xen.lowlevel",

     3.1 --- a/tools/python/xen/xend/sv/HTMLBase.py	Tue Jul 20 10:41:45 2004 +0000
     3.2 +++ b/tools/python/xen/xend/sv/HTMLBase.py	Tue Jul 20 11:05:08 2004 +0000
     3.3 @@ -4,8 +4,6 @@ from twisted.internet import reactor
     3.4  class HTMLBase( resource.Resource ):
     3.5  	
     3.6      isLeaf = True
     3.7 -    
     3.8 -    defaultPath = "/usr/lib/python2.2/site-packages/xen/xend/sv/"
     3.9  		
    3.10      def __init__( self ):
    3.11          resource.Resource.__init__(self)
    3.12 @@ -22,9 +20,8 @@ class HTMLBase( resource.Resource ):
    3.13  		request.write( "BODY" )
    3.14          
    3.15      def write_TOP( self, request ):
    3.16 -        f = open( self.defaultPath + 'inc/top.htm', 'r' )
    3.17 -        request.write( f.read() )
    3.18 +        request.write( '<html><head><title>Xen</title><link rel="stylesheet" type="text/css" href="inc/style.css" />' )
    3.19 +        request.write( '</head><body>' )
    3.20  
    3.21      def write_BOTTOM( self, request ):
    3.22 -        f = open( self.defaultPath + 'inc/bottom.htm', 'r' )
    3.23 -        request.write( f.read() )
    3.24 \ No newline at end of file
    3.25 +        request.write( "</body></html>" )
    3.26 \ No newline at end of file

     4.1 --- a/tools/python/xen/xend/sv/inc/bottom.htm	Tue Jul 20 10:41:45 2004 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,2 +0,0 @@
     4.4 -	</body>
     4.5 -</html>
     4.6 \ No newline at end of file

     5.1 --- a/tools/python/xen/xend/sv/inc/top.htm	Tue Jul 20 10:41:45 2004 +0000
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,8 +0,0 @@
     5.4 -<html>
     5.5 -    <head>
     5.6 -        <title>
     5.7 -            Xen
     5.8 -        </title>
     5.9 -        <link rel="stylesheet" type="text/css" href="inc/style.css" />
    5.10 -    </head>
    5.11 -	<body>
    5.12 \ No newline at end of file