You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/06/07 05:53:38 UTC
git commit: putting console proxy back into the build - just not
default
Updated Branches:
refs/heads/master b7ca7f8df -> 724d40df7
putting console proxy back into the build - just not default
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/724d40df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/724d40df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/724d40df
Branch: refs/heads/master
Commit: 724d40df793eb6033f69df48ebcddbc969741b92
Parents: b7ca7f8
Author: David Nalley <da...@gnsa.us>
Authored: Wed Jun 6 23:52:39 2012 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Wed Jun 6 23:52:39 2012 -0400
----------------------------------------------------------------------
build/build-cloud.xml | 92 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/724d40df/build/build-cloud.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 8467069..60953a7 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -91,6 +91,9 @@
<property name="scripts.dir" location="${base.dir}/scripts" />
<property name="scripts.target.dir" location="${target.dir}/scripts"/>
+ <!-- directories for console proxy compilation-->
+ <property name="console-proxy.dir" location="${base.dir}/console-proxy" />
+ <property name="console-proxy.dist.dir" location="${dist.dir}/console-proxy" />
<property name="tools.dir" location="${base.dir}/tools" />
<!-- <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
@@ -109,6 +112,7 @@
<property name="utils.jar" value="cloud-utils.jar" />
<property name="server.jar" value="cloud-server.jar" />
<property name="agent.jar" value="cloud-agent.jar" />
+ <property name="console-proxy.jar" value="cloud-console-proxy.jar" />
<property name="api.jar" value="cloud-api.jar"/>
<property name="vmware-base.jar" value="cloud-vmware-base.jar" />
@@ -306,7 +310,95 @@
</copy>
</target>
+ <path id="console-proxy.classpath">
+ <path refid="deps.classpath" />
+ <path refid="dist.classpath" />
+ </path>
+ <target name="compile-console-proxy" depends="-init" description="Compile the console proxy.">
+ <compile-java jar.name="${console-proxy.jar}" top.dir="${console-proxy.dir}" classpath="console-proxy.classpath" >
+ <include-files>
+ <fileset dir="${console-proxy.dir}/certs">
+ <include name="*.keystore" />
+ <include name="*.crt" />
+ <include name="*.key" />
+ </fileset>
+ </include-files>
+ </compile-java>
+ </target>
+ <target name="copy-console-proxy" depends="-init">
+ <property name="copyto.dir" value="${console-proxy.dist.dir}" />
+ <mkdir dir="${copyto.dir}" />
+ <mkdir dir="${copyto.dir}/conf" />
+ <mkdir dir="${copyto.dir}/logs" />
+ <mkdir dir="${copyto.dir}/applet" />
+ <mkdir dir="${copyto.dir}/images" />
+ <mkdir dir="${copyto.dir}/js" />
+ <mkdir dir="${copyto.dir}/ui" />
+ <mkdir dir="${copyto.dir}/css" />
+ <mkdir dir="${copyto.dir}/certs" />
+
+ <copy todir="${copyto.dir}">
+ <fileset dir="${deps.dir}">
+ <include name="log4j-1.2.15.jar" />
+ <include name="apache-log4j-extras-1.0.jar" />
+ <include name="gson.jar" />
+ </fileset>
+ </copy>
+
+ <copy todir="${copyto.dir}">
+ <fileset dir="${jar.dir}">
+ <include name="cloud-console-proxy.jar" />
+ </fileset>
+ </copy>
+ <copy todir="${copyto.dir}/conf">
+ <fileset dir="${production.dir}/consoleproxy/conf">
+ <include name="log4j-cloud.xml" />
+ <include name="consoleproxy.properties" />
+ </fileset>
+ </copy>
+ <copy todir="${copyto.dir}/images">
+ <fileset dir="${console-proxy.dir}/images">
+ <include name="*.jpg" />
+ <include name="*.gif" />
+ <include name="*.png" />
+ <include name="*.cur" />
+ </fileset>
+ </copy>
+ <copy todir="${copyto.dir}/js">
+ <fileset dir="${console-proxy.dir}/js">
+ <include name="*.js" />
+ </fileset>
+ </copy>
+ <copy todir="${copyto.dir}/ui">
+ <fileset dir="${console-proxy.dir}/ui">
+ <include name="*.ftl" />
+ </fileset>
+ </copy>
+ <copy todir="${copyto.dir}/css">
+ <fileset dir="${console-proxy.dir}/css">
+ <include name="*.css" />
+ </fileset>
+ </copy>
+ <copy todir="${copyto.dir}/certs">
+ <fileset dir="${console-proxy.dir}/certs">
+ <include name="*.keystore" />
+ <include name="*.crt" />
+ <include name="*.key" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="build-console-proxy" depends="-init, compile-console-proxy, copy-console-proxy">
+ <copy todir="${console-proxy.dist.dir}">
+ <fileset dir="${console-proxy.dir}/scripts">
+ </fileset>
+ </copy>
+ <copy todir="${console-proxy.dist.dir}/conf">
+ <fileset dir="${console-proxy.dir}/conf">
+ </fileset>
+ </copy>
+ </target>
<path id="agent.classpath">