[hibernate-commits] Hibernate SVN: r12947 - in trunk/HibernateExt: annotations/ivy and 10 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Aug 15 16:40:27 EDT 2007
Author: epbernard
Date: 2007-08-15 16:40:27 -0400 (Wed, 15 Aug 2007)
New Revision: 12947
Added:
trunk/HibernateExt/annotations/ivy.xml
trunk/HibernateExt/annotations/ivy/
trunk/HibernateExt/annotations/ivy/ivy-1.4.1.jar
trunk/HibernateExt/annotations/ivy/ivyconf.xml
trunk/HibernateExt/commons-annotations/ivy.xml
trunk/HibernateExt/commons-annotations/ivy/
trunk/HibernateExt/commons-annotations/ivy/ivy-1.4.1.jar
trunk/HibernateExt/commons-annotations/ivy/ivyconf.xml
trunk/HibernateExt/entitymanager/ivy.xml
trunk/HibernateExt/entitymanager/ivy/
trunk/HibernateExt/entitymanager/ivy/ivy-1.4.1.jar
trunk/HibernateExt/entitymanager/ivy/ivyconf.xml
trunk/HibernateExt/jpa-api/ivy.xml
trunk/HibernateExt/jpa-api/ivy/
trunk/HibernateExt/jpa-api/ivy/ivy-1.4.1.jar
trunk/HibernateExt/jpa-api/ivy/ivyconf.xml
trunk/HibernateExt/search/ivy.xml
trunk/HibernateExt/search/ivy/
trunk/HibernateExt/search/ivy/ivy-1.4.1.jar
trunk/HibernateExt/search/ivy/ivyconf.xml
trunk/HibernateExt/validator/ivy.xml
trunk/HibernateExt/validator/ivy/
trunk/HibernateExt/validator/ivy/ivy-1.4.1.jar
trunk/HibernateExt/validator/ivy/ivyconf.xml
Modified:
trunk/HibernateExt/annotations/build.xml
trunk/HibernateExt/commons-annotations/build.xml
trunk/HibernateExt/entitymanager/build.xml
trunk/HibernateExt/jpa-api/build.xml
trunk/HibernateExt/search/build.xml
trunk/HibernateExt/validator/build.xml
Log:
Migrate internal dependency management to ivy
Modified: trunk/HibernateExt/annotations/build.xml
===================================================================
--- trunk/HibernateExt/annotations/build.xml 2007-08-15 20:23:35 UTC (rev 12946)
+++ trunk/HibernateExt/annotations/build.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -6,9 +6,10 @@
-->
-<project name="Hibernate Annotations" default="dist" basedir=".">
+<project name="Hibernate Annotations" default="dist" basedir="."
+ xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
- <!-- Give user a chance to override without editing this file
+ <!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
<property file="build.properties"/>
<property file="${user.home}/.ant.properties"/>
@@ -24,19 +25,23 @@
<property name="javac.target" value="1.5"/>
<property name="common.dir" value="../common"/>
- <property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/>
+ <!-- property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/>
<property name="commons-annotations.jar"
- value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/>
+ value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/ -->
+ <property name="ivy.dep.dir" value="${basedir}/build/lib" />
- <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/>
+ <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/>
<import file="${common.dir}/common-build.xml"/>
<property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/>
<path id="lib.moduleclass.path">
- <pathelement location="${jpa-api.jar}"/>
- <pathelement location="${commons-annotations.jar}"/>
- </path>
+ <!-- pathelement location="${jpa-api.jar}"/>
+ <pathelement location="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<path id="junit.moduleclasspath">
<pathelement location="${src.dir}"/>
@@ -46,16 +51,34 @@
<include name="**/*.jar"/>
<include name="**/*.zip"/>
</fileset>
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- ivy load -->
+ <property name="ivy.jar.dir" value="${basedir}/ivy" />
+ <property name="ivy.conf.dir" value="${basedir}" />
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
</path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
- <target name="init">
+ <target name="init">
<antcall target="common-build.init"/>
- <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/>
- <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/>
+ <tstamp>
+ <format property="now" pattern="yyyyMMddhhmmss"/>
+ </tstamp>
+ <!-- available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/>
+ <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/ -->
<mkdir dir="${lib.dir}/test"/>
+ <mkdir dir="${ivy.dep.dir}/core"/>
+ <mkdir dir="${ivy.dep.dir}/test"/>
+ <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" />
</target>
- <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available">
+ <!-- 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>
@@ -63,11 +86,17 @@
<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 -->
- <target name="compile" depends="init,get.jpa-api,get.commons-annotations"
+ <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" />
+ </target>
+
+ <target name="compile" depends="init,get.deps.core"
description="Compile the Java source code">
- <available
+
+ <available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter"
@@ -91,8 +120,13 @@
</copy>
</target>
- <target name="compiletest" depends="compile" description="Compile the tests">
- <available
+ <target name="get.deps.test" depends="init" description="retrieve the test dependencies">
+ <ivy:resolve conf="test" />
+ <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" />
+ </target>
+
+ <target name="compiletest" depends="compile,get.deps.test" description="Compile the tests">
+ <available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter"
@@ -180,7 +214,14 @@
<attribute name="Specification-Vendor" value="jcp.org"/>
</manifest>
<antcall target="common-build.jar"/>
- </target>
+ <ivy:resolve conf="core"/>
+ <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="latest"
+ 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>
@@ -197,7 +238,7 @@
</target>
<!-- Some of this can probably be moved to common-build... -->
- <target name="dist" depends="jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras"
+ <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras"
description="Build everything">
<ant inheritall="false" dir="${basedir}/doc/reference"/>
@@ -215,10 +256,18 @@
<!-- copy dependencies -->
<copy todir="${dist.lib.dir}" failonerror="false">
- <fileset file="${jpa-api.jar}"/>
- <fileset file="${commons-annotations.jar}"/>
+ <!-- fileset file="${jpa-api.jar}"/>
+ <fileset file="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
</copy>
<mkdir dir="${dist.lib.dir}/test"/>
+ <copy todir="${dist.lib.dir}/test" failonerror="false">
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
Added: trunk/HibernateExt/annotations/ivy/ivy-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/HibernateExt/annotations/ivy/ivy-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/HibernateExt/annotations/ivy/ivyconf.xml
===================================================================
--- trunk/HibernateExt/annotations/ivy/ivyconf.xml (rev 0)
+++ trunk/HibernateExt/annotations/ivy/ivyconf.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,27 @@
+<ivyconf>
+ <conf defaultResolver="jboss-rep"/>
+ <resolvers>
+ <chain name="jboss-rep">
+ <url name="jboss-rep-regular">
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ <chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
+ <filesystem name="local">
+ <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
+ <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
+ </filesystem>
+ <url name="jboss-rep-hibernate">
+ <ivy pattern="http://repository.jboss.org/hibernate-[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/hibernate-[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ <url name="jboss-rep-regular-with-ivy">
+ <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ </resolvers>
+ <modules>
+ <module organisation="org.hibernate" name="*" resolver="rep-hibernate"/>
+ </modules>
+</ivyconf>
Added: trunk/HibernateExt/annotations/ivy.xml
===================================================================
--- trunk/HibernateExt/annotations/ivy.xml (rev 0)
+++ trunk/HibernateExt/annotations/ivy.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation=
+ "http://www.jayasoft.org/misc/ivy/ivy.xsd">
+ <info organisation="org.hibernate" module="annotations"/>
+ <configurations>
+ <conf name="core" description="Core module dependencies"/>
+ <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
+ </configurations>
+ <publications>
+ <artifact name="hibernate-annotations" conf="core"/>
+ </publications>
+ <dependencies>
+ <dependency name="jpa-api" rev="1.0.0.GA" conf="core->default"/>
+ <dependency name="commons-annotations" rev="latest.integration" conf="core->core"/>
+ </dependencies>
+</ivy-module>
\ No newline at end of file
Modified: trunk/HibernateExt/commons-annotations/build.xml
===================================================================
--- trunk/HibernateExt/commons-annotations/build.xml 2007-08-15 20:23:35 UTC (rev 12946)
+++ trunk/HibernateExt/commons-annotations/build.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -1,4 +1,5 @@
-<project name="Hibernate Commons Annotations" default="dist" basedir=".">
+<project name="Hibernate Commons Annotations" default="dist" basedir="."
+ xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
@@ -15,9 +16,10 @@
<property name="javac.target" value="1.5"/>
<property name="common.dir" value="${basedir}/../common"/>
<property name="hibernate-core.jar.available" value="true"/>
- <property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/>
+ <!-- property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/ -->
+ <property name="ivy.dep.dir" value="${basedir}/build/lib" />
- <import file="${common.dir}/common-build.xml"/>
+ <import file="${common.dir}/common-build.xml"/>
<path id="lib.class.path">
<fileset dir="${hibernate-core.lib.dir}">
@@ -27,20 +29,35 @@
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
- <path refid="lib.moduleclass.path"/>
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
+ <path refid="lib.moduleclass.path"/>
<pathelement path="${clover.jar}"/>
</path>
<path id="junit.moduleclasspath">
<pathelement location="${src.dir}"/>
<pathelement location="${test.dir}"/>
- <pathelement location="${jpa-api.jar}"/>
- <fileset dir="${hibernate-core.lib.dir}">
+ <!-- pathelement location="${jpa-api.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${hibernate-core.lib.dir}">
<include name="junit*.jar"/>
</fileset>
</path>
- <!-- target name="report">
+ <!-- ivy load -->
+ <property name="ivy.jar.dir" value="${basedir}/ivy" />
+ <property name="ivy.conf.dir" value="${basedir}" />
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
+
+ <!-- target name="report">
<mkdir dir="test_output"/>
<junitreport todir="test_output">
<fileset dir="test_output">
@@ -55,7 +72,10 @@
<tstamp>
<format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/>
</tstamp>
- <echo message="Build ${Name}-${version} (${subversion})"/>
+ <tstamp>
+ <format property="now" pattern="yyyyMMddhhmmss"/>
+ </tstamp>
+ <echo message="Build ${Name}-${version} (${subversion})"/>
<mkdir dir="${classes.dir}"/>
<mkdir dir="${testclasses.dir}"/>
<copy todir="${classes.dir}">
@@ -70,13 +90,29 @@
<include name="lgpl.txt"/>
</fileset>
</copy>
-
+ <mkdir dir="${ivy.dep.dir}/core"/>
+ <mkdir dir="${ivy.dep.dir}/test"/>
+ <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" />
<!-- check for dependency artefacts -->
- <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/>
+ <!-- available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/ -->
</target>
- <target name="compiletest" depends="get.jpa-api,compile" description="Compile the tests">
- <available
+ <target name="get.deps.core" depends="init" description="retrieve the core dependencies">
+ <ivy:resolve conf="core" />
+ <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="core" />
+ </target>
+
+ <target name="compile" depends="get.deps.core">
+ <antcall target="common-build.compile"/>
+ </target>
+
+ <target name="get.deps.test" depends="init" description="retrieve the test dependencies">
+ <ivy:resolve conf="test" />
+ <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" />
+ </target>
+
+ <target name="compiletest" depends="compile,get.deps.test" description="Compile the tests">
+ <available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter"
@@ -93,10 +129,10 @@
</javac>
</target>
- <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available">
+ <!-- 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 -->
<target name="jar" depends="compile" description="Build the distribution .jar file">
<mkdir dir="${classes.dir}/META-INF"/>
@@ -108,10 +144,18 @@
<attribute name="Implementation-URL" value="http://annotations.hibernate.org"/>
</manifest>
<antcall target="common-build.jar"/>
- </target>
+ <delete file="${dist.dir}/ivy.xml"/> <!-- delete last produced ivy file to be sure a new one will be generated -->
+ <ivy:resolve conf="core"/>
+ <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="latest"
+ pubdate="${now}"
+ status="integration"
+ />
+ </target>
<!-- Some of this can probably be moved to common-build... -->
- <target name="dist" depends="jar,javadoc,copysource,copytest,copylib,extras" description="Build everything">
+ <target name="dist" depends="jar,get.deps.core,get.deps.test,javadoc,copysource,copytest,copylib,extras" description="Build everything">
<copy todir="${dist.dir}" failonerror="false">
<fileset dir="${common.dir}">
@@ -120,7 +164,23 @@
</copy>
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
- <antcall target="common-build.dist"/>
+
+ <!-- copy dependencies -->
+ <copy todir="${dist.lib.dir}" failonerror="false">
+ <!-- fileset file="${jpa-api.jar}"/>
+ <fileset file="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${dist.lib.dir}/test"/>
+ <copy todir="${dist.lib.dir}/test" failonerror="false">
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+
+ <antcall target="common-build.dist"/>
</target>
<target name="zip-dist" description="zip the dist">
Added: trunk/HibernateExt/commons-annotations/ivy/ivy-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/HibernateExt/commons-annotations/ivy/ivy-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/HibernateExt/commons-annotations/ivy/ivyconf.xml
===================================================================
--- trunk/HibernateExt/commons-annotations/ivy/ivyconf.xml (rev 0)
+++ trunk/HibernateExt/commons-annotations/ivy/ivyconf.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,27 @@
+<ivyconf>
+ <conf defaultResolver="jboss-rep"/>
+ <resolvers>
+ <chain name="jboss-rep">
+ <url name="jboss-rep-regular">
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ <chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
+ <filesystem name="local">
+ <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
+ <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
+ </filesystem>
+ <url name="jboss-rep-hibernate">
+ <ivy pattern="http://repository.jboss.org/hibernate-[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/hibernate-[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ <url name="jboss-rep-regular-with-ivy">
+ <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ </resolvers>
+ <modules>
+ <module organisation="org.hibernate" name="*" resolver="rep-hibernate"/>
+ </modules>
+</ivyconf>
Added: trunk/HibernateExt/commons-annotations/ivy.xml
===================================================================
--- trunk/HibernateExt/commons-annotations/ivy.xml (rev 0)
+++ trunk/HibernateExt/commons-annotations/ivy.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation=
+ "http://www.jayasoft.org/misc/ivy/ivy.xsd">
+ <info organisation="org.hibernate" module="commons-annotations"/>
+ <configurations>
+ <conf name="core" description="Core module dependencies"/>
+ <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
+ </configurations>
+ <publications>
+ <artifact name="hibernate-commons-annotations" conf="core"/>
+ </publications>
+ <dependencies>
+ <dependency name="jpa-api" force="true" rev="1.0.0.GA" conf="test->default"/>
+ </dependencies>
+</ivy-module>
\ No newline at end of file
Modified: trunk/HibernateExt/entitymanager/build.xml
===================================================================
--- trunk/HibernateExt/entitymanager/build.xml 2007-08-15 20:23:35 UTC (rev 12946)
+++ trunk/HibernateExt/entitymanager/build.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -6,7 +6,8 @@
-->
-<project name="HibernateEntityManager" default="dist" basedir=".">
+<project name="HibernateEntityManager" default="dist" basedir="."
+ xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
@@ -25,11 +26,12 @@
<property name="common.dir" value="../common"/>
<available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/>
- <property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/>
+ <!-- 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"/>
+ value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/ -->
+ <property name="ivy.dep.dir" value="${basedir}/build/lib" />
<import file="${common.dir}/common-build.xml"/>
<property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/>
@@ -41,9 +43,12 @@
<property name="build.temp.dir" value="${build.dir}/temp"/>
<path id="lib.moduleclass.path">
- <pathelement location="${jpa-api.jar}"/>
+ <!-- pathelement location="${jpa-api.jar}"/>
<pathelement location="${commons-annotations.jar}"/>
- <pathelement location="${annotations.jar}"/>
+ <pathelement location="${annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
</path>
<path id="junit.moduleclasspath">
<pathelement location="${src.dir}"/>
@@ -56,18 +61,36 @@
<include name="*.jar"/>
<include name="*.zip"/>
</fileset>
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
</path>
+ <!-- ivy load -->
+ <property name="ivy.jar.dir" value="${basedir}/ivy" />
+ <property name="ivy.conf.dir" value="${basedir}" />
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
+
<target name="init">
<antcall target="common-build.init"/>
- <!-- check for dependency artefacts -->
- <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/>
+ <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="${annotations.jar}" type="file" property="annotations.jar.available"/ -->
<mkdir dir="${lib.dir}/test"/>
+ <mkdir dir="${ivy.dep.dir}/core"/>
+ <mkdir dir="${ivy.dep.dir}/test"/>
+ <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" />
</target>
- <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available">
+ <!-- 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>
@@ -80,9 +103,15 @@
<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 -->
- <target name="compile" depends="init,get.jpa-api,get.commons-annotations,get.annotations" description="Compile the Java source code">
+ <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" />
+ </target>
+
+
+ <target name="compile" depends="init,get.deps.core" description="Compile the Java source code">
<available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
@@ -171,7 +200,12 @@
</antcall>
</target>
- <target name="compiletest" depends="compile" description="Compile the tests">
+ <target name="get.deps.test" depends="init" description="retrieve the test dependencies">
+ <ivy:resolve conf="test" />
+ <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" />
+ </target>
+
+ <target name="compiletest" depends="compile,get.deps.test" description="Compile the tests">
<available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
@@ -278,6 +312,13 @@
<attribute name="Specification-Vendor" value="jcp.org"/>
</manifest>
<antcall target="common-build.jar"/>
+ <ivy:resolve conf="core"/>
+ <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="latest"
+ pubdate="${now}"
+ status="integration"
+ />
</target>
<!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir">
@@ -295,7 +336,7 @@
</target>
<!-- Some of this can probably be moved to common-build... -->
- <target name="dist" depends="jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" description="Build everything">
+ <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" description="Build everything">
<ant inheritall="false" dir="${basedir}/doc/reference"/>
<copy todir="${dist.dir}/doc/reference" failonerror="false">
@@ -322,11 +363,18 @@
<!-- copy dependencies -->
<copy todir="${dist.lib.dir}" failonerror="false">
- <fileset file="${jpa-api.jar}"/>
- <fileset file="${commons-annotations.jar}"/>
- <fileset file="${annotations.jar}"/>
+ <!-- fileset file="${jpa-api.jar}"/>
+ <fileset file="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
</copy>
<mkdir dir="${dist.lib.dir}/test"/>
+ <copy todir="${dist.lib.dir}/test" failonerror="false">
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
Added: trunk/HibernateExt/entitymanager/ivy/ivy-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/HibernateExt/entitymanager/ivy/ivy-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/HibernateExt/entitymanager/ivy/ivyconf.xml
===================================================================
--- trunk/HibernateExt/entitymanager/ivy/ivyconf.xml (rev 0)
+++ trunk/HibernateExt/entitymanager/ivy/ivyconf.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,27 @@
+<ivyconf>
+ <conf defaultResolver="jboss-rep"/>
+ <resolvers>
+ <chain name="jboss-rep">
+ <url name="jboss-rep-regular">
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ <chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
+ <filesystem name="local">
+ <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
+ <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
+ </filesystem>
+ <url name="jboss-rep-hibernate">
+ <ivy pattern="http://repository.jboss.org/hibernate-[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/hibernate-[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ <url name="jboss-rep-regular-with-ivy">
+ <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ </resolvers>
+ <modules>
+ <module organisation="org.hibernate" name="*" resolver="rep-hibernate"/>
+ </modules>
+</ivyconf>
Added: trunk/HibernateExt/entitymanager/ivy.xml
===================================================================
--- trunk/HibernateExt/entitymanager/ivy.xml (rev 0)
+++ trunk/HibernateExt/entitymanager/ivy.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation=
+ "http://www.jayasoft.org/misc/ivy/ivy.xsd">
+ <info organisation="org.hibernate" module="entitymanager"/>
+ <configurations>
+ <conf name="core" description="Core module dependencies"/>
+ <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
+ </configurations>
+ <publications>
+ <artifact name="hibernate-entitymanager" conf="core"/>
+ </publications>
+ <dependencies>
+ <dependency name="jpa-api" rev="latest.integration" conf="core->default"/>
+ <dependency name="commons-annotations" rev="latest.integration" conf="core->core"/>
+ <dependency name="annotations" rev="latest.integration" conf="core->core"/>
+ </dependencies>
+</ivy-module>
\ No newline at end of file
Modified: trunk/HibernateExt/jpa-api/build.xml
===================================================================
--- trunk/HibernateExt/jpa-api/build.xml 2007-08-15 20:23:35 UTC (rev 12946)
+++ trunk/HibernateExt/jpa-api/build.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -6,7 +6,8 @@
-->
-<project name="EJB-API" default="jar" basedir=".">
+<project name="EJB-API" default="jar" basedir="."
+ xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
<!-- Give user a chance to override without editing this file or typing -D -->
<property file="build.properties"/>
@@ -33,9 +34,18 @@
<include name="META-INF/ra.xml"/>
</patternset>
+ <!-- ivy load -->
+ <property name="ivy.jar.dir" value="${basedir}/ivy" />
+ <property name="ivy.conf.dir" value="${basedir}" />
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
- <!-- ############################ Targets #############################-->
+ <!-- ############################ Targets #############################-->
+
<target name="clean" description="Cleans up build and dist directories">
<delete dir="${build.dir}"/>
</target>
@@ -44,11 +54,15 @@
<tstamp>
<format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/>
</tstamp>
- <echo message="Build ${name}-${version} (${subversion})"/>
+ <tstamp>
+ <format property="now" pattern="yyyyMMddhhmmss"/>
+ </tstamp>
+ <echo message="Build ${name}-${version} (${subversion})"/>
<mkdir dir="${classes.dir}"/>
+ <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" />
- </target>
+ </target>
<target name="compile" depends="init" description="Compile the Java source code">
<available
@@ -66,8 +80,7 @@
</javac>
</target>
-
- <target name="jar" depends="compile" description="Build the distribution .jar file">
+ <target name="jar" depends="compile" description="Build the distribution .jar file">
<jar jarfile="${build.dir}/${jar.name}.jar" basedir="${classes.dir}">
<include name="javax/**/*.class"/>
<manifest>
@@ -83,7 +96,15 @@
<include name="**/license.txt"/>
</metainf>
</jar>
- </target>
+ <delete file="${build.dir}/ivy.xml"/> <!-- delete last produced ivy file to be sure a new one will be generated -->
+ <ivy:resolve/>
+ <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="latest"
+ pubdate="${now}"
+ status="integration"
+ />
+ </target>
<target name="javadoc" description="Compile the Javadoc API documentation">
<mkdir dir="${build.dir}/api"/>
Added: trunk/HibernateExt/jpa-api/ivy/ivy-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/HibernateExt/jpa-api/ivy/ivy-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/HibernateExt/jpa-api/ivy/ivyconf.xml
===================================================================
--- trunk/HibernateExt/jpa-api/ivy/ivyconf.xml (rev 0)
+++ trunk/HibernateExt/jpa-api/ivy/ivyconf.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,27 @@
+<ivyconf>
+ <conf defaultResolver="jboss-rep"/>
+ <resolvers>
+ <chain name="jboss-rep">
+ <url name="jboss-rep-regular">
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ <chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
+ <filesystem name="local">
+ <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
+ <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
+ </filesystem>
+ <url name="jboss-rep-hibernate">
+ <ivy pattern="http://repository.jboss.org/hibernate-[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/hibernate-[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ <url name="jboss-rep-regular-with-ivy">
+ <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ </resolvers>
+ <modules>
+ <module organisation="org.hibernate" name="*" resolver="rep-hibernate"/>
+ </modules>
+</ivyconf>
Added: trunk/HibernateExt/jpa-api/ivy.xml
===================================================================
--- trunk/HibernateExt/jpa-api/ivy.xml (rev 0)
+++ trunk/HibernateExt/jpa-api/ivy.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation=
+ "http://www.jayasoft.org/misc/ivy/ivy.xsd">
+ <info organisation="org.hibernate" module="jpa-api" revision="1.0.0.GA" status="release"/>
+ <publications>
+ <artifact name="ejb3-persistence" type="jar" />
+ </publications>
+</ivy-module>
\ No newline at end of file
Modified: trunk/HibernateExt/search/build.xml
===================================================================
--- trunk/HibernateExt/search/build.xml 2007-08-15 20:23:35 UTC (rev 12946)
+++ trunk/HibernateExt/search/build.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -6,9 +6,10 @@
-->
-<project name="Hibernate Search" default="dist" basedir=".">
+<project name="Hibernate Search" default="dist" basedir="."
+ xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
- <!-- Give user a chance to override without editing this file
+ <!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
<property file="build.properties"/>
<property file="${user.home}/.ant.properties"/>
@@ -24,14 +25,24 @@
<property name="jdbc.dir" value="jdbc"/>
<property name="common.dir" value="${basedir}/../common"/>
- <property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/>
+ <!-- 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"/>
+ value="${basedir}/../entitymanager/target/hibernate-entitymanager/hibernate-entitymanager.jar"/ -->
+ <property name="ivy.dep.dir" value="${basedir}/build/lib" />
+ <!-- ivy load -->
+ <property name="ivy.jar.dir" value="${basedir}/ivy" />
+ <property name="ivy.conf.dir" value="${basedir}" />
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
+
<import file="${common.dir}/common-build.xml"/>
@@ -66,9 +77,12 @@
<path id="lib.moduleclass.path">
- <pathelement location="${jpa-api.jar}"/>
- <pathelement location="${commons-annotations.jar}"/>
- </path>
+ <!-- pathelement location="${jpa-api.jar}"/>
+ <pathelement location="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<path id="junit.moduleclasspath">
<!-- order matters for JBoss XB proper bootstrap -->
<fileset dir="${lib.dir}/test">
@@ -77,8 +91,11 @@
</fileset>
<pathelement location="${src.dir}"/>
<pathelement location="${test.dir}"/>
- <pathelement location="${annotations.jar}"/>
- <pathelement location="${entitymanager.jar}"/>
+ <!-- pathelement location="${annotations.jar}"/>
+ <pathelement location="${entitymanager.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="${jdbc.dir}">
<include name="*.jar"/>
<include name="*.zip"/>
@@ -87,16 +104,23 @@
<target name="init">
<antcall target="common-build.init"/>
- <!-- check for dependency artefacts -->
- <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/>
+ <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"/>
+ <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" />
<mkdir dir="${lib.dir}/test"/>
<mkdir dir="${build.testresources.dir}"/>
</target>
- <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available">
+ <!-- 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>
@@ -114,10 +138,15 @@
<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 -->
- <target name="compile" depends="init,get.commons-annotations" description="Compile the Java source code">
- <available
+ <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" />
+ </target>
+
+ <target name="compile" depends="init,get.deps.core" description="Compile the Java source code">
+ <available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter"
@@ -141,8 +170,13 @@
</copy>
</target>
- <target name="compiletest" depends="init,get.jpa-api,get.annotations,get.entitymanager,compile" description="Compile the tests">
- <available
+ <target name="get.deps.test" depends="init" description="retrieve the test dependencies">
+ <ivy:resolve conf="test" />
+ <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" />
+ </target>
+
+ <target name="compiletest" depends="init,get.deps.test,compile" description="Compile the tests">
+ <available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter"
@@ -257,7 +291,14 @@
<attribute name="Implementation-URL" value="http://search.hibernate.org"/>
</manifest>
<antcall target="common-build.jar"/>
- </target>
+ <ivy:resolve conf="core"/>
+ <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="latest"
+ 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>
@@ -265,7 +306,7 @@
<!-- Some of this can probably be moved to common-build... -->
- <target name="dist" depends="jar,javadoc,copysource,copytest,copylib,extras"
+ <target name="dist" depends="get.deps.core,get.deps.test,jar,jar,javadoc,copysource,copytest,copylib,extras"
description="Build everything">
<ant inheritall="false" dir="${basedir}/doc/reference"/>
@@ -289,13 +330,17 @@
<!-- copy dependencies -->
<copy todir="${dist.lib.dir}" failonerror="false">
- <fileset file="${jpa-api.jar}"/>
- <fileset file="${commons-annotations.jar}"/>
+ <!-- fileset file="${jpa-api.jar}"/>
+ <fileset file="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
</copy>
<mkdir dir="${dist.lib.dir}/test"/>
<copy todir="${dist.lib.dir}/test" failonerror="false">
- <fileset file="${annotations.jar}"/>
- <fileset file="${entitymanager.jar}"/>
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
</copy>
<copy todir="${dist.lib.dir}/test" failonerror="false">
<fileset file="${lib.dir}/test/*.jar"/>
Added: trunk/HibernateExt/search/ivy/ivy-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/HibernateExt/search/ivy/ivy-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/HibernateExt/search/ivy/ivyconf.xml
===================================================================
--- trunk/HibernateExt/search/ivy/ivyconf.xml (rev 0)
+++ trunk/HibernateExt/search/ivy/ivyconf.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,27 @@
+<ivyconf>
+ <conf defaultResolver="jboss-rep"/>
+ <resolvers>
+ <chain name="jboss-rep">
+ <url name="jboss-rep-regular">
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ <chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
+ <filesystem name="local">
+ <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
+ <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
+ </filesystem>
+ <url name="jboss-rep-hibernate">
+ <ivy pattern="http://repository.jboss.org/hibernate-[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/hibernate-[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ <url name="jboss-rep-regular-with-ivy">
+ <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ </resolvers>
+ <modules>
+ <module organisation="org.hibernate" name="*" resolver="rep-hibernate"/>
+ </modules>
+</ivyconf>
Added: trunk/HibernateExt/search/ivy.xml
===================================================================
--- trunk/HibernateExt/search/ivy.xml (rev 0)
+++ trunk/HibernateExt/search/ivy.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation=
+ "http://www.jayasoft.org/misc/ivy/ivy.xsd">
+ <info organisation="org.hibernate" module="search"/>
+ <configurations>
+ <conf name="core" description="Core module dependencies"/>
+ <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
+ </configurations>
+ <publications>
+ <artifact name="hibernate-search" conf="core"/>
+ </publications>
+ <dependencies>
+ <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"/>
+ </dependencies>
+</ivy-module>
\ No newline at end of file
Modified: trunk/HibernateExt/validator/build.xml
===================================================================
--- trunk/HibernateExt/validator/build.xml 2007-08-15 20:23:35 UTC (rev 12946)
+++ trunk/HibernateExt/validator/build.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -14,9 +14,10 @@
alter lib.moduleclass.path or junit.moduleclasspath accordingly
-->
-<project name="Hibernate Validator" default="dist" basedir=".">
+<project name="Hibernate Validator" default="dist" basedir="."
+ xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
- <!-- Give user a chance to override without editing this file
+ <!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
<property file="build.properties"/>
<property file="${user.home}/.ant.properties"/>
@@ -32,8 +33,10 @@
<property name="jdbc.dir" value="jdbc"/>
<property name="common.dir" value="${basedir}/../common"/>
+ <property name="ivy.dep.dir" value="${basedir}/build/lib" />
+
<!-- dependencies -->
- <property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/>
+ <!-- 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="jpa.jar"
@@ -41,21 +44,27 @@
<property name="archive-browsing.jar"
value="${basedir}/../entitymanager/lib/jboss-archive-browsing.jar"/>
<property name="commons-annotations.jar"
- value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/>
+ value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/ -->
<import file="${common.dir}/common-build.xml"/>
<path id="lib.moduleclass.path">
- <pathelement location="${jpa-api.jar}"/>
- <pathelement location="${commons-annotations.jar}"/>
- </path>
+ <!-- pathelement location="${jpa-api.jar}"/>
+ <pathelement location="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<path id="junit.moduleclasspath">
<pathelement location="${src.dir}"/>
<pathelement location="${test.dir}"/>
- <pathelement location="${annotations.jar}"/>
+ <!-- pathelement location="${annotations.jar}"/>
<pathelement location="${jpa.jar}"/>
- <pathelement location="${archive-browsing.jar}"/>
+ <pathelement location="${archive-browsing.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="${jdbc.dir}">
<include name="*.jar"/>
<include name="*.zip"/>
@@ -66,17 +75,32 @@
</fileset>
</path>
- <target name="init">
+ <!-- ivy load -->
+ <property name="ivy.jar.dir" value="${basedir}/ivy" />
+ <property name="ivy.conf.dir" value="${basedir}" />
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
+
+ <target name="init">
<antcall target="common-build.init"/>
- <!-- check for dependency artefacts -->
- <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/>
+ <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="${jpa.jar}" type="file" property="jpa.jar.available"/>
+ <available file="${jpa.jar}" type="file" property="jpa.jar.available"/ -->
+ <mkdir dir="${ivy.dep.dir}/core"/>
+ <mkdir dir="${ivy.dep.dir}/test"/>
+ <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" />
<mkdir dir="${lib.dir}/test"/>
</target>
- <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available">
+ <!-- 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>
@@ -94,9 +118,14 @@
<target name="get.jpa" depends="init" unless="jpa.jar.available">
<ant inheritall="false" dir="${basedir}/../entitymanager" target="clean"/>
<ant inheritall="false" dir="${basedir}/../entitymanager" target="jar"/>
- </target>
+ </target -->
- <target name="compile" depends="init,get.jpa-api,get.commons-annotations" description="Compile the Java source code">
+ <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" />
+ </target>
+
+ <target name="compile" depends="init,get.deps.core" description="Compile the Java source code">
<available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
@@ -121,7 +150,12 @@
</copy>
</target>
- <target name="compiletest" depends="init,get.annotations,get.jpa,compile" description="Compile the tests">
+ <target name="get.deps.test" depends="init" description="retrieve the test dependencies">
+ <ivy:resolve conf="test" />
+ <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" />
+ </target>
+
+ <target name="compiletest" depends="init,get.deps.test,compile" description="Compile the tests">
<available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
@@ -207,10 +241,17 @@
<attribute name="Implementation-URL" value="http://validator.hibernate.org"/>
</manifest>
<antcall target="common-build.jar"/>
- </target>
+ <ivy:resolve conf="core"/>
+ <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
+ resolver="local"
+ pubrevision="latest"
+ pubdate="${now}"
+ status="integration"
+ />
+ </target>
<!-- Some of this can probably be moved to common-build... -->
- <target name="dist" depends="jar,javadoc,copysource,copytest,copylib,extras"
+ <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,copysource,copytest,copylib,extras"
description="Build everything">
<ant inheritall="false" dir="${basedir}/doc/reference"/>
@@ -228,14 +269,17 @@
<!-- copy dependencies -->
<copy todir="${dist.lib.dir}" failonerror="false">
- <fileset file="${jpa-api.jar}"/>
- <fileset file="${commons-annotations.jar}"/>
+ <!-- fileset file="${jpa-api.jar}"/>
+ <fileset file="${commons-annotations.jar}"/ -->
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
</copy>
<mkdir dir="${dist.lib.dir}/test"/>
<copy todir="${dist.lib.dir}/test" failonerror="false">
- <fileset file="${annotations.jar}"/>
- <fileset file="${jpa.jar}"/>
- <fileset file="${archive-browsing.jar}"/>
+ <fileset dir="${ivy.dep.dir}/test">
+ <include name="*.jar"/>
+ </fileset>
</copy>
<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
Added: trunk/HibernateExt/validator/ivy/ivy-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/HibernateExt/validator/ivy/ivy-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/HibernateExt/validator/ivy/ivyconf.xml
===================================================================
--- trunk/HibernateExt/validator/ivy/ivyconf.xml (rev 0)
+++ trunk/HibernateExt/validator/ivy/ivyconf.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,27 @@
+<ivyconf>
+ <conf defaultResolver="jboss-rep"/>
+ <resolvers>
+ <chain name="jboss-rep">
+ <url name="jboss-rep-regular">
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ <chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
+ <filesystem name="local">
+ <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
+ <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
+ </filesystem>
+ <url name="jboss-rep-hibernate">
+ <ivy pattern="http://repository.jboss.org/hibernate-[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/hibernate-[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ <url name="jboss-rep-regular-with-ivy">
+ <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml"/>
+ <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ </url>
+ </chain>
+ </resolvers>
+ <modules>
+ <module organisation="org.hibernate" name="*" resolver="rep-hibernate"/>
+ </modules>
+</ivyconf>
Added: trunk/HibernateExt/validator/ivy.xml
===================================================================
--- trunk/HibernateExt/validator/ivy.xml (rev 0)
+++ trunk/HibernateExt/validator/ivy.xml 2007-08-15 20:40:27 UTC (rev 12947)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation=
+ "http://www.jayasoft.org/misc/ivy/ivy.xsd">
+ <info organisation="org.hibernate" module="validator"/>
+ <configurations>
+ <conf name="core" description="Core module dependencies"/>
+ <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
+ </configurations>
+ <publications>
+ <artifact name="hibernate-validator" conf="core"/>
+ </publications>
+ <dependencies>
+ <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="annotations" rev="3.3.0.GA" conf="test->core"/>
+ <dependency name="entitymanager" rev="3.3.1.GA" conf="test->core"/>
+ </dependencies>
+</ivy-module>
\ No newline at end of file
More information about the hibernate-commits
mailing list