[hibernate-commits] Hibernate SVN: r18080 - annotations/branches/v3_4_0_GA_CP-r17982.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Fri Nov 27 15:37:44 EST 2009


Author: stliu
Date: 2009-11-27 15:37:44 -0500 (Fri, 27 Nov 2009)
New Revision: 18080

Removed:
   annotations/branches/v3_4_0_GA_CP-r17982/build.properties.dist
   annotations/branches/v3_4_0_GA_CP-r17982/build.xml
   annotations/branches/v3_4_0_GA_CP-r17982/common-build.xml
   annotations/branches/v3_4_0_GA_CP-r17982/ivy.xml
   annotations/branches/v3_4_0_GA_CP-r17982/ivy/
   annotations/branches/v3_4_0_GA_CP-r17982/jdbc/
   annotations/branches/v3_4_0_GA_CP-r17982/lib/
Modified:
   annotations/branches/v3_4_0_GA_CP-r17982/pom.xml
Log:
JBPAPP-3150 remove unnecessary ivy stuff and update pom.xml

Deleted: annotations/branches/v3_4_0_GA_CP-r17982/build.properties.dist
===================================================================
--- annotations/branches/v3_4_0_GA_CP-r17982/build.properties.dist	2009-11-27 20:04:42 UTC (rev 18079)
+++ annotations/branches/v3_4_0_GA_CP-r17982/build.properties.dist	2009-11-27 20:37:44 UTC (rev 18080)
@@ -1,3 +0,0 @@
-common.dir=.
-src.dir=src
-test.dir=test

Deleted: annotations/branches/v3_4_0_GA_CP-r17982/build.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP-r17982/build.xml	2009-11-27 20:04:42 UTC (rev 18079)
+++ annotations/branches/v3_4_0_GA_CP-r17982/build.xml	2009-11-27 20:37:44 UTC (rev 18080)
@@ -1,232 +0,0 @@
-<!--
-
-  Hibernate Annotations ANT build script.
-
-  You need JDK 5.0 installed to build Hibernate Annotations.
-
--->
-
-<project name="Hibernate 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) -->
-	<property file="build.properties"/>
-	<property file="${user.home}/.ant.properties"/>
-	
-	<!-- Name of project and version, used to create filenames -->
-	<property name="Name" value="Hibernate Annotations"/>
-	<property name="name" value="hibernate-annotations"/>
-	<property name="version" value="3.4.0.GA"/>
-	<property name="javadoc.packagenames" value="org.hibernate.*"/>
-	<property name="jdbc.dir" value="jdbc"/>
-	<property name="copy.test" value="true"/>
-	<property name="javac.source" value="1.5"/>
-	<property name="javac.target" value="1.5"/>
-	<property name="common.dir" value="${basedir}"/>
-	<property name="ivy.dep.dir" value="${basedir}/build/lib"/>
-	
-	<available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/>
-	<property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/>
-	
-	<import file="${common.dir}/common-build.xml"/>
-	
-	<path id="lib.moduleclass.path">
-		<fileset dir="${ivy.dep.dir}/core">
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${common-build.basedir}/lib/build">
-			<!-- ${build.lib.dir} fails in reference doc build -->
-			<include name="junitext-*.jar"/>
-		</fileset>
-	</path>
-	
-	<path id="junit.moduleclasspath">
-		<pathelement location="${src.dir}"/>
-		<pathelement location="${test.dir}"/>
-		<fileset dir="${jdbc.dir}">
-			<include name="**/*.jar"/>
-			<include name="**/*.zip"/>
-		</fileset>
-		<fileset dir="${ivy.dep.dir}/test">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	
-	<target name="init">
-		<antcall target="common-build.init"/>
-		<tstamp>
-			<format property="now" pattern="yyyyMMddhhmmss"/>
-		</tstamp>
-		<mkdir dir="${ivy.dep.dir}/core"/>
-		<mkdir dir="${ivy.dep.dir}/test"/>
-		<ivy:configure file="${ivy.jar.dir}/ivyconf.xml"/>
-	</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"
-			classpath="${java.class.path}"/>
-		<javac srcdir="${src.dir}" destdir="${classes.dir}"
-			classpathref="lib.class.path" debug="${javac.debug}"
-			optimize="${javac.optimize}" nowarn="on" source="${javac.source}"
-			target="${javac.target}">
-			<src path="${src.dir}"/>
-		</javac>
-		<copy todir="${classes.dir}">
-			<fileset dir="${src.dir}">
-				<include name="**/resources/*.properties"/>
-				<include name="**/*.xsd"/>
-			</fileset>
-		</copy>
-	</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"
-			classpath="${java.class.path}"/>
-		<javac destdir="${testclasses.dir}" classpathref="junit.classpath"
-			debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on"
-			source="${javac.source}" target="${javac.target}">
-			<src refid="testsrc.path"/>
-		</javac>
-	</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">
-			<attribute name="Implementation-Title" value="${Name}"/>
-			<attribute name="Implementation-Version" value="${version}"/>
-			<attribute name="Implementation-Vendor" value="hibernate.org"/>
-			<attribute name="Implementation-Vendor-Id" value="hibernate.org"/>
-			<attribute name="Implementation-URL"
-				value="http://annotations.hibernate.org"/>
-			<attribute name="Specification-Title" value="Java Persistence"/>
-			<attribute name="Specification-Version" value="1.0"/>
-			<attribute name="Specification-Vendor" value="jcp.org"/>
-		</manifest>
-		<antcall target="common-build.jar"/>
-		<delete file="${dist.dir}/ivy.xml"/>
-		<!-- delete last produced ivy file to be sure a new one will be generated -->
-		<ivy:resolve conf="default"/>
-		<ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
-			resolver="local" pubrevision="latest" pubdate="${now}"
-			status="integration"/>
-	</target>
-	
-	<target name="junit" depends="compiletest">
-		<for list="${targetdb}" param="db">
-			<sequential>
-				<antcall target="test-resources">
-					<param name="db" value="@{db}"/>
-				</antcall>
-				<mkdir dir="${testreports.dir}/@{db}"/>
-				<echo>Running against db: @{db}</echo>
-				<junit printsummary="yes" haltonfailure="yes" forkmode="once">
-					<classpath refid="junit.classpath"/>
-					<formatter type="plain"/>
-					<formatter type="xml"/>
-					<batchtest fork="yes" todir="${testreports.dir}/@{db}"
-						haltonfailure="no">
-						<fileset refid="junit.batchtestset"/>
-					</batchtest>
-				</junit>
-			</sequential>
-		</for>
-	</target>
-	
-	<!-- Run a single unit test. -->
-	<target name="junitsingle" depends="compiletest"
-		description="Run a single test suite (requires testname and jdbc.driver properties)">
-		<for list="${targetdb}" param="db">
-			<sequential>
-				<antcall target="test-resources">
-					<param name="db" value="@{db}"/>
-				</antcall>
-				<mkdir dir="${testreports.dir}/@{db}"/>
-				<echo>Running against db: @{db}</echo>
-				<junit printsummary="yes" fork="yes" haltonfailure="yes">
-					<classpath refid="junit.classpath"/>
-					<formatter type="plain"/>
-					<formatter type="xml"/>
-					<test fork="yes" todir="${testreports.dir}/@{db}"
-						haltonfailure="no" name="${testname}"/>
-				</junit>
-			</sequential>
-		</for>
-	</target>
-	
-	<target name="jpa-javadoc" if="jpa-present">
-		<mkdir dir="${jpa-javadoc.dir}"/>
-		<ant dir="../jpa-api" target="javadoc" inheritAll="false"/>
-		<copy todir="${jpa-javadoc.dir}">
-			<fileset dir="${basedir}/../jpa-api/build/api">
-				<include name="**/*.*"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<!-- Some of this can probably be moved to common-build... -->
-	<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">
-			<fileset dir="${basedir}/doc/reference/build">
-				<include name="**/*.*"/>
-			</fileset>
-		</copy>
-		
-		<copy todir="${dist.dir}" failonerror="false">
-			<fileset dir="${common.dir}">
-				<include name="common-build.xml"/>
-			</fileset>
-		</copy>
-		<copy todir="${dist.dir}/ivy" failonerror="false">
-			<fileset dir="${ivy.jar.dir}">
-				<include name="**/*.*"/>
-			</fileset>
-		</copy>
-		
-		<!-- copy dependencies -->
-		<copy todir="${dist.lib.dir}" failonerror="false">
-			<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>
-		
-		
-		<!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation -->
-		<move file="${dist.lib.dir}/commons-annotations.jar"
-			tofile="${dist.lib.dir}/hibernate-commons-annotations.jar"
-			failonerror="false"/>
-		
-		<copy file="${basedir}/build.properties.dist"
-			tofile="${dist.dir}/build.properties" failonerror="false">
-		</copy>
-		<antcall target="common-build.dist"/>
-	</target>
-	
-	<target name="zip-dist" description="zip the dist">
-		<zip zipfile="${dist.dir}-${version}.zip">
-			<zipfileset prefix="${name}-${version}" dir="${dist.dir}"/>
-		</zip>
-		<tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz">
-			<tarfileset prefix="${name}-${version}" dir="${dist.dir}"/>
-		</tar>
-	</target>
-	
-</project>

Deleted: annotations/branches/v3_4_0_GA_CP-r17982/common-build.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP-r17982/common-build.xml	2009-11-27 20:04:42 UTC (rev 18079)
+++ annotations/branches/v3_4_0_GA_CP-r17982/common-build.xml	2009-11-27 20:37:44 UTC (rev 18080)
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="common-build" default="dist"
-	xmlns:artifact="urn:maven-artifact-ant" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-	<description>Common properties and targets for the HibernateExt
-		project</description>
-	
-	
-	<!-- my.basedir property can be used to refer to files/directories relatively to the common-build.xml file -->
-	<dirname property="common-build.basedir" file="${ant.file.common-build}"/>
-	
-	<!-- Give user a chance to override without editing this file
-	(and without typing -D each time it compiles it) -->
-	<property file="${common-build.basedir}/build.properties"/>
-	<property file="${user.home}/.ant.properties"/>
-	
-	<property name="src.dir" location="src/java"/> 
-	<property name="test.dir" location="src/test"/>
-	<property name="test.resources.dir" location="src/test-resources"/>
-	<property name="filter.dir" location="src/filters"/>
-	<property name="lib.dir" location="lib"/>
-	<property name="build.dir" location="build"/>
-	<property name="classes.dir" location="${build.dir}/classes"/>
-	<property name="testclasses.dir" location="${build.dir}/testclasses"/>
-	<property name="testreports.dir" location="${build.dir}/test-reports"/>
-	<property name="dist.target.dir" location="target"/>
-	<property name="dist.dir" location="${dist.target.dir}/${name}"/>
-	<property name="instrumenttest.out.dir" value="${build.dir}/test-reports/instrument"/>
-	<property name="doc.dir" location="doc"/>
-	<property name="doc.api.dir" location="${doc.dir}/api"/>
-	<property name="doc.reference.dir" location="${doc.dir}/reference"/>
-	
-	<property name="dist.doc.dir" location="${dist.dir}/doc"/>
-	<property name="dist.api.dir" location="${dist.dir}/doc/api"/>
-	
-	<property name="dist.src.dir" location="${dist.dir}/src"/>
-	<property name="dist.test.dir" location="${dist.dir}/test"/>
-	<property name="dist.lib.dir" location="${dist.dir}/lib"/>
-	<property name="jar.name" value="${name}"/>
-	<property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/>
-	<property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/>
-	
-	<property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/>
-	<property name="javac.debug" value="on"/>
-	<property name="javac.optimize" value="off"/>
-	<property name="javac.source" value="1.4"/>
-	<property name="javac.target" value="1.4"/>
-	
-	<property name="pom.file" value="${build.dir}/pom.xml"/>
-	<property name="src.jar" value="${build.dir}/src.jar"/>
-	
-	<taskdef name="junit"
-		classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
-		<classpath>
-			<fileset dir="${common-build.basedir}/lib/build">
-				<!-- ${build.lib.dir} fails in reference doc build -->
-				<include name="junit-*.jar"/>
-				<include name="ant-junit-*.jar"/>
-			</fileset>
-		</classpath>
-	</taskdef>
-	
-	<taskdef name="junitreport"
-		classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator">
-		<classpath>
-			<fileset dir="${common-build.basedir}/lib/build">
-				<!-- ${build.lib.dir} fails in reference doc build -->
-				<include name="junit-*.jar"/>
-				<include name="ant-junit-*.jar"/>
-			</fileset>
-		</classpath>
-	</taskdef>
-	
-	<taskdef resource="net/sf/antcontrib/antlib.xml">
-		<classpath>
-			<fileset dir="${common-build.basedir}/lib/build">
-				<!-- ${build.lib.dir} fails in reference doc build -->
-				<include name="ant-contrib-*.jar"/>
-			</fileset>
-		</classpath>
-	</taskdef>
-	
-	<!-- ivy load -->
-	<property name="ivy.jar.dir" value="${common-build.basedir}/ivy"/>
-	<property name="ivy.conf.dir" value="${common-build.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"/>
-	
-	<!-- maven task load -->
-	<path id="maven-ant-tasks.path" path="${ivy.jar.dir}/maven-ant-tasks.jar"/>
-	<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-		uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.path"/>
-	
-	<artifact:remoteRepository id="offline.repository.jboss.org"
-		url="file://${offline.repository.jboss.org}"/>
-	
-	<path id="lib.class.path">
-		<path refid="lib.moduleclass.path"/>
-		<pathelement path="${clover.jar}"/>
-	</path>
-	
-	<!-- overridable in modules -->
-	<path id="lib.moduleclass.path"/>
-	
-	<patternset id="support.files">
-		<include name="**/*.jpg"/>
-		<include name="**/*.gif"/>
-		<include name="**/*.dtd"/>
-		<include name="**/*.xsd"/>
-		<include name="**/*.xml"/>
-		<include name="**/*.xslt"/>
-		
-		<!-- exclude everything we don't want in the jar -->
-		<exclude name="${build.dir}/**/*"/>
-		<exclude name="${doc.dir}/**/*"/>
-		<exclude name="classes/**/*"/>
-		<exclude name="build.xml"/>
-		<exclude name="**/*.properties"/>
-		<exclude name="**/*.ccf"/>
-		<exclude name="**/*.cfg.xml"/>
-		<exclude name="**/ehcache.xml"/>
-	</patternset>
-	
-	<patternset id="source.files">
-		<include name="**/*.java"/>
-		<include name="**/*.properties"/>
-	</patternset>
-	
-	<!-- junit paths/filesets -->
-	<fileset dir="${testclasses.dir}" id="junit.batchtestset">
-		<include name="**/*Test.class"/>
-	</fileset>
-	
-	<path id="testsrc.path">
-		<pathelement location="${test.dir}"/>
-	</path>
-		
-	<path id="junit.classpath">
-		<pathelement path="${classes.dir}"/>
-		<pathelement path="${testclasses.dir}"/>
-		<path refid="lib.class.path"/>
-		<path refid="junit.moduleclasspath"/>
-		<path location="${clover.jar}"/>
-	</path>
-	
-	<!-- Determine the database against which to run  tests-->
-	<if>
-		<equals arg1="${targetdb}" arg2="$${targetdb}"/>
-		<then>
-			<echo message="No target database specified using default HSQLDB"/>
-			<property name="targetdb" value="hsqldb"/>
-		</then>
-	</if>
-	
-	<!-- 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">
-		<tstamp>
-			<format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/>
-		</tstamp>
-		<tstamp>
-			<format property="releasedate" pattern="dd-MM-yyyy"/>
-		</tstamp>
-		<echo message="Build ${Name}-${version} (${subversion})"/>
-		<mkdir dir="${classes.dir}"/>
-		<mkdir dir="${testclasses.dir}"/>
-		<copy todir="${classes.dir}">
-			<fileset dir="${src.dir}">
-				<patternset refid="support.files"/>
-			</fileset>
-		</copy>
-		<filter token="version" value="${version}"/>
-        <filter token="releasedate" value="${releasedate}"/>
-		<copy todir="${build.dir}" filtering="true">
-			<fileset dir=".">
-				<include name="readme.txt"/>
-				<include name="lgpl.txt"/>
-                <include name="pom.xml"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="get.deps.core" depends="init"
-		description="retrieve the core dependencies" unless="disable.ivy">
-		<ivy:resolve conf="default"/>
-		<ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]"
-			conf="default"/>
-	</target>	
-	
-	<target name="get.deps.test" depends="init"
-		description="retrieve the test dependencies" unless="disable.ivy">
-		<ivy:resolve conf="test"/>
-		<ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/>
-	</target>	
-				
-	<target name="copytest" description="Copy tests to dist dir" if="copy.test">
-		<mkdir dir="${dist.test.dir}"/>
-		<copy todir="${dist.test.dir}">
-			<fileset dir="${test.dir}"/>
-		</copy>
-	</target>
-	
-	<target name="copysource" depends="copytest"
-		description="Copy sources to dist dir">
-		<mkdir dir="${dist.src.dir}"/>
-		<copy todir="${dist.src.dir}">
-			<fileset dir="${src.dir}">
-				<patternset refid="source.files"/>
-			</fileset>
-			<fileset dir="${src.dir}">
-				<patternset refid="support.files"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${dist.src.dir}"/>
-		<copy todir="${dist.src.dir}">
-			<fileset dir="${src.dir}">
-				<patternset refid="source.files"/>
-			</fileset>
-			<fileset dir="${src.dir}">
-				<patternset refid="support.files"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="copylib" description="Copy jars to lib dir">
-		<mkdir dir="${dist.lib.dir}"/>
-		<copy todir="${dist.lib.dir}" verbose="true">
-			<fileset dir="${lib.dir}">
-				<include name="**/*.jar"/>
-				<exclude name="log4j.jar"/>
-				<exclude name="checkstyle*.jar"/>
-				<include name="*.txt"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="copydoc" description="Copy doc to dist dir" if="copy.doc">
-		<mkdir dir="${dist.doc.dir}"/>
-		<copy todir="${dist.doc.dir}">
-			<fileset dir="${doc.dir}">
-				<include name="**/*.html"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="jar" depends="compile"
-		description="Build the distribution .jar file">
-		<mkdir dir="${dist.dir}"/>
-		<jar filesetmanifest="merge" jarfile="${jar.file.name}"
-			basedir="${classes.dir}"/>
-	</target>
-	
-	<target name="jartest" depends="compiletest"
-		description="Build the distribution .jar file">
-		<mkdir dir="${dist.dir}"/>
-		<jar filesetmanifest="merge" jarfile="${jartest.file.name}"
-			basedir="${testclasses.dir}"/>
-	</target>
-	
-	<!-- DOCUMENTATION -->
-	
-	<target name="javadoc"
-		description="Compile the Javadoc API documentation to dist dir">
-		<mkdir dir="${dist.api.dir}"/>
-		<javadoc packagenames="${javadoc.packagenames}"
-			classpathref="lib.class.path" destdir="${dist.api.dir}" use="true"
-			protected="true" version="true"
-			windowtitle="${Name} API Documentation"
-			Overview="${doc.api.dir}/package.html"
-			doctitle="${Name} API Documentation"
-			stylesheetfile="${doc.api.dir}/jdstyle.css" link="${javadoc}">
-			<packageset dir="${src.dir}" defaultexcludes="yes">
-				<include name="**/*"/>
-			</packageset>
-		</javadoc>
-	</target>
-	
-	<target name="extras" description="Copies miscellaneous files to root dir">
-		<copy todir="${dist.dir}/bin" failonerror="false">
-			<fileset dir="bin">
-				<include name="*.bat"/>
-			</fileset>
-		</copy>
-		<copy file="${build.dir}/readme.txt" todir="${dist.dir}"/>
-		<copy file="lgpl.txt" todir="${dist.dir}"/>
-		<copy file="changelog.txt" todir="${dist.dir}"/>
-		<copy file="build.xml" todir="${dist.dir}"/>
-		<replace file="${dist.dir}/build.xml">
-			<replacetoken><![CDATA[../${name}-${version}]]>
-			</replacetoken>
-			<replacevalue><![CDATA[../${name}]]>
-			</replacevalue>
-		</replace>
-	</target>
-	
-	<target name="dist" depends="jar,javadoc,copysource,copydoc,extras"
-		description="Build everything">
-		<zip zipfile="${dist.dir}-${version}.zip">
-			<zipfileset prefix="${name}-${version}" dir="${dist.dir}"/>
-		</zip>
-		<tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz">
-			<tarfileset prefix="${name}-${version}" dir="${dist.dir}"/>
-		</tar>
-	</target>
-	
-	<target name="info" description="Echoes useful system properties">
-		<echo message="java.vm.info=${java.vm.info}"/>
-		<echo message="java.vm.name=${java.vm.name}"/>
-		<echo message="java.vm.vendor=${java.vm.vendor}"/>
-		<echo message="java.vm.version=${java.vm.version}"/>
-		<echo message="os.arch=${os.arch}"/>
-		<echo message="os.name=${os.name}"/>
-		<echo message="os.version=${os.version}"/>
-		<echo message="java.home = ${java.home}"/>
-		<echo message="java.class.path = ${java.class.path}"/>
-		<echo message="build.compiler = ${build.compiler}"/>
-		<echo message="file.encoding=${file.encoding}"/>
-		<echo message="user.home = ${user.home}"/>
-		<echo message="user.language=${user.language}"/>
-	</target>
-	
-	<target name="test-resources" description="Copies and filters test resources">
-		<filter filtersfile="${filter.dir}/${db}.filter"/>
-		<mkdir dir="${testclasses.dir}"/>
-		<copy todir="${testclasses.dir}" filtering="true" overwrite="true">
-			<fileset dir="${test.resources.dir}">
-				<include name="*.properties"/>
-				<include name="*.xml"/>
-			</fileset>
-		</copy>
-	</target>
-		
-	<target name="instrument" depends="compiletest"
-		description="Instrument the persistent classes"> <!-- depends="jar" -->
-		
-		<taskdef name="instrument"
-			classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
-			<classpath refid="junit.classpath"/>
-		</taskdef>
-		
-		<instrument verbose="true">
-			<fileset dir="${testclasses.dir}/org/hibernate/test">
-				<include name="**/*.class"/>
-				<exclude name="**/*Test$*.class"/>
-				<exclude name="**/*Test.class"/>
-				<exclude name="**/*Tests.class"/>
-			</fileset>
-		</instrument>
-	</target>	
-	
-	<target name="junitinstrument" depends="compiletest,instrument"
-		description="Run the instrument test suite">
-		<for list="${targetdb}" param="db">
-			<sequential>
-				<antcall target="test-resources">
-					<param name="db" value="@{db}"/>
-				</antcall>
-				<mkdir dir="${instrumenttest.out.dir}/@{db}"/>
-				<echo>Running against db: @{db}</echo>
-				<junit printsummary="yes" haltonfailure="yes" dir="${basedir}"
-					maxmemory="256M" fork="yes" forkmode="perBatch">
-					<classpath refid="junit.classpath"/>
-					<formatter type="plain"/>
-					<formatter type="xml"/>
-					<batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no">
-						<fileset refid="junit.batchtestset"/>
-					</batchtest>
-				</junit>
-			</sequential>
-		</for>
-	</target>
-	
-	<target name="junitreport" depends="">
-		<junitreport todir="${testreports.dir}">
-			<fileset dir="${testreports.dir}">
-				<include name="TEST-*.xml"/>
-			</fileset>
-			<report format="frames" todir="${testreports.dir}"/>
-		</junitreport>
-	</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>
-	
-	<!-- maven deploy: to be used by the subbuild and delcare deps on jar -->
-	<target name="deploy" depends="jar">
-		<fail unless="offline.repository.jboss.org"
-			message="offline.repository.jboss.org must be defined"/>
-		<jar jarfile="${src.jar}" basedir="${src.dir}">
-			<include name="**/*.java"/>
-			<exclude name="**/test/*.java"/>
-			<!-- patternset refid="meta.files" / -->
-		</jar>
-		
-		<artifact:pom id="maven.project" file="${pom.file}"/>
-		
-		<artifact:install file="${jar.file.name}">
-			<pom refid="maven.project"/>
-		</artifact:install>
-		
-		<artifact:deploy file="${jar.file.name}">
-			<pom refid="maven.project"/>
-			<remoteRepository refId="offline.repository.jboss.org">
-			</remoteRepository>
-			<attach file="${src.jar}" classifier="sources"/>
-			<attach file="${jar.file.name}" classifier=""/>
-		</artifact:deploy>
-	</target>
-	
-</project>

Deleted: annotations/branches/v3_4_0_GA_CP-r17982/ivy.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP-r17982/ivy.xml	2009-11-27 20:04:42 UTC (rev 18079)
+++ annotations/branches/v3_4_0_GA_CP-r17982/ivy.xml	2009-11-27 20:37:44 UTC (rev 18080)
@@ -1,36 +0,0 @@
-<?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="default" description="Core module dependencies"/>
-        <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
-    </configurations>
-    <publications>
-        <artifact name="hibernate-annotations" conf="default"/>
-    </publications>
-    <dependencies>
-        <!-- compile time dependencies -->
-        <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/>
-        <dependency name="commons-annotations" rev="3.1.0.GA" conf="default->default"/>
-        <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.SP1" conf="default->default"/>
-        <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/>
-        <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/>
-
-
-        <!-- transitive dependencies -->
-        <dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/>
-        <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="test->default"/>
-
-        <!-- test deps -->
-        <dependency org="javassist" name="javassist" rev="3.4.GA" conf="test->default"/>
-        <dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/>
-        <dependency org="asm" name="asm-attrs" rev="1.5.3" conf="test->default"/>
-        <dependency org="javax.transaction" name="jta" rev="1.1" conf="test->default"/>
-        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/>
-        <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/>
-        <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
-    </dependencies>
-</ivy-module>
\ No newline at end of file

Modified: annotations/branches/v3_4_0_GA_CP-r17982/pom.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP-r17982/pom.xml	2009-11-27 20:04:42 UTC (rev 18079)
+++ annotations/branches/v3_4_0_GA_CP-r17982/pom.xml	2009-11-27 20:37:44 UTC (rev 18080)
@@ -1,52 +1,653 @@
 <?xml version="1.0"?>
-<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"
->
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.hibernate</groupId>
 	<artifactId>hibernate-annotations</artifactId>
 	<packaging>jar</packaging>
-	<version>@version@</version>
+	<version>3.4.0.GA</version>
 
 	<name>Hibernate Annotations</name>
 	<description>Annotations metadata for Hibernate</description>
 	<url>http://annotations.hibernate.org</url>
 
+	<organization>
+		<name>Hibernate.org</name>
+		<url>http://hibernate.org</url>
+	</organization>
+
 	<licenses>
 		<license>
-			<name>GNU LESSER GENERAL PUBLIC LICENSE</name>
-			<url>http://www.gnu.org/licenses/lgpl.txt</url>
+			<name>GNU Lesser General Public License</name>
+			<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+			<comments>See discussion at http://hibernate.org/356.html for more
+				details.</comments>
+			<distribution>repo</distribution>
 		</license>
 	</licenses>
+	<issueManagement>
+        <system>JIRA</system>
+        <url>http://opensource.atlassian.com/projects/hibernate/browse/ANN</url>
+    </issueManagement>
+    <scm>
+        <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/annotations/branches/v3_4_0_GA_CP</connection>
+        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/annotations/branches/v3_4_0_GA_CP</developerConnection>
+        <url>http://fisheye.jboss.com/browse/Hibernate/annotations/branches/v3_4_0_GA_CP</url>
+    </scm>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>3.3.2.GA</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
 			<artifactId>ejb3-persistence</artifactId>
 			<version>1.0.2.GA</version>
 		</dependency>
-        <dependency>
+		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-commons-annotations</artifactId>
 			<version>3.1.0.GA</version>
 		</dependency>
-        <dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>3.3.0.SP1</version>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4jVersion}</version>
 		</dependency>
 		<dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.4.2</version>
-        </dependency>
-        <dependency>
 			<groupId>dom4j</groupId>
 			<artifactId>dom4j</artifactId>
 			<version>1.6.1</version>
 		</dependency>
-    </dependencies>
+		<!-- =============================== -->
+        <!-- Testing Dependencies            -->
+        <!-- =============================== -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${slf4jVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${slf4jVersion}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>99.0-does-not-exist</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging-api</artifactId>
+			<version>99.0-does-not-exist</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.9.0.GA</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.2</version>
+			<scope>test</scope>
+		</dependency>  
+	</dependencies>
+	<build>
+		<testResources>
+			<testResource>
+				<filtering>false</filtering>
+				<directory>src/test/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</testResource>
+			<testResource>
+				<filtering>true</filtering>
+				<directory>src/test/resources</directory>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+				<groupId>org.jboss.maven.plugins</groupId>
+				<artifactId>maven-injection-plugin</artifactId>
+				<version>1.0.0</version>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>bytecode</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<bytecodeInjections>
+						<bytecodeInjection>
+							<expression>${pom.version}</expression>
+							<targetMembers>
+								<constant>
+									<className>org.hibernate.cfg.annotations.Version</className>
+									<fieldName>VERSION</fieldName>
+									&gt;
+								</constant>
+							</targetMembers>
+						</bytecodeInjection>
+					</bytecodeInjections>
+				</configuration>
+			</plugin>
+			<plugin>
+				<!-- require at least JDK 1.5 to run the build -->
+				<!-- ... -->
+				<!--
+					we need at least Maven 2.0.8 because of a bug fix affecting our
+					antlr usage
+				-->
+				<!--
+					2.0.8 not released at this time, so I instead say anything greater
+					that 2.0.7
+				-->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>enforce-java</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireJavaVersion>
+									<version>[1.5,)</version>
+								</requireJavaVersion>
+								<requireMavenVersion>
+									<version>(2.0.7,)</version>
+								</requireMavenVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.jboss.maven.plugins</groupId>
+				<artifactId>maven-test-ext-plugin</artifactId>
+				<version>1.1.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>extend</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!--
+				by default, compile to JDK 1.4 compatibility (individual modules
+				and/or user can override)
+			-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<!-- add specification/implementation details to the manifests -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+						<manifest>
+							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Specification-Vendor>jcp.org</Specification-Vendor>
+							<Specification-Version>1.0</Specification-Version>
+							<Specification-Title>Java Persistence</Specification-Title>
+							<Implementation-Vendor-Id>hibernate.org</Implementation-Vendor-Id>
+							<Implementation-URL>http://annotations.hibernate.org</Implementation-URL>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+				</configuration>
+			</plugin>
+			 <plugin>
+	                <artifactId>maven-assembly-plugin</artifactId>
+	                <configuration>
+	                    <descriptors>
+	                        <descriptor>src/main/assembly/dist.xml</descriptor>
+	                    </descriptors>
+	                </configuration>
+	            </plugin>
+				 <plugin>
+                        <groupId>org.jboss.maven.plugins</groupId>
+                        <artifactId>maven-jdocbook-plugin</artifactId>
+                        <version>2.2.0</version>
+                        <extensions>true</extensions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jdocbook-style</artifactId>
+                                <version>2.0.0</version>
+                                <type>jdocbook-style</type>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <sourceDocumentName>master.xml</sourceDocumentName>
+                            <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
+                            <masterTranslation>en</masterTranslation>
+                            <imageResource>
+                                <directory>${basedir}/src/main/docbook/en/images</directory>
+                            </imageResource>
+                            <formats>
+                                <format>
+                                    <formatName>pdf</formatName>
+                                    <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
+                                    <finalName>hibernate_annotations_reference.pdf</finalName>
+                                </format>
+                                <format>
+                                    <formatName>html_single</formatName>
+                                    <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl
+                            </stylesheetResource>
+                                    <finalName>index.html</finalName>
+                                </format>
+                                <format>
+                                    <formatName>html</formatName>
+                                    <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl
+                            </stylesheetResource>
+                                    <finalName>index.html</finalName>
+                                </format>
+                            </formats>
+                            <options>
+                                <xincludeSupported>true</xincludeSupported>
+                                <xmlTransformerType>saxon</xmlTransformerType>
+                                <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+                                <!--     could also locate the docbook dependency and inspect its version... -->
+                                <docbookVersion>1.72.0</docbookVersion>
+                                <localeSeparator>-</localeSeparator>
+                            </options>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>make-doc</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>resources</goal>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<links>
+								<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+								<link>http://java.sun.com/javaee/5/docs/api/</link>
+							</links>
+							<stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
+						</configuration>
+						          <executions>
+			                            <execution>
+			                                <id>make-doc</id>
+			                                <phase>package</phase>
+			                                <goals>
+			                                    <goal>javadoc</goal>
+			                                </goals>
+			                            </execution>
+			                        </executions>
+					</plugin>
+		</plugins>
+<!--		<pluginManagement>
+			<plugins>
 
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.4.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>1.0-alpha-3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.0.2</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-webdav</artifactId>
+				<version>1.0-beta-2</version>
+			</extension>
+		</extensions> -->
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.4.3</version>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<linkXRef>true</linkXRef>
+					<minimumTokens>100</minimumTokens>
+					<targetJdk>1.5</targetJdk>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<tags>
+						<tag>@FIXME</tag>
+						<tag>@fixme</tag>
+						<tag>FIXME</tag>
+						<tag>fixme</tag>
+						<tag>@TODO</tag>
+						<tag>@todo</tag>
+						<tag>TODO</tag>
+						<tag>todo</tag>
+					</tags>
+				</configuration>
+			</plugin>
+			<plugin>
+				<!--
+					Note: aggregate-able, may cause problems if we aggregate jxr and
+					not this because of the xref links
+				-->
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>javancss-maven-plugin</artifactId>
+				<version>2.0-beta-2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>1.1.1</version>
+				<configuration>
+					<onlyAnalyze>org.hibernate.*</onlyAnalyze>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
+
+	<profiles>
+		<!-- HSQLDB is the default (eventually move to H2) -->
+		<profile>
+			<id>hsqldb</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>hsqldb</groupId>
+					<artifactId>hsqldb</artifactId>
+					<version>1.8.0.2</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
+				<jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
+				<jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
+				<jdbc.user>sa</jdbc.user>
+				<jdbc.pass />
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!-- The H2 test envionment -->
+		<profile>
+			<id>h2</id>
+			<dependencies>
+				<dependency>
+					<groupId>org.h2database</groupId>
+					<artifactId>h2database</artifactId>
+					<version>1.0.20061217</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
+				<jdbc.driver>org.h2.Driver</jdbc.driver>
+				<jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
+				<jdbc.user>sa</jdbc.user>
+				<jdbc.pass />
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!--
+			###################################################################
+			Profiles naming db instances in the Red Hat QA/QE lab First, those
+			with OSS drivers
+			###################################################################
+		-->
+
+		<!-- The MySQL5 test envionment -->
+		<profile>
+			<id>mysql5</id>
+			<dependencies>
+				<dependency>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+					<version>5.0.5</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
+				<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+				<jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!-- The PostgreSQL test envionment -->
+		<profile>
+			<id>postgresql823</id>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+					<version>8.2-504</version>
+					<classifier>jdbc3</classifier>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+				<jdbc.driver>org.postgresql.Driver</jdbc.driver>
+				<jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:hibbr330</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!--
+			###################################################################
+			Then, those with commercial drivers
+			###################################################################
+		-->
+
+		<!-- The DB2 8.x test envionment (using 9x drivers)-->
+		<profile>
+			<id>db2v82</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.ibm</groupId>
+					<artifactId>db2jcc</artifactId>
+					<version>3.1.57</version>
+				</dependency>
+				<dependency>
+					<groupId>com.ibm</groupId>
+					<artifactId>db2jcc_license_cu</artifactId>
+					<version>3.1.57</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+				<jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+				<jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!-- The DB2 9.x test envionment (using 9x drivers)-->
+		<profile>
+			<id>db2v91</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.ibm</groupId>
+					<artifactId>db2jcc</artifactId>
+					<version>3.1.57</version>
+				</dependency>
+				<dependency>
+					<groupId>com.ibm</groupId>
+					<artifactId>db2jcc_license_cu</artifactId>
+					<version>3.1.57</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+				<jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+				<jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!-- The Oracle9i test envionment -->
+		<profile>
+			<id>oracle9i</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+					<!-- use the 10g drivers which are surprisingly largely bug free -->
+					<version>10.0.2.0</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
+				<jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+				<jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!-- The Oracle10g test envionment -->
+		<profile>
+			<id>oracle10g</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+					<!-- use the 10g drivers which are surprisingly largely bug free -->
+					<version>10.0.2.0</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+				<jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+				<jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!-- The Sybase 15 test envionment -->
+		<profile>
+			<id>sybase15</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.sybase</groupId>
+					<artifactId>jconnect</artifactId>
+					<version>6.0.5</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
+				<jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
+				<jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation />
+			</properties>
+		</profile>
+
+		<!-- The SQLServer2005 (MS JDBC) test envionment -->
+		<profile>
+			<id>mssql2005</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.microsoft.sqlserver</groupId>
+					<artifactId>msjdbc</artifactId>
+					<version>1.1</version>
+				</dependency>
+			</dependencies>
+			<properties>
+				<db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+				<jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+				<jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
+				<jdbc.user>hibbr330</jdbc.user>
+				<jdbc.pass>hibbr330</jdbc.pass>
+				<jdbc.isolation>4096</jdbc.isolation>
+			</properties>
+		</profile>
+
+	</profiles>
+	<properties>
+		<slf4jVersion>1.5.8</slf4jVersion>
+	</properties>
 </project>
\ No newline at end of file



More information about the hibernate-commits mailing list