Skip to content

Commit 19e7387

Browse files
anthonyxuanthonyxu
committed
build fix
1 parent f7e1b52 commit 19e7387

5 files changed

Lines changed: 3 additions & 11 deletions

File tree

‎build/build-cloud.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
<property name="dep.cache.dir" location="${target.dir}/dep-cache" />
6262
<property name="build.log" location="${target.dir}/ant_verbose.txt" />
6363

64-
<property name="proprietary.dir" location="${base.dir}/cloudstack-proprietary" />
65-
6664
<property name="thirdparty.dir" location="${base.dir}/thirdparty" />
6765
<property name="deps.dir" location="${base.dir}/deps" />
6866

@@ -115,9 +113,6 @@
115113
<property name="test.target.dir" location="${target.dir}/test" />
116114
<property name="test.classes.dir" location="${test.target.dir}/classes" />
117115

118-
<property name="premium.dir" location="${proprietary.dir}/premium" />
119-
<property name="core-premium.dir" location="${proprietary.dir}/core-premium" />
120-
121116
<!-- directories for branding -->
122117
<property name="branding.dir" location="${build.dir}/deploy/branding/${branding.name}" />
123118

‎build/package.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@
191191
<zipfileset dir="${console-proxy.dist.dir}" filemode="555">
192192
<include name="**/*.sh" />
193193
<include name="**/certs/" />
194-
<include name="**/cloud-console-proxy-premium.jar" />
195194
</zipfileset>
196195
<zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555">
197196
<exclude name="**/.project" />

‎console-proxy/scripts/run.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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 %*
1+
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 %*

‎scripts/vm/hypervisor/xen/rundomrpre.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,9 @@ then
223223
fi
224224
fi
225225

226-
cpfile=$(dirname $0)/../../../../console-proxy-premium.zip
226+
cpfile=$(dirname $0)/../../../../console-proxy.zip
227227
[ -f $cpfile ] || $(dirname $0)/../../../../console-proxy.zip
228-
[ -f $cpfile ] || $(dirname $0)/../../console-proxy-premium.zip
229228
[ -f $cpfile ] || $(dirname $0)/../../console-proxy.zip
230-
[ -f $cpfile ] || $(dirname $0)/console-proxy-premium.zip
231229
[ -f $cpfile ] || $(dirname $0)/console-proxy.zip
232230
if [[ "$template" == "domP" && -f $cpfile ]]
233231
then

‎wscript_configure‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api
245245
conf.env.MSCLASSPATH = pathsep.join(msclasspath)
246246

247247
# the agent and simulator classpaths point to JARs required to run these two applications
248-
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() ]
248+
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() ]
249249
conf.env.AGENTCLASSPATH = pathsep.join(agentclasspath)
250250
conf.env.AGENTSIMULATORCLASSPATH = pathsep.join(agentclasspath+[in_javadir("%s-agent-simulator.jar"%conf.env.PACKAGE)])
251251

0 commit comments

Comments
 (0)