[testng] 10/160: Remove old and and maven build files.

Eugene Zhukov eugene-guest at moszumanska.debian.org
Tue Aug 18 10:22:14 UTC 2015


This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag testng-6.9.5
in repository testng.

commit 963e0d85d3abd9024b5d584ece1d65579e28cccb
Author: Cedric Beust <cedric at beust.com>
Date:   Mon May 25 21:29:07 2015 -0700

    Remove old and and maven build files.
---
 build-ant.xml => ant/build-ant.xml     | 148 +++---
 build-tests.xml => ant/build-tests.xml |   0
 build.xml => ant/build.xml             | 934 ++++++++++++++++-----------------
 maven/build-with-maven                 |  25 +
 maven/bundle-pom.xml                   |  59 +++
 pom-test.xml => maven/pom-test.xml     |   0
 pom.xml => maven/pom.xml               |   0
 7 files changed, 625 insertions(+), 541 deletions(-)

diff --git a/build-ant.xml b/ant/build-ant.xml
similarity index 97%
rename from build-ant.xml
rename to ant/build-ant.xml
index a3aeb7c..4502117 100644
--- a/build-ant.xml
+++ b/ant/build-ant.xml
@@ -1,74 +1,74 @@
-<project name="testng" default="all" basedir=".">
-
-  <property file="build.properties"/>
-  <property name="this.directory" value="${test.dir}" />
-  <property name="test-output" value="${this.directory}/test-output" />
-
-  <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${testng.jar}" />
-
-  <target name="all">
-    <echo>This dir: ${this.directory}</echo>
-    <delete failonerror="false" dir="${this.directory}/build" />
-  	<mkdir dir="${this.directory}/build" />
-  	
-  	<javac classpath="${testng.jar}"
-  		  destdir="${this.directory}/build" srcdir="${this.directory}" includes="test/ant/*.java" />
-
-<!--
-    <testng classpath="build;../../testng-5.2beta-jdk15.jar"
-            outputdir="test-output"
-    	      dumpcommand="true">
-        <xmlfileset dir="." includes="testng.xml"/>
-    </testng>
--->
-	<delete failonerror="false">
-	<fileset dir="${test-output}" includes="**"/></delete>
-  	
-    <testng classpath="${this.directory}/build;${testng.jar}"
-            outputdir="${test-output}"
-  	    parallel="methods"
-  	    threadcount="5"
-    	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
-    	haltonfailure="true"
-    	>
-        <classfileset dir="${this.directory}/build">
-        	<include name="test/ant/NoPackageTest.class" />
-        	<include name="test/ant/MultipleThreadTest.class" />
-        </classfileset>
-    </testng>
-  	
-  	<available file="${test-output}/Ant suite/Ant test.xml" 
-  		type="file" property="test.exists"/>
-  	<fail unless="test.exists" 
-  		message="The appropriately named output should have been created"/>
-  	
-    <testng classpath="${this.directory}/build;${testng.jar}"
-            outputdir="${test-output}"
-	   	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
-    	haltonfailure="true"
-    	suitename="Test Ant Suite"
-    	testname="Test Ant Test"
-    	>
-        <classfileset dir="${this.directory}/build">
-        	<include name="test/ant/DontOverrideSuiteNameTest.class" />
-         </classfileset>
-    </testng>
-  	
-  	<available file="${test-output}/Test Ant Suite/Test Ant Test.xml" 
-  		type="file" property="test2.exists"/>
-  	<fail unless="test2.exists" message="The appropriately named output should have been created"/>
-  	
-  	<!-- Ensure standard tests get run -->
-    <testng classpath="${this.directory}/build;${testng.jar}"
-            outputdir="${test-output}"
-    	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
-    	haltonfailure="true"
-    	>
-        <xmlfileset file="${test.resources.dir}/testng-ant.xml"/>
-    </testng>
-  	<available file="${test-output}/Suitename from xml/TestName.xml" 
-  		type="file" property="test3.exists"/>
-  	<fail unless="test3.exists" message="The appropriately named output should have been created"/>
-
-  </target>
-</project>
+<project name="testng" default="all" basedir=".">
+
+  <property file="build.properties"/>
+  <property name="this.directory" value="${test.dir}" />
+  <property name="test-output" value="${this.directory}/test-output" />
+
+  <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${testng.jar}" />
+
+  <target name="all">
+    <echo>This dir: ${this.directory}</echo>
+    <delete failonerror="false" dir="${this.directory}/build" />
+  	<mkdir dir="${this.directory}/build" />
+  	
+  	<javac classpath="${testng.jar}"
+  		  destdir="${this.directory}/build" srcdir="${this.directory}" includes="test/ant/*.java" />
+
+<!--
+    <testng classpath="build;../../testng-5.2beta-jdk15.jar"
+            outputdir="test-output"
+    	      dumpcommand="true">
+        <xmlfileset dir="." includes="testng.xml"/>
+    </testng>
+-->
+	<delete failonerror="false">
+	<fileset dir="${test-output}" includes="**"/></delete>
+  	
+    <testng classpath="${this.directory}/build;${testng.jar}"
+            outputdir="${test-output}"
+  	    parallel="methods"
+  	    threadcount="5"
+    	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
+    	haltonfailure="true"
+    	>
+        <classfileset dir="${this.directory}/build">
+        	<include name="test/ant/NoPackageTest.class" />
+        	<include name="test/ant/MultipleThreadTest.class" />
+        </classfileset>
+    </testng>
+  	
+  	<available file="${test-output}/Ant suite/Ant test.xml" 
+  		type="file" property="test.exists"/>
+  	<fail unless="test.exists" 
+  		message="The appropriately named output should have been created"/>
+  	
+    <testng classpath="${this.directory}/build;${testng.jar}"
+            outputdir="${test-output}"
+	   	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
+    	haltonfailure="true"
+    	suitename="Test Ant Suite"
+    	testname="Test Ant Test"
+    	>
+        <classfileset dir="${this.directory}/build">
+        	<include name="test/ant/DontOverrideSuiteNameTest.class" />
+         </classfileset>
+    </testng>
+  	
+  	<available file="${test-output}/Test Ant Suite/Test Ant Test.xml" 
+  		type="file" property="test2.exists"/>
+  	<fail unless="test2.exists" message="The appropriately named output should have been created"/>
+  	
+  	<!-- Ensure standard tests get run -->
+    <testng classpath="${this.directory}/build;${testng.jar}"
+            outputdir="${test-output}"
+    	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
+    	haltonfailure="true"
+    	>
+        <xmlfileset file="${test.resources.dir}/testng-ant.xml"/>
+    </testng>
+  	<available file="${test-output}/Suitename from xml/TestName.xml" 
+  		type="file" property="test3.exists"/>
+  	<fail unless="test3.exists" message="The appropriately named output should have been created"/>
+
+  </target>
+</project>
diff --git a/build-tests.xml b/ant/build-tests.xml
similarity index 100%
rename from build-tests.xml
rename to ant/build-tests.xml
diff --git a/build.xml b/ant/build.xml
similarity index 97%
rename from build.xml
rename to ant/build.xml
index a39c816..a1e4bba 100644
--- a/build.xml
+++ b/ant/build.xml
@@ -1,467 +1,467 @@
-<project name="testng" default="dev" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
-  
-  <!-- ====================================================================== -->
-  <!-- TestNG build file                                                      -->
-  <!-- Created cbeust, April 26th, 2004                                       -->
-  <!-- ====================================================================== -->
-
-  <property file="build.properties" />
-  <property name="optimize" value="false" />
-
-  <!-- ====================================================================== -->
-  <!-- PREPARE                                                                -->
-  <!-- ====================================================================== -->
-  <target name="prepare" depends="retrieve-dependencies"
-          description="Performs all preparations required to build.">
-    <tstamp />
-    <mkdir dir="${build.dir}" />
-    <mkdir dir="${other.jars.dir}" />
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- DUMP                                                                   -->
-  <!-- ====================================================================== -->
-  <target name="dump" description="Dumps all properties." depends="prepare">
-    <echoproperties />
-  </target>
-
-	<!-- ====================================================================== -->
-  <!-- VALIDATE                                                               -->
-  <!-- ====================================================================== -->
-
-  <target name="validate" description="Validates the build environment.">
-    <!-- java greater than 1.6 required to build -->
-    <condition property="requiredJavaVersion">
-      <or>
-        <equals arg1="${ant.java.version}" arg2="1.9" />
-        <equals arg1="${ant.java.version}" arg2="1.8" />
-        <equals arg1="${ant.java.version}" arg2="1.7" />
-      </or>
-    </condition>
-    <fail unless="requiredJavaVersion"
-          message="Java version 1.7 required." />
-    <!-- validate ant version too ... -->
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- COPY-RESOURCES                                                       -->
-  <!-- ==================================================================== -->
-
-  <target name="copy-resources" description="Copies resources.">
-    <copy verbose="false"
-          file="${src.resources.dir}/testngtasks"
-          todir="${build.dir}" />
-    <copy todir="${build.dir}">
-      <fileset dir="${src.resources.dir}">
-        <exclude name="**/.*" />
-        <exclude name="**/CVS/*" />
-      </fileset>
-    </copy>
-  </target>
-
-
-  <target name="dev"
-          depends="prepare,validate,copy-resources,build,tests" />
-
-  <target name="all"
-          depends="prepare,validate,copy-resources,build,dist,tests,test-ant,javadocs,dist" />
-
-  <target name="build" depends="prepare,compile,testng-jar-all" />
-
-  <target name="testng-jar-all">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${testng.jar}" />
-    </antcall>
-    <jar jarfile="${testng.jar}" update="true">
-      <zipfileset src="${lib.dir}/${beanshell.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${yaml.jar}" />
-    </jar>
-
-  </target>
-
-  <target name="single">
-    <ant antfile="build-tests.xml" target="run:single"/>
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Compile                                                              -->
-  <!-- ==================================================================== -->
-
-  <path id="compile2.cp">
-    <fileset dir="${lib.dir}" includes="${all.jar.files}" />
-  </path>
-
-  <target name="compile"
-          depends="prepare,copy-resources"
-          description="Compiles sources">
-    <echo message="                                 -- Compiling sources --" />
-
-    <echo>Src:${src.dir}</echo>
-    <javac classpathref="compile2.cp"
-           verbose="false"
-           target="1.7"
-           debug="true"
-           optimize="${optimize}"
-           destdir="${build.dir}">
-      <src path="${src.dir}" />
-    </javac>
-  </target>
-
-  <target name="compile:all" depends="compile" />
-
-  <target name="examples">
-    <ant inheritall="no" antfile="examples/build.xml" />
-  </target>
-
-  <target name="tests" depends="build" description="runs all JDK5 tests with JDK5 distro">
-    <ant inheritall="no" antfile="build-tests.xml" />
-  </target>
-  
-  <target name="test-ant" depends="build">
-    <echo message="                                 -- Testing ant testng task functionality --" />
-    <ant inheritall="no" antfile="build-ant.xml" />
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Documentation                                                        -->
-  <!-- ==================================================================== -->
-
-  <target name="javadocs" depends="build,javadocs-current" />
-
-  <target name="doclava">
-    <javadoc
-      docletpath="3rdparty/doclava-1.0.3.jar"
-      bootclasspath="${javahome}/jre/lib/rt.jar"
-      classpath="${testng.jar}:lib/${ant.jar}:lib/${guice2.jar}:lib/aopalliance-1.0.jar"
-      maxmemory="2048M"
-      additionalparam="-quiet"
-      verbose="false"
-      destdir="javadocs"
-      >
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/xml/Xml*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/annotations/**" />
-      </fileset>
-      <doclet name="com.google.doclava.Doclava">
-        <param name="-stubs" value="build/stubs" />
-        <param name="-hdf"/>
-        <param name="project.name" value="TestNG" />
-        <!-- versioning -->
-        <param name="-since"/>
-        <param name="doclava/previous.xml"/>
-        <param name="v1" />
-        <param name="-apiversion" value="v2"/>
-        <!-- federation -->
-        <param name="-federate" />
-        <param name="JDK"/>
-        <param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
-        <param name="-federationxml"/><param name="JDK"/>
-        <param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
-      </doclet>
-    </javadoc>
-  </target>
-
-  <target name="javadocs-current">
-    <javadoc additionalparam="-quiet" destdir="javadocs" source="1.7" windowtitle="TestNG"
-      classpath="${testng.jar}" classpathref="compile2.cp" verbose="false">
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/xml/Xml*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/annotations/**" />
-      </fileset>
-    </javadoc>
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Distribution                                                         -->
-  <!-- ==================================================================== -->
-
-  <target name="dist" depends="build,all-jar-flavors,dist-all-zip,eclipse" />
-
-  <target name="all-jar-flavors" depends="dist-junit,dist-nobsh-guice,dist-bsh-noguice,dist-nobsh-noguice,dist-testng-dist,dist-testng-javadoc" />
-
-  <target name="dist-junit">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.junit.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.junit.jar}" update="true">
-      <zipfileset src="${lib.dir}/${beanshell.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-      <zipfileset src="${lib.dir}/${yaml.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-nobsh-guice">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.guice.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.nobsh.guice.jar}" update="true">
-      <zipfileset src="${lib.dir}/${guice2.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-bsh-noguice">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.bsh.noguice.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">
-      <zipfileset src="${lib.dir}/${beanshell.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-nobsh-noguice">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.noguice.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-testng-dist">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.dist.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.dist.jar}" update="true">
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-testng-javadoc" depends="javadocs">
-    <zip destfile="${other.jars.dir}/${testng.javadoc.zip}">
-        <fileset dir="javadocs"/>
-    </zip>
-  </target>
-
-  <target name="create-jar" description="Create a jar file with the Testng classes and nothing else" 
-          depends="compile">
-    <delete file="${jar.file}" />
-    <jar destfile="${jar.file}" >
-      <manifest>
-        <attribute name="Main-Class" value="org.testng.TestNG" />
-        <attribute name="Implementation-Version" value="${testng.version}-${DSTAMP}${TSTAMP}" />
-      </manifest>
-      <fileset dir="${build.dir}" />
-      <fileset file="TESTNG-${testng.version}" />
-    </jar>
-  </target>
-
-  <target name="dist-all-zip" depends="dist-prepare,javadocs">
-    <property name="zip.dir" value="testng-${testng.version}" />
-    <echo>Adding ${testng.fullname}</echo>
-    <zip zipfile="${testng.zip}">
-      <zipfileset prefix="${zip.dir}" dir="${target}">
-        <include name="${testng.fullname}.jar" />
-      </zipfileset>
-      <zipfileset prefix="${zip.dir}" dir="${basedir}" includesfile="FILES" />
-      <zipfileset dir="${other.jars.dir}" prefix="${zip.dir}/other-jars"/>
-      <zipfileset dir="javadocs" prefix="${zip.dir}/javadocs" />
-      <zipfileset dir="src" prefix="${zip.dir}/src" />
-      <zipfileset dir="spring" prefix="${zip.dir}/spring" />
-      <zipfileset dir="doc" prefix="${zip.dir}/doc" />
-      <zipfileset dir="${src.resources.dir}"
-               prefix="${zip.dir}/resources" 
-            includes="**/*.css"/>
-    </zip>
-  </target>
-  
-<!--
-  <target name="dist-maven-bundle" depends="dist-all-zip">
-    <mkdir dir="${build.maven-bundle.dir}" />
-    <copy file="bundle-pom.xml" tofile="${build.maven-bundle.dir}/pom.xml" overwrite="true">
-      <filterchain>
-        <expandproperties/>
-      </filterchain>
-    </copy>
-    <jar destfile="${build.maven-bundle.dir}/${sources.testng.jar}">
-      <fileset dir="${src.dir}" />
-    </jar>
-
-    <exec executable="gpg">
-      <arg value="- -yes" />
-      <arg value="-ab" />
-      <arg value="${testng.jar}" />
-    </exec>
-
-    <exec executable="gpg">
-      <arg value="- -yes" />
-      <arg value="-ab" />
-      <arg value="${build.maven-bundle.dir}/pom.xml" />
-    </exec>
-
-    <exec executable="gpg">
-      <arg value="- -yes" />
-      <arg value="-ab" />
-      <arg value="${build.maven-bundle.dir}/${sources.testng.jar}" />
-    </exec>
-
-    <jar destfile="${testng.maven-bundle}">
-      <fileset file="${build.maven-bundle.dir}/pom.xml" />
-      <fileset file="${build.maven-bundle.dir}/${sources.testng.jar}" />
-      <fileset file="${build.maven-bundle.dir}/*asc" />
-      <fileset file="${testng.jar}" />
-      <fileset file="${testng.jar}.asc" />
-    </jar>
-  </target>
--->
-
-  <target name="dist-prepare" depends="update-readme">
-    <delete file="{other.jars.dir}/${testng.nobsh.jar}" />
-    <mkdir dir="${other.jars.dir}" />
-  </target>
-
-  <target name="update-readme">
-    <copy file="README.template" tofile="README.md" />
-    <replace file="README.md" token="${version}" value="${testng.version}" />
-    <touch file="TESTNG-${testng.version}" />
-  </target>
-      
-  <target name="eclipse" description="Used by Cedric to build distributions">
-    <property name="jdk15.jar"
-              value="${testng-eclipse.dir}/lib/testng.jar" />
-
-    <delete file="${jdk15.jar}" />
-    <copy file="${testng.jar}" tofile="${jdk15.jar}" />
-
-    <!-- sources -->
-    <property name="sources" value="${testng-eclipse.dir}/lib/testng-sources.jar"/>
-    <echo>Sources: ${sources}</echo>
-    <jar destfile="${sources}" basedir="src/main/java/" />
-  </target>
-
-  <target name="ftp">
-    <!--
-          <ftp action="put"
-             server="beust.com"
-             remotedir="w/testng/test-output"
-             userid="${userid}"
-             password="${password}">
-              <fileset dir="c:\weblogic\dev\sandbox\cbeust\testng\test\test-output">
-                <include name="index.html" />
-                <include name="main.html" />
-                <include name="toc.html" />
-                <include name="*egression*" />
-             </fileset>
-        </ftp>
-      -->
-    <ftp action="put"
-         server="beust.com"
-         remotedir="w/testng"
-         userid="${userid}"
-         password="${password}">
-      <fileset dir="${root.dir}">
-        <include name="${testng.zip}" />
-        <include name="javadocs/**" />
-        <include name="testng-1.0.dtd" />
-      </fileset>
-      <fileset dir="${root.dir}/doc">
-        <include name="*.html" />
-      </fileset>
-    </ftp>
-
-  </target>
-
-  <target name="ftp2">
-    <ftp action="put"
-         server="beust.com"
-         remotedir="w/testng"
-         userid="${userid}"
-         password="${password}">
-      <fileset dir="${root.dir}/test">
-        <include name="test-output/*" />
-      </fileset>
-      <fileset dir="${root.dir}/test">
-        <include name="test-report/*" />
-      </fileset>
-    </ftp>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}" />
-    <delete dir="${target}" />
-    <delete dir="${build.maven-bundle.dir}" />
-    <delete failonerror="false">
-      <fileset dir="." includes="testng*.jar,*.zip" />
-    </delete>
-    <delete dir="test-output" failonerror="false" />
-    <delete dir="test-output-tests" failonerror="false" />
-    <ant antfile="build-tests.xml" target="clean" />
-    <ant dir="examples" target="clean" />
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Maven1/2 Distribution                                                -->
-  <!-- ==================================================================== -->
-
-<!--
-  <target name="maven-plugin">
-    <jar destfile="maven-testng-plugin-${testng-maven.version}.jar"
-         basedir="./maven/" />
-  </target>
--->
-
-  <!-- ==================================================================== -->
-  <!-- Ivy                                                                  -->
-  <!-- ==================================================================== -->
-
-  <target name="retrieve-dependencies" description="Retrieve dependencies with ivy">
-    <ivy:retrieve log="quiet" />
-  </target>
-
-  <target name="publish">
-    <ivy:resolve />
-    <mkdir dir="dist/jars" />
-    <copy file="${testng.jar}" todir="dist/jars" />
-    <ivy:publish organisation="org.testng" resolver="local" overwrite="true"/>
-  </target>
-
-  <target name="pom">
-    <ivy:makepom ivyfile="ivy.xml" pomfile="ivy-pom.xml" />
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Code coverage                                                        -->
-  <!-- ==================================================================== -->
-
-<!--
-  <property name="cobertura.dir" value="../cobertura-1.9.4.1" />
-
-  <path id="cobertura.classpath">
-      <fileset dir="${cobertura.dir}">
-          <include name="cobertura.jar" />
-          <include name="lib/**/*.jar" />
-      </fileset>
-  </path>
-
-  <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
-
-  <target name="coverage:create">
-    <cobertura-instrument classpath="cobertura-1.9.4.1/lib/*" todir="target/instrumented-classes">
-      <fileset dir="${build.dir}">
-        <include name="**/*.class" />
-      </fileset>
-    </cobertura-instrument>
-  </target>
-
-  <target name="coverage">
-    <cobertura-report srcdir="${src.dir}" destdir="target/coverage-report"/>
-  </target>
--->
-
-</project>
+<project name="testng" default="dev" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+  
+  <!-- ====================================================================== -->
+  <!-- TestNG build file                                                      -->
+  <!-- Created cbeust, April 26th, 2004                                       -->
+  <!-- ====================================================================== -->
+
+  <property file="build.properties" />
+  <property name="optimize" value="false" />
+
+  <!-- ====================================================================== -->
+  <!-- PREPARE                                                                -->
+  <!-- ====================================================================== -->
+  <target name="prepare" depends="retrieve-dependencies"
+          description="Performs all preparations required to build.">
+    <tstamp />
+    <mkdir dir="${build.dir}" />
+    <mkdir dir="${other.jars.dir}" />
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- DUMP                                                                   -->
+  <!-- ====================================================================== -->
+  <target name="dump" description="Dumps all properties." depends="prepare">
+    <echoproperties />
+  </target>
+
+	<!-- ====================================================================== -->
+  <!-- VALIDATE                                                               -->
+  <!-- ====================================================================== -->
+
+  <target name="validate" description="Validates the build environment.">
+    <!-- java greater than 1.6 required to build -->
+    <condition property="requiredJavaVersion">
+      <or>
+        <equals arg1="${ant.java.version}" arg2="1.9" />
+        <equals arg1="${ant.java.version}" arg2="1.8" />
+        <equals arg1="${ant.java.version}" arg2="1.7" />
+      </or>
+    </condition>
+    <fail unless="requiredJavaVersion"
+          message="Java version 1.7 required." />
+    <!-- validate ant version too ... -->
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- COPY-RESOURCES                                                       -->
+  <!-- ==================================================================== -->
+
+  <target name="copy-resources" description="Copies resources.">
+    <copy verbose="false"
+          file="${src.resources.dir}/testngtasks"
+          todir="${build.dir}" />
+    <copy todir="${build.dir}">
+      <fileset dir="${src.resources.dir}">
+        <exclude name="**/.*" />
+        <exclude name="**/CVS/*" />
+      </fileset>
+    </copy>
+  </target>
+
+
+  <target name="dev"
+          depends="prepare,validate,copy-resources,build,tests" />
+
+  <target name="all"
+          depends="prepare,validate,copy-resources,build,dist,tests,test-ant,javadocs,dist" />
+
+  <target name="build" depends="prepare,compile,testng-jar-all" />
+
+  <target name="testng-jar-all">
+    <antcall target="create-jar">
+      <param name="jar.file" value="${testng.jar}" />
+    </antcall>
+    <jar jarfile="${testng.jar}" update="true">
+      <zipfileset src="${lib.dir}/${beanshell.jar}" />
+      <zipfileset src="${lib.dir}/${jcommander.jar}" />
+      <zipfileset src="${lib.dir}/${yaml.jar}" />
+    </jar>
+
+  </target>
+
+  <target name="single">
+    <ant antfile="build-tests.xml" target="run:single"/>
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- Compile                                                              -->
+  <!-- ==================================================================== -->
+
+  <path id="compile2.cp">
+    <fileset dir="${lib.dir}" includes="${all.jar.files}" />
+  </path>
+
+  <target name="compile"
+          depends="prepare,copy-resources"
+          description="Compiles sources">
+    <echo message="                                 -- Compiling sources --" />
+
+    <echo>Src:${src.dir}</echo>
+    <javac classpathref="compile2.cp"
+           verbose="false"
+           target="1.7"
+           debug="true"
+           optimize="${optimize}"
+           destdir="${build.dir}">
+      <src path="${src.dir}" />
+    </javac>
+  </target>
+
+  <target name="compile:all" depends="compile" />
+
+  <target name="examples">
+    <ant inheritall="no" antfile="examples/build.xml" />
+  </target>
+
+  <target name="tests" depends="build" description="runs all JDK5 tests with JDK5 distro">
+    <ant inheritall="no" antfile="build-tests.xml" />
+  </target>
+  
+  <target name="test-ant" depends="build">
+    <echo message="                                 -- Testing ant testng task functionality --" />
+    <ant inheritall="no" antfile="build-ant.xml" />
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- Documentation                                                        -->
+  <!-- ==================================================================== -->
+
+  <target name="javadocs" depends="build,javadocs-current" />
+
+  <target name="doclava">
+    <javadoc
+      docletpath="3rdparty/doclava-1.0.3.jar"
+      bootclasspath="${javahome}/jre/lib/rt.jar"
+      classpath="${testng.jar}:lib/${ant.jar}:lib/${guice2.jar}:lib/aopalliance-1.0.jar"
+      maxmemory="2048M"
+      additionalparam="-quiet"
+      verbose="false"
+      destdir="javadocs"
+      >
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+        <include name="org/testng/*.java" />
+      </fileset>
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+        <include name="org/testng/xml/Xml*.java" />
+      </fileset>
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+        <include name="org/testng/annotations/**" />
+      </fileset>
+      <doclet name="com.google.doclava.Doclava">
+        <param name="-stubs" value="build/stubs" />
+        <param name="-hdf"/>
+        <param name="project.name" value="TestNG" />
+        <!-- versioning -->
+        <param name="-since"/>
+        <param name="doclava/previous.xml"/>
+        <param name="v1" />
+        <param name="-apiversion" value="v2"/>
+        <!-- federation -->
+        <param name="-federate" />
+        <param name="JDK"/>
+        <param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
+        <param name="-federationxml"/><param name="JDK"/>
+        <param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
+      </doclet>
+    </javadoc>
+  </target>
+
+  <target name="javadocs-current">
+    <javadoc additionalparam="-quiet" destdir="javadocs" source="1.7" windowtitle="TestNG"
+      classpath="${testng.jar}" classpathref="compile2.cp" verbose="false">
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+        <include name="org/testng/*.java" />
+      </fileset>
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+        <include name="org/testng/xml/Xml*.java" />
+      </fileset>
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+        <include name="org/testng/annotations/**" />
+      </fileset>
+    </javadoc>
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- Distribution                                                         -->
+  <!-- ==================================================================== -->
+
+  <target name="dist" depends="build,all-jar-flavors,dist-all-zip,eclipse" />
+
+  <target name="all-jar-flavors" depends="dist-junit,dist-nobsh-guice,dist-bsh-noguice,dist-nobsh-noguice,dist-testng-dist,dist-testng-javadoc" />
+
+  <target name="dist-junit">
+    <antcall target="create-jar">
+      <param name="jar.file" value="${other.jars.dir}/${testng.junit.jar}" />
+    </antcall>
+    <jar jarfile="${other.jars.dir}/${testng.junit.jar}" update="true">
+      <zipfileset src="${lib.dir}/${beanshell.jar}" />
+      <zipfileset src="${lib.dir}/${jcommander.jar}" />
+      <zipfileset src="${lib.dir}/${junit.jar}" />
+      <zipfileset src="${lib.dir}/${yaml.jar}" />
+    </jar>
+  </target>
+
+  <target name="dist-nobsh-guice">
+    <antcall target="create-jar">
+      <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.guice.jar}" />
+    </antcall>
+    <jar jarfile="${other.jars.dir}/${testng.nobsh.guice.jar}" update="true">
+      <zipfileset src="${lib.dir}/${guice2.jar}" />
+      <zipfileset src="${lib.dir}/${jcommander.jar}" />
+      <zipfileset src="${lib.dir}/${junit.jar}" />
+    </jar>
+  </target>
+
+  <target name="dist-bsh-noguice">
+    <antcall target="create-jar">
+      <param name="jar.file" value="${other.jars.dir}/${testng.bsh.noguice.jar}" />
+    </antcall>
+    <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">
+      <zipfileset src="${lib.dir}/${beanshell.jar}" />
+      <zipfileset src="${lib.dir}/${jcommander.jar}" />
+      <zipfileset src="${lib.dir}/${junit.jar}" />
+    </jar>
+  </target>
+
+  <target name="dist-nobsh-noguice">
+    <antcall target="create-jar">
+      <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.noguice.jar}" />
+    </antcall>
+    <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">
+      <zipfileset src="${lib.dir}/${jcommander.jar}" />
+      <zipfileset src="${lib.dir}/${junit.jar}" />
+    </jar>
+  </target>
+
+  <target name="dist-testng-dist">
+    <antcall target="create-jar">
+      <param name="jar.file" value="${other.jars.dir}/${testng.dist.jar}" />
+    </antcall>
+    <jar jarfile="${other.jars.dir}/${testng.dist.jar}" update="true">
+      <zipfileset src="${lib.dir}/${jcommander.jar}" />
+    </jar>
+  </target>
+
+  <target name="dist-testng-javadoc" depends="javadocs">
+    <zip destfile="${other.jars.dir}/${testng.javadoc.zip}">
+        <fileset dir="javadocs"/>
+    </zip>
+  </target>
+
+  <target name="create-jar" description="Create a jar file with the Testng classes and nothing else" 
+          depends="compile">
+    <delete file="${jar.file}" />
+    <jar destfile="${jar.file}" >
+      <manifest>
+        <attribute name="Main-Class" value="org.testng.TestNG" />
+        <attribute name="Implementation-Version" value="${testng.version}-${DSTAMP}${TSTAMP}" />
+      </manifest>
+      <fileset dir="${build.dir}" />
+      <fileset file="TESTNG-${testng.version}" />
+    </jar>
+  </target>
+
+  <target name="dist-all-zip" depends="dist-prepare,javadocs">
+    <property name="zip.dir" value="testng-${testng.version}" />
+    <echo>Adding ${testng.fullname}</echo>
+    <zip zipfile="${testng.zip}">
+      <zipfileset prefix="${zip.dir}" dir="${target}">
+        <include name="${testng.fullname}.jar" />
+      </zipfileset>
+      <zipfileset prefix="${zip.dir}" dir="${basedir}" includesfile="FILES" />
+      <zipfileset dir="${other.jars.dir}" prefix="${zip.dir}/other-jars"/>
+      <zipfileset dir="javadocs" prefix="${zip.dir}/javadocs" />
+      <zipfileset dir="src" prefix="${zip.dir}/src" />
+      <zipfileset dir="spring" prefix="${zip.dir}/spring" />
+      <zipfileset dir="doc" prefix="${zip.dir}/doc" />
+      <zipfileset dir="${src.resources.dir}"
+               prefix="${zip.dir}/resources" 
+            includes="**/*.css"/>
+    </zip>
+  </target>
+  
+<!--
+  <target name="dist-maven-bundle" depends="dist-all-zip">
+    <mkdir dir="${build.maven-bundle.dir}" />
+    <copy file="bundle-pom.xml" tofile="${build.maven-bundle.dir}/pom.xml" overwrite="true">
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
+    </copy>
+    <jar destfile="${build.maven-bundle.dir}/${sources.testng.jar}">
+      <fileset dir="${src.dir}" />
+    </jar>
+
+    <exec executable="gpg">
+      <arg value="- -yes" />
+      <arg value="-ab" />
+      <arg value="${testng.jar}" />
+    </exec>
+
+    <exec executable="gpg">
+      <arg value="- -yes" />
+      <arg value="-ab" />
+      <arg value="${build.maven-bundle.dir}/pom.xml" />
+    </exec>
+
+    <exec executable="gpg">
+      <arg value="- -yes" />
+      <arg value="-ab" />
+      <arg value="${build.maven-bundle.dir}/${sources.testng.jar}" />
+    </exec>
+
+    <jar destfile="${testng.maven-bundle}">
+      <fileset file="${build.maven-bundle.dir}/pom.xml" />
+      <fileset file="${build.maven-bundle.dir}/${sources.testng.jar}" />
+      <fileset file="${build.maven-bundle.dir}/*asc" />
+      <fileset file="${testng.jar}" />
+      <fileset file="${testng.jar}.asc" />
+    </jar>
+  </target>
+-->
+
+  <target name="dist-prepare" depends="update-readme">
+    <delete file="{other.jars.dir}/${testng.nobsh.jar}" />
+    <mkdir dir="${other.jars.dir}" />
+  </target>
+
+  <target name="update-readme">
+    <copy file="README.template" tofile="README.md" />
+    <replace file="README.md" token="${version}" value="${testng.version}" />
+    <touch file="TESTNG-${testng.version}" />
+  </target>
+      
+  <target name="eclipse" description="Used by Cedric to build distributions">
+    <property name="jdk15.jar"
+              value="${testng-eclipse.dir}/lib/testng.jar" />
+
+    <delete file="${jdk15.jar}" />
+    <copy file="${testng.jar}" tofile="${jdk15.jar}" />
+
+    <!-- sources -->
+    <property name="sources" value="${testng-eclipse.dir}/lib/testng-sources.jar"/>
+    <echo>Sources: ${sources}</echo>
+    <jar destfile="${sources}" basedir="src/main/java/" />
+  </target>
+
+  <target name="ftp">
+    <!--
+          <ftp action="put"
+             server="beust.com"
+             remotedir="w/testng/test-output"
+             userid="${userid}"
+             password="${password}">
+              <fileset dir="c:\weblogic\dev\sandbox\cbeust\testng\test\test-output">
+                <include name="index.html" />
+                <include name="main.html" />
+                <include name="toc.html" />
+                <include name="*egression*" />
+             </fileset>
+        </ftp>
+      -->
+    <ftp action="put"
+         server="beust.com"
+         remotedir="w/testng"
+         userid="${userid}"
+         password="${password}">
+      <fileset dir="${root.dir}">
+        <include name="${testng.zip}" />
+        <include name="javadocs/**" />
+        <include name="testng-1.0.dtd" />
+      </fileset>
+      <fileset dir="${root.dir}/doc">
+        <include name="*.html" />
+      </fileset>
+    </ftp>
+
+  </target>
+
+  <target name="ftp2">
+    <ftp action="put"
+         server="beust.com"
+         remotedir="w/testng"
+         userid="${userid}"
+         password="${password}">
+      <fileset dir="${root.dir}/test">
+        <include name="test-output/*" />
+      </fileset>
+      <fileset dir="${root.dir}/test">
+        <include name="test-report/*" />
+      </fileset>
+    </ftp>
+  </target>
+
+  <target name="clean">
+    <delete dir="${build.dir}" />
+    <delete dir="${target}" />
+    <delete dir="${build.maven-bundle.dir}" />
+    <delete failonerror="false">
+      <fileset dir="." includes="testng*.jar,*.zip" />
+    </delete>
+    <delete dir="test-output" failonerror="false" />
+    <delete dir="test-output-tests" failonerror="false" />
+    <ant antfile="build-tests.xml" target="clean" />
+    <ant dir="examples" target="clean" />
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- Maven1/2 Distribution                                                -->
+  <!-- ==================================================================== -->
+
+<!--
+  <target name="maven-plugin">
+    <jar destfile="maven-testng-plugin-${testng-maven.version}.jar"
+         basedir="./maven/" />
+  </target>
+-->
+
+  <!-- ==================================================================== -->
+  <!-- Ivy                                                                  -->
+  <!-- ==================================================================== -->
+
+  <target name="retrieve-dependencies" description="Retrieve dependencies with ivy">
+    <ivy:retrieve log="quiet" />
+  </target>
+
+  <target name="publish">
+    <ivy:resolve />
+    <mkdir dir="dist/jars" />
+    <copy file="${testng.jar}" todir="dist/jars" />
+    <ivy:publish organisation="org.testng" resolver="local" overwrite="true"/>
+  </target>
+
+  <target name="pom">
+    <ivy:makepom ivyfile="ivy.xml" pomfile="ivy-pom.xml" />
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- Code coverage                                                        -->
+  <!-- ==================================================================== -->
+
+<!--
+  <property name="cobertura.dir" value="../cobertura-1.9.4.1" />
+
+  <path id="cobertura.classpath">
+      <fileset dir="${cobertura.dir}">
+          <include name="cobertura.jar" />
+          <include name="lib/**/*.jar" />
+      </fileset>
+  </path>
+
+  <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
+
+  <target name="coverage:create">
+    <cobertura-instrument classpath="cobertura-1.9.4.1/lib/*" todir="target/instrumented-classes">
+      <fileset dir="${build.dir}">
+        <include name="**/*.class" />
+      </fileset>
+    </cobertura-instrument>
+  </target>
+
+  <target name="coverage">
+    <cobertura-report srcdir="${src.dir}" destdir="target/coverage-report"/>
+  </target>
+-->
+
+</project>
diff --git a/maven/build-with-maven b/maven/build-with-maven
new file mode 100644
index 0000000..a6c135a
--- /dev/null
+++ b/maven/build-with-maven
@@ -0,0 +1,25 @@
+# Two different POMs are needed to build TestNG with Maven because it's not
+# allowed to have circular dependencies.
+# - pom.xml defines the project version "n-SNAPSHOT", builds, jars and deploys (but doesn't
+# run the tests).
+# - pom-test.xml declares a test dependency on "n-SNAPSHOT", which it will find
+# in the local repository (~/.m2/repository). All it does then is run the tests.
+
+
+mvn clean install -Dgpg.skip=true
+#or if you want to sign the jar, uncomment this:
+#mvn clean install
+
+mvn -f pom-test.xml test
+
+
+echo
+echo "To run the tests: mvn -f pom-test.xml test"
+echo "To deploy to the snapshot repository: mvn deploy"
+echo "To deploy to the release directory: mvn release:clean release:prepare release:perform"
+echo "Nexus UI:  https://oss.sonatype.org/index.html"
+echo "Wiki: https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide"
+
+# deploy without tagging: mvn deploy -DperformRelease
+
+
diff --git a/maven/bundle-pom.xml b/maven/bundle-pom.xml
new file mode 100644
index 0000000..c969d80
--- /dev/null
+++ b/maven/bundle-pom.xml
@@ -0,0 +1,59 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <!--
+    This POM cannot be used to build TestNG; it should only be used as part of a Maven
+    repository upload bundle.
+    
+    See the guide to creating a bundle here:
+    http://maven.apache.org/guides/mini/guide-central-repository-upload.html
+    -->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.testng</groupId>
+    <artifactId>testng</artifactId>
+    <name>TestNG</name>
+    <version>5.12.1</version>
+    <description>TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.</description>
+    <url>http://testng.org</url>
+    
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <connection>scm:svn:http://testng.googlecode.com/svn/trunk/</connection>
+        <developerConnection>scm:svn:http://testng.googlecode.com/svn/trunk/</developerConnection>
+        <url>http://testng.googlecode.com/svn/trunk</url>
+    </scm>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.7.0</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.beanshell</groupId>
+            <artifactId>bsh</artifactId>
+            <version>2.0b4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.google.inject</groupId>
+           <artifactId>guice</artifactId>
+           <version>2.0</version>
+           <scope>provided</scope>
+        </dependency>
+
+    </dependencies>    
+    
+</project>
diff --git a/pom-test.xml b/maven/pom-test.xml
similarity index 100%
rename from pom-test.xml
rename to maven/pom-test.xml
diff --git a/pom.xml b/maven/pom.xml
old mode 100755
new mode 100644
similarity index 100%
rename from pom.xml
rename to maven/pom.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git



More information about the pkg-java-commits mailing list