From 19e73877028cc87f7fc9539b65cec6568e18d032 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 28 Jan 2011 19:19:32 -0800
Subject: [PATCH] build fix

---
 build/build-cloud.xml                   | 5 -----
 build/package.xml                       | 1 -
 console-proxy/scripts/run.bat           | 2 +-
 scripts/vm/hypervisor/xen/rundomrpre.sh | 4 +---
 wscript_configure                       | 2 +-
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 38025c10916..86ea5738343 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -61,8 +61,6 @@
   <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
   <property name="build.log" location="${target.dir}/ant_verbose.txt" />
 
-  <property name="proprietary.dir" location="${base.dir}/cloudstack-proprietary" />
-
   <property name="thirdparty.dir" location="${base.dir}/thirdparty" />
   <property name="deps.dir" location="${base.dir}/deps" />
 
@@ -115,9 +113,6 @@
   <property name="test.target.dir" location="${target.dir}/test" />
   <property name="test.classes.dir" location="${test.target.dir}/classes" />
 
-  <property name="premium.dir" location="${proprietary.dir}/premium" />
-  <property name="core-premium.dir" location="${proprietary.dir}/core-premium" />
-
   <!-- directories for branding -->
   <property name="branding.dir" location="${build.dir}/deploy/branding/${branding.name}" />
 
diff --git a/build/package.xml b/build/package.xml
index 6c6c6b0d303..c049e9033bf 100755
--- a/build/package.xml
+++ b/build/package.xml
@@ -191,7 +191,6 @@
       <zipfileset dir="${console-proxy.dist.dir}" filemode="555">
         <include name="**/*.sh" />
         <include name="**/certs/" />
-        <include name="**/cloud-console-proxy-premium.jar" />
       </zipfileset>
       <zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555">
         <exclude name="**/.project" />
diff --git a/console-proxy/scripts/run.bat b/console-proxy/scripts/run.bat
index a24d232bb71..e5fab0dbf41 100644
--- a/console-proxy/scripts/run.bat
+++ b/console-proxy/scripts/run.bat
@@ -1 +1 @@
-java -mx700m -cp cloud-console-proxy.jar;cloud-console-proxy-premium.jar;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %*
+java -mx700m -cp cloud-console-proxy.jar;;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %*
diff --git a/scripts/vm/hypervisor/xen/rundomrpre.sh b/scripts/vm/hypervisor/xen/rundomrpre.sh
index 3318803ed30..41ab4b64ed6 100755
--- a/scripts/vm/hypervisor/xen/rundomrpre.sh
+++ b/scripts/vm/hypervisor/xen/rundomrpre.sh
@@ -223,11 +223,9 @@ then
   fi
 fi
 
-cpfile=$(dirname $0)/../../../../console-proxy-premium.zip
+cpfile=$(dirname $0)/../../../../console-proxy.zip
 [ -f $cpfile ] || $(dirname $0)/../../../../console-proxy.zip
-[ -f $cpfile ] || $(dirname $0)/../../console-proxy-premium.zip
 [ -f $cpfile ] || $(dirname $0)/../../console-proxy.zip
-[ -f $cpfile ] || $(dirname $0)/console-proxy-premium.zip
 [ -f $cpfile ] || $(dirname $0)/console-proxy.zip
 if [[ "$template" == "domP" &&  -f $cpfile ]]
 then
diff --git a/wscript_configure b/wscript_configure
index 24d85c84ad1..89b66792c1d 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -245,7 +245,7 @@ msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api
 conf.env.MSCLASSPATH = pathsep.join(msclasspath)
 
 # the agent and simulator classpaths point to JARs required to run these two applications
-agentclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras agent console-common console-proxy core-extras console-proxy-premium".split() ]
+agentclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras agent console-common console-proxy core-extras".split() ]
 conf.env.AGENTCLASSPATH = pathsep.join(agentclasspath)
 conf.env.AGENTSIMULATORCLASSPATH = pathsep.join(agentclasspath+[in_javadir("%s-agent-simulator.jar"%conf.env.PACKAGE)])