Return-Path: 
 <cloudstack-commits-return-3337-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9FA47D3B4
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Fri,  7 Sep 2012 23:32:01 +0000 (UTC)
Received: (qmail 17815 invoked by uid 500); 7 Sep 2012 23:32:01 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 17788 invoked by uid 500); 7 Sep 2012 23:32:01 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 17781 invoked by uid 99); 7 Sep 2012 23:32:01 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2012 23:32:01 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 308F82846A; Fri,  7 Sep 2012 23:32:01 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: anthonyxu@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: Removing the older xenapi jar and adding an ant target to
 build one from the source.
Message-Id: <20120907233201.308F82846A@tyr.zones.apache.org>
Date: Fri,  7 Sep 2012 23:32:01 +0000 (UTC)

Updated Branches:
  refs/heads/master 24fa14845 -> f9e91a9f9


Removing the older xenapi jar and adding an ant target to build one from the source.

provided-by : Devdeep Singh


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f9e91a9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f9e91a9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f9e91a9f

Branch: refs/heads/master
Commit: f9e91a9f967fe159a2ec7a09e4cb457aa8dcbd0c
Parents: 24fa148
Author: Anthony Xu <anthony@cloud.com>
Authored: Fri Sep 7 16:31:47 2012 -0700
Committer: Anthony Xu <anthony@cloud.com>
Committed: Fri Sep 7 16:31:47 2012 -0700

----------------------------------------------------------------------
 build/build-cloud.xml |   14 ++++++++++++--
 deps/.classpath       |    1 -
 2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9e91a9f/build/build-cloud.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 10f4809..014c75b 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -78,6 +78,7 @@
   <property name="build.log" location="${target.dir}/ant_verbose.txt" />
 
   <property name="deps.dir" location="${base.dir}/deps" />
+  <property name="xenapi.dir" location="${deps.dir}/XenServerJava" />
 
   <!-- directories for client compilation-->
   <property name="client.dir" location="${base.dir}/client" />
@@ -129,6 +130,7 @@
   <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="xenapi.jar" value="cloud-xenapi.jar" />
   <property name="vmware-base.jar" value="cloud-vmware-base.jar" />
   <property name="vmware.jar" value="cloud-vmware.jar" />
 
@@ -215,12 +217,20 @@
   <target name="compile-vmware-base" depends="-init, compile-utils" description="Compile the VMware support library">
     <compile-java jar.name="${vmware-base.jar}" top.dir="${vmware-base.dir}" classpath="vmware-base.classpath" />
   </target>
-	
+
+  <path id="xenapi.classpath">
+    <path refid="deps.classpath" />
+    <path refid="dist.classpath" />
+  </path>
+  <target name="compile-xenapi" depends="-init" description="Compile XenServer java sdk.">
+    <compile-java jar.name="${xenapi.jar}" top.dir="${xenapi.dir}" classpath="xenapi.classpath" />
+  </target>
+
   <path id="server.classpath">
     <path refid="deps.classpath" />
     <path refid="dist.classpath" />
   </path>
-  <target name="compile-server" depends="-init, compile-utils, compile-core, compile-agent" description="Compile the management server.">
+  <target name="compile-server" depends="-init, compile-utils, compile-xenapi, compile-core, compile-agent" description="Compile the management server.">
     <compile-java jar.name="${server.jar}" top.dir="${server.dir}" classpath="server.classpath" />
   </target>
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9e91a9f/deps/.classpath
----------------------------------------------------------------------
diff --git a/deps/.classpath b/deps/.classpath
index 1376b4f..14dd132 100755
--- a/deps/.classpath
+++ b/deps/.classpath
@@ -40,7 +40,6 @@ under the License.
 	<classpathentry exported="true" kind="lib" path="cloud-trilead-ssh2-build213.jar"/>
 	<classpathentry exported="true" kind="lib" path="cloud-ws-commons-util-1.0.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="cloud-wsdl4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="cloud-xenserver-5.6.100-1.jar"/>
 	<classpathentry exported="true" kind="lib" path="cloud-xmlrpc-client-3.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="cloud-xmlrpc-common-3.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="cloud-xstream-1.3.1.jar"/>