[Hyperic-hq-discuss] hq r14607 - branches/HQ_4_4

[<pn...@hy...>]

Author: pnguyen
Date: 2010-05-20 23:16:54 -0700 (Thu, 20 May 2010)
New Revision: 14607
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14607

Modified:
   branches/HQ_4_4/build.xml
Log:
updated for vsphere plugin

Modified: branches/HQ_4_4/build.xml
===================================================================
--- branches/HQ_4_4/build.xml	2010-05-21 06:14:59 UTC (rev 14606)
+++ branches/HQ_4_4/build.xml	2010-05-21 06:16:54 UTC (rev 14607)
@@ -31,6 +31,7 @@
 
   <!-- Native libs -->
   <property name="hq.bin" location="hq_bin" />
+  <property name="hqapi.lib" location="ui_plugins/hqapi1/lib" />
   <property name="lather.lib" location="${hq.bin}/lather_bin" />
   <property name="sigar.lib" location="${hq.bin}/sigar_bin/lib" />
   <property name="db2monitor.dir" location="${hq.bin}/db2monitor_bin"/>
@@ -258,6 +259,7 @@
             <include name="*/src"/>
             <exclude name="xen/src"/>
             <exclude name="vim/src"/>
+            <exclude name="vsphere/src"/>
 			<exclude name="spring/src"/>
           </dirset>
         </src>
@@ -270,15 +272,20 @@
 			<path refid="alljars" />
 			<path refid="testjars" />
 			<path location="${build.dir}/classes"/>
+	      	<path>
+	      		<fileset dir="${hqapi.lib}" includes="hqapi*.jar" />
+	      	</path>
 		  </classpath>
 	      <src>
 	        <path location="${basedir}/plugins/xen/src" />
 	        <path location="${basedir}/plugins/vim/src" />
+	        <path location="${basedir}/plugins/vsphere/src" />
 			<path location="${basedir}/plugins/spring/src/main/java" />
 	      </src>
 	      <include name="org/hyperic/hq/plugin/xen/**"/>
 	      <include name="com/xensource/**"/>
 	      <include name="org/hyperic/hq/plugin/vim/**"/>
+		  <include name="org/hyperic/hq/plugin/vsphere/**"/>
 	 	  <include name="org/hyperic/hq/plugin/spring/**"/>
 	    </hq-javac>
   </target>
@@ -1021,6 +1028,8 @@
         <!-- for CollectorThread -->
         <include name="backport-util-concurrent-3.1.jar"/>
       </fileset>
+      <!-- for vsphere plugin -->
+      <fileset dir="${hqapi.lib}" includes="hqapi*.jar" />
     </copy>
 
     <!-- product.jmx.* has to be loaded from the plugin ClassLoader -->
@@ -1148,6 +1157,8 @@
 
     <hqplugin name="vmware"/>
 
+    <hqplugin name="vsphere"/>
+
     <hqplugin name="xen">
        <!-- XXX Xen sdk built w/ 1.6 + mods for Xen 4.0 compat -->
        <fileset dir="${build.dir}/classes"