From 9fd09a7f5fe732a888f10c1dfffb9de28e485ae1 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <bhaisaab@apache.org>
Date: Wed, 13 Feb 2013 12:40:30 +0530
Subject: [PATCH] console-proxy: Fix broken build system due to console-proxy
 moves

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
---
 packaging/centos63/cloud.spec         | 4 ++--
 pom.xml                               | 2 +-
 services/console-proxy/server/pom.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 2577cd0e58b..a90fde95871 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -181,8 +181,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/
 cp -r scripts/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
-install -D console-proxy/dist/systemvm.iso ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.iso
-install -D console-proxy/dist/systemvm.zip ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.zip
+install -D services/console-proxy/server/dist/systemvm.iso ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.iso
+install -D services/console-proxy/server/dist/systemvm.zip ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.zip
 install python/lib/cloud_utils.py ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloud_utils.py
 cp -r python/lib/cloudutils ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/
 python -m py_compile ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloud_utils.py
diff --git a/pom.xml b/pom.xml
index f7aaf95f5d1..a9209c14260 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,7 +361,7 @@
               <exclude>**/target/**</exclude>
               <exclude>**/.vagrant</exclude>
               <exclude>build/build.number</exclude>
-              <exclude>console-proxy/js/jquery.js</exclude>
+              <exclude>services/console-proxy/server/js/jquery.js</exclude>
               <exclude>debian/compat</exclude>
               <exclude>debian/control</exclude>
               <exclude>debian/dirs</exclude>
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 58fd62a71a3..71e83933ca9 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -111,7 +111,7 @@
                   </includes>
                 </resource>
                 <resource>
-                  <directory>../patches/systemvm/debian/config/root/.ssh</directory>
+                  <directory>../../../patches/systemvm/debian/config/root/.ssh</directory>
                   <includes>
                     <include>authorized_keys</include>
                   </includes>