10:01 p.m.
Author: gbadner
Date: 2008-10-10 23:01:40 -0400 (Fri, 10 Oct 2008)
New Revision: 15323
Added:
annotations/branches/v3_2_1_GA_CP/doc/api/
annotations/branches/v3_2_1_GA_CP/doc/api/jdstyle.css
Modified:
annotations/branches/v3_2_1_GA_CP/build.xml
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java
Log:
JBPAPP-1269 JBPAPP-931 - Change version to 3.2.1.GA.CP03 and misc updates for build file
Modified: annotations/branches/v3_2_1_GA_CP/build.xml
===================================================================
--- annotations/branches/v3_2_1_GA_CP/build.xml 2008-10-11 02:31:00 UTC (rev 15322)
+++ annotations/branches/v3_2_1_GA_CP/build.xml 2008-10-11 03:01:40 UTC (rev 15323)
@@ -16,7 +16,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate Annotations"/>
<property name="name" value="hibernate-annotations"/>
- <property name="version" value="3.2.1.GA.CP02"/>
+ <property name="version" value="3.2.1.GA.CP03"/>
<property name="javadoc.packagenames"
value="org.hibernate.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
@@ -25,6 +25,28 @@
<available property="jpa-present" file="${basedir}/../ejb-api"
type="dir"/>
<import file="${common.dir}/common-build.xml"/>
<property name="jpa-javadoc.dir"
value="${dist.doc.dir}/ejb-api"/>
+
+ <path id="lib.class.path">
+ <path location="${hibernate-core.jar}"></path>
+ <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>
<target name="compile" depends="init"
description="Compile the Java source code">
<available
@@ -33,13 +55,14 @@
value="org.eclipse.jdt.core.JDTCompilerAdapter"
classpath="${java.class.path}"/>
<javac
- srcdir="${src.dir}"
+ srcdir="${src.dir}"
destdir="${classes.dir}"
classpathref="lib.class.path"
debug="${javac.debug}"
optimize="${javac.optimize}"
nowarn="on"
- source="1.5">
+ source="${javac.source}"
+ target="${javac.target}">
<src path="${src.dir}"/>
</javac>
<copy todir="${classes.dir}">
@@ -62,8 +85,8 @@
debug="${javac.debug}"
optimize="${javac.optimize}"
nowarn="on"
- source="1.5"
- target="1.5">
+ source="${javac.source}"
+ target="${javac.target}">
<src refid="testsrc.path"/>
</javac>
</target>
@@ -78,33 +101,21 @@
</fileset>
</path>
- <!-- target name="junit" depends="compiletest">
- <mkdir dir="test_output"/>
- <junit fork="yes" printsummary="yes"
haltonfailure="yes"
- forkmode="perBatch">
- <classpath>
- <fileset dir="${jdbc.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
- <path refid="lib.class.path"/>
- <pathelement path="${classes.dir}"/>
- <pathelement path="${src.dir}"/>
- <pathelement path="${test.dir}"/>
- </classpath>
+ <target name="junit" depends="compiletest">
+ <mkdir dir="${test.out.dir}"/>
+ <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 dir="${classes.dir}">
- <include name="**/*Test.class"/>
- </fileset>
+ <batchtest fork="yes" todir="${test.out.dir}"
haltonfailure="no">
+ <fileset refid="junit.batchtestset"/>
</batchtest>
</junit>
- </target -->
-
+ </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"/>
+ <mkdir dir="${test.out.dir}"/>
<junit printsummary="yes" fork="yes"
haltonfailure="yes">
<classpath>
<fileset dir="${jdbc.dir}">
@@ -118,17 +129,17 @@
</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>
<!-- target name="report">
- <mkdir dir="test_output"/>
- <junitreport todir="test_output">
- <fileset dir="test_output">
+ <mkdir dir="${test.out.dir}"/>
+ <junitreport todir="${test.out.dir}">
+ <fileset dir="${test.out.dir}">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="test_output/report"/>
+ <report format="frames"
todir="${test.out.dir}/report"/>
</junitreport>
</target -->
@@ -138,7 +149,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: annotations/branches/v3_2_1_GA_CP/doc/api/jdstyle.css
===================================================================
--- annotations/branches/v3_2_1_GA_CP/doc/api/jdstyle.css (rev 0)
+++ annotations/branches/v3_2_1_GA_CP/doc/api/jdstyle.css 2008-10-11 03:01:40 UTC (rev
15323)
@@ -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;
+}
Modified:
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java
===================================================================
---
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java 2008-10-11
02:31:00 UTC (rev 15322)
+++
annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java 2008-10-11
03:01:40 UTC (rev 15323)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.2.1.GA.CP02";
+ public static final String VERSION = "3.2.1.GA.CP03";
private static Log log = LogFactory.getLog( Version.class );
static {