[Jboss-cvs] JBossAS SVN: r56160 - trunk/testsuite

[jboss-cvs-commits at lists.jboss.org]

Author: rachmatowicz at jboss.com
Date: 2006-08-22 17:43:19 -0400 (Tue, 22 Aug 2006)
New Revision: 56160

Added:
   trunk/testsuite/build-thirdparty.xml
Modified:
   trunk/testsuite/build.xml
Log:
JBQA-434: Modify testsuite to add to thirdparty

Added: trunk/testsuite/build-thirdparty.xml
===================================================================
--- trunk/testsuite/build-thirdparty.xml	2006-08-22 21:34:36 UTC (rev 56159)
+++ trunk/testsuite/build-thirdparty.xml	2006-08-22 21:43:19 UTC (rev 56160)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<project name="main.build"
+          default="synchronize"
+          basedir=".">
+
+   <!-- Property File definitions -->
+   <property file="local.properties"/>
+   <property file="synchronize.properties"/>
+   <property environment="env"/>
+
+   <!-- Property Definitions -->
+   <property name="generatedLibrariesFiles" value="../thirdparty/testsuite-libraries.ent"/>
+
+   <!-- Allow jbossbuild.repository to be set from (in order or priority)
+      + Command line -Djbossbuild.repository=...
+      + synchronize.properties jbossbuild.repository setting
+      + JBOSS_REPOSITORY environment variable
+   -->
+   <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+      <isset property="env.JBOSS_REPOSITORY"/>
+   </condition>
+   <!-- Fall back to default -->
+   <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+   <!-- File Imports -->
+   <import file="../tools/etc/jbossbuild/tasks.xml"/>
+
+   <!-- Main Definition of dependencies -->
+   <build id="jbossas-thirdparty"
+      impltitle="JBossAS"
+      implversion="jboss-head"
+      implvendor="JBoss Inc."
+      implurl="http://www.jboss.org"
+      description="JBoss Application Server"
+      cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+      thirdpartypath="../thirdparty/"
+      location="${jbossbuild.repository}"
+      targetdefs="targets">
+
+      <!--
+        The repository is in CVS under the module repository.jboss.com whose contents
+        are pushed to the http://repository.jboss.com site.
+      -->
+      <componentref name="jboss/jboss-messaging" version="1.0.1.CR4"/> 
+
+    </build>
+
+   <synchronizeinfo/>
+
+   <!-- Generate the targets -->
+   <generate generate="jbossas-thirdparty"/>
+
+   <target name="generate-lib-file"
+      description="generate testsuite-libraries.ent" 
+      depends="synchronize">
+         <gen-lib-file filename="${generatedLibrariesFiles}" />
+    </target>
+    
+</project>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2006-08-22 21:34:36 UTC (rev 56159)
+++ trunk/testsuite/build.xml	2006-08-22 21:43:19 UTC (rev 56160)
@@ -288,6 +288,49 @@
       <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
    </target>
 
+   <!-- retrieve items from the repository, store them in the -->
+   <!-- thirdparty folder, and create a testsuite-libraries.ent file -->
+   <!-- then generate a new libraries.ent file and include it in  -->
+   <!-- the build                                                 -->
+   <target name="createthirdparty" unless="inhibit.downloads"
+      depends="check.inhibit.downloads, set.proxy">
+      <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
+   </target>
+
+   <!-- check if thirdparty libraries are to be downloaded -->
+   <target name="check.inhibit.downloads">
+      <condition property="inhibit.downloads">
+         <or>
+            <uptodate property="dependencies.current"
+	          srcfile="build-thirdparty.xml"
+               targetfile="../thirdparty/testsuite-libraries.ent"/>
+            <istrue value="${nodownload}"/>
+         </or>
+      </condition>
+  </target>
+
+  <!-- check if the the user has specied proxy settings -->
+  <target name="check.proxy">
+    <condition property="hasproxy">
+        <and>
+            <isset property="proxy.host"/>
+            <isset property="proxy.port"/>
+            <not>
+                <equals arg1="" arg2="${proxy.host}" trim="true"/>
+            </not>
+            <not>
+                <equals arg1="" arg2="${proxy.port}" trim="true"/>
+            </not>
+        </and>
+    </condition>
+  </target>
+
+  <!-- set proxy settings -->
+  <target name="set.proxy" if="hasproxy" depends="check.proxy">
+    <echo>Proxy is set to ${proxy.host}:${proxy.port}</echo>
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+  </target>
+
    <!-- ================================================================== -->
    <!-- Compile                                                            -->
    <!-- ================================================================== -->
@@ -436,7 +479,7 @@
 
    <target name="main"
       description="Executes the default target (most)."
-      depends="most"/>
+      depends="createthirdparty,most"/>
 
    <target name="all"
       description="Builds everything."