Author: gbadner Date: 2008-10-11 01:31:47 -0400 (Sat, 11 Oct 2008) New Revision: 15327 Added: entitymanager/branches/v3_2_1_GA_CP/doc/api/ entitymanager/branches/v3_2_1_GA_CP/doc/api/jdstyle.css Removed: entitymanager/branches/v3_2_1_GA_CP/lib/hibernate-annotations.jar Modified: entitymanager/branches/v3_2_1_GA_CP/build.xml entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java Log: JBPAPP-931 JBPAPP-1270 : Change version to 3.2.1.GA.CP04 and misc updates for build file Modified: entitymanager/branches/v3_2_1_GA_CP/build.xml =================================================================== --- entitymanager/branches/v3_2_1_GA_CP/build.xml 2008-10-11 03:29:23 UTC (rev 15326) +++ entitymanager/branches/v3_2_1_GA_CP/build.xml 2008-10-11 05:31:47 UTC (rev 15327) @@ -1,6 +1,6 @@ <!-- - Hibernate Annotations ANT build script. + Hibernate EntityManager ANT build script. You need JDK 5.0 installed to build Hibernate EntityManager. @@ -16,7 +16,7 @@ <!-- Name of project and version, used to create filenames --> <property name="Name" value="Hibernate EntityManager"/> <property name="name" value="hibernate-entitymanager"/> - <property name="version" value="3.2.1.GA_CP03"/> + <property name="version" value="3.2.1.GA_CP04"/> <property name="javadoc.packagenames" value="org.hibernate.ejb.*"/> <property name="jdbc.dir" value="jdbc"/> <property name="copy.test" value="true"/> @@ -26,12 +26,45 @@ <import file="${common.dir}/common-build.xml"/> <property name="jpa-javadoc.dir" value="${dist.doc.dir}/ejb-api"/> + <property name="hibernate-annotations.jar" location="${hibernate-annotations.home}/target/hibernate-annotations/hibernate-annotations.jar"/> + <path id="lib.class.path"> + <path location="${hibernate-core.jar}"/> + <path location="${hibernate-annotations.jar}"/> + <fileset dir="${hibernate-core.lib.dir}"> + <include name="*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> + <pathelement path="${clover.jar}"/> + </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 location="${clover.jar}"/> + </path> + <property name="resources.dir" value="src/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"/> + <target name="init" description="Initialize the build"> + <antcall target="common-build.init" inheritall="true"/> + <available file="${hibernate-annotations.jar}" + type="file" property="hibernate-annotations.jar.available"/> + <!-- removing failure for now since brew build uses a symlink for + hibernate-annotations.jar in ${lib.dir} --> + <!-- <fail unless="hibernate-annotations.jar.available" message="Cannot locate hibernate-annotations.jar: ${hibernate-annotations.jar}"/> --> + </target> + <target name="compile" depends="init" description="Compile the Java source code"> <available classname="org.eclipse.core.launcher.Main" @@ -39,7 +72,8 @@ value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> <javac - source="1.5" + source="${javac.source}" + target="${javac.target}" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="lib.class.path" @@ -57,7 +91,7 @@ <mkdir dir="${build.testresources.dir}"/> <jar destfile="${build.testresources.dir}/${jarname}.${extension}"> <!-- fileset dir="${build.temp.dir}"/ --> - <fileset dir="${classes.dir}"> + <fileset dir="${testclasses.dir}"> <include name="**/test/pack/${packagename}/**.*"/> </fileset> <fileset dir="${testresources.dir}/${jarname}"> @@ -73,7 +107,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}"> @@ -127,20 +161,28 @@ value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> <javac - source="1.5" + source="${javac.source}" + target="${javac.target}" srcdir="${test.dir}" - destdir="${classes.dir}" + destdir="${testclasses.dir}" debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on"> <classpath> <path refid="lib.class.path"/> + <pathelement path="${classes.dir}"/> </classpath> </javac> </target> + <target name="instrument" description="Instrument the persistent classes"> + <antcall target="common-build.instrument" inheritall="true"> + <param name="testclasses.test.dir" value="${testclasses.dir}/org/hibernate/ejb/test"/> + </antcall> + </target> + <target name="junit" depends="compiletest,test-resources"> - <mkdir dir="test_output"/> + <mkdir dir="${test.out.dir}"/> <mkdir dir="${classes.dir}/META-INF/services"/> <copy todir="${classes.dir}"> <fileset dir="${resources.dir}"> @@ -163,21 +205,17 @@ <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> - - <!-- pathelement path="build/test.par"/ --> <pathelement path="${src.dir}"/> - <!-- pick up properties from here --> <pathelement path="${test.dir}"/> - <!-- pick up mappings from here --> </classpath> <formatter type="plain"/> <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> - <fileset dir="${classes.dir}"> + <batchtest fork="yes" todir="${test.out.dir}" haltonfailure="no"> + <fileset dir="${testclasses.dir}"> <include name="**/*Test.class"/> </fileset> </batchtest> @@ -187,7 +225,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="${test.out.dir}"/> <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath> <fileset dir="${jdbc.dir}"> @@ -204,7 +242,7 @@ </classpath> <formatter type="plain"/> <formatter type="xml"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> + <test fork="yes" todir="${test.out.dir}" haltonfailure="no" name="${testname}"/> </junit> </target> @@ -219,7 +257,8 @@ <attribute name="Product" value="${Name}"/> <attribute name="Version" value="${version}"/> </manifest> - <antcall target="common-build.jar"/> + <mkdir dir="${dist.dir}"/> + <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/> </target> <!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> Added: entitymanager/branches/v3_2_1_GA_CP/doc/api/jdstyle.css =================================================================== --- entitymanager/branches/v3_2_1_GA_CP/doc/api/jdstyle.css (rev 0) +++ entitymanager/branches/v3_2_1_GA_CP/doc/api/jdstyle.css 2008-10-11 05:31:47 UTC (rev 15327) @@ -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; +} Deleted: entitymanager/branches/v3_2_1_GA_CP/lib/hibernate-annotations.jar =================================================================== (Binary files differ) Modified: entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java =================================================================== --- entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java 2008-10-11 03:29:23 UTC (rev 15326) +++ entitymanager/branches/v3_2_1_GA_CP/src/java/org/hibernate/ejb/Version.java 2008-10-11 05:31:47 UTC (rev 15327) @@ -8,7 +8,7 @@ * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.2.1.GA_CP03"; + public static final String VERSION = "3.2.1.GA_CP04"; private static Log log = LogFactory.getLog( Version.class ); static {