cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [12/19] Move the system vm to a separate maven project.
Date Fri, 20 Sep 2013 10:33:04 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/config/root/userdata.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/userdata.sh b/patches/systemvm/debian/config/root/userdata.sh
deleted file mode 100644
index 83ecdfd..0000000
--- a/patches/systemvm/debian/config/root/userdata.sh
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-# 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.
-
- 
-
-source /root/func.sh
-
-lock="biglock"
-#default timeout value is 30 mins as userdata command is not synchronized on agent side any more,
-#and multiple commands can be sent to the same VR at a time
-locked=$(getLockFile $lock 1800)
-if [ "$locked" != "1" ]
-then
-    exit 1
-fi
-
-usage() {
-  printf "Usage: %s: -v <vm ip> -F <vm data folder> -f <vm data file> -d <data to put in file> \n" $(basename $0) >&2
-  unlock_exit 2 $lock $locked
-}
-
-set -x
-
-PORT=3922
-
-create_htaccess() {
-  local vmIp=$1
-  local folder=$2
-  local file=$3
-
-  local result=0
-
-  entry="RewriteRule ^$file$ ../$folder/%{REMOTE_ADDR}/$file [L,NC,QSA]"
-  htaccessFolder="/var/www/html/latest"
-  htaccessFile=$htaccessFolder/.htaccess
-  mkdir -p $htaccessFolder
-  touch $htaccessFile
-
-# Fixed the issue with checking if record exists, rewrote the else/if logic, reference issue CLOUDSTACK-2053
-
-  if ! grep -Fq "$entry" $htaccessFile
-        then
-                echo -e $entry >> $htaccessFile;
-                result=$?
-  fi
-
-  entry="Options -Indexes\\nOrder Deny,Allow\\nDeny from all\\nAllow from $vmIp"
-  testentry="Allow from $vmIp"
-  htaccessFolder="/var/www/html/$folder/$vmIp"
-  htaccessFile=$htaccessFolder/.htaccess
-  if ! grep -Fq "$testentry" $htaccessFile
-        then
-                mkdir -p $htaccessFolder
-                echo -e $entry > $htaccessFile
-                result=$?
-  fi
-
-
-# Please reference issue CLOUDSTACK-2053, added to fix boto/cloud-init integration
-
-  htaccessFileNoIP="/var/www/html/latest/.htaccess"
-  metadataentry1='RewriteRule ^meta-data/$ ../metadata/%{REMOTE_ADDR}/meta-data [L,NC,QSA]'
-  metadataentry2='RewriteRule ^meta-data/(.*)$ ../metadata/%{REMOTE_ADDR}/$1 [L,NC,QSA]'
-  if ! grep -Fq "$metadataentry1" $htaccessFileNoIP
-        then
-                echo -e "$metadataentry1" >> $htaccessFileNoIP;
-  fi
-
-  if ! grep -Fq "$metadataentry2" $htaccessFileNoIP
-        then
-                echo -e "$metadataentry2" >> $htaccessFileNoIP;
-  fi
-
-  return $result
-}
-
-copy_vm_data_file() {
-  local vmIp=$1
-  local folder=$2
-  local file=$3
-  local dataFile=$4        
-  
-  dest=/var/www/html/$folder/$vmIp/$file
-  metamanifest=/var/www/html/$folder/$vmIp/meta-data
-  chmod +r $dataFile
-  cp $dataFile $dest
-  chmod 644 $dest
-  touch $metamanifest
-  chmod 644 $metamanifest
-  if [ "$folder" == "metadata" ] || [ "$folder" == "meta-data" ]
-  then
-    sed -i '/$file/d' $metamanifest
-    echo $file >> $metamanifest
-  fi
-  return $?
-}
-
-delete_vm_data_file() {
-  local domrIp=$1
-  local vmIp=$2
-  local folder=$3
-  local file=$4
-  
-  vmDataFilePath="/var/www/html/$folder/$vmIp/$file"
-  if [ -f $vmDataFilePath ]; then 
-    rm -rf $vmDataFilePath 
-  fi
-  return $?
-}
-
-vmIp=
-folder=
-file=
-dataFile=
-
-while getopts 'v:F:f:d:' OPTION
-do
-  case $OPTION in
-  v)	vmIp="$OPTARG"
-		;;
-  F)	folder="$OPTARG"
-  		;;
-  f)	file="$OPTARG"
-  		;;
-  d)	dataFile="$OPTARG"
-  		;;
-  ?)    usage
-                unlock_exit 1 $lock $locked
-		;;
-  esac
-done
-
-[ "$vmIp" == "" ]  || [ "$folder" == "" ] || [ "$file" == "" ] && usage 
-[ "$folder" != "userdata" ] && [ "$folder" != "metadata" ] && usage
-
-if [ "$dataFile" != "" ]
-then
-  create_htaccess $vmIp $folder $file
-  
-  if [ $? -gt 0 ]
-  then
-    unlock_exit 1 $lock $locked
-  fi
-  
-  copy_vm_data_file $vmIp $folder $file $dataFile
-else
-  delete_vm_data_file $vmIp $folder $file
-fi
-
-unlock_exit $? $lock $locked

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/config/var/www/html/latest/.htaccess
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/var/www/html/latest/.htaccess b/patches/systemvm/debian/config/var/www/html/latest/.htaccess
deleted file mode 100644
index 038a4c9..0000000
--- a/patches/systemvm/debian/config/var/www/html/latest/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-Options +FollowSymLinks  
-RewriteEngine On
-#RewriteBase /
-
-RewriteRule ^user-data$  ../userdata/%{REMOTE_ADDR}/user-data [L,NC,QSA]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/config/var/www/html/userdata/.htaccess
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/var/www/html/userdata/.htaccess b/patches/systemvm/debian/config/var/www/html/userdata/.htaccess
deleted file mode 100644
index 5a928f6..0000000
--- a/patches/systemvm/debian/config/var/www/html/userdata/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Options -Indexes

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/convert.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/convert.sh b/patches/systemvm/debian/convert.sh
deleted file mode 100755
index 27098a1..0000000
--- a/patches/systemvm/debian/convert.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# 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.
-
-
-
- 
-
-
-begin=$(date +%s)
-echo "Backing up systemvm.img"
-cp systemvm.img systemvm.img.tmp
-echo "Converting raw image to fixed vhd"
-vhd-util convert -s 0 -t 1 -i systemvm.img.tmp -o systemvm.vhd &> /dev/null
-echo "Converting fixed vhd to dynamic vhd"
-vhd-util convert -s 1 -t 2 -i systemvm.vhd -o systemvm.vhd &> /dev/null
-echo "Compressing vhd..."
-bzip2 -c systemvm.vhd > systemvm.vhd.bz2
-echo "Done VHD"
-
-echo "Converting raw image to qcow2"
-qemu-img  convert -f raw -O qcow2 systemvm.img systemvm.qcow2
-echo "Compressing qcow2..."
-bzip2 -c systemvm.qcow2 > systemvm.qcow2.bz2
-echo "Done qcow2"
-echo "Converting raw image to vmdk"
-qemu-img  convert -f raw -O vmdk systemvm.img systemvm.vmdk
-echo "Done creating vmdk"
-echo "Creating ova appliance "
-ovftool systemvm.vmx systemvm.ova
-echo "Done creating OVA"
-echo "Cleaning up..."
-rm -vf systemvm.vmdk
-rm -vf systemvm.vhd.bak
-
-echo "Compressing raw image..."
-bzip2 -c systemvm.img > systemvm.img.bz2
-echo "Done compressing raw image"
-
-echo "Generating md5sums"
-md5sum systemvm.img  > md5sum
-md5sum systemvm.img.bz2  >> md5sum
-md5sum systemvm.vhd  >> md5sum
-md5sum systemvm.vhd.bz2  >> md5sum
-md5sum systemvm.qcow2  >> md5sum
-md5sum systemvm.qcow2.bz2  >> md5sum
-md5sum systemvm.ova  >> md5sum
-fin=$(date +%s)
-t=$((fin-begin))
-echo "Finished compressing/converting image in $t seconds"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/qemuconvert.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/qemuconvert.sh b/patches/systemvm/debian/qemuconvert.sh
deleted file mode 100755
index dc8eb15..0000000
--- a/patches/systemvm/debian/qemuconvert.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# 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.
-
-
-
- 
-
-echo "Converting raw image to qcow2"
-qemu-img  convert -f raw -O qcow2 systemvm.img systemvm.qcow2
-echo "Compressing qcow2..."
-bzip2 -c systemvm.qcow2 > systemvm.qcow2.bz2
-echo "Done qcow2"
-echo "Converting raw image to vmdk"
-qemu-img  convert -f raw -O vmdk systemvm.img systemvm.vmdk
-echo "Compressing vmdk..."
-bzip2 -c systemvm.vmdk > systemvm.vmdk.bz2
-echo "Done vmdk"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/systemvm.vmx
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/systemvm.vmx b/patches/systemvm/debian/systemvm.vmx
deleted file mode 100644
index 9b93449..0000000
--- a/patches/systemvm/debian/systemvm.vmx
+++ /dev/null
@@ -1,37 +0,0 @@
-config.version = "8"
-displayname = "systemvm"
-ethernet0.addressType = "generated"
-ethernet0.connectionType = "bridged"
-ethernet0.present = "true"
-ethernet0.startConnected = "true"
-ethernet0.virtualDev = "e1000"
-floppy0.autodetect = "false"
-floppy0.fileType = "device"
-floppy0.present = "true"
-floppy0.startConnected = "false"
-guestos = "debian5"
-ide0:0.deviceType = "disk"
-ide0:0.fileName = "systemvm.vmdk"
-ide0:0.present = "true"
-ide1:0.autodetect = "true"
-ide1:0.deviceType = "atapi-cdrom"
-ide1:0.present = "true"
-ide1:0.startConnected = "false"
-memsize = "256"
-numvcpus = "1"
-pciBridge0.present = "TRUE"
-pciBridge4.functions = "8"
-pciBridge4.present = "TRUE"
-pciBridge4.virtualDev = "pcieRootPort"
-pciBridge5.functions = "8"
-pciBridge5.present = "TRUE"
-pciBridge5.virtualDev = "pcieRootPort"
-pciBridge6.functions = "8"
-pciBridge6.present = "TRUE"
-pciBridge6.virtualDev = "pcieRootPort"
-pciBridge7.functions = "8"
-pciBridge7.present = "TRUE"
-pciBridge7.virtualDev = "pcieRootPort"
-svga.autodetect = "true"
-virtualhw.version = "7"
-vmci0.present = "TRUE"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/systemvm.xml
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/systemvm.xml b/patches/systemvm/debian/systemvm.xml
deleted file mode 100644
index fffc077..0000000
--- a/patches/systemvm/debian/systemvm.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-  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.
--->
-<domain type='kvm' id='4'>
-  <name>systemvm2</name>
-  <memory>1572864</memory>
-  <currentMemory>1572864</currentMemory>
-  <vcpu>1</vcpu>
-  <os>
-    <type arch='i686' >hvm</type>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <!--<emulator>/usr/bin/qemu-system-x86_64</emulator>-->
-    <emulator>/usr/bin/qemu-kvm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw' cache='writeback'/>
-      <source file='/var/lib/images/systemvm2/systemvm.img'/>
-      <!-- <target dev='hda' bus='ide'/> -->
-      <target dev='vda' bus='virtio'/>
-    </disk>
-    <interface type='network'>
-      <mac address='52:54:00:65:a8:eb'/>
-      <source network='default'/>
-      <target dev='vnet0'/>
-      <model type='virtio' />
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5900' autoport='yes'/>
-  </devices>
-</domain>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vhdconvert.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vhdconvert.sh b/patches/systemvm/debian/vhdconvert.sh
deleted file mode 100755
index 0b0dbfb..0000000
--- a/patches/systemvm/debian/vhdconvert.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-# 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.
-
-
-
- 
-
-# BUILDING vhd-util on Linux
-# The xen repository has a tool called vhd-util that compiles and runs on any linux system 
-# (http://xenbits.xensource.com/xen-4.0-testing.hg?file/8e8dd38374e9/tools/blktap2/vhd/ or full Xen source at http://www.xen.org/products/xen_source.html).
-# Apply this patch: http://lists.xensource.com/archives/cgi-bin/mesg.cgi?a=xen-devel&i=006101cb22f6%242004dd40%24600e97c0%24%40zhuo%40cloudex.cn.
-# Build the vhd-util tool:
-#    cd tools/blktap2
-#    make
-#    sudo make install
-
-echo "Backing up systemvm.img"
-cp systemvm.img systemvm.img.tmp
-echo "Converting raw image to fixed vhd"
-vhd-util convert -s 0 -t 1 -i systemvm.img.tmp -o systemvm.vhd
-echo "Converting fixed vhd to dynamic vhd"
-vhd-util convert -s 1 -t 2 -i systemvm.vhd -o systemvm.vhd
-echo "Compressing..."
-bzip2 -c systemvm.vhd > systemvm.vhd.bz2
-echo "Done"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vpn/etc/ipsec.conf
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.conf b/patches/systemvm/debian/vpn/etc/ipsec.conf
deleted file mode 100644
index dc363b3..0000000
--- a/patches/systemvm/debian/vpn/etc/ipsec.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Manual:     ipsec.conf.5
-version	2.0	
-
-config setup
-	nat_traversal=yes
-	virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12
-	protostack=auto
-	
-include /etc/ipsec.d/*.conf

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf b/patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf
deleted file mode 100644
index 7459e25..0000000
--- a/patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-conn L2TP-PSK
-        authby=secret
-        pfs=no
-        rekey=no
-        keyingtries=3
-        #
-        # ----------------------------------------------------------
-        # The VPN server.
-        #
-        # Allow incoming connections on the external network interface.
-        # If you want to use a different interface or if there is no
-        # defaultroute, you can use:   left=your.ip.addr.ess
-        #
-        left=172.26.0.151
-        #
-        leftprotoport=17/1701
-        # If you insist on supporting non-updated Windows clients,
-        # you can use:    leftprotoport=17/%any
-        #
-        # ----------------------------------------------------------
-        # The remote user(s).
-        #
-        # Allow incoming connections only from this IP address.
-        right=%any
-        # If you want to allow multiple connections from any IP address,
-        # you can use:    right=%any
-        #
-        rightprotoport=17/%any
-        #
-        # ----------------------------------------------------------
-        # Change 'ignore' to 'add' to enable this configuration.
-        #
-        auto=add

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vpn/etc/ipsec.secrets
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.secrets b/patches/systemvm/debian/vpn/etc/ipsec.secrets
deleted file mode 100644
index d9a9a43..0000000
--- a/patches/systemvm/debian/vpn/etc/ipsec.secrets
+++ /dev/null
@@ -1,2 +0,0 @@
-include /var/lib/openswan/ipsec.secrets.inc
-include /etc/ipsec.d/ipsec.*.secrets

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd b/patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd
deleted file mode 100644
index 08c301b..0000000
--- a/patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd
+++ /dev/null
@@ -1,14 +0,0 @@
-proxyarp
-ipcp-accept-local
-ipcp-accept-remote
-noccp
-idle 1800
-auth
-crtscts
-mtu 1410
-mru 1410
-nodefaultroute
-debug
-lock
-connect-delay 5000
-ms-dns 10.1.1.1

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf b/patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf
deleted file mode 100644
index 574eab1..0000000
--- a/patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[lns default]
-ip range = 10.1.9.2-10.1.9.8
-local ip = 10.1.9.1
-require chap = yes
-refuse pap = yes
-pppoptfile =    /etc/ppp/options.xl2tpd

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh b/patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh
deleted file mode 100755
index 0595869..0000000
--- a/patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/bash
-# 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.
-
- 
-
-
-#set -x
-usage() {
-  printf "Usage:\n"
-  printf "Create VPN     : %s -c -r <ip range for clients> -l <local ip> -p <ipsec psk> -s <public ip> -D <eth for public ip> -z < zone cidr>  \n" $(basename $0)
-  printf "Delete VPN     : %s -d -l <local ip> -s <public ip> -D <eth for public ip> -z < zone cidr> \n" $(basename $0)
-  printf "Add VPN User   : %s -u <username,password> \n" $(basename $0)
-  printf "Remote VPN User: %s -U <username \n" $(basename $0)
-}
-
-iptables_() {
-  local op=$1
-  local public_ip=$2
-
-  sudo iptables $op INPUT -i $dev -d $public_ip -p udp --dport 500 -j ACCEPT
-  sudo iptables $op INPUT -i $dev -d $public_ip -p udp --dport 4500 -j ACCEPT
-  sudo iptables $op INPUT -i $dev -d $public_ip -p udp --dport 1701 -j ACCEPT
-  sudo iptables $op INPUT -i $dev -p ah -j ACCEPT
-  sudo iptables $op INPUT -i $dev -p esp -j ACCEPT
-  sudo iptables $op FORWARD -i ppp+ -d $zcidr -j ACCEPT
-  sudo iptables $op FORWARD -i ppp+ -o ppp+ -j ACCEPT 
-  sudo iptables $op INPUT -i ppp+ -p udp --dport 53 -j ACCEPT
-  sudo iptables $op INPUT -i ppp+ -p tcp --dport 53 -j ACCEPT
-  sudo iptables -t nat $op PREROUTING -i ppp+ -p udp --dport 53 -j DNAT --to-destination $local_ip
-  sudo iptables -t nat $op PREROUTING -i ppp+ -p tcp --dport 53 -j DNAT --to-destination $local_ip
-}
-
-ipsec_server() {
-  local op=$1
-  if [ "$op" == "restart" ]
-  then
-    service ipsec stop
-    service xl2tpd stop
-    service ipsec start
-    service xl2tpd start
-    return $?
-  fi
-  service ipsec $op
-  service xl2tpd $op
-}
-
-create_l2tp_ipsec_vpn_server() {
-  local ipsec_psk=$1
-  local public_ip=$2
-  local client_range=$3
-  local local_ip=$4
-
-  sed -i -e "s/left=.*$/left=$public_ip/" /etc/ipsec.d/l2tp.conf
-  echo ": PSK \"$ipsec_psk\"" > /etc/ipsec.d/ipsec.any.secrets
-  sed -i -e "s/^ip range = .*$/ip range = $client_range/"  /etc/xl2tpd/xl2tpd.conf
-  sed -i -e "s/^local ip = .*$/local ip = $local_ip/"  /etc/xl2tpd/xl2tpd.conf
-
-  sed -i -e "s/^ms-dns.*$/ms-dns $local_ip/" /etc/ppp/options.xl2tpd
-
-  iptables_ "-D" $public_ip
-  iptables_ "-I" $public_ip
-
-  ipsec_server "restart"
-
-  ipsec auto --rereadsecrets 
-  ipsec auto --replace L2TP-PSK
-}
-
-destroy_l2tp_ipsec_vpn_server() {
-  local public_ip=$1
-
-  ipsec auto --down L2TP-PSK
-
-  iptables_ "-D" $public_ip
-   
-  ipsec_server "stop"
-}
-
-remove_l2tp_ipsec_user() {
-  local u=$1
-  sed -i -e "/^$u .*$/d" /etc/ppp/chap-secrets
-  if [ -x /usr/bin/tdbdump ]; then
-     pid=$(tdbdump /var/run/pppd2.tdb | grep -w $u | awk -F';' '{print $4}' | awk -F= '{print $2}')
-     [ "$pid" != "" ] && kill -9 $pid
-  fi
-  return 0
-}
-
-add_l2tp_ipsec_user() {
-  local u=$1
-  local passwd=$2
-
-  remove_l2tp_ipsec_user $u
-  echo "$u * $passwd *" >> /etc/ppp/chap-secrets
-}
-
-rflag=
-pflag=
-lflag=
-sflag=
-create=
-destroy=
-useradd=
-userdel=
-
-while getopts 'cdl:p:r:s:u:U:D:z' OPTION
-do
-  case $OPTION in
-  c)	create=1
-		;;
-  d)	destroy=1
-		;;
-  u)	useradd=1
-		user_pwd="$OPTARG"
-		;;
-  U)	userdel=1
-		user="$OPTARG"
-		;;
-  r)	rflag=1
-		client_range="$OPTARG"
-		;;
-  p)	pflag=1
-		ipsec_psk="$OPTARG"
-		;;
-  l)	lflag=1
-		local_ip="$OPTARG"
-		;;
-  s)	sflag=1
-		server_ip="$OPTARG"
-		;;
-  D)    dev="$OPTARG"
-                ;;
-  z)    zcidr="$OPTARG"
-                ;;
-  ?)	usage
-		exit 2
-		;;
-  esac
-done
-
-[ "$create$destroy" == "11" ] || [ "$create$destroy$useradd$userdel" == "" ] && usage && exit 2
-[ "$create" == "1" ] && [ "$lflag$pflag$rflag$sflag" != "1111" ] && usage && exit 2
-
-if [ "$create" == "1" ]; then
-  create_l2tp_ipsec_vpn_server $ipsec_psk $server_ip $client_range $local_ip
-  exit $?
-fi
-
-if [ "$destroy" == "1" ]; then
-  destroy_l2tp_ipsec_vpn_server $server_ip
-  exit $?
-fi
-
-if [ "$useradd" == "1" ]; then
-  u=$(echo $user_pwd | awk -F',' '{print $1}')
-  pwd=$(echo $user_pwd | awk -F',' '{print $2}')
-  add_l2tp_ipsec_user $u $pwd
-  exit $?
-fi
-if [ "$userdel" == "1" ]; then
-  remove_l2tp_ipsec_user $user 
-  exit $?
-fi

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh b/patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
deleted file mode 100755
index 79661c8..0000000
--- a/patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/bash
-# 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.
-
- 
-
-
-#set -x
-usage() {
-  printf "Usage:\n"
-  printf "Create VPN     : %s -c -r <ip range for clients> -l <localip> -p <ipsec psk> -s <public ip> \n" $(basename $0)
-  printf "Delete VPN     : %s -d -s <public ip>\n" $(basename $0)
-  printf "Add VPN User   : %s -u <username,password> \n" $(basename $0)
-  printf "Remote VPN User: %s -U <username \n" $(basename $0)
-}
-
-get_intf_ip() {
-  ip addr show $1 | grep -w inet | awk '{print $2}' | awk -F'/' '{print $1}'
-}
-
-
-iptables_() {
-   local op=$1
-   local public_ip=$2
-   local public_if="eth2"
-   local subnet_if="eth0"
-   local subnet_ip=$(get_intf_ip $subnet_if)
-
-   sudo iptables $op INPUT -i $public_if --dst $public_ip -p udp -m udp --dport 500 -j ACCEPT
-   sudo iptables $op INPUT -i $public_if --dst $public_ip -p udp -m udp --dport 4500 -j ACCEPT
-   sudo iptables $op INPUT -i $public_if --dst $public_ip -p udp -m udp --dport 1701 -j ACCEPT
-   sudo iptables $op INPUT -i eth2 -p ah -j ACCEPT
-   sudo iptables $op INPUT -i eth2 -p esp -j ACCEPT
-   sudo iptables $op FORWARD -i ppp+ -o $subnet_if -j ACCEPT 
-   sudo iptables $op FORWARD -i $subnet_if -o ppp+ -j ACCEPT 
-   sudo iptables $op FORWARD -i ppp+ -o ppp+ -j ACCEPT 
-   sudo iptables $op INPUT -i ppp+ -m udp -p udp --dport 53 -j ACCEPT
-   sudo iptables $op INPUT -i ppp+ -m tcp -p tcp --dport 53 -j ACCEPT
-   sudo iptables -t nat $op PREROUTING -i ppp+ -p tcp -m tcp --dport 53 -j  DNAT --to-destination $subnet_ip
-
-   if sudo iptables -t mangle -N VPN_$public_ip &> /dev/null
-   then
-     logger -t cloud "$(basename $0): created VPN chain in PREROUTING mangle"
-     sudo iptables -t mangle -I PREROUTING -d $public_ip -j VPN_$public_ip
-     sudo iptables -t mangle -A VPN_$public_ip -j RETURN
-   fi
-   op2="-D"
-   [ "$op" == "-A" ] && op2="-I"
-   sudo iptables -t mangle $op VPN_$public_ip  -p ah -j ACCEPT
-   sudo iptables -t mangle $op VPN_$public_ip  -p esp -j ACCEPT
-}
-
-ipsec_server() {
-   local op=$1
-   if [ "$op" == "restart" ]; then
-     service ipsec stop
-     service xl2tpd stop
-     service ipsec start
-     service xl2tpd start
-     return $?
-   fi
-   service ipsec $op
-   service xl2tpd $op
-}
-
-create_l2tp_ipsec_vpn_server() {
-   local ipsec_psk=$1
-   local public_ip=$2
-   local client_range=$3
-   local local_ip=$4
-
-   sed -i -e "s/left=.*$/left=$public_ip/" /etc/ipsec.d/l2tp.conf
-   echo ": PSK \"$ipsec_psk\"" > /etc/ipsec.d/ipsec.any.secrets
-   sed -i -e "s/^ip range = .*$/ip range = $client_range/"  /etc/xl2tpd/xl2tpd.conf
-   sed -i -e "s/^local ip = .*$/local ip = $local_ip/"  /etc/xl2tpd/xl2tpd.conf
-
-   sed -i -e "s/^ms-dns.*$/ms-dns $local_ip/" /etc/ppp/options.xl2tpd
-
-   iptables_ "-D" $public_ip
-   iptables_ "-I" $public_ip
-
-   ipsec_server "restart"
-
-   ipsec auto --rereadsecrets 
-   ipsec auto --replace L2TP-PSK
-}
-
-destroy_l2tp_ipsec_vpn_server() {
-   local public_ip=$1
-
-   ipsec auto --down L2TP-PSK
-
-   iptables_ "-D" $public_ip
-   
-   ipsec_server "stop"
-}
-
-remove_l2tp_ipsec_user() {
-   local u=$1
-   sed -i -e "/^$u .*$/d" /etc/ppp/chap-secrets
-   if [ -x /usr/bin/tdbdump ]; then
-      pid=$(tdbdump /var/run/pppd2.tdb | grep -w $u | awk -F';' '{print $4}' | awk -F= '{print $2}')
-      [ "$pid" != "" ] && kill -9 $pid
-   fi
-   return 0
-}
-
-add_l2tp_ipsec_user() {
-   local u=$1
-   local passwd=$2
-
-   remove_l2tp_ipsec_user $u
-   echo "$u * $passwd *" >> /etc/ppp/chap-secrets
-}
-
-rflag=
-pflag=
-lflag=
-sflag=
-create=
-destroy=
-useradd=
-userdel=
-
-while getopts 'cdl:p:r:s:u:U:' OPTION
-do
-  case $OPTION in
-  c)	create=1
-		;;
-  d)	destroy=1
-		;;
-  u)	useradd=1
-		user_pwd="$OPTARG"
-		;;
-  U)	userdel=1
-		user="$OPTARG"
-		;;
-  r)	rflag=1
-		client_range="$OPTARG"
-		;;
-  p)	pflag=1
-		ipsec_psk="$OPTARG"
-		;;
-  l)	lflag=1
-		local_ip="$OPTARG"
-		;;
-  s)	sflag=1
-		server_ip="$OPTARG"
-		;;
-  ?)	usage
-		exit 2
-		;;
-  esac
-done
-
-[ "$create$destroy" == "11" ] || [ "$create$destroy$useradd$userdel" == "" ] && usage && exit 2
-[ "$create" == "1" ] && [ "$lflag$pflag$rflag$sflag" != "1111" ] && usage && exit 2
-
-if [ "$create" == "1" ]; then
-    create_l2tp_ipsec_vpn_server $ipsec_psk $server_ip $client_range $local_ip
-    exit $?
-fi
-
-if [ "$destroy" == "1" ]; then
-   destroy_l2tp_ipsec_vpn_server $server_ip
-   exit $?
-fi
-
-if [ "$useradd" == "1" ]; then
-   u=$(echo $user_pwd | awk -F',' '{print $1}')
-   pwd=$(echo $user_pwd | awk -F',' '{print $2}')
-   add_l2tp_ipsec_user $u $pwd
-   exit $?
-fi
-if [ "$userdel" == "1" ]; then
-   remove_l2tp_ipsec_user $user 
-   exit $?
-fi

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/xe/xe-daemon
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/xe/xe-daemon b/patches/systemvm/debian/xe/xe-daemon
deleted file mode 100644
index bc514d7..0000000
--- a/patches/systemvm/debian/xe/xe-daemon
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-LANG="C"
-export LANG
-
-usage() {
-    echo "$0 [ -p <pidfile> ]" >&2
-    exit 1
-}
-
-# Parse command line opts
-while [ $# -ne 0 ] ; do
-    arg="$1"
-    shift
-    case "$arg" in
-        "-p")
-            [ $# -eq 0 ] && usage
-            pidfile="$1"
-            shift
-            mkdir -p "$(dirname "$pidfile")"
-            echo $$ > "$pidfile"
-            ;;
-        *)
-            usage
-            ;;
-    esac
-done
-
-XE_UPDATE_GUEST_ATTRS=${XE_UPDATE_GUEST_ATTRS:-/usr/sbin/xe-update-guest-attrs}
-XE_DAEMON_RATE=${XE_DAEMON_RATE:-60}                    # run once a minute by default
-XE_MEMORY_UPDATE_DIVISOR=${XE_MEMORY_UPDATE_DIVISOR:-2}  # update mem stats 1/2 as often by dflt
-
-# Delete xenstore cache following each reboot
-rm -rf /var/cache/xenstore
-
-MEMORY_UPDATE_COUNTER=0
-while true ; do 
-    if [ ${MEMORY_UPDATE_COUNTER} -eq 0 ] ; then
-	MEMORY=--memory
-	MEMORY_UPDATE_COUNTER=${XE_MEMORY_UPDATE_DIVISOR}
-    else
-	MEMORY=
-    fi
-    MEMORY_UPDATE_COUNTER=$((${MEMORY_UPDATE_COUNTER} - 1))
-    ${XE_UPDATE_GUEST_ATTRS} ${MEMORY}
-
-    sleep ${XE_DAEMON_RATE}
-done

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/xe/xe-linux-distribution
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/xe/xe-linux-distribution b/patches/systemvm/debian/xe/xe-linux-distribution
deleted file mode 100644
index 774f1c7..0000000
--- a/patches/systemvm/debian/xe/xe-linux-distribution
+++ /dev/null
@@ -1,267 +0,0 @@
-#! /bin/sh
-
-# 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.
-
-# Script to write information about the current distribution to stdout or a file.
-# Information collected:
-#   - Distribution name
-#   - Distribution version (major and minor)
-#   - Kernel version (uname)
-
-LANG="C"
-export LANG
-
-
-write_to_output()
-{
-    local distro="$1"
-    local major="$2"
-    local minor="$3"
-    local name="$4"
-    local uname=$(uname -r)
-
-    if [ -n "${TEST_RESULT}" ] ; then
-	MAJOR=$major
-	MINOR=$minor
-	DISTRO=$distro
-	UNAME=$uname
-	return 0
-    fi
-
-    echo "os_distro=\"${distro}\""
-    echo "os_majorver=\"${major}\""
-    echo "os_minorver=\"${minor}\""
-    echo "os_uname=\"${uname}\""
-    echo "os_name=\"${name}\""
-
-    return 0
-}
-
-identify_debian()
-{
-    local debian_version="$1"
-    local major
-    local minor
-
-    # 3.1
-    # 4.0
-    # Ignores testing and unstable which contain ".*/sid".
-
-    if [ ! -f "${debian_version}" ] ; then
-	return 1
-    fi
-
-    eval $(awk -F. '/^[0-9]*\.[0-9]*/ \
-                        { print "major="$1 ; print "minor="$2 ; exit 0 }' \
-                   "${debian_version}")
-    
-    if [ -z "${major}" ] && [ -z "${minor}" ] && ! grep -q /sid "${debian_version}" ; then
-	return 1
-    fi
-
-    write_to_output "debian" "${major}" "${minor}" "Debian $(head -n 1 $debian_version)"
-
-    return 0
-}
-
-identify_redhat()
-{
-    redhat_release="$1"
-    local distro
-    local major
-    local minor
-    local beta
-
-    # distro=rhel
-    # Red Hat Enterprise Linux AS release 3 (Taroon Update 6)
-    # Red Hat Enterprise Linux AS release 3 (Taroon Update 8)
-    # Red Hat Enterprise Linux AS release 4 (Nahant)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 1)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 2)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 3)
-    # Red Hat Enterprise Linux AS release 4 (Nahant Update 4)
-    # Red Hat Enterprise Linux Server release 4.92 (Tikanga)
-    # Red Hat Enterprise Linux Server release 5 (Tikanga)
-    # Red Hat Enterprise Linux Server release 5.1 Beta (Tikanga)
-
-    # distro=xe-ddk
-    # \@PRODUCT_BRAND\@ DDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@)
-    # Rio DDK release 0.5.6-2991c (xenenterprise)
-
-    # distro=xe-sdk
-    # \@PRODUCT_BRAND\@ SDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@)
-    # Rio SDK release 0.5.6-2991c (xenenterprise)
-
-    # distro=fedora
-    # Fedora Core release 3 (Heidelberg)
-
-    # distro=centos
-    # CentOS release 4.0 (Final)
-    # CentOS release 5 (Final)
-
-    # distro=oracle
-    # Enterprise Linux Enterprise Linux Server release 5 (Carthage)
-    
-    if [ ! -f "${redhat_release}" ] ; then
-	return 1
-    fi
-
-    eval $(sed -n \
-               -e 's/^\(.*\) DDK release \(.*\)-\(.*\) (.*)$/distro=xe-ddk;major=\2;minor=\3/gp;' \
-               -e 's/^\(.*\) SDK release \(.*\)-\(.*\) (.*)$/distro=xe-sdk;major=\2;minor=\3/gp;' \
-               -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\) (.* Update \(.*\))$/distro=rhel;major=\1;minor=\2/gp;'\
-               -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\) (.*)$/distro=rhel;major=\1/gp;' \
-               -e 's/^Red Hat Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) \([Bb]eta \)\?(.*)$/distro=rhel;major=\1;minor=\2;beta=\3;/gp;' \
-               -e 's/^Fedora.*release \([0-9]*\) (.*)$/distro=fedora;major=\1/gp;' \
-               -e 's/^CentOS release \([0-9]*\)\.\([0-9]*\) (.*)/distro=centos;major=\1;minor=\2/gp;' \
-               -e 's/^CentOS release \([0-9]*\) (.*)/distro=centos;major=\1/gp;' \
-               -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=oracle;major=\1;minor=\2;/gp;' \
-               -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\) (.*)$/distro=oracle;major=\1/gp;' \
-                         "${redhat_release}")
-
-    if [ -z "${major}" -o -z "${distro}" ] ; then
-        return 1
-    fi
-
-    if [ -z "${minor}" ] ; then
-        minor=0
-    fi
-
-    # HACK to handle RHEL betas
-    if [ "${distro}" == "rhel" ] && [ ${minor} -gt 90 ] ; then
-    	major=$(expr ${major} + 1 )
-	minor=0
-	beta=Beta
-    fi
-
-    if [ -n "${beta}" ] ; then
-	minor="${minor}beta"
-    fi
-
-    write_to_output "${distro}" "${major}" "${minor}" "$(head -n 1 ${redhat_release})"
-
-}
-
-identify_sles()
-{
-    suse_release="$1"
-    local major
-    local minor
-    local _major
-
-    # SUSE LINUX Enterprise Server 9 (i586)
-    # VERSION = 9
-    #
-    # SUSE LINUX Enterprise Server 9 (i586)
-    # VERSION = 9
-    # PATCHLEVEL = 2
-    #
-    # SUSE LINUX Enterprise Server 9 (i586)
-    # VERSION = 9
-    # PATCHLEVEL = 3
-    #
-    # SUSE Linux Enterprise Server 10 (i586)
-    # VERSION = 10
-    #
-    # SUSE Linux Enterprise Server 10 (i586)
-    # VERSION = 10
-    # PATCHLEVEL = 1
-    #
-    # SUSE Linux Enterprise Server 11 (i586)
-    # VERSION = 11
-    # PATCHLEVEL = 0
-
-    if [ ! -f "${suse_release}" ] ; then
-        return 1
-    fi
-
-    eval $(sed -n \
-               -e 's/^SUSE L\(inux\|INUX\) Enterprise Server \([0-9]*\) (.*)/_major=\2;/gp;' \
-               -e 's/^VERSION = \([0-9]*\)$/major=\1;/gp;' \
-               -e 's/^PATCHLEVEL = \([0-9]*\)$/minor=\1;/gp;' \
-               "${suse_release}")
-
-    if [ -z "${major}" -o -z "${_major}" ] ; then
-        return 1
-    fi
-
-    if [ "${major}" != "${_major}" ] ; then
-        return 1
-    fi
-
-    if [ -z "${minor}" ] ; then
-        minor=0
-    fi
-
-    write_to_output "sles" "${major}" "${minor}" "$(head -n 1 ${suse_release})"
-
-}
-
-identify_lsb()
-{
-    lsb_release="$1"
-
-    if [ ! -x "${lsb_release}" ] ; then
-	saved_IFS=$IFS
-	IFS=:
-	for i in $PATH ; do
-	    if [ -x "${i}/${lsb_release}" ] ; then
-		lsb_release="${i}/${lsb_release}"
-		break
-	    fi
-	done
-	IFS=$saved_IFS
-    fi
-
-    if [ ! -x "${lsb_release}" ] ; then
-	return 1
-    fi
-    
-    distro=$(${lsb_release} --short --id | tr 'A-Z' 'a-z')
-    description=$(${lsb_release} --short --description | sed -e 's/^"\(.*\)"$/\1/g')
-    release=$(${lsb_release} --short --release)
-
-    if [ -z "${distro}" -o -z "${release}" ] ; then
-	return 1
-    fi
-
-    eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }')
-
-    if [ -z "${major}" -o -z "${distro}" ] ; then
-        return 1
-    fi
-
-    write_to_output "${distro}" "${major}" "${minor}" "${description}"
-}
-
-if [ $# -eq 1 ] ; then
-    exec 1>"$1"
-fi
-
-if [ -z "${TEST}" ] ; then
-    identify_redhat /etc/redhat-release && exit 0
-    identify_sles   /etc/SuSE-release   && exit 0
-    identify_lsb    lsb_release         && exit 0
-    identify_debian /etc/debian_version && exit 0
-
-    if [ $# -eq 1 ] ; then
-	rm -f "$1"
-    fi
-
-    exit 1
-fi

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/patches/systemvm/debian/xe/xe-update-guest-attrs
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/xe/xe-update-guest-attrs b/patches/systemvm/debian/xe/xe-update-guest-attrs
deleted file mode 100644
index 30a4498..0000000
--- a/patches/systemvm/debian/xe/xe-update-guest-attrs
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# Script to write information about the guest to XenStore.
-#
-# Information collected (if --memory NOT passed in):
-#   - Distribution name
-#   - Distribution version (major and minor)
-#   - Kernel version (uname)
-#   - IP address for each Ethernet interface
-#
-# Information collected (if --memory IS passed in):
-#   - memtotal
-#   - memfree
-#
-# Memory stats are separated out because they change all the time
-# and so we may not want to update them as frequently
-
-LANG="C"
-export LANG
-
-
-XE_LINUX_DISTRIBUTION_CACHE=/var/cache/xe-linux-distribution
-
-IPADDR_RE="\([[:digit:]]\{1,3\}\.\)\{3\}[[:digit:]]\{1,3\}"
-
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-XENSTORE=${XENSTORE:-xenstore}
-
-XENSTORE_UPDATED=0
-
-# parse command line opts
-
-MEMORY_MODE=0 # do not update memory stats 
-while [ $# -ge 1 ] ; do 
-    if [ "$1" = "--memory" ] ; then
-	MEMORY_MODE=1	# update only memory stats 
-    fi
-    shift
-done
-
-xenstore_write_cached() {
-    key="$1" newval="$2"
-    cache=/var/cache/xenstore/$key
-    if [ -f $cache ] ; then
-	# cache exists
-	oldval=$(cat "$cache")
-	if [ "$oldval" = "$newval" ] ; then
-	    # value unchanged
-	    return 0
-	fi
-    else
-	# cache does not exist
-	if [ -e $cache ] ; then 
-	    # something (directory?) in its way
-	    rm -rf $cache
-	fi
-    fi
-    
-    # try to write and update cache if successfull
-    if $XENSTORE write "$key" "$newval" ; then
-	mkdir -p $(dirname "$cache")
-	echo -n "$newval" > "$cache"
-	XENSTORE_UPDATED=1
-	return 0
-    fi
-    return 1
-}
-
-# If we detect a domain change then delete our cache and force a refresh
-domid=$(xenstore-read "domid")
-cache=/var/cache/xenstore/unique-domain-id
-newval=$(xenstore-read "/local/domain/${domid}/unique-domain-id")
-if [ -e $cache ]; then
-    oldval=$(cat "$cache")
-    if [ "$oldval" != "$newval" ]; then
-	# domain changed
-	rm -rf /var/cache/xenstore
-    fi
-fi
-mkdir -p $(dirname "$cache")
-echo -n "$newval" > "$cache"
-
-xenstore_rm_cached() {
-    key="$1"
-    cache=/var/cache/xenstore/$key
-    if [ ! -e $cache ] ; then
-	return 1
-    fi
-    # try to write and update cache if successfull
-    if $XENSTORE rm "$key" ; then
-	rm -rf "$cache"
-	XENSTORE_UPDATED=1
-	return 0
-    fi
-    return 1
-}
-
-xenstore_list_interfaces_cached() {
-    topdir=/var/cache/xenstore/attr
-    if [ -d $topdir ] ; then
-	cd $topdir 
-	for dir in * ; do 
-	    [ -f $dir/ip ] && echo $dir
-	done
-    fi
-}
-
-if [ $MEMORY_MODE -eq 1 ] ; then
-    # Update the memory information
-    eval $(cat /proc/meminfo | \
-	sed -n -e 's/MemTotal\: *\([0-9]*\)[^$]*/memtotal=\1/gp;' \
-        -e 's/MemFree\: *\([0-9]*\)[^$]*/memfree=\1/gp;')
-    
-    xenstore_write_cached "data/meminfo_total" "${memtotal}"
-    xenstore_write_cached "data/meminfo_free" "${memfree}"
-fi
-
-
-
-# e.g.
-# $ ip addr show
-# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue 
-#     link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
-#     inet 127.0.0.1/8 scope host lo
-#     inet6 ::1/128 scope host 
-#        valid_lft forever preferred_lft forever
-# 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast qlen 1000
-#     link/ether 00:13:20:95:e8:74 brd ff:ff:ff:ff:ff:ff
-#     inet 172.31.0.57/20 brd 172.31.15.255 scope global eth0
-#     inet6 fe80::213:20ff:fe95:e874/64 scope link 
-#        valid_lft forever preferred_lft forever
-# 3: sit0: <NOARP> mtu 1480 qdisc noop 
-#     link/sit 0.0.0.0 brd 0.0.0.0
-
-#eval $(ip addr show | \
-#       sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/ifs="\$ifs \1"; current="\1"; /gp;' \
-#	      -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;')
-
-# e.g.
-# eth0      Link encap:Ethernet  HWaddr 00:13:20:95:E8:74  
-#           inet addr:172.31.0.57  Bcast:172.31.15.255  Mask:255.255.240.0
-#           inet6 addr: fe80::213:20ff:fe95:e874/64 Scope:Link
-#           UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
-#           RX packets:98001128 errors:0 dropped:0 overruns:0 frame:0
-#           TX packets:87728920 errors:0 dropped:0 overruns:0 carrier:0
-#           collisions:0 txqueuelen:1000 
-#           RX bytes:35864034092 (33.4 GiB)  TX bytes:27544025180 (25.6 GiB)
-#           Interrupt:177 
-# 
-# lo        Link encap:Local Loopback  
-#           inet addr:127.0.0.1  Mask:255.0.0.0
-#           inet6 addr: ::1/128 Scope:Host
-#           UP LOOPBACK RUNNING  MTU:16436  Metric:1
-#           RX packets:32928 errors:0 dropped:0 overruns:0 frame:0
-#           TX packets:32928 errors:0 dropped:0 overruns:0 carrier:0
-#           collisions:0 txqueuelen:0 
-#           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
-
-eval $(/sbin/ifconfig | \
-        sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \
-               -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \
-               -e 's/  *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;')
-
-# network
-for if in $ifs ; do
-
-	[ "${if}" = "lo" ] && continue
-	inet=$(eval echo \${inet_${if}})
-	[ -z "${inet}" ] && continue
-
-	xenstore_write_cached "attr/${if}/ip" "${inet}"
-done
-
-# remove any interfaces that have been unplugged or downed
-for at in $(xenstore_list_interfaces_cached) ; do
-    for if in $ifs ; do
-	[ "${if}" = "${at}" ] && continue 2
-    done
-    xenstore_rm_cached "attr/${at}"
-done
-
-# distro
-if [ -f ${XE_LINUX_DISTRIBUTION_CACHE} ] ; then
-    . ${XE_LINUX_DISTRIBUTION_CACHE}
-    for key in os_name os_majorver os_minorver os_uname os_distro ; do
-	new=$(eval echo \${${key}})
-	[ -n "${new}" ] || continue
-	xenstore_write_cached "data/${key}" "${new}"
-    done
-fi
-
-# whether I support ballooning or not
-xenstore_write_cached "control/feature-balloon" "1"
-
-# whether I support ballooning or not
-xenstore_write_cached "control/feature-balloon" "1"
-
-# build time addons
-xenstore_write_cached "attr/PVAddons/MajorVersion" "5"
-xenstore_write_cached "attr/PVAddons/MinorVersion" "6"
-xenstore_write_cached "attr/PVAddons/MicroVersion" "0" 
-xenstore_write_cached "attr/PVAddons/BuildVersion" "31188"
-xenstore_write_cached "attr/PVAddons/Installed" "1" 
-
-# update xenstore if necc
-if [ $XENSTORE_UPDATED -eq 1 ] ; then
-    xenstore_write_cached "data/updated" "$(date)"
-fi
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4bae29a..cb4dd1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,6 @@
     <module>deps/XenServerJava</module>
     <module>engine</module>
     <module>plugins</module>
-    <module>patches</module>
     <module>framework</module>
     <module>test</module>
     <module>client</module>
@@ -681,6 +680,12 @@
       </modules>
     </profile>
     <profile>
+      <id>systemvm</id>
+      <modules>
+        <module>systemvm</module>
+      </modules>
+    </profile>
+    <profile>
       <id>eclipse</id>
       <properties>
         <cs.target.dir>target-eclipse</cs.target.dir>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/bindir/cloud-setup-console-proxy.in
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/bindir/cloud-setup-console-proxy.in b/services/console-proxy/server/bindir/cloud-setup-console-proxy.in
deleted file mode 100755
index 6439c0f..0000000
--- a/services/console-proxy/server/bindir/cloud-setup-console-proxy.in
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/usr/bin/env python
-
-# 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.
-
-
-import sys, os, subprocess, errno, re, getopt
-
-# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ----
-# ---- We do this so cloud_utils can be looked up in the following order:
-# ---- 1) Sources directory
-# ---- 2) waf configured PYTHONDIR
-# ---- 3) System Python path
-for pythonpath in (
-		"@PYTHONDIR@",
-		os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"),
-	):
-		if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath)
-# ---- End snippet of code ----
-import cloud_utils
-from cloud_utils import stderr
-
-E_GENERIC= 1
-E_NOKVM = 2
-E_NODEFROUTE = 3
-E_DHCP = 4
-E_NOPERSISTENTNET = 5
-E_NETRECONFIGFAILED = 6
-E_VIRTRECONFIGFAILED = 7
-E_FWRECONFIGFAILED = 8
-E_CPRECONFIGFAILED = 9
-E_CPFAILEDTOSTART = 10
-E_NOFQDN = 11
-
-def bail(errno=E_GENERIC,message=None,*args):
-	if message: stderr(message,*args)
-	stderr("Cloud Console Proxy setup aborted")
-	sys.exit(errno)
-
-
-#---------------- boilerplate for python 2.4 support 
-
-
-# CENTOS does not have this -- we have to put this here
-try:
-	from subprocess import check_call
-	from subprocess import CalledProcessError
-except ImportError:
-	def check_call(*popenargs, **kwargs):
-		import subprocess
-		retcode = subprocess.call(*popenargs, **kwargs)
-		cmd = kwargs.get("args")
-		if cmd is None: cmd = popenargs[0]
-		if retcode: raise CalledProcessError(retcode, cmd)
-		return retcode
-
-	class CalledProcessError(Exception):
-		def __init__(self, returncode, cmd):
-			self.returncode = returncode ; self.cmd = cmd
-		def __str__(self): return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
-
-# ------------ end boilerplate -------------------------
-
-def check_hostname(): return check_call(["hostname",'--fqdn'])
-
-class Command:
-	def __init__(self,name,parent=None):
-		self.__name = name
-		self.__parent = parent
-	def __getattr__(self,name):
-		if name == "_print": name = "print"
-		return Command(name,self)
-	def __call__(self,*args):
-		cmd = self.__get_recursive_name() + list(args)
-		#print "	",cmd
-		popen = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-		m = popen.communicate()
-		ret = popen.wait()
-		if ret:
-			e = CalledProcessError(ret,cmd)
-			e.stdout,e.stderr = m
-			raise e
-		class CommandOutput:
-			def __init__(self,stdout,stderr):
-				self.stdout = stdout
-				self.stderr = stderr
-		return CommandOutput(*m)
-	def __lt__(self,other):
-		cmd = self.__get_recursive_name()
-		#print "	",cmd,"<",other
-		popen = subprocess.Popen(cmd,stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-		m = popen.communicate(other)
-		ret = popen.wait()
-		if ret:
-			e = CalledProcessError(ret,cmd)
-			e.stdout,e.stderr = m
-			raise e
-		class CommandOutput:
-			def __init__(self,stdout,stderr):
-				self.stdout = stdout
-				self.stderr = stderr
-		return CommandOutput(*m)
-		
-	def __get_recursive_name(self,sep=None):
-		m = self
-		l = []
-		while m is not None:
-			l.append(m.__name)
-			m = m.__parent
-		l.reverse()
-		if sep: return sep.join(l)
-		else: return l
-	def __str__(self):
-		return '<Command %r>'%self.__get_recursive_name(sep=" ")
-		
-	def __repr__(self): return self.__str__()
-
-ip = Command("ip")
-service = Command("service")
-chkconfig = Command("chkconfig")
-ufw = Command("ufw")
-iptables = Command("iptables")
-augtool = Command("augtool")
-ifconfig = Command("ifconfig")
-uuidgen = Command("uuidgen")
-
-Fedora = os.path.exists("/etc/fedora-release")
-CentOS = os.path.exists("/etc/centos-release") or ( os.path.exists("/etc/redhat-release") and not os.path.exists("/etc/fedora-release") )
-
-#--------------- procedure starts here ------------
-
-def main():
-	# parse cmd line	
-	opts, args = getopt.getopt(sys.argv[1:], "a", ["host=", "zone=", "pod="])
-	host=None
-	zone=None
-	pod=None
-    	autoMode=False
-	do_check_kvm = True	
-	for opt, arg in opts:
-		if opt == "--host":
-			if arg != "":
-				host = arg
-		elif opt == "--zone":
-			if arg != "":
-				zone = arg
-		elif opt == "--pod":
-		        if arg != "":
-				pod = arg
-        	elif opt == "-a":
-            		autoMode=True
-	servicename = "@PACKAGE@-console-proxy"
-	
-	if autoMode:
-		cloud_utils.setLogFile("/var/log/cloud/setupConsoleProxy.log")
-
-	stderr("Welcome to the Cloud Console Proxy setup")
-	stderr("")
-
-	try:
-		check_hostname()
-		stderr("The hostname of this machine is properly set up")
-	except CalledProcessError,e:
-		bail(E_NOFQDN,"This machine does not have an FQDN (fully-qualified domain name) for a hostname")
-
-	stderr("Stopping the Cloud Console Proxy")
-	cloud_utils.stop_service(servicename)
-	stderr("Cloud Console Proxy stopped")
-
-	ports = "8002".split()
-	if Fedora or CentOS:
-		try:
-			o = chkconfig("--list","iptables")
-			if ":on" in o.stdout and os.path.exists("/etc/sysconfig/iptables"):
-				stderr("Setting up firewall rules to permit traffic to Cloud services")
-				service.iptables.start() ; print o.stdout + o.stderr
-				for p in ports: iptables("-I","INPUT","1","-p","tcp","--dport",p,'-j','ACCEPT')
-				o = service.iptables.save() ; print o.stdout + o.stderr
-		except CalledProcessError,e:
-			print e.stdout+e.stderr
-			bail(E_FWRECONFIGFAILED,"Firewall rules could not be set")
-	else:
-		stderr("Setting up firewall rules to permit traffic to Cloud services")
-		try:
-			for p in ports: ufw.allow(p)
-			stderr("Rules set")
-		except CalledProcessError,e:
-			print e.stdout+e.stderr
-			bail(E_FWRECONFIGFAILED,"Firewall rules could not be set")
-
-		stderr("We are going to enable ufw now.  This may disrupt network connectivity and service availability.  See the ufw documentation for information on how to manage ufw firewall policies.")
-		try:
-			o = ufw.enable < "y\n" ; print o.stdout + o.stderr
-		except CalledProcessError,e:
-			print e.stdout+e.stderr
-			bail(E_FWRECONFIGFAILED,"Firewall could not be enabled")
-
-	cloud_utils.setup_consoleproxy_config("@CPSYSCONFDIR@/agent.properties", host, zone, pod)
-	stderr("Enabling and starting the Cloud Console Proxy")
-	cloud_utils.enable_service(servicename)
-	stderr("Cloud Console Proxy restarted")
-
-if __name__ == "__main__":
-	main()
-
-# FIXMES: 1) nullify networkmanager on ubuntu (asking the user first) and enable the networking service permanently

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/certs/localhost.crt
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/certs/localhost.crt b/services/console-proxy/server/certs/localhost.crt
deleted file mode 100644
index 005d98b..0000000
--- a/services/console-proxy/server/certs/localhost.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrTCCApWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJVUzEL
-MAkGA1UECAwCQ0ExEjAQBgNVBAcMCUN1cGVydGlubzESMBAGA1UECgwJQ2xvdWQu
-Y29tMRAwDgYDVQQLDAdEZWZhdWx0MRswGQYDVQQDDBJTZWNvbmRhcnlTdG9yYWdl
-Vk0wHhcNMTAwNTI3MTgzNjI1WhcNMTMwMjIwMTgzNjI1WjBxMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCUN1cGVydGlubzESMBAGA1UECgwJQ2xv
-dWQuY29tMRAwDgYDVQQLDAdEZWZhdWx0MRswGQYDVQQDDBJTZWNvbmRhcnlTdG9y
-YWdlVk0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbhstQ5Gn2gzrk
-ZX1es+tuz4rnrcONRHUzyY/UdoT5jiVfmmS9CML/GgSpKzmnEMNZcCSh7G/GKPwD
-gBZywpTVD56nYT4ZzK0GjPxcg0a+BvxxA2esQ2/kFBvtdcZ1TNExtjdOqysjK0It
-M6U2891wbn+Y9oHqooTA0uaZELTpe/MCg2eBx7A4+u26novHHfOaKEEqtBscpDP8
-0+nQduNQf61haV25Lv2CDqrCIuv/FrNmgQhcUg8e1dFkk4VCsflEDuSYh9PpaD7J
-t+oqmNTVw8k6u3JAYJFkcu457uYz0wrED7Cai7Y6gUy7xwmY2SSY/r2mJJHEpSpZ
-NhiH47kZAgMBAAGjUDBOMB0GA1UdDgQWBBQ2hUX5Jdhn277SBisACnEABqg52zAf
-BgNVHSMEGDAWgBQ2hUX5Jdhn277SBisACnEABqg52zAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQBAVrkGGDPHDPQdZRgI1+1L87sX5xdNoet9sJUVRtz9
-ZwhGWAmca30cJGlhSFNx5y01E6T7lHDLrF9HCf9nVC10t0FwQwTVYijE8VyM7fAA
-4Hv/whSKg1kkQQSTis2ZW0wMU6TnanhJy6MrxwdhRampeXjNOpNtoLrF/5LbhWxO
-Gm0S5u+4q7eYnUPD4o3sb17idG62kkejHeToPnJwXtDwyq0XYNlL/OoqRaaY5f0b
-IKdeqqEkdtkzfU4N1dG7bJA29gBl48gPn+CSrh9u3D0s1OYM7MWi1/TjpwCR18ir
-CslVzO6kVNyQoNEYhZ9+2Sz0ceZVrYDFFzp8qAF8qbZ7
------END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/certs/localhost.key
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/certs/localhost.key b/services/console-proxy/server/certs/localhost.key
deleted file mode 100644
index 6d95765..0000000
--- a/services/console-proxy/server/certs/localhost.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAm4bLUORp9oM65GV9XrPrbs+K563DjUR1M8mP1HaE+Y4lX5pk
-vQjC/xoEqSs5pxDDWXAkoexvxij8A4AWcsKU1Q+ep2E+GcytBoz8XINGvgb8cQNn
-rENv5BQb7XXGdUzRMbY3TqsrIytCLTOlNvPdcG5/mPaB6qKEwNLmmRC06XvzAoNn
-gcewOPrtup6Lxx3zmihBKrQbHKQz/NPp0HbjUH+tYWlduS79gg6qwiLr/xazZoEI
-XFIPHtXRZJOFQrH5RA7kmIfT6Wg+ybfqKpjU1cPJOrtyQGCRZHLuOe7mM9MKxA+w
-mou2OoFMu8cJmNkkmP69piSRxKUqWTYYh+O5GQIDAQABAoIBAQCI5S8VNtimaYBv
-BX5C26+BzCECKIsWT4myWdrGMsR9PUdcTXQaiBnLncU4epm2miS5FuLHvGvuSqj5
-E8eun+ONXsBRqGCXKPer6nE/pTWhklilyU9566oTYjfq3l4fZcxFK5SnJDdGL4+C
-ZhEou6LQkhKyO1jDhOXBLGJZnMEBOf+zXhgZGLDbQwCcCQ5PAZUiSf0cnVRk3rI9
-GwdsbCDNJk6awy8ANlFATemDvHwHZ7ZwmvVzsjsYlYJbY/vJYlOyxa7tzYROVAlm
-m8oiPfDvGjnXcGxVQwT0pgDvwtUkUFijZORpkJOPavxqSkpOzDFrOe9UW6HJYGzH
-ujhmZBVhAoGBAMnbfssRwYI5egfsxNbA62NkxRcGe5HIlnyZ1Ln0BCE8ae60frcf
-4IluZzT53Ly3jUQP2uGdp6nJVq/5ymRYSySNr46DXek2qcJ2TMbtRBhjebPwi+Rb
-qTNjccNSgqs0j+1qP78PoTUO5fUWGL9XqIlfPU6Vji4+SmdNMvz6z84lAoGBAMU9
-/3l2WVXykD6FNrRbtvpzU1C9LDixOaVVpGnZHO8krW440LnhIZJbkXnXDVZXc7eI
-D/doecfL8rtFteqeBr0LiXGQXU5mIMjXAOAPSvDqIciYzhL8KOK5CWEgVZo6RQlU
-G3ne0mk93I+w8N0SE2VKeuxepz4yw0oiKUpAgWrlAoGAS06qNRSAvxa2YjKBFSWQ
-K9qydO6kNzVAf2fcpytURxoE41tPUv5/hIY91tPI+Fb6SwQnQrjQjlVhE/H7Agi2
-sAJ0FpUH+jO8jaIY7rYiC39BLlJ1vlI8A8H79UTZHwpTD93tvlgUankObas6vFf1
-tppjgufkzXfLxlJUzXC9CkkCgYA7gy9YOKtP0XZQRuVwmdOl0bIrxEhZeq/IAQUw
-or+mMEzb2uyviQwWGubT+l0d1hkmITmgDrff3tuIQcpX1gJ2e8qmp0Zf51SxBJ5Q
-/IxCEILNAb374HV9oxL/aUAq3rYB0IzRwrd95ZptCJhEO7X6c/SO6ShRDgP6lEAd
-FUV3OQKBgQCFC0Xx/fCX1yquARgoe5pbK7IpXWaTvjBu//gbHsfR2lk3dZbESdeg
-OquPDdfp+jFPGISsDhPLzcfkZIPbz5ZVs8KdmpB/YLwyJwFqjDyjwVaDnRnuycb1
-/4PlVWKp7j5SDDNCfleYvmiRn8k6P4mxVJOHKzwb/IwQcKghyqAF1w==
------END RSA PRIVATE KEY-----

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/certs/realhostip.crt
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/certs/realhostip.crt b/services/console-proxy/server/certs/realhostip.crt
deleted file mode 100644
index 7520b0c..0000000
--- a/services/console-proxy/server/certs/realhostip.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFZTCCBE2gAwIBAgIHKBCduBUoKDANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
-BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
-aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
-IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
-ODcwHhcNMTIwMjAzMDMzMDQwWhcNMTcwMjA3MDUxMTIzWjBZMRkwFwYDVQQKDBAq
-LnJlYWxob3N0aXAuY29tMSEwHwYDVQQLDBhEb21haW4gQ29udHJvbCBWYWxpZGF0
-ZWQxGTAXBgNVBAMMECoucmVhbGhvc3RpcC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCDT9AtEfs+s/I8QXp6rrCw0iNJ0+GgsybNHheU+JpL39LM
-TZykCrZhZnyDvwdxCoOfE38Sa32baHKNds+y2SHnMNsOkw8OcNucHEBX1FIpOBGp
-h9D6xC+umx9od6xMWETUv7j6h2u+WC3OhBM8fHCBqIiAol31/IkcqDxxsHlQ8S/o
-CfTlXJUY6Yn628OA1XijKdRnadV0hZ829cv/PZKljjwQUTyrd0KHQeksBH+YAYSo
-2JUl8ekNLsOi8/cPtfojnltzRI1GXi0ZONs8VnDzJ0a2gqZY+uxlz+CGbLnGnlN4
-j9cBpE+MfUE+35Dq121sTpsSgF85Mz+pVhn2S633AgMBAAGjggG+MIIBujAPBgNV
-HRMBAf8EBTADAQEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNV
-HQ8BAf8EBAMCBaAwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5
-LmNvbS9nZHMxLTY0LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkwNwYI
-KwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3Np
-dG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-Z29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdv
-ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSME
-GDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zArBgNVHREEJDAighAqLnJlYWxob3N0
-aXAuY29tgg5yZWFsaG9zdGlwLmNvbTAdBgNVHQ4EFgQUZyJz9/QLy5TWIIscTXID
-E8Xk47YwDQYJKoZIhvcNAQEFBQADggEBAKiUV3KK16mP0NpS92fmQkCLqm+qUWyN
-BfBVgf9/M5pcT8EiTZlS5nAtzAE/eRpBeR3ubLlaAogj4rdH7YYVJcDDLLoB2qM3
-qeCHu8LFoblkb93UuFDWqRaVPmMlJRnhsRkL1oa2gM2hwQTkBDkP7w5FG1BELCgl
-gZI2ij2yxjge6pOEwSyZCzzbCcg9pN+dNrYyGEtB4k+BBnPA3N4r14CWbk+uxjrQ
-6j2Ip+b7wOc5IuMEMl8xwTyjuX3lsLbAZyFI9RCyofwA9NqIZ1GeB6Zd196rubQp
-93cmBqGGjZUs3wMrGlm7xdjlX6GQ9UvmvkMub9+lL99A5W50QgCmFeI=
------END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/certs/realhostip.csr
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/certs/realhostip.csr b/services/console-proxy/server/certs/realhostip.csr
deleted file mode 100644
index 61395c9..0000000
--- a/services/console-proxy/server/certs/realhostip.csr
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN NEW CERTIFICATE REQUEST-----
-MIICsDCCAZgCAQAwazELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlDdXBlcnRp
-bm8xDjAMBgNVBAoTBVZNT3BzMRAwDgYDVQQLEwdVbmtub3duMRkwFwYDVQQDDBAqLnJlYWxob3N0
-aXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0/QLRH7PrPyPEF6eq6wsNIj
-SdPhoLMmzR4XlPiaS9/SzE2cpAq2YWZ8g78HcQqDnxN/Emt9m2hyjXbPstkh5zDbDpMPDnDbnBxA
-V9RSKTgRqYfQ+sQvrpsfaHesTFhE1L+4+odrvlgtzoQTPHxwgaiIgKJd9fyJHKg8cbB5UPEv6An0
-5VyVGOmJ+tvDgNV4oynUZ2nVdIWfNvXL/z2SpY48EFE8q3dCh0HpLAR/mAGEqNiVJfHpDS7DovP3
-D7X6I55bc0SNRl4tGTjbPFZw8ydGtoKmWPrsZc/ghmy5xp5TeI/XAaRPjH1BPt+Q6tdtbE6bEoBf
-OTM/qVYZ9kut9wIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAF5lhhni9dW9MqSL2ixNbViPWpFS
-ecOggshYChJfZKrhsuZaDpumJ/+ebICS4zv/oxDwNLSmeAmydiaUQC9LFQEEwvPBYDTtTzwCrtwH
-yyFJQSm6pyeIBP/Bih/5hLW8JPm0bDbp5ldrHCDEgKQeeyQhyYOKFODkTuMLw+FLD+V86IVHxElL
-/urCRWyZEPwyMsgfsU6ywNX9XNShyk1uDHjFDE67sPhfw52ooxXrYQnBdTk+g0UXPbULzrCK/1kU
-fjRq347V9Fwi5NFyGADOaA+q6mtnlb1i3uH1n1YVUzevvpnIr3/RxPSYHB47Kj9iYKeDlYdTRHJy
-NpuvTfmQO2Y=
------END NEW CERTIFICATE REQUEST-----

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/certs/realhostip.key
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/certs/realhostip.key b/services/console-proxy/server/certs/realhostip.key
deleted file mode 100644
index 53bdc86..0000000
--- a/services/console-proxy/server/certs/realhostip.key
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCDT9AtEfs+s/I8QXp6rrCw0iNJ
-0+GgsybNHheU+JpL39LMTZykCrZhZnyDvwdxCoOfE38Sa32baHKNds+y2SHnMNsOkw8OcNucHEBX
-1FIpOBGph9D6xC+umx9od6xMWETUv7j6h2u+WC3OhBM8fHCBqIiAol31/IkcqDxxsHlQ8S/oCfTl
-XJUY6Yn628OA1XijKdRnadV0hZ829cv/PZKljjwQUTyrd0KHQeksBH+YAYSo2JUl8ekNLsOi8/cP
-tfojnltzRI1GXi0ZONs8VnDzJ0a2gqZY+uxlz+CGbLnGnlN4j9cBpE+MfUE+35Dq121sTpsSgF85
-Mz+pVhn2S633AgMBAAECggEAH/Szd9RxbVADenCA6wxKSa3KErRyq1YN8ksJeCKMAj0FIt0caruE
-qO11DebWW8cwQu1Otl/cYI6pmg24/BBldMrp9IELX/tNJo+lhPpRyGAxxC0eSXinFfoASb8d+jJd
-Bd1mmemM6fSxqRlxSP4LrzIhjhR1g2CiyYuTsiM9UtoVKGyHwe7KfFwirUOJo3Mr18zUVNm7YqY4
-IVhOSq59zkH3ULBlYq4bG50jpxa5mNSCZ7IpafPY/kE/CbR+FWNt30+rk69T+qb5abg6+XGm+OAm
-bnQ18yZEqX6nJLk7Ch0cfA5orGgrTMOrM71wK7tBBDQ308kOxDGebx6j0qD36QKBgQDTRDr8kuhA
-9sUyKr9vk2DQCMpNvEeiwI3JRMqmmxpNAtg01aJ3Ya57vX5Fc+zcuV87kP6FM1xgpHQvnw5LWo2J
-s7ANwQcP8ricEW5zkZhSjI4ssMeAubmsHOloGxmLFYZqwx0JI7CWViGTLMcUlqKblmHcjeQDeDfP
-P1TaCItFmwKBgQCfHZwVvIcaDs5vxVpZ4ftvflIrW8qq0uOVK6QIf9A/YTGhCXl2qxxTg2A6+0rg
-ZqI7zKzUDxIbVv0KlgCbpHDC9d5+sdtDB3wW2pimuJ3p1z4/RHb4n/lDwXCACZl1S5l24yXX2pFZ
-wdPCXmy5PYkHMssFLNhI24pprUIQs66M1QKBgQDQwjAjWisD3pRXESSfZRsaFkWJcM28hdbVFhPF
-c6gWhwQLmTp0CuL2RPXcPUPFi6sN2iWWi3zxxi9Eyz+9uBn6AsOpo56N5MME/LiOnETO9TKb+Ib6
-rQtKhjshcv3XkIqFPo2XdVvOAgglPO7vajX91iiXXuH7h7RmJud6l0y/lwKBgE+bi90gLuPtpoEr
-VzIDKz40ED5bNYHT80NNy0rpT7J2GVN9nwStRYXPBBVeZq7xCpgqpgmO5LtDAWULeZBlbHlOdBwl
-NhNKKl5wzdEUKwW0yBL1WSS5PQgWPwgARYP25/ggW22sj+49WIo1neXsEKPGWObk8e050f1fTt92
-Vo1lAoGAb1gCoyBCzvi7sqFxm4V5oapnJeiQQJFjhoYWqGa26rQ+AvXXNuBcigIeDXNJPctSF0Uc
-p11KbbCgiruBbckvM1vGsk6Sx4leRk+IFHRpJktFUek4o0eUg0shOsyyvyet48Dfg0a8FvcxROs0
-gD+IYds5doiob/hcm1hnNB/3vk4=
------END PRIVATE KEY-----
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/certs/realhostip.keystore
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/certs/realhostip.keystore b/services/console-proxy/server/certs/realhostip.keystore
deleted file mode 100644
index c8d54d4..0000000
Binary files a/services/console-proxy/server/certs/realhostip.keystore and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/conf.dom0/agent.properties.in
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/conf.dom0/agent.properties.in b/services/console-proxy/server/conf.dom0/agent.properties.in
deleted file mode 100644
index 1920481..0000000
--- a/services/console-proxy/server/conf.dom0/agent.properties.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.
-
-# Sample configuration file for VMOPS console proxy
-
-instance=ConsoleProxy
-consoleproxy.httpListenPort=8002
-
-#resource= the java class, which agent load to execute
-resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource
-
-#host= The IP address of management server
-host=localhost
-
-#port = The port management server listening on, default is 8250
-port=8250
-
-#pod= The pod, which agent belonged to
-pod=default
-
-#zone= The zone, which agent belonged to
-zone=default
-
-#private.network.device= the private nic device
-# if this is commented, it is autodetected on service startup
-# private.network.device=cloudbr0
-
-#public.network.device= the public nic device
-# if this is commented, it is autodetected on service startup
-# public.network.device=cloudbr0
-
-#guid= a GUID to identify the agent

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/conf.dom0/consoleproxy.properties.in
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/conf.dom0/consoleproxy.properties.in b/services/console-proxy/server/conf.dom0/consoleproxy.properties.in
deleted file mode 100644
index a3cddbc..0000000
--- a/services/console-proxy/server/conf.dom0/consoleproxy.properties.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-consoleproxy.tcpListenPort=0
-consoleproxy.httpListenPort=80
-consoleproxy.httpCmdListenPort=8001
-consoleproxy.jarDir=./applet/
-consoleproxy.viewerLinger=180
-consoleproxy.reconnectMaxRetry=5

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/conf.dom0/log4j-cloud.xml.in
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/conf.dom0/log4j-cloud.xml.in b/services/console-proxy/server/conf.dom0/log4j-cloud.xml.in
deleted file mode 100644
index dde844f..0000000
--- a/services/console-proxy/server/conf.dom0/log4j-cloud.xml.in
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.apache.log4j.rolling.RollingFileAppender">
-      <param name="Append" value="true"/>
-      <param name="Threshold" value="WARN"/>
-      <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
-        <param name="FileNamePattern" value="@CPLOG@.%d{yyyy-MM-dd}.gz"/>
-        <param name="ActiveFileName" value="@CPLOG@"/>
-      </rollingPolicy>
-      <layout class="org.apache.log4j.EnhancedPatternLayout">
-         <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/>
-      </layout>
-   </appender>
-   
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="WARN"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="com.cloud.console.ConsoleCanvas">
-     <priority value="WARN"/>
-   </category>
-   
-   <category name="com.cloud.consoleproxy.ConsoleProxyAjaxImageHandler">
-     <priority value="WARN"/>
-   </category>
-   
-   <category name="com.cloud.consoleproxy.ConsoleProxyViwer">
-     <priority value="WARN"/>
-   </category>
-
-   <category name="com.cloud.consoleproxy">
-     <priority value="INFO"/>
-   </category>
-
-   <category name="com.cloud">
-     <priority value="DEBUG"/>
-   </category>
-   
-   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
-   <category name="org.apache">
-      <priority value="INFO"/>
-   </category>
-
-   <category name="org">
-      <priority value="INFO"/>
-   </category>
-   
-   <category name="net">
-     <priority value="INFO"/>
-   </category>
-
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <level value="INFO"/>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/conf/agent.properties
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/conf/agent.properties b/services/console-proxy/server/conf/agent.properties
deleted file mode 100644
index 246cb1c..0000000
--- a/services/console-proxy/server/conf/agent.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-instance=ConsoleProxy
-resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/conf/consoleproxy.properties
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/conf/consoleproxy.properties b/services/console-proxy/server/conf/consoleproxy.properties
deleted file mode 100644
index bb452f5..0000000
--- a/services/console-proxy/server/conf/consoleproxy.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-consoleproxy.tcpListenPort=0
-consoleproxy.httpListenPort=8088
-consoleproxy.httpCmdListenPort=8001
-consoleproxy.jarDir=./applet/
-consoleproxy.viewerLinger=180
-consoleproxy.reconnectMaxRetry=5

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/conf/environment.properties
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/conf/environment.properties b/services/console-proxy/server/conf/environment.properties
deleted file mode 100644
index 269acad..0000000
--- a/services/console-proxy/server/conf/environment.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-paths.script=../../scripts/storage/secondary/
-paths.pid=.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/conf/log4j-cloud.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/conf/log4j-cloud.xml b/services/console-proxy/server/conf/log4j-cloud.xml
deleted file mode 100644
index 2d1d361..0000000
--- a/services/console-proxy/server/conf/log4j-cloud.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-      <param name="File" value="${log.home}systemvm.log"/>
-      <param name="Append" value="true"/>
-      <param name="Threshold" value="DEBUG"/>
-
-      <!-- Rollover at midnight each day -->
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c{3}] (%t:%x) %m%n"/>
-      </layout>
-   </appender>
-   
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="WARN"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="com.cloud.console.ConsoleCanvas">
-     <priority value="WARN"/>
-   </category>
-   
-   <category name="com.cloud.consoleproxy.ConsoleProxyAjaxImageHandler">
-     <priority value="WARN"/>
-   </category>
-   
-   <category name="com.cloud.consoleproxy.ConsoleProxyViewer">
-     <priority value="WARN"/>
-   </category>
-
-   <category name="com.cloud.consoleproxy">
-     <priority value="INFO"/>
-   </category>
-
-   <category name="com.cloud">
-     <priority value="DEBUG"/>
-   </category>
-   
-   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
-   <category name="org.apache">
-      <priority value="INFO"/>
-   </category>
-
-   <category name="org">
-      <priority value="INFO"/>
-   </category>
-   
-   <category name="net">
-     <priority value="INFO"/>
-   </category>
-
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <level value="INFO"/>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/css/ajaxviewer.css
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/css/ajaxviewer.css b/services/console-proxy/server/css/ajaxviewer.css
deleted file mode 100644
index fd2fb3c..0000000
--- a/services/console-proxy/server/css/ajaxviewer.css
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-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.
-*/
-
-body {
-	margin:0 0;
-	text-align: center;
-}
-	
-#main_panel {
-	clear:both;
-	margin: 0 auto;
-	text-align: left;
-}
-
-.canvas_tile {
-	cursor:crosshair;
-}
-
-#toolbar {
-	font:normal 12px 'Trebuchet MS','Arial'; 
-	margin:0 auto; 
-	text-align: left;
-	padding:0 0; 
-	height:32px;
-	background-image:url(/resource/images/back.gif); 
-	background-repeat:repeat-x; 
-}
-
-#toolbar ul { 
-	margin:0 0; 
-	padding:0 10px 0 10px; 
-	float:left;
-	display:block;
-	line-height:32px;
-	list-style:none; 
-}
-
-#toolbar li {
-	float:left; 
-	display:inline; 
-	padding:0;
-	height:32px;
-}
-
-#toolbar a { 
-	color:white; 
-	float:left;
-	display:block;
-	padding:0 3px 0 3px; 
-	text-decoration:none;
-	line-height:32px;
-}
-
-#toolbar a span { 
-	display:block; 
-	float:none; 
-	padding:0 10px 0 7px; 
-} 
-
-#toolbar a span img { 
-	border:none; 
-	margin:8px 4px 0 0; 
-} 
-
-#toolbar a:hover { 
-	background: url(/resource/images/left.png) no-repeat left center; 
-} 
-
-#toolbar a:hover span { 
-	background:url(/resource/images/right.png) no-repeat right center; 
-}
-
-
-#toolbar ul li ul {
-    position: absolute;
-    top:32;
-    width: 260;
-    height: 95;
-    display: block;
-    display: none;
-    border-top: 1px solid black;
-    background-image:url(/resource/images/back.gif);
-    background-repeat:repeat-x repeat-y;
-}
-
-#toolbar ul li ul li {
-    display: list-item;
-    float:none;
-    padding-left: 20;
-}
-
-#toolbar ul li ul li.current {
-    background: url(/resource/images/cad.gif) no-repeat left center; 
-}
-
-#toolbar ul li ul li a {
-    display:block;
-    padding:0 3px 0 3px; 
-    text-decoration:none;
-    line-height:32px;
-    vertical-align: bottom;    /* this is to fix the list gap in IE */
-}
-
-#toolbar ul li ul li a:hover {
-    background: url(/resource/images/left.png) no-repeat left center; 
-}
-
-#toolbar ul li ul li a:hover span {
-    background: url(/resource/images/right2.png) no-repeat right center; 
-}
-
-span.dark {
-	margin-right:20px;
-	float:right;
-	display:block;
-	width:32px;
-	height:30px;
-	background:url(/resource/images/gray-green.png) no-repeat center center; 
-}
-
-span.bright {
-	margin-right:20px;
-	float:right;
-	display:block;
-	width:32px;
-	height:30px;
-	background:url(/resource/images/bright-green.png) no-repeat center center; 
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c261042/services/console-proxy/server/css/logger.css
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/css/logger.css b/services/console-proxy/server/css/logger.css
deleted file mode 100644
index 42ac807..0000000
--- a/services/console-proxy/server/css/logger.css
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-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.
-*/
-
-@charset "UTF-8";
-.logwin {
-      position: absolute;
-
-      z-index:2147483648;
-      width: 800px;
-      border: 1px solid gray;
-      background: white;
-      text-align: left;
-}
-
-.logwin_title{
-	width:auto;
-	  height: 23px;
-	  background:url(../images/grid_headerbg.gif) repeat-x top left;
-	  border: 1px sold #737373;
-}
-
-.logwin_title_actionbox{
-	width:175px;
-	height:16px;
-	float:left;
-	margin:4px 0 0 7px;
-	display:inline;
-}
-
-
-.logwin_title_actionbox .select {
-	background: #424242; 
-	font: normal 10px Arial, Helvetica, sans-serif; 
-	float:left; 
-	border: 1px solid #6e6e6e; 
-	height: 16px; 
-	width: 100px; 
-	margin-left:3px; 
-	padding:0 0 0 3px; 
-	color:#CCC;
-}
-
-.logwin_title_rgtactionbox{
-	width:49px;
-	height:15px;
-	float:right;
-	margin:4px 0 0 7px;
-	display:inline;
-}
-
-
-a.logwin_playbutton {
-	width:18px;
-	height:15px;
-	float:left;
-	background:url(../images/play_button.gif) no-repeat top left;
-	margin-right:2px;
-	padding:0;
-}
-
-a:hover.logwin_playbutton {
-	background:url(../images/play_button_hover.gif) no-repeat top left;
-}
-
-a.logwin_stopbutton {
-	width:18px;
-	height:15px;
-	float:left;
-	background:url(../images/stop_button.gif) no-repeat top left;
-	margin-right:2px;
-	padding:0;
-}
-
-a:hover.logwin_stopbutton {
-	background:url(../images/stop_button_hover.gif) no-repeat top left;
-}
-
-a.logwin_clrbutton {
-	width:28px;
-	height:15px;
-	float:left;
-	background:url(../images/clr_button.gif) no-repeat top left;
-	margin:0;
-	padding:0;
-}
-
-a:hover.logwin_clrbutton {
-	background:url(../images/clr_button_hover.gif) no-repeat top left;
-}
-
-a.logwin_shrinkbutton {
-	width:18px;
-	height:15px;
-	float:right;
-	background:url(../images/shrink_button.gif) no-repeat top left;
-	margin-right:7px;
-	margin-top:4px;
-	padding:0;
-}
-
-a:hover.logwin_shrinkbutton {
-	background:url(../images/shrink_button_hover.gif) no-repeat top left;
-}
-
-a.logwin_minimizebutton {
-	width:18px;
-	height:15px;
-	float:left;
-	background:url(../images/minimize_button.gif) no-repeat top left;
-	margin-right:2px;
-	padding:0;
-}
-
-a:hover.logwin_minimizebutton {
-	background:url(../images/minimize_button_hover.gif) no-repeat top left;
-}
-
-.logwin_content {
-    overflow:scroll;
-    height: 477px;
-    background: white;
-}
-


Mime
View raw message