2:20 a.m.
Author: stliu
Date: 2011-04-08 03:20:42 -0400 (Fri, 08 Apr 2011)
New Revision: 20928
Added:
entitymanager/branches/v3_3_2_GA_CP/doc/
entitymanager/branches/v3_3_2_GA_CP/doc/api/
entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css
entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html
Removed:
entitymanager/branches/v3_3_2_GA_CP/common-build.xml
entitymanager/branches/v3_3_2_GA_CP/ivy.xml
entitymanager/branches/v3_3_2_GA_CP/ivy/
Modified:
entitymanager/branches/v3_3_2_GA_CP/build.xml
Log:
JBPAPP-6278 update build scripts of hem and hsearch
Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-04-08 05:07:29 UTC (rev 20927)
+++ entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-04-08 07:20:42 UTC (rev 20928)
@@ -6,8 +6,7 @@
-->
-<project name="HibernateEntityManager" default="dist"
basedir="."
- xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project name="HibernateEntityManager" default="jar"
basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
@@ -21,22 +20,62 @@
<property name="javadoc.packagenames"
value="org.hibernate.ejb.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
+ <property name="src.dir" location="src/java"/>
+ <property name="test.dir" location="src/test"/>
+ <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="dist.target.dir" location="target"/>
+ <property name="dist.dir"
location="${dist.target.dir}/${name}"/> -->
+
+ <property name="doc.dir" location="doc"/>
+ <property name="doc.api.dir" location="${doc.dir}/api"/>
+
+
+ <property name="dist.doc.dir"
location="${build.dir}/doc"/>
+ <property name="dist.api.dir"
location="${dist.doc.dir}/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="${build.dir}/${jar.name}.jar"/>
+ <property name="jartest.file.name"
value="${build.dir}/${jar.name}-tests.jar"/>
+
+ <property name="javadoc"
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.source" value="1.5"/>
<property name="javac.target" value="1.5"/>
- <property name="common.dir" value="${basedir}"/>
<available property="jpa-present" file="${basedir}/../jpa-api"
type="dir"/>
- <property name="ivy.dep.dir" value="${basedir}/build/lib"
/>
- <import file="${common.dir}/common-build.xml"/>
<property name="jpa-javadoc.dir"
value="${dist.doc.dir}/jpa-api"/>
+
+
+ <!-- set Hibernate core related properties -->
+ <property name="hibernate-core.home" location="../core"/>
+ <property name="hibernate-core.jar"
location="${hibernate-core.home}/build/hibernate3.jar"/>
+ <property name="hibernate-core.lib.dir"
location="${hibernate-core.home}/lib"/>
+<property name="resources.dir" value="src/resources"/>
+<property name="testresources.dir"
value="src/test-resources"/>
+ <!-- <property name="hibernate-core.jdbc.dir"
location="${hibernate-core.home}/lib"/>
+ <property name="hibernate-core.doc.api"
location="${hibernate-core.home}/doc/api"/>
+
+ <property name="common.dir" value="${basedir}"/>
+
<property name="resources.dir" value="src/resources"/>
- <property name="testresources.dir"
value="src/test-resources"/>
+ <property name="testresources.dir"
value="src/test-resources"/>-->
<property name="build.testresources.dir"
value="${build.dir}/testresources"/>
- <property name="build.temp.dir"
value="${build.dir}/temp"/>
-
- <path id="lib.moduleclass.path">
- <fileset dir="${ivy.dep.dir}/core">
- <include name="*.jar"/>
- </fileset>
+ <property name="build.temp.dir" value="${build.dir}/temp"/>
+ <path id="lib.class.path">
+ <path location="${hibernate-core.jar}" />
+ <fileset dir="${hibernate-core.lib.dir}">
+ <include name="*.jar"/>
+ <exclude name="ant-*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
</path>
<path id="junit.moduleclasspath">
<pathelement location="${src.dir}"/>
@@ -49,43 +88,51 @@
<include name="*.jar"/>
<include name="*.zip"/>
</fileset>
- <fileset dir="${ivy.dep.dir}/test">
- <include name="*.jar"/>
- </fileset>
</path>
+ <patternset id="support.files">
+ <include name="**/*.jpg"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xslt"/>
- <!-- ivy load -->
- <property name="ivy.jar.dir" value="${basedir}/ivy" />
- <property name="ivy.conf.dir" value="${basedir}" />
- <path id="ivy.lib.path">
- <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
- </path>
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
- uri="antlib:fr.jayasoft.ivy.ant"
classpathref="ivy.lib.path"/>
+ <!-- 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>
<target name="init">
- <antcall target="common-build.init"/>
<tstamp>
- <format property="now" pattern="yyyyMMddhhmmss"/>
+ <format property="subversion" pattern="yyyy-MM-dd
hh:mm:ss"/>
</tstamp>
- <mkdir dir="${lib.dir}/test"/>
- <mkdir dir="${ivy.dep.dir}/core"/>
- <mkdir dir="${ivy.dep.dir}/test"/>
- <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" />
- </target>
+ <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>
+
+ <copy todir="${build.dir}">
+ <fileset dir=".">
+ <include name="readme.txt"/>
+ <include name="lgpl.txt"/>
+ </fileset>
+ </copy>
- <target name="get.deps.core" depends="init"
description="retrieve the core dependencies">
- <ivy:resolve conf="core" />
- <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]"
conf="core" />
- </target>
+ <available file="${hibernate-core.jar}" type="file"
property="hibernate-core.jar.available"/>
+ <fail unless="hibernate-core.jar.available" message="Cannot
locate hibernate-core.jar: ${hibernate-core.jar}"/>
-
- <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}"/>
+ </target>
+ <target name="compile" depends="init"
description="Compile the Java source code">
<javac
srcdir="${src.dir}"
destdir="${classes.dir}"
@@ -97,6 +144,12 @@
target="${javac.target}"
</javac>
+ <copy todir="${classes.dir}">
+ <fileset dir="${src.dir}">
+ <include name="**/resources/*.properties"/>
+ <include name="**/*.xsd"/>
+ </fileset>
+ </copy>
</target>
<target name="packjar">
@@ -107,7 +160,7 @@
<mkdir dir="${build.testresources.dir}"/>
<mkdir dir="${build.temp.dir}/${headerdirectory}"/>
<copy todir="${build.temp.dir}/${headerdirectory}">
- <fileset dir="${classes.dir}" >
+ <fileset dir="${testclasses.dir}" >
<include name="**/test/pack/${packagename}/**.*"/>
</fileset>
</copy>
@@ -131,7 +184,7 @@
<mkdir
dir="${build.testresources.dir}/${jarname}.${extension}"/>
<copy
todir="${build.testresources.dir}/${jarname}.${extension}">
<!-- fileset dir="${build.temp.dir}"/ -->
- <fileset dir="${classes.dir}">
+ <fileset dir="${testclasses.dir}">
<include name="**/test/pack/${jarname}/**.*"/>
</fileset>
<fileset dir="${testresources.dir}/${jarname}">
@@ -196,12 +249,7 @@
</antcall>
</target>
- <target name="get.deps.test" depends="init"
description="retrieve the test dependencies">
- <ivy:resolve conf="test" />
- <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]"
conf="test" />
- </target>
-
- <target name="compiletest" depends="compile,get.deps.test"
description="Compile the tests">
+ <target name="compiletest" depends="compile"
description="Compile the tests">
<available
classname="org.eclipse.core.launcher.Main"
property="build.compiler"
@@ -209,7 +257,7 @@
classpath="${java.class.path}"/>
<javac
srcdir="${test.dir}"
- destdir="${classes.dir}"
+ destdir="${testclasses.dir}"
debug="${javac.debug}"
optimize="${javac.optimize}"
nowarn="on"
@@ -217,19 +265,20 @@
target="${javac.target}">
<classpath>
<path refid="lib.class.path"/>
+ <pathelement path="${classes.dir}"/>
</classpath>
</javac>
</target>
<target name="junit" depends="compiletest,test-resources">
- <mkdir dir="test_output"/>
+ <mkdir dir="${build.dir}/test_output"/>
<mkdir dir="${classes.dir}/META-INF/services"/>
<copy todir="${classes.dir}">
<fileset dir="${resources.dir}">
<include name="**/*.*"/>
</fileset>
</copy>
- <junit fork="once" printsummary="yes"
haltonfailure="yes">
+ <junit fork="once" printsummary="yes"
haltonfailure="no">
<classpath>
<fileset dir="${jdbc.dir}">
<include name="**/*.jar"/>
@@ -245,8 +294,8 @@
<include name="**/*.par"/>
</fileset>
<path refid="lib.class.path"/>
- <!-- pathelement path="${classes.dir}"/ -->
- <dirset dir="${classes.dir}">
+ <pathelement path="${classes.dir}"/>
+ <dirset dir="${testclasses.dir}">
<exclude name="**/pack/**.*"/>
</dirset>
@@ -258,8 +307,8 @@
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
- <batchtest fork="yes" todir="test_output"
haltonfailure="no">
- <fileset dir="${classes.dir}">
+ <batchtest fork="yes" todir="${build.dir}/test_output"
haltonfailure="no">
+ <fileset dir="${testclasses.dir}">
<include name="**/*Test.class"/>
</fileset>
</batchtest>
@@ -269,7 +318,7 @@
<!-- Run a single unit test. -->
<target name="junitsingle" depends="compiletest"
description="Run a single test suite (requires testname and jdbc.driver
properties)">
- <mkdir dir="test_output"/>
+ <mkdir dir="${build.dir}/test_output"/>
<junit printsummary="yes" fork="yes"
haltonfailure="yes">
<classpath>
<fileset dir="${jdbc.dir}">
@@ -286,7 +335,7 @@
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
- <test fork="yes" todir="test_output"
haltonfailure="no" name="${testname}"/>
+ <test fork="yes" todir="${build.dir}/test_output"
haltonfailure="no" name="${testname}"/>
</junit>
</target>
@@ -307,16 +356,36 @@
<attribute name="Specification-Version" value="1.0"/>
<attribute name="Specification-Vendor"
value="jcp.org"/>
</manifest>
- <antcall target="common-build.jar"/>
- <ivy:resolve conf="core"/>
- <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
- resolver="local"
- pubrevision="${version}"
- pubdate="${now}"
- status="integration"
- />
+ <mkdir dir="${build.dir}"/>
+ <jar filesetmanifest="merge" jarfile="${jar.file.name}"
basedir="${classes.dir}"/>
+
</target>
+ <target name="clean" description="Cleans up build and dist
directories">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.target.dir}"/>
+ </target>
+ <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="javadoc" description="Compile the Javadoc API
documentation to dist dir">
<echo>Skipping java doc since ant's javadoc task cannot handle an
alternative javadoc</echo>
</target -->
@@ -331,96 +400,4 @@
</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}/resources"
failonerror="false">
- <fileset dir="${resources.dir}">
- <include name="**/*.*"/>
- </fileset>
- </copy>
- <copy todir="${dist.dir}/test-resources"
failonerror="false">
- <fileset dir="${testresources.dir}">
- <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 file="${jpa-api.jar}"/>
- <fileset file="${commons-annotations.jar}"/ -->
- <fileset dir="${ivy.dep.dir}/core">
- <include name="*.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${dist.lib.dir}/test"/>
- <copy todir="${dist.lib.dir}/test"
failonerror="false">
- <fileset dir="${ivy.dep.dir}/test">
- <include name="*.jar"/>
- </fileset>
- </copy>
- <copy todir="${dist.lib.dir}/test"
failonerror="false">
- <fileset file="${lib.dir}/test/*.jar"/>
- </copy>
-
- <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>
-
- <target name="profile" depends="compiletest">
- <java classname="org.hibernate.ejb.test.Profile"
fork="true">
- <jvmarg
value="-XrunjbossInspector:c:\profiler\data,include=org.hibernate.ejb,ignore=*,wakeupOnStartup=true"/>
- <classpath>
- <fileset dir="${jdbc.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
- <dirset dir="${build.testresources.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.par"/>
- </dirset>
-
- <fileset dir="${build.testresources.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.par"/>
- </fileset>
- <path refid="lib.class.path"/>
- <pathelement path="${classes.dir}"/>
- <!-- pathelement path="build/test.par"/ -->
- <pathelement path="${src.dir}"/>
- <!-- pick up properties from here -->
- <pathelement path="${test.dir}"/>
- <!-- pick up mappings from here -->
- </classpath>
- </java>
- </target>
-
-
</project>
Deleted: entitymanager/branches/v3_3_2_GA_CP/common-build.xml
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/common-build.xml 2011-04-08 05:07:29 UTC (rev
20927)
+++ entitymanager/branches/v3_3_2_GA_CP/common-build.xml 2011-04-08 07:20:42 UTC (rev
20928)
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="common-build" default="dist">
- <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="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="dist.target.dir" location="target"/>
- <property name="dist.dir"
location="${dist.target.dir}/${name}"/>
- <property name="instrumenttest.out.dir"
value="instrumenttestout"/>
- <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.5.0/docs/api"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
- <property name="javac.source" value="1.5"/>
- <property name="javac.target" value="1.5"/>
-
-
- <!-- set Hibernate core related properties -->
- <property name="hibernate-core.home"
location="${common-build.basedir}/../hibernate-3.2"/>
- <property name="hibernate-core.jar"
location="${hibernate-core.home}/hibernate3.jar"/>
- <property name="hibernate-core.lib.dir"
location="${hibernate-core.home}/lib"/>
- <property name="hibernate-core.jdbc.dir"
location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is
renamed to lib instead of jdbc when doing a dist of hibernate3 -->
- <property name="hibernate-core.doc.api"
location="${hibernate-core.home}/doc/api"/>
- <property name="hibernate-cvs.doc.reference"
location="${common-build.basedir}/../core/doc/reference"/>
-
- <taskdef name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath>
- <fileset dir="${hibernate-core.lib.dir}">
- <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="${hibernate-core.lib.dir}">
- <include name="junit-*.jar"/>
- <include name="ant-junit-*.jar"/>
- </fileset>
- </classpath>
- </taskdef>
-
- <path id="lib.class.path">
- <path location="${hibernate-core.jar}"></path>
- <fileset dir="${hibernate-core.lib.dir}">
- <include name="*.jar"/>
- <exclude name="ant*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <path refid="lib.moduleclass.path"/>
- </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">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${classes.dir}"/>
- <pathelement path="${testclasses.dir}"/>
- <path refid="lib.class.path"/>
- <path refid="junit.moduleclasspath"/>
- </path>
-
- <!-- Tasks -->
-
- <target name="clean" description="Cleans up build and dist
directories">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.target.dir}"/>
- </target>
-
- <target name="init" description="Initialize the build">
- <tstamp>
- <format property="subversion" pattern="yyyy-MM-dd
hh:mm:ss"/>
- </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>
-
- <copy todir="${build.dir}">
- <fileset dir=".">
- <include name="readme.txt"/>
- <include name="lgpl.txt"/>
- </fileset>
- </copy>
-
- <available file="${hibernate-core.jar}" type="file"
property="hibernate-core.jar.available"/>
- <fail unless="hibernate-core.jar.available" message="Cannot
locate hibernate-core.jar: ${hibernate-core.jar}"/>
- </target>
-
- <target name="compile" depends="init"
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
- target="${javac.target}"
- source="${javac.source}"
- srcdir="${src.dir}"
- destdir="${classes.dir}"
- classpathref="lib.class.path"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- nowarn="on">
- </javac>
- </target>
-
- <target name="compiletest" depends="compile"
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
- target="${javac.target}"
- source="${javac.source}"
- destdir="${testclasses.dir}"
- classpathref="junit.classpath"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- nowarn="on">
- <src refid="testsrc.path"/>
- </javac>
- </target>
-
- <target name="instrument" depends="compiletest"
- description="Instrument the persistent classes"> <!--
depends="jar" -->
-
- <taskdef name="instrument"
classname="org.hibernate.tool.instrument.InstrumentTask">
- <classpath path="${classes.dir}"/>
- <classpath path="${testclasses.dir}"/>
- <classpath refid="lib.class.path"/>
- </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>
-
- <!-- jar jarfile="${build.dir}/instrumented-classes.jar">
- <fileset dir="${testclasses.dir}">
- <include name="org/hibernate/test/**/*.class"/>
- <exclude name="org/hibernate/test/**/*Test.class"/>
- </fileset>
- </jar -->
-
- </target>
-
- <target name="copytest" description="Copy tests to dist dir"
if="copy.test" >
- <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}">
- <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="${hibernate-core.doc.api}/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="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,copylib,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="junit" depends="compiletest">
- <mkdir dir="test_output"/>
- <junit printsummary="yes" haltonfailure="yes"
forkmode="once">
- <classpath refid="junit.classpath"/>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <batchtest fork="yes" todir="test_output"
haltonfailure="no">
- <fileset refid="junit.batchtestset"/>
- </batchtest>
- </junit>
- </target>
-
- <!-- Run a single unit test. -->
- <target name="junitsingle" depends="compiletest"
description="Run a single test suite (requires testname and jdbc.driver
properties)">
- <mkdir dir="test_output"/>
- <junit printsummary="yes" fork="yes"
haltonfailure="yes">
- <classpath refid="junit.classpath"/>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <test fork="yes" todir="test_output"
haltonfailure="no" name="${testname}"/>
- </junit>
- </target>
-
- <target name="junitinstrument" depends="compiletest,instrument"
- description="Run the instrument test suite (requires driver.jar
property)">
- <mkdir dir="${instrumenttest.out.dir}"/>
- <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}"
haltonfailure="no">
- <fileset dir="${classes.dir}">
- <include name="org/hibernate/test/**/*Test.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="junitreport" depends="">
- <junitreport todir="./test_output">
- <fileset dir="test_output">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="./test_output"/>
- </junitreport>
- </target>
-
- <target name="run" depends="compile" description="Run
Hibernate Console">
- <java classname="org.hibernate.console.Start"
classpathref="lib.class.path" fork="true">
- <classpath>
- <path location="${build.dir}"/>
- </classpath>
- </java>
- </target>
-
-
- <target name="checkstyle" description="Check coding
style">
- <taskdef resource="checkstyletask.properties">
- <classpath>
- <path refid="lib.class.path"/>
- <fileset dir="${common-build.basedir}/lib">
- <include name="checkstyle*.jar"/>
- </fileset>
- </classpath>
- </taskdef>
-
- <checkstyle
config="${common-build.basedir}/checkstyle_checks.xml">
- <fileset dir="${src.dir}">
- <include name="**/*.java"/>
- </fileset>
- <formatter type="plain"/>
- </checkstyle>
- </target>
-
- <target name="patch" depends="checkstyle"
- description="Create a patch">
- <cvs command="-q diff -u -N" output="patch.txt"/>
- </target>
-
-</project>
\ No newline at end of file
Added: entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css (rev
0)
+++ entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css 2011-04-08 07:20:42 UTC (rev
20928)
@@ -0,0 +1,117 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the defaults */
+
+/* Page background color */
+body { font-family: Arial;
+ background-color: white;
+ font-size: 10pt;
+ }
+td { font-family: Arial;
+ font-size: 10pt;
+ }
+/* Table colors */
+.TableHeadingColor { background: #F4F4F4 }
+.TableSubHeadingColor { background: #F4F4F4 }
+.TableRowColor { background: #FFFFFF }
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont { font-size: normal; font-family: Arial }
+.FrameHeadingFont { font-size: normal; font-family: Arial }
+.FrameItemFont { font-size: normal; font-family: Arial }
+
+/* Example of smaller, sans-serif font in frames */
+/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */
+
+/* Navigation bar fonts and colors */
+.NavBarCell1 { background-color:#F4F4F4;}
+.NavBarCell1Rev { background-color:silver;}
+
+.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
+
+.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+
+A {
+ color: #003399;
+}
+
+A:active {
+ color: #003399;
+}
+
+A:visited {
+ color: #888888;
+}
+
+P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
+ color: #000000;
+}
+
+TD, TH, SPAN {
+ color: #000000;
+}
+
+BLOCKQUOTE {
+ margin-right: 0px;
+}
+
+
+/*H1, H2, H3, H4, H5, H6 {
+ color: #000000;
+ font-weight:500;
+ margin-top:10px;
+ padding-top:15px;
+}
+
+H1 { font-size: 150%; }
+H2 { font-size: 140%; }
+H3 { font-size: 110%; font-weight: bold; }
+H4 { font-size: 110%; font-weight: bold;}
+H5 { font-size: 100%; font-style: italic; }
+H6 { font-size: 100%; font-style: italic; }*/
+
+TT {
+font-size: 90%;
+ font-family: "Courier New", Courier, monospace;
+ color: #000000;
+}
+
+PRE {
+font-size: 90%;
+ padding: 5px;
+ border-style: solid;
+ border-width: 1px;
+ border-color: #CCCCCC;
+ background-color: #F4F4F4;
+}
+
+UL, OL, LI {
+ list-style: disc;
+}
+
+HR {
+ width: 100%;
+ height: 1px;
+ background-color: #CCCCCC;
+ border-width: 0px;
+ padding: 0px;
+ color: #CCCCCC;
+}
+
+.variablelist {
+ padding-top: 10;
+ padding-bottom:10;
+ margin:0;
+}
+
+.itemizedlist, UL {
+ padding-top: 0;
+ padding-bottom:0;
+ margin:0;
+}
+
+.term {
+ font-weight:bold;
+}
Added: entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html (rev
0)
+++ entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html 2011-04-08 07:20:42 UTC (rev
20928)
@@ -0,0 +1 @@
+<body></body>
Deleted: entitymanager/branches/v3_3_2_GA_CP/ivy.xml
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/ivy.xml 2011-04-08 05:07:29 UTC (rev 20927)
+++ entitymanager/branches/v3_3_2_GA_CP/ivy.xml 2011-04-08 07:20:42 UTC (rev 20928)
@@ -1,19 +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="hibernate-entitymanager"/>
- <configurations>
- <conf name="core" description="Core module
dependencies"/>
- <conf name="test" visibility="private"
description="Dependencies needed for testing purposes"/>
- </configurations>
- <publications>
- <artifact name="hibernate-entitymanager" conf="core"/>
- </publications>
- <dependencies>
- <dependency name="hibernate-annotations" rev="3.3.1.GA"
conf="core->core"/>
- <dependency name="ejb3-persistence" rev="1.0.1.GA"
conf="core->default"/>
- <dependency name="commons-annotations" rev="3.0.0.GA"
conf="core->core"/>
- </dependencies>
-</ivy-module>
\ No newline at end of file