merge thridparty to deps

build/build-cloud.xml

@@ -61,7 +61,6 @@
   <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
   <property name="build.log" location="${target.dir}/ant_verbose.txt" />
 
-  <property name="thirdparty.dir" location="${base.dir}/thirdparty" />
   <property name="deps.dir" location="${base.dir}/deps" />
 
   <!-- directories for client compilation-->
@@ -146,13 +145,6 @@
   <path id="src.classpath">
   </path>
 
-  <path id="thirdparty.classpath">
-    <!--filelist files="${thirdparty.classpath}" /-->
-    <fileset dir="${thirdparty.dir}" erroronmissingdir="false">
-      <include name="*.jar" />
-    </fileset>
-  </path>
-
   <path id="deps.classpath">
     <!--filelist files="${deps.classpath}" /-->
     <fileset dir="${deps.dir}" erroronmissingdir="false">
@@ -207,7 +199,7 @@
   </target>
 
   <path id="vmware-base.classpath">
-    <path refid="thirdparty.classpath" />
+    <path refid="deps.classpath" />
     <path refid="dist.classpath" />
   </path>
   <target name="compile-vmware-base" depends="-init, compile-utils" description="Compile the VMware support library">
@@ -469,7 +461,6 @@
 
   <path id="agent.classpath">
     <path refid="deps.classpath" />
-    <path refid="thirdparty.classpath"/>
     <fileset dir="${target.dir}">
       <include name="**/${core.jar}" />
       <include name="**/${utils.jar}" />
@@ -643,7 +634,7 @@
   <property name="ovm.dir" location="${base.dir}/ovm" />
   <property name="ovm-scripts.dir" location="${ovm.dir}/scripts" />
   <path id="ovm.classpath" >
-    <path refid="thirdparty.classpath" />
+    <path refid="deps.classpath" />
     <path refid="dist.classpath" />
   </path>
   <target name="compile-ovm" depends="-init, compile-server" description="Compile OVM">

build/build-docs.xml

@@ -26,7 +26,7 @@
   </target>
 
   <target name="pdf" depends="-init">
-    <javadoc doclet="com.tarsec.javadoc.pdfdoclet.PDFDoclet" docletpath="${tools.dir}/pdfdoclet/pdfdoclet-1.0.2-all.jar" overview="${build.dir}/overview.html" additionalparam="-pdf javadoc.pdf -debug" private="no" access="public" classpathref="thirdparty.classpath" linksource="true" sourcepathref="prod.src.path">
+    <javadoc doclet="com.tarsec.javadoc.pdfdoclet.PDFDoclet" docletpath="${tools.dir}/pdfdoclet/pdfdoclet-1.0.2-all.jar" overview="${build.dir}/overview.html" additionalparam="-pdf javadoc.pdf -debug" private="no" access="public" classpathref="deps.classpath" linksource="true" sourcepathref="prod.src.path">
       <!--
             <taglet name="net.sourceforge.taglets.Taglets" path="${tools.dir}/taglets/taglets.jar"/>
             <tag name="config" description="Configurable Parameters in components.xml" scope="types"/>
@@ -44,7 +44,7 @@
     <!-- documentation properties -->
     <property name="jdoc.footer" value="Copyright &amp;copy; ${company.copyright.year} ${company.name}" />
 
-    <javadoc destdir="${docs.dir}/html/api-internal" author="true" version="true" classpathref="thirdparty.classpath" sourcepathref="prod.src.path" access="protected" linksource="true" windowtitle="${company.name} ${version} Maintenance API Reference" doctitle="${company.name} ${version} Maintenance API Reference" bottom="${jdoc.footer}" overview="${build.dir}/overview.html">
+    <javadoc destdir="${docs.dir}/html/api-internal" author="true" version="true" classpathref="deps.classpath" sourcepathref="prod.src.path" access="protected" linksource="true" windowtitle="${company.name} ${version} Maintenance API Reference" doctitle="${company.name} ${version} Maintenance API Reference" bottom="${jdoc.footer}" overview="${build.dir}/overview.html">
       <excludepackage name="com.xensource.xenapi.*" />
       <taglet name="net.sourceforge.taglets.Taglets" path="${tools.dir}/taglets/taglets.jar" />
       <tag name="config" description="Configurable Parameters in components.xml" scope="types" />

build/build-tests.xml

@@ -35,7 +35,7 @@
 
   <!-- =================== Agent Simulator ==================== -->
   <path id="agent-simulator.classpath">
-    <path refid="thirdparty.classpath" />
+    <path refid="deps.classpath" />
     <path refid="dist.classpath" />
   </path>
   <target name="compile-agent-simulator" depends="-init, compile-api, compile-utils, compile-core, compile-agent, compile-server" description="Compile the agent simulator.">
@@ -61,7 +61,7 @@
         <include name="${core.jar}" />
         <include name="${api.jar}" />
       </fileset>
-      <fileset dir="${thirdparty.dir}">
+      <fileset dir="${deps.dir}">
         <include name="log4j-1.2.15.jar" />
         <include name="gson-1.3.jar" />
         <include name="commons-logging-1.1.1.jar" />
@@ -95,7 +95,7 @@
   </target>
 
   <path id="testclient.classpath">
-    <path refid="thirdparty.classpath" />
+    <path refid="deps.classpath" />
     <path refid="dist.classpath" />
   </path>
   <target name="compile-testclient" depends="-init-test, compile-utils" description="Compile the test client.">
@@ -114,7 +114,7 @@
         <include name="${testclient.jar}" />
         <include name="${utils.jar}" />
       </fileset>
-      <fileset dir="${thirdparty.dir}">
+      <fileset dir="${deps.dir}">
         <include name="commons-httpclient-3.1.jar" />
         <include name="commons-logging-1.1.1.jar" />
         <include name="commons-codec-1.4.jar" />
@@ -170,7 +170,7 @@
         <include name="${testclient.jar}" />
         <include name="${utils.jar}" />
       </fileset>
-      <fileset dir="${thirdparty.dir}">
+      <fileset dir="${deps.dir}">
         <include name="commons-httpclient-3.1.jar" />
         <include name="commons-logging-1.1.1.jar" />
         <include name="commons-codec-1.4.jar" />
@@ -220,7 +220,7 @@
     <depend srcdir="${server.test.dir}" destdir="${server.test.target.dir}" cache="${dep.cache.dir}">
     </depend>
     <javac srcdir="${server.test.dir}" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" source="1.5" target="1.5" destdir="${server.test.target.dir}" includeantruntime="false">
-      <classpath refid="thirdparty.classpath" />
+      <classpath refid="deps.classpath" />
       <classpath refid="test.classpath" />
       <compilerarg value="-Xlint:all" />
     </javac>

cloud.spec

@@ -510,6 +510,12 @@ fi
 %{_javadir}/%{name}-iControl.jar
 %{_javadir}/%{name}-manageontap.jar
 %{_javadir}/vmware*.jar
+%{_javadir}/%{name}-charva.jar
+%{_javadir}/%{name}-jnetpcap.jar
+%{_javadir}/%{name}-junit.jar
+%{_javadir}/%{name}-selenium-java-client-driver.jar
+%{_javadir}/%{name}-selenium-server.jar
+
 
 %files core
 %defattr(0644,root,root,0755)