Author: stliu Date: 2010-02-25 11:34:19 -0500 (Thu, 25 Feb 2010) New Revision: 18894 Modified: search/branches/Branch_3_0_1_GA_CP/build.xml search/branches/Branch_3_0_1_GA_CP/common-build.xml search/branches/Branch_3_0_1_GA_CP/ivy.xml search/branches/Branch_3_0_1_GA_CP/ivy/ivyconf.xml Log: 1. clean the build script 2. change the ivy publish version from latest to the actual version 3. upgrade annotations dependency to 3.3.1.GA 4. add jboss-rep-maven to ivyconf.xml Modified: search/branches/Branch_3_0_1_GA_CP/build.xml =================================================================== --- search/branches/Branch_3_0_1_GA_CP/build.xml 2010-02-25 16:10:59 UTC (rev 18893) +++ search/branches/Branch_3_0_1_GA_CP/build.xml 2010-02-25 16:34:19 UTC (rev 18894) @@ -24,14 +24,6 @@ <property name="javac.target" value="1.5"/> <property name="jdbc.dir" value="jdbc"/> <property name="common.dir" value="${basedir}"/> - - <!-- property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/> - <property name="annotations.jar" - value="${basedir}/../annotations/target/hibernate-annotations/hibernate-annotations.jar"/> - <property name="commons-annotations.jar" - value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/> - <property name="entitymanager.jar" - value="${basedir}/../entitymanager/target/hibernate-entitymanager/hibernate-entitymanager.jar"/ --> <property name="ivy.dep.dir" value="${basedir}/build/lib" /> <!-- ivy load --> @@ -58,7 +50,6 @@ <pathelement path="${testclasses.dir}"/> <path refid="junit.moduleclasspath"/> <path refid="lib.class.path"/> - <path location="${clover.jar}"/> </path> <!-- override order for JBossXB to bootstrap properly --> <path id="lib.class.path"> @@ -72,13 +63,10 @@ <include name="*.jar"/> </fileset> <path refid="lib.moduleclass.path"/> - <pathelement path="${clover.jar}"/> </path> <path id="lib.moduleclass.path"> - <!-- pathelement location="${jpa-api.jar}"/> - <pathelement location="${commons-annotations.jar}"/ --> <fileset dir="${ivy.dep.dir}/core"> <include name="*.jar"/> </fileset> @@ -91,8 +79,6 @@ </fileset> <pathelement location="${src.dir}"/> <pathelement location="${test.dir}"/> - <!-- pathelement location="${annotations.jar}"/> - <pathelement location="${entitymanager.jar}"/ --> <fileset dir="${ivy.dep.dir}/test"> <include name="*.jar"/> </fileset> @@ -107,12 +93,6 @@ <tstamp> <format property="now" pattern="yyyyMMddhhmmss"/> </tstamp> - <!-- check for dependency artefacts --> - - <!-- available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> - <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/> - <available file="${annotations.jar}" type="file" property="annotations.jar.available"/> - <available file="${entitymanager.jar}" type="file" property="entitymanager.jar.available"/ --> <mkdir dir="${ivy.dep.dir}/core"/> <mkdir dir="${ivy.dep.dir}/test"/> <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> @@ -120,26 +100,6 @@ <mkdir dir="${build.testresources.dir}"/> </target> - <!-- target name="get.jpa-api" depends="init" unless="jpa-api.jar.available"> - <ant inheritall="false" dir="${basedir}/../jpa-api" target="clean"/> - <ant inheritall="false" dir="${basedir}/../jpa-api" target="jar"/> - </target> - - <target name="get.commons-annotations" depends="init" unless="commons-annotations.jar.available"> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="clean"/> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="jar"/> - </target> - - <target name="get.annotations" depends="init" unless="annotations.jar.available"> - <ant inheritall="false" dir="${basedir}/../annotations" target="clean"/> - <ant inheritall="false" dir="${basedir}/../annotations" target="jar"/> - </target> - - <target name="get.entitymanager" depends="init" unless="entitymanager.jar.available"> - <ant inheritall="false" dir="${basedir}/../entitymanager" target="clean"/> - <ant inheritall="false" dir="${basedir}/../entitymanager" target="jar"/> - </target --> - <target name="get.deps.core" depends="init" description="retrieve the core dependencies"> <ivy:resolve conf="core" /> <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="core" /> @@ -217,10 +177,6 @@ <junit forkmode="once" printsummary="yes" haltonfailure="yes"> <classpath> <path path="${build.testresources.dir}"/> - <!-- dirset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </dirset --> <path refid="junit.classpath"/> <fileset dir="${jdbc.dir}"> @@ -242,22 +198,7 @@ <mkdir dir="test_output"/> <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath> - <!-- fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <path refid="lib.class.path"/> - <pathelement path="${classes.dir}"/> - <pathelement path="${src.dir}"/> - < ! - - pick up properties from here - - > - <pathelement path="${test.dir}"/> - < ! - - pick up mappings from here - - > - --> <path path="${build.testresources.dir}"/> - <!-- dirset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </dirset --> <path refid="junit.classpath"/> <fileset dir="${jdbc.dir}"> @@ -271,16 +212,6 @@ </junit> </target> - <!-- target name="report"> - <mkdir dir="test_output"/> - <junitreport todir="test_output"> - <fileset dir="test_output"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="test_output/report"/> - </junitreport> - </target --> - <target name="jar" depends="compile" description="Build the distribution .jar file"> <mkdir dir="${classes.dir}/META-INF"/> <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> @@ -294,17 +225,12 @@ <ivy:resolve conf="core"/> <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" resolver="local" - pubrevision="latest" + pubrevision="${version}" pubdate="${now}" status="integration" /> </target> - <!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> - <echo>Skipping java doc since ant's javadoc task cannot handle an alternative javadoc</echo> - </target --> - - <!-- Some of this can probably be moved to common-build... --> <target name="dist" depends="get.deps.core,get.deps.test,jar,jar,javadoc,copysource,copytest,copylib,extras" description="Build everything"> @@ -364,6 +290,4 @@ <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> </tar> </target> - - </project> Modified: search/branches/Branch_3_0_1_GA_CP/common-build.xml =================================================================== --- search/branches/Branch_3_0_1_GA_CP/common-build.xml 2010-02-25 16:10:59 UTC (rev 18893) +++ search/branches/Branch_3_0_1_GA_CP/common-build.xml 2010-02-25 16:34:19 UTC (rev 18894) @@ -47,27 +47,6 @@ <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 --> <property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/> <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../core/doc/reference"/> - - <!-- - Explicitly define tasks from ant.. - Unfortunately, checkstyle-a<path id="lib.class.path"> - <path location="${hibernate-core.jar}"></path> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="*.jar"/> - </fileset> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${clover.jar}"/> - </path>ll.jar contains it's own version of ANTLR, so ANTLR cannot be in the classpath. - --> - <!-- Emmanuel: Removed antlr, shouldn't be useful in Ext package... - taskdef name="antlr" classname="org.apache.tools.ant.taskdefs.optional.ANTLR"> - <classpath> - <pathelement location="${hibernate-core.lib.dir}/antlr-2.7.2.jar"/> - <pathelement location="${hibernate-core.lib.dir}/ant-antlr-1.6.1.jar"/> - </classpath> - </taskdef --> <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> <classpath> @@ -96,7 +75,6 @@ <include name="*.jar"/> </fileset> <path refid="lib.moduleclass.path"/> - <pathelement path="${clover.jar}"/> </path> <!-- overridable in modules --> @@ -134,11 +112,6 @@ <path id="testsrc.path"> <pathelement location="${test.dir}"/> </path> - - <!-- Clover --> - <property name="clover.out.dir" value="cloverout"/> - <property name="clover.jar" value="${ant.home}/lib/clover.jar"/> - <taskdef resource="clovertasks"/> <path id="junit.classpath"> <fileset dir="${lib.dir}"> @@ -148,33 +121,13 @@ <pathelement path="${testclasses.dir}"/> <path refid="lib.class.path"/> <path refid="junit.moduleclasspath"/> - <path location="${clover.jar}"/> </path> - <!-- Clover tasks --> - <target name="with.clover"> - <clover-setup initString="clover_coverage.db"/> - </target> - - <target name="cloverreport.html" depends="with.clover" - description="Generate a clover report from the current clover database."> - <clover-report> - <current outfile="${clover.out.dir}"> - <format type="html"/> - </current> - </clover-report> - </target> - - <target name="cloverreport" depends="with.clover,junitreport,cloverreport.html" - description="Run the tests and generate a clover report"> - </target> - <!-- Tasks --> <target name="clean" description="Cleans up build and dist directories"> <delete dir="${build.dir}"/> <delete dir="${dist.target.dir}"/> - <delete dir="${clover.out.dir}"/> </target> <target name="init" description="Initialize the build"> @@ -254,14 +207,6 @@ <exclude name="**/*Tests.class"/> </fileset> </instrument> - - <!-- jar jarfile="${build.dir}/instrumented-classes.jar"> - <fileset dir="${testclasses.dir}"> - <include name="org/hibernate/test/**/*.class"/> - <exclude name="org/hibernate/test/**/*Test.class"/> - </fileset> - </jar --> - </target> <target name="copytest" description="Copy tests to dist dir" if="copy.test" > @@ -298,7 +243,6 @@ <fileset dir="${lib.dir}"> <include name="*.jar"/> <exclude name="log4j.jar"/> - <exclude name="checkstyle*.jar"/> <include name="*.txt"/> </fileset> </copy> @@ -436,37 +380,4 @@ <report format="frames" todir="./test_output"/> </junitreport> </target> - - <target name="run" depends="compile" description="Run Hibernate Console"> - <java classname="org.hibernate.console.Start" classpathref="lib.class.path" fork="true"> - <classpath> - <path location="${build.dir}"/> - </classpath> - </java> - </target> - - - <target name="checkstyle" description="Check coding style"> - <taskdef resource="checkstyletask.properties"> - <classpath> - <path refid="lib.class.path"/> - <fileset dir="${common-build.basedir}/lib"> - <include name="checkstyle*.jar"/> - </fileset> - </classpath> - </taskdef> - - <checkstyle config="${common-build.basedir}/checkstyle_checks.xml"> - <fileset dir="${src.dir}"> - <include name="**/*.java"/> - </fileset> - <formatter type="plain"/> - </checkstyle> - </target> - - <target name="patch" depends="checkstyle" - description="Create a patch"> - <cvs command="-q diff -u -N" output="patch.txt"/> - </target> - </project> \ No newline at end of file Modified: search/branches/Branch_3_0_1_GA_CP/ivy/ivyconf.xml =================================================================== --- search/branches/Branch_3_0_1_GA_CP/ivy/ivyconf.xml 2010-02-25 16:10:59 UTC (rev 18893) +++ search/branches/Branch_3_0_1_GA_CP/ivy/ivyconf.xml 2010-02-25 16:34:19 UTC (rev 18894) @@ -19,6 +19,10 @@ <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml&quo... <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifa... </url> + <url name="jboss-rep-maven" m2compatible="true"> + <ivy pattern="http://repository.jboss.org/maven2/[organization]/[module]/... + <artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/... + </url> </chain> </resolvers> <modules> Modified: search/branches/Branch_3_0_1_GA_CP/ivy.xml =================================================================== --- search/branches/Branch_3_0_1_GA_CP/ivy.xml 2010-02-25 16:10:59 UTC (rev 18893) +++ search/branches/Branch_3_0_1_GA_CP/ivy.xml 2010-02-25 16:34:19 UTC (rev 18894) @@ -15,6 +15,6 @@ <dependency name="jpa-api" rev="1.0.0.GA" conf="core->default"/> <dependency name="commons-annotations" rev="3.0.0.GA" conf="core->core"/> <dependency name="entitymanager" rev="3.3.1.GA" conf="test->core"/> - <dependency name="annotations" rev="3.3.0.GA" conf="test->core"/> + <dependency name="hibernate-annotations" rev="3.3.1.GA" conf="test->core"/> </dependencies> </ivy-module> \ No newline at end of file