Author: brmeyer Date: 2012-08-30 12:52:35 -0400 (Thu, 30 Aug 2012) New Revision: 21064 Added: core/patches/JBPAPP-6940/build.xml core/patches/JBPAPP-6940/doc/ core/patches/JBPAPP-6940/eg/ core/patches/JBPAPP-6940/etc/ core/patches/JBPAPP-6940/grammar/ core/patches/JBPAPP-6940/hibernate_logo.gif core/patches/JBPAPP-6940/jdbc/ core/patches/JBPAPP-6940/lgpl.txt core/patches/JBPAPP-6940/lib/ core/patches/JBPAPP-6940/src/ core/patches/JBPAPP-6940/test/ Log: Branching for JBPAPP-6940 Copied: core/patches/JBPAPP-6940/build.xml (from rev 21063, core/branches/Branch_3_2_4_SP1_CP/build.xml) =================================================================== --- core/patches/JBPAPP-6940/build.xml (rev 0) +++ core/patches/JBPAPP-6940/build.xml 2012-08-30 16:52:35 UTC (rev 21064) @@ -0,0 +1,643 @@ +<!-- + + Hibernate ANT build script. + + (Originally contributed by Fabricio Goncalves) + +--> + +<project name="Hibernate3" default="jar" basedir="."> + + <!-- ################################################################## --> + <!-- ################## Property definitions ########################## --> + <!-- ################################################################## --> + + <!-- Give user a chance to override without editing this file or typing -D --> + <property file="build.properties"/> + <property file="${user.home}/.ant.properties"/> + + <!-- Name of project and version, used to create filenames --> + <property name="Name" value="Hibernate"/> + <property name="name" value="hibernate"/> + <property name="name2" value="hibernate3"/> + <property name="version.major" value="3"/> + <property name="version.minor" value="2"/> + <property name="version.micro" value="4"/> + <property name="version.qualifier" value="sp1"/> + <property name="version.cp" value="cp11"/> + <property name="version.full" + value="${version.major}.${version.minor}.${version.micro}.${version.qualifier}.${version.cp}"/> + <property name="version.major_minor" value="${version.major}.${version.minor}"/> + <property name="fullname" value="${name}-${version.full}"/> + + <!-- Various SCM-controlled directories --> + <property name="dir.src" value="src"/> + <property name="dir.test" value="test"/> + <property name="dir.grammar" value="grammar"/> + <property name="dir.etc" value="etc"/> + <property name="dir.lib" value="lib"/> + <property name="dir.jdbc" value="jdbc"/> + <property name="dir.doc" value="doc"/> + <property name="dir.doc.api" value="${dir.doc}/api"/> + <property name="dir.eg" value="eg"/> + <property name="dir.props" value="${dir.etc}"/> + + <!-- Define the build directory layout --> + <property name="dir.build" value="build"/> + <property name="dir.out.classes" value="${dir.build}/classes"/> + <property name="dir.out.test-classes" value="${dir.build}/testclasses"/> + <property name="dir.out.generated-source" value="${dir.build}/gensrc"/> + <property name="dir.out.antlr-package" value="${dir.out.generated-source}/org/hibernate/hql/antlr"/> + <property name="dir.out.junit" value="${dir.build}/testout"/> + <property name="dir.out.junit-reports" value="${dir.build}/test-reports"/> + <property name="dir.out.perf-test" value="${dir.build}/testout-perf"/> + <property name="dir.out.db" value="${dir.build}/db"/> + <property name="dir.out.doc" value="${dir.build}/doc"/> + <property name="dir.out.eg" value="${dir.build}/eg"/> + <property name="dir.dist" value="${dir.build}/dist"/> + + <!-- Define various operational options --> + <property name="javadoc.url.jse" value="http://java.sun.com/j2se/1.5.0/docs/api"/> + <property name="javac.debug" value="on"/> + <property name="javac.optimize" value="off"/> + <property name="javac.target" value="1.5"/> + <property name="javac.source" value="1.5"/> + <property name="jar.driver" value="${dir.jdbc}/hsqldb.jar"/> + + <!-- JAR and dist file names --> + <property name="jar.name" value="${name2}"/> + <property name="testjar.name" value="${name2}-test"/> + + <property name="hibernate.test.validatefailureexpected" value="true"/> + + <!-- fileset definition for the lib directory --> + <fileset id="fs.lib" dir="${dir.lib}"> + <include name="**/*.jar"/> + </fileset> + <fileset id="fs.lib.test" dir="${dir.lib}"> + <include name="**/*.jar"/> + <exclude name="**/ant-*.jar"/> + </fileset> + <path id="path.lib"> + <fileset refid="fs.lib"/> + </path> + + <!-- fileset definition for the "supported" jars for distribution --> + <fileset id="fs.lib.dist" dir="${dir.lib}"> + <include name="**/javassist.jar"/> + <include name="**/cglib.jar"/> + <include name="**/asm.jar"/> + <include name="**/asm-attrs.jar"/> + <include name="**/commons-collections.jar"/> + <include name="**/commons-logging.jar"/> + <include name="**/apache-1.1.txt"/> + <include name="**/apache-2.0.txt"/> + <include name="**/antlr.jar"/> + <include name="**/antlr.txt"/> + <include name="**/dom4j.jar"/> + <include name="**/jaxen.jar"/> + <include name="**/jboss-j2ee.jar"/> + <include name="**/jboss-cache-jdk50.jar"/> + <include name="**/concurrent.jar"/> + <include name="**/jboss-common.jar"/> + <include name="**/jboss-jmx.jar"/> + <include name="**/jboss-minimal.jar"/> + <include name="**/jboss-system.jar"/> + <include name="**/jgroups.jar"/> + <include name="**/version-dist.properties"/> + </fileset> + + <!-- path definition for the JDBC driver(s) --> + <path id="path.jdbc"> + <!-- By default include everything in the ${dir.jdbc} directory --> + <fileset dir="${dir.jdbc}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + <!-- And the explicitly defined jar.driver property (used by the CC scripts) --> + <pathelement path="${jar.driver}"/> + </path> + <!-- allows external definition of the JDBC classpath fragment --> + <property name="hibernate.test.jdbc.fs.importFile" value="doNotImport"/> + <import file="${hibernate.test.jdbc.fs.importFile}" optional="true"/> + + <!-- patternset for insturmentation-eligible resources --> + <patternset id="ps.instrument.domain"> + <include name="org/hibernate/test/instrument/domain/*"/> + <exclude name="**/*.hbm.xml"/> + </patternset> + + + <!-- ################################################################## --> + <!-- ############################# Tasks ############################## --> + <!-- ################################################################## --> + + <!-- ################################################################## --> + <!-- ############################ Targets ############################# --> + <!-- ################################################################## --> + + <!-- Various 'preparation targets --> + + <target name="splash" unless="nosplash" description="Display the logo"> + <property name="splash.dir" location="."/> + <splash imageurl="file:${splash.dir}/hibernate_logo.gif" showduration="0"/> + </target> + + <target name="init" depends="splash" description="Initialize the build"> + <tstamp> + <format property="now" pattern="yyyy-MM-dd hh:mm:ss"/> + </tstamp> + <echo message="Build ${Name}-${version.full} (${now})"/> + <echo message="JDK version: ${ant.java.version}"/> + </target> + + + <!-- Various 'clean' targets --> + + <target name="clean" depends="init" description="Cleans up build directories"> + <delete dir="${dir.build}"/> + </target> + + <target name="cleantestdb" depends="init" description="Clean up the test file-based database directories"> + <delete dir="${dir.out.db}"/> + </target> + + <target name="init.antlr" depends="init" unless="antlr.isUpToDate" description="Check ANTLR dependencies."> + <uptodate property="antlr.isUpToDate" targetfile="${dir.out.antlr-package}/.antlr_run"> + <srcfiles dir="${dir.grammar}" includes="*.g"/> + </uptodate> + </target> + + <target name="antlr" depends="init.antlr" unless="antlr.isUpToDate" description="Generate ANTLR parsers."> + <mkdir dir="${dir.out.antlr-package}"/> + <antlr target="${dir.grammar}/hql.g" outputdirectory="${dir.out.antlr-package}"> + <classpath refid="path.lib"/> + </antlr> + <antlr target="${dir.grammar}/hql-sql.g" outputdirectory="${dir.out.antlr-package}"> + <classpath refid="path.lib"/> + </antlr> + <antlr target="${dir.grammar}/sql-gen.g" outputdirectory="${dir.out.antlr-package}"> + <classpath refid="path.lib"/> + </antlr> + <touch file="${dir.out.antlr-package}/.antlr_run"/> + </target> + + <target name="cleanantlr" depends="init" description="Clean up the generated ANTLR parsers."> + <delete dir="${dir.out.antlr-package}"/> + </target> + + <target name="antlr.regen" depends="init,cleanantlr,antlr" description="Regenerate all ANTLR generated code."/> + + <target name="antlr.bnf" depends="init" description="Generate BNF diagram for HQL"> + <mkdir dir="${dir.out.doc}/other"/> + <property name="bnf.grammar" location="${dir.grammar}/hql.g"/> + + <java dir="${dir.out.doc}/other" classname="net.mark_malakanov.sdg2.Main" classpathref="path.lib" fork="true"> + <jvmarg line="-Xmx512M"/> + <arg line="-blind"/> + <arg line="-savehtml hql-bnf.html"/> + <arg line="-savehtmltitle Hibernate ${version.full} HQL"/> + <arg line="${bnf.grammar}"/> + </java> + </target> + + + <!-- Compilation targets --> + + <target name="compile" depends="init,antlr" unless="classes.isUpToDate" description="Compile the Java source code"> + <mkdir dir="${dir.out.classes}"/> + <available classname="org.eclipse.core.launcher.Main" property="build.compiler" + value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> + <javac destdir="${dir.out.classes}" + classpathref="path.lib" + debug="${javac.debug}" + optimize="${javac.optimize}" + target="${javac.target}" + source="${javac.source}" + nowarn="on"> + <src path="${dir.src}"/> + <src path="${dir.out.generated-source}"/> + </javac> + <copy todir="${dir.out.classes}"> + <fileset dir="${dir.src}"> + <include name="**/*.dtd"/> + <include name="**/*.xml"/> + <include name="**/*.xslt"/> + </fileset> + </copy> + </target> + + <target name="compiletest" depends="compile" unless="test-classes.isUpToDate" description="Compile the tests"> + <mkdir dir="${dir.out.test-classes}"/> + <available classname="org.eclipse.core.launcher.Main" property="build.compiler" + value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> + <javac destdir="${dir.out.test-classes}" + debug="${javac.debug}" + optimize="${javac.optimize}" + target="${javac.target}" + source="${javac.source}" + nowarn="on"> + <classpath> + <path refid="path.lib"/> + <pathelement path="${dir.out.classes}"/> + </classpath> + <src path="${dir.test}"/> + </javac> + <copy todir="${dir.out.test-classes}"> + <fileset dir="${dir.test}"> + <include name="**/*.xml"/> + <include name="**/*.properties"/> + </fileset> + </copy> + </target> + + + <!-- testsuite targets --> + + <target name="junitreport" + depends="splash,junit" + description="Run tests and create JUnit report (requires driver.jar property)"> + <delete dir="${dir.out.junit-reports}"/> + <mkdir dir="${dir.out.junit-reports}"/> + <junitreport todir="${dir.out.junit-reports}"> + <fileset dir="${dir.out.junit}"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${dir.out.junit-reports}"/> + </junitreport> + </target> + + <target name="junitreport-dist" + depends="splash,prepare-dist,junitreport" + description="Run tests using distribution jars and create JUnit report (requires driver.jar property)"/> + + <target name="prepare-dist" depends="init" description="Unzip jar and test jar to be use in distribution"> + <mkdir dir="${dir.build}"/> + <delete dir="${dir.out.classes}"/> + <mkdir dir="${dir.out.classes}"/> + <delete dir="${dir.out.test-classes}"/> + <mkdir dir="${dir.out.test-classes}"/> + <unzip src="${basedir}/${jar.name}.jar" dest="${dir.out.classes}"/> + <unzip src="${basedir}/${testjar.name}.jar" dest="${dir.out.test-classes}"/> + <delete dir="${dir.out.generated-source}"/> + <available file="${dir.out.classes}/org/hibernate/hql/antlr" + type="dir" + property="antlr.isUpToDate"/> + <available file="${dir.out.classes}/org/hibernate" + type="dir" + property="classes.isUpToDate"/> + <available file="${dir.out.test-classes}/org/hibernate/test" + type="dir" + property="test-classes.isUpToDate"/> + <property name="test-classes.isFromJar" value="$test-classes.isUpToDate"/> + <echo message="antlr.isUpToDate=${antlr.isUpToDate}"/> + <echo message="classes.isUpToDate=${classes.isUpToDate}"/> + <echo message="test-classes.isUpToDate=${test-classes.isUpToDate}"/> + </target> + + <target name="junit" depends="junit.prepare"> + <sequential> + <antcall target="junit.standard"/> + <antcall target="junit.instrument.cglib"/> + <antcall target="junit.instrument.javassist"/> + </sequential> + </target> + + <target name="junit.prepare" depends="cleantestdb,compiletest"> + <delete dir="${dir.out.junit}"/> + <mkdir dir="${dir.out.junit}"/> + </target> + + <target name="junit.standard" + depends="junit.prepare" + description="Run the test suite (requires driver.jar property)"> + <path id="selector.classpath"> + <!-- + the selector needs all of this because it actually gets the suite + from AllTests and then performs the filtering based on that + --> + <fileset refid="fs.lib.test"/> + <path refid="path.jdbc"/> + <pathelement path="${dir.out.classes}"/> + <pathelement path="${dir.out.test-classes}"/> + <pathelement path="${dir.props}"/> + </path> + + <junit printsummary="on" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch"> + <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> + <classpath> + <fileset refid="fs.lib.test"/> + <path refid="path.jdbc"/> + <pathelement path="${dir.out.classes}"/> + <pathelement path="${dir.out.test-classes}"/> + <pathelement path="${dir.props}"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="${dir.out.junit}" haltonfailure="no"> + <fileset dir="${dir.out.test-classes}"> + <include name="org/hibernate/test/**/*Test.class"/> + <!-- exclude the build-time instrumentation tasks as we will be running them manually shortly --> + <exclude name="org/hibernate/test/instrument/buildtime/*"/> + <!--custom selector to make sure only those tests in the AllTests suite get picked up here --> + <custom classname="org.hibernate.test.TestSelector" classpathref="selector.classpath"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="junit.instrument" depends="junit.prepare,junit.instrument.cglib,junit.instrument.javassist"/> + + <target name="junit.instrument.cglib" depends="instrument.cglib"> + <mkdir dir="${dir.out.junit}"/> + <junit printsummary="yes" maxmemory="256M" fork="yes"> + <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> + <classpath> + <fileset refid="fs.lib.test"/> + <path refid="path.jdbc"/> + <pathelement path="${dir.out.classes}"/> + <pathelement path="${dir.out.test-classes}"/> + <pathelement path="${dir.props}"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <test name="org.hibernate.test.instrument.buildtime.InstrumentTest" + outfile="TEST-CGLIB-org.hibernate.test.instrument.buildtime.InstrumentTest" + todir="${dir.out.junit}" + haltonerror="false" + haltonfailure="false"/> + </junit> + </target> + + <target name="junit.instrument.javassist" depends="instrument.javassist"> + <mkdir dir="${dir.out.junit}"/> + <junit printsummary="yes" maxmemory="256M" fork="yes"> + <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> + <classpath> + <fileset refid="fs.lib.test"/> + <path refid="path.jdbc"/> + <pathelement path="${dir.out.classes}"/> + <pathelement path="${dir.out.test-classes}"/> + <pathelement path="${dir.props}"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <test name="org.hibernate.test.instrument.buildtime.InstrumentTest" + outfile="TEST-JAVASSIST-org.hibernate.test.instrument.buildtime.InstrumentTest" + todir="${dir.out.junit}" + haltonerror="false" + haltonfailure="false"/> + </junit> + </target> + + <!-- Run a single unit test. --> + <target name="junitsingle" + depends="cleantestdb,compiletest" + description="Run a single test suite (requires testname and jar.driver properties)"> + <delete dir="${dir.out.junit}"/> + <mkdir dir="${dir.out.junit}"/> + <junit printsummary="yes" fork="yes" haltonfailure="yes" dir="${basedir}"> + <classpath> + <fileset refid="fs.lib.test"/> + <path refid="path.jdbc"/> + <pathelement path="${dir.out.classes}"/> + <pathelement path="${dir.out.test-classes}"/> + <pathelement path="${dir.props}"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <test fork="yes" todir="${dir.out.junit}" haltonfailure="no" name="${testname}"/> + </junit> + </target> + + <!-- Instrumentation tasks --> + + <target name="instrument.clean"> + <delete> + <fileset dir="${dir.out.test-classes}"> + <patternset refid="ps.instrument.domain"/> + </fileset> + </delete> + </target> + + + <target name="instrument.prepare-from-testjar" depends="instrument.clean" if="test-classes.isFromJar"> + <unzip src="${basedir}/${testjar.name}.jar" dest="${dir.out.test-classes}"/> + </target> + + <target name="instrument.prepare" depends="instrument.prepare-from-testjar" unless="test-classes.isFromJar"> + <available classname="org.eclipse.core.launcher.Main" property="build.compiler" + value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> + <javac destdir="${dir.out.test-classes}" + debug="${javac.debug}" + optimize="${javac.optimize}" + target="${javac.target}" + source="${javac.source}" + nowarn="on"> + <classpath> + <path refid="path.lib"/> + <pathelement path="${dir.out.classes}"/> + </classpath> + <src path="${dir.test}"/> + <patternset refid="ps.instrument.domain"/> + </javac> + </target> + + + <target name="instrument.cglib" + depends="instrument.prepare,compiletest" + description="Performs cglib-based instrumentation"> + <taskdef name="instrument" classname="org.hibernate.tool.instrument.cglib.InstrumentTask"> + <classpath path="${dir.out.classes}"/> + <classpath refid="path.lib"/> + </taskdef> + <instrument verbose="true"> + <fileset dir="${dir.out.test-classes}"> + <patternset refid="ps.instrument.domain"/> + </fileset> + </instrument> + </target> + + <target name="instrument.javassist" + depends="instrument.prepare,compiletest" + description="Performs javassist-based instrumentation"> + <taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask"> + <classpath path="${dir.out.classes}"/> + <classpath refid="path.lib"/> + </taskdef> + <instrument verbose="true"> + <fileset dir="${dir.out.test-classes}"> + <patternset refid="ps.instrument.domain"/> + </fileset> + </instrument> + </target> + + <!-- Distribution related targets --> + + <target name="jar" depends="compile" description="Build the distribution .jar file"> + <mkdir dir="${dir.build}"/> + + <jar jarfile="${dir.build}/${jar.name}.jar" basedir="${dir.out.classes}"> + <include name="org/hibernate/**/*.class"/> + <include name="org/hibernate/*.dtd"/> + <manifest> + <attribute name="Implementation-Title" value="Hibernate3"/> + <attribute name="Implementation-Version" value="${version.full}"/> + <attribute name="Implementation-Vendor" value="hibernate.org"/> + <attribute name="Hibernate-Version" value="${version.full}"/> + </manifest> + </jar> + + <!-- currently for testing *only* --> + <jar jarfile="${dir.build}/hibernate3-client.jar"> + <zipfileset src="${dir.build}/${jar.name}.jar"> + <include name="org/hibernate/AssertionFailure.class"/> + <include name="org/hibernate/**/*Exception.class"/> + <include name="org/hibernate/collection/**"/> + <include name="org/hibernate/exception/Nestable*.class"/> + <include name="org/hibernate/exception/ExceptionUtils.class"/> + <include name="org/hibernate/engine/SessionImplementor.class"/> + <include name="org/hibernate/loader/CollectionAliases.class"/> + <include name="org/hibernate/persister/collection/**"/> + <include name="org/hibernate/pretty/MessageHelper.class"/> + <include name="org/hibernate/type/Type.class"/> + <include name="org/hibernate/EntityMode.class"/> + <include name="org/hibernate/util/**"/> + <include name="org/hibernate/proxy/**"/> + </zipfileset> + <manifest> + <attribute name="Implementation-Title" value="Hibernate3 Client"/> + <attribute name="Implementation-Version" value="${version.full}"/> + <attribute name="Implementation-Vendor" value="hibernate.org"/> + <attribute name="Hibernate-Version" value="${version.full}"/> + </manifest> + </jar> + </target> + + <target name="testjar" depends="compiletest" description="Build the distribution test .jar file"> + <mkdir dir="${dir.build}"/> + <jar jarfile="${dir.build}/${testjar.name}.jar" basedir="${dir.out.test-classes}"> + <include name="org/hibernate/**/*"/> + + <manifest> + <attribute name="Implementation-Title" value="Hibernate3-test"/> + <attribute name="Implementation-Version" value="${version.full}"/> + <attribute name="Implementation-Vendor" value="hibernate.org"/> + <attribute name="Hibernate-Version" value="${version.full}"/> + </manifest> + </jar> + </target> + + <target name="dist" depends="init,jar,testjar,javadoc" + description="Build everything and package"> + <mkdir dir="${dir.dist}"/> + + <!-- prepare build.xml --> + <copy file="${basedir}/build.xml" todir="${dir.dist}"/> + <replace file="${dir.dist}/build.xml"> + <replacetoken><![CDATA[../${name}-${version}]]></replacetoken> + <replacevalue><![CDATA[../${name}]]></replacevalue> + </replace> + <replace file="${dir.dist}/build.xml"> + <replacetoken><![CDATA[name="dir.jdbc" value="jdbc"]]></replacetoken> + <replacevalue><![CDATA[name="dir.jdbc" value="lib"]]></replacevalue> + </replace> + + <zip zipfile="${dir.dist}/${fullname}.zip"> + <zipfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar"/> + <zipfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/> + <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.bat"/> + <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.sh"/> + <zipfileset prefix="${name}-${version.major_minor}" file="${dir.dist}/build.xml"/> + <zipfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}"> + <exclude name="ehcache.xml"/> + <exclude name="oscache.properties"/> + </zipfileset> + <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/lgpl.txt"/> + <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/JBossORG-EULA.txt"/> + <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/readme.txt"/> + <zipfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${testjar.name}.jar"/> + <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/hibernate_logo.gif"/> + </zip> + <checksum file="${dir.dist}/${fullname}.zip" algorithm="MD5" fileext=".md5.txt"/> + + <zip zipfile="${dir.dist}/${fullname}-src.zip"> + <zipfileset prefix="${name}-${version.major_minor}-src/src" dir="${dir.src}"/> + <zipfileset prefix="${name}-${version.major_minor}-src/grammar" dir="${dir.grammar}"/> + <zipfileset prefix="${name}-${version.major_minor}-src/grammar/gensrc" dir="${dir.out.generated-source}"/> + <zipfileset prefix="${name}-${version.major_minor}-src/test" dir="${dir.test}"/> + <zipfileset prefix="${name}-${version.major_minor}-src/eg" dir="${dir.eg}"/> + <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/build.bat"/> + <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/build.sh"/> + <zipfileset prefix="${name}-${version.major_minor}-src" file="${dir.dist}/build.xml"/> + <zipfileset prefix="${name}-${version.major_minor}-src/etc" dir="${dir.etc}"> + <exclude name="ehcache.xml"/> + <exclude name="oscache.properties"/> + </zipfileset> + <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/hibernate_logo.gif"/> + <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/lgpl.txt"/> + <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/JBossORG-EULA.txt"/> + <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/readme.txt"/> + </zip> + <checksum file="${dir.dist}/${fullname}-src.zip" algorithm="MD5" fileext=".md5.txt"/> + + <delete file="${dir.dist}/build.xml"/> + </target> + + <target name="dist.complete" depends="init,jar,javadoc,antlr.bnf" + description="Build and package everything, and run test suite and eg example"> + <!-- perform a call to the junit target --> + <antcall target="junitreport"/> + <antcall target="dist"/> + </target> + + + <!-- Documentation related targets --> + + <target name="javadoc" description="Compile the Javadoc API documentation to dist dir" depends="splash,antlr"> + <mkdir dir="${dir.out.doc}/api"/> + <javadoc classpathref="path.lib" + destdir="${dir.out.doc}/api" + use="true" + protected="true" + version="true" + doctitle="${Name} API Documentation (${version.full})" + windowtitle="${Name} API Documentation" + Overview="${dir.doc.api}/package.html" + stylesheetfile="${dir.doc.api}/jdstyle.css" + source="${javac.source}" + link="${javadoc.url.jse}"> + <packageset dir="${dir.out.generated-source}" defaultexcludes="yes"> + <include name="org/hibernate/**"/> + </packageset> + <packageset dir="${dir.src}" defaultexcludes="yes"> + <include name="org/hibernate/**"/> + </packageset> + <group title="Core API" + packages="org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.usertype"/> + <group title="Extension API" + packages="org.hibernate.id:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.action:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc"/> + <group title="Miscellaneous API" + packages="org.hibernate.stat:org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.mapping:org.hibernate.tool.instrument"/> + <group title="Internal Implementation" + packages="org.hibernate.engine:org.hibernate.impl:org.hibernate.sql:org.hibernate.lob:org.hibernate.util:org.hibernate.exception:org.hibernate.hql:org.hibernate.hql.ast:org.hibernate.hql.antlr:org.hibernate.hql.classic:org.hibernate.intercept:org.hibernate.secure:org.hibernate.pretty"/> + </javadoc> + <copy file="${dir.doc.api}/package.html" todir="${dir.out.doc}/api"/> + </target> + + + <target name="prepare-dir-up" depends="jar"> + <!-- for backwards compatibility with where the tools expect to find the jar and libs --> + <property name="targetdir" value="../${name}-${version.major_minor}"/> + <mkdir dir="${targetdir}"/> + <mkdir dir="${targetdir}/lib"/> + + <copy todir="${targetdir}" file="${dir.build}/${jar.name}.jar"/> + <copy todir="${targetdir}/lib"> + <fileset dir="${dir.lib}"/> + </copy> + + <copy todir="${targetdir}/doc/api" file="${dir.doc.api}/jdstyle.css"/> + </target> + +</project> Copied: core/patches/JBPAPP-6940/hibernate_logo.gif (from rev 21063, core/branches/Branch_3_2_4_SP1_CP/hibernate_logo.gif) =================================================================== (Binary files differ) Copied: core/patches/JBPAPP-6940/lgpl.txt (from rev 21063, core/branches/Branch_3_2_4_SP1_CP/lgpl.txt) =================================================================== --- core/patches/JBPAPP-6940/lgpl.txt (rev 0) +++ core/patches/JBPAPP-6940/lgpl.txt 2012-08-30 16:52:35 UTC (rev 21064) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + +