Hibernate SVN: r15328 - entitymanager/tags.
by hibernate-commits@lists.jboss.org
Author: gbadner
Date: 2008-10-11 01:35:54 -0400 (Sat, 11 Oct 2008)
New Revision: 15328
Added:
entitymanager/tags/v3_2_1_GA_CP04/
Log:
JBPAPP-1270 : create v3_2_1_GA_CP04 tag for Hibernate entitymanager in EAP 4.2.0.GA_CP05 / 4.3.0.GA_CP03
Copied: entitymanager/tags/v3_2_1_GA_CP04 (from rev 15327, entitymanager/branches/v3_2_1_GA_CP)
17 years, 3 months
Hibernate SVN: r15327 - in entitymanager/branches/v3_2_1_GA_CP: doc and 3 other directories.
by hibernate-commits@lists.jboss.org
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 {
17 years, 3 months
Hibernate SVN: r15326 - common/tags.
by hibernate-commits@lists.jboss.org
Author: gbadner
Date: 2008-10-10 23:29:23 -0400 (Fri, 10 Oct 2008)
New Revision: 15326
Added:
common/tags/3_2_1_GA_CP01/
Log:
JBPAPP-1269 : Create 3_2_1_GA_CP01 tag for Hibernate common in EAP 4.2.0.GA_CP05 / 4.3.0.GA_CP03
Copied: common/tags/3_2_1_GA_CP01 (from rev 15325, common/branches/v3_2_1_GA_CP)
17 years, 3 months
Hibernate SVN: r15325 - common/branches/v3_2_1_GA_CP.
by hibernate-commits@lists.jboss.org
Author: gbadner
Date: 2008-10-10 23:24:18 -0400 (Fri, 10 Oct 2008)
New Revision: 15325
Modified:
common/branches/v3_2_1_GA_CP/common-build.xml
Log:
JBPAPP-931 : Updates to common-build.xml so the same version can be used for both annotations and entitymanager
Modified: common/branches/v3_2_1_GA_CP/common-build.xml
===================================================================
--- common/branches/v3_2_1_GA_CP/common-build.xml 2008-10-11 03:06:40 UTC (rev 15324)
+++ common/branches/v3_2_1_GA_CP/common-build.xml 2008-10-11 03:24:18 UTC (rev 15325)
@@ -18,6 +18,7 @@
<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="test.out.dir" value="test_output"/>
<property name="instrumenttest.out.dir" value="instrumenttestout"/>
<property name="doc.dir" location="doc"/>
<property name="doc.api.dir" location="${doc.dir}/api"/>
@@ -33,18 +34,18 @@
<property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/>
<property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/>
- <property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/>
+ <property name="javac.source" value="1.5"/>
+ <property name="javac.target" value="1.5"/>
+ <property name="javadoc" value="http://java.sun.com/j2se/${javac.source}/docs/api"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
-
<!-- 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.home" location="${common-build.basedir}/../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="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}/../../Hibernate3/doc/reference"/>
+ <property name="hibernate-annotations.home" location="${common-build.basedir}/../annotations"/>
<!--
Explicitly define tasks from ant..
@@ -76,7 +77,7 @@
</classpath>
</taskdef>
- <path id="lib.class.path">
+ <!--<path id="lib.class.path">
<path location="${hibernate-core.jar}"></path>
<fileset dir="${hibernate-core.lib.dir}">
<include name="*.jar"/>
@@ -85,7 +86,7 @@
<include name="*.jar"/>
</fileset>
<pathelement path="${clover.jar}"/>
- </path>
+ </path>-->
<patternset id="support.files">
<include name="**/*.jpg"/>
@@ -125,7 +126,7 @@
<property name="clover.jar" value="${ant.home}/lib/clover.jar"/>
<taskdef resource="clovertasks"/>
- <path id="junit.classpath">
+ <!--<path id="junit.classpath">
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
@@ -134,7 +135,7 @@
<path refid="lib.class.path"/>
<path refid="junit.moduleclasspath"/>
<path location="${clover.jar}"/>
- </path>
+ </path>-->
<!-- Clover tasks -->
<target name="with.clover">
@@ -193,8 +194,8 @@
value="org.eclipse.jdt.core.JDTCompilerAdapter"
classpath="${java.class.path}"/>
<javac
- target="1.4"
- source="1.4"
+ source="${javac.source}"
+ target="${javac.target}"
srcdir="${src.dir}"
destdir="${classes.dir}"
classpathref="lib.class.path"
@@ -211,8 +212,8 @@
value="org.eclipse.jdt.core.JDTCompilerAdapter"
classpath="${java.class.path}"/>
<javac
- target="1.4"
- source="1.4"
+ source="${javac.source}"
+ target="${javac.target}"
destdir="${testclasses.dir}"
classpathref="junit.classpath"
debug="${javac.debug}"
@@ -222,31 +223,23 @@
</javac>
</target>
- <target name="instrument" depends="compiletest"
+ <target name="instrument" depends="compiletest"
description="Instrument the persistent classes"> <!-- depends="jar" -->
-
- <taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask">
+ <property name="testclasses.test.dir" value="${testclasses.dir}/org/hibernate/test"/>
+ <taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
<classpath path="${classes.dir}"/>
- <classpath path="${testclasses.dir}"/>
- <classpath refid="lib.class.path"/>
+ <classpath path="${testclasses.dir}"/>
+ <classpath refid="lib.class.path"/>
</taskdef>
<instrument verbose="true">
- <fileset dir="${testclasses.dir}/org/hibernate/test">
+ <fileset dir="${testclasses.test.dir}">
<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" >
@@ -298,11 +291,6 @@
</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}"/>
@@ -320,9 +308,8 @@
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"
+ stylesheetfile="${doc.api.dir}/jdstyle.css"
link="${javadoc}">
<packageset dir="${src.dir}" defaultexcludes="yes" >
<include name="**/*" />
@@ -374,43 +361,29 @@
<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>
-
<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>
+ <antcall target="junit" inheritall="true">
+ <param name="test.out.dir" value="${instrumenttest.out.dir}"/>
+ </antcall>
+ </target>
<target name="junitreport" depends="">
- <junitreport todir="./test_output">
- <fileset dir="test_output">
+ <junitreport todir="${test.out.dir}">
+ <fileset dir="${test.out.dir}">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="./test_output"/>
+ <report format="frames" todir="${test.out.dir}"/>
</junitreport>
</target>
+ <target name="junitinstrumentreport" depends="">
+ <antcall target="junitreport" inheritall="true">
+ <param name="test.out.dir" value="${instrumenttest.out.dir}"/>
+ </antcall>
+ </target>
+
+
<target name="run" depends="compile" description="Run Hibernate Console">
<java classname="org.hibernate.console.Start" classpathref="lib.class.path" fork="true">
<classpath>
@@ -443,4 +416,4 @@
<cvs command="-q diff -u -N" output="patch.txt"/>
</target>
-</project>
\ No newline at end of file
+</project>
17 years, 3 months
Hibernate SVN: r15324 - annotations/tags.
by hibernate-commits@lists.jboss.org
Author: gbadner
Date: 2008-10-10 23:06:40 -0400 (Fri, 10 Oct 2008)
New Revision: 15324
Added:
annotations/tags/3_2_1_GA_CP03/
Log:
JBPAPP-1269 : Create 3_2_1_GA_CP03 tag for annotations in EAP 4.2.0.GA_CP05 / 4.3.0.GA_CP03
Copied: annotations/tags/3_2_1_GA_CP03 (from rev 15323, annotations/branches/v3_2_1_GA_CP)
17 years, 3 months
Hibernate SVN: r15323 - in annotations/branches/v3_2_1_GA_CP: doc and 2 other directories.
by hibernate-commits@lists.jboss.org
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 {
17 years, 3 months
Hibernate SVN: r15322 - core/tags.
by hibernate-commits@lists.jboss.org
Author: gbadner
Date: 2008-10-10 22:31:00 -0400 (Fri, 10 Oct 2008)
New Revision: 15322
Added:
core/tags/JBOSS_EAP_3_2_4_SP1_CP06/
Log:
JBPAPP-1214 - Create JBOSS_EAP_3_2_4_SP1_CP06 tag for EAP 4.2.0.GA_CP05 / 4.3.0.GA_CP03
Copied: core/tags/JBOSS_EAP_3_2_4_SP1_CP06 (from rev 15321, core/branches/Branch_3_2_4_SP1_CP)
17 years, 3 months
Hibernate SVN: r15321 - in core/branches/Branch_3_2_4_SP1_CP: lib and 1 other directories.
by hibernate-commits@lists.jboss.org
Author: gbadner
Date: 2008-10-10 22:23:14 -0400 (Fri, 10 Oct 2008)
New Revision: 15321
Modified:
core/branches/Branch_3_2_4_SP1_CP/build.xml
core/branches/Branch_3_2_4_SP1_CP/changelog.txt
core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
core/branches/Branch_3_2_4_SP1_CP/readme.txt
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java
Log:
JBPAPP-1214 - change Hibernate core version to 3.2.4.SP1_CP06 (JBOSS_EAP_3_2_4_SP1_CP05 was already used)
Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-10-10 20:37:33 UTC (rev 15320)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-10-11 02:23:14 UTC (rev 15321)
@@ -24,7 +24,7 @@
<property name="version.minor" value="2"/>
<property name="version.micro" value="4"/>
<property name="version.qualifier" value="sp1"/>
- <property name="version.cp" value="cp05"/>
+ <property name="version.cp" value="cp06"/>
<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}"/>
Modified: core/branches/Branch_3_2_4_SP1_CP/changelog.txt
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/changelog.txt 2008-10-10 20:37:33 UTC (rev 15320)
+++ core/branches/Branch_3_2_4_SP1_CP/changelog.txt 2008-10-11 02:23:14 UTC (rev 15321)
@@ -5,7 +5,7 @@
refer to the particular case on JIRA using the issue tracking number to learn
more about each case.
-Changes in version 3.2.4.sp1.cp05
+Changes in version 3.2.4.sp1.cp06
-------------------------------------------
** Bug
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-10-10 20:37:33 UTC (rev 15320)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-10-11 02:23:14 UTC (rev 15321)
@@ -1,6 +1,6 @@
hibernate.lib=hibernate3.jar
hibernate.ignorecheck=true
-hibernate.version=3.2.4.SP1_CP05-brew
+hibernate.version=3.2.4.SP1_CP06-brew
hibernate.name=Hibernate core
hibernate.when=runtime, required
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-10-10 20:37:33 UTC (rev 15320)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-10-11 02:23:14 UTC (rev 15321)
@@ -39,7 +39,7 @@
cleanimports.name=cleanimports
cleanimports.when=buildtime
-hibernate.version=3.2.4.SP1_CP05-brew
+hibernate.version=3.2.4.SP1_CP06-brew
hibernate.name=Hibernate core
hibernate.when=runtime, required
Modified: core/branches/Branch_3_2_4_SP1_CP/readme.txt
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/readme.txt 2008-10-10 20:37:33 UTC (rev 15320)
+++ core/branches/Branch_3_2_4_SP1_CP/readme.txt 2008-10-11 02:23:14 UTC (rev 15321)
@@ -1,6 +1,6 @@
Hibernate - Relational Persistence for Idiomatic Java
=====================================================
-version 3.2.4.sp1.cp05
+version 3.2.4.sp1.cp06
Copyright © 2008 Red Hat, Inc.
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java 2008-10-10 20:37:33 UTC (rev 15320)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java 2008-10-11 02:23:14 UTC (rev 15321)
@@ -153,7 +153,7 @@
*/
public final class Environment {
- public static final String VERSION = "3.2.4.sp1.cp05";
+ public static final String VERSION = "3.2.4.sp1.cp06";
/**
* <tt>ConnectionProvider</tt> implementor to use when obtaining connections
17 years, 3 months
Hibernate SVN: r15320 - in core/branches/Branch_3_2_4_SP1_CP: lib and 1 other directories.
by hibernate-commits@lists.jboss.org
Author: gbadner
Date: 2008-10-10 16:37:33 -0400 (Fri, 10 Oct 2008)
New Revision: 15320
Modified:
core/branches/Branch_3_2_4_SP1_CP/build.xml
core/branches/Branch_3_2_4_SP1_CP/changelog.txt
core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
core/branches/Branch_3_2_4_SP1_CP/readme.txt
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java
Log:
JBPAPP-1214 - Upgrade Hibernate core to 3.2.4.SP1_CP05
Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-10-10 20:14:22 UTC (rev 15319)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-10-10 20:37:33 UTC (rev 15320)
@@ -24,7 +24,7 @@
<property name="version.minor" value="2"/>
<property name="version.micro" value="4"/>
<property name="version.qualifier" value="sp1"/>
- <property name="version.cp" value="cp04"/>
+ <property name="version.cp" value="cp05"/>
<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}"/>
Modified: core/branches/Branch_3_2_4_SP1_CP/changelog.txt
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/changelog.txt 2008-10-10 20:14:22 UTC (rev 15319)
+++ core/branches/Branch_3_2_4_SP1_CP/changelog.txt 2008-10-10 20:37:33 UTC (rev 15320)
@@ -5,6 +5,22 @@
refer to the particular case on JIRA using the issue tracking number to learn
more about each case.
+Changes in version 3.2.4.sp1.cp05
+-------------------------------------------
+
+** Bug
+ * [JBPAPP-940 / HHH-3496] - DB2 hanging on JPALockTest and CMTTest
+ * [JBPAPP-948 / HHH-3501] - ASTParserLoadingTest testing unsupported queries for DB2
+ * [JBPAPP-949 / HHH-3519] - VM-based,timestamps are not generated for DB2
+ * [JBPAPP-950 / HHH-3483] - org.hibernate.test.hql.ScrollableCollectionFetchingTest#testScrollingJoinFetchesForward unsupported by DB2
+ * [JBPAPP-965 / HHH-1329] - Views not supported by schema validation
+ * [JBPAPP-969 / HHH-3294] - Version incorrectly incremented for unchanged persistent entity that is parent of a one to many relationship
+ * [JBPAPP-984 / HHH-2795] - CollectionLoadContexts for empy collections are not removed until PersistenceContext.clear()
+
+** Improvement
+ * [JBPAPP-1083 / HHH-1696] - Add outer join support for aliases on DetachedCriteria
+ * [JBPAPP-1205 / HHH-2592] - Force hibernate to generate use offset query when offset is zero
+
Changes in version 3.2.4.sp1.cp04
-------------------------------------------
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-10-10 20:14:22 UTC (rev 15319)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version-dist.properties 2008-10-10 20:37:33 UTC (rev 15320)
@@ -1,6 +1,6 @@
hibernate.lib=hibernate3.jar
hibernate.ignorecheck=true
-hibernate.version=3.2.4.SP1_CP04-brew
+hibernate.version=3.2.4.SP1_CP05-brew
hibernate.name=Hibernate core
hibernate.when=runtime, required
@@ -54,7 +54,7 @@
## j2ee related
jboss-j2ee.lib=jboss-j2ee.jar
-jboss-j2ee.version=4.2.0.GA_CP04
+jboss-j2ee.version=4.2.0.GA_CP05
jboss-j2ee.name=J2EE API
jboss-j2ee.when=runtime, required for standalone operation (outside application server)
@@ -74,15 +74,15 @@
jboss-common.when=runtime, optional (required by TreeCache)
jboss-jmx.lib=jboss-jmx.jar
-jboss-jmx.version=4.2.0.GA_CP04
+jboss-jmx.version=4.2.0.GA_CP05
jboss-jmx.when=runtime, optional (required by TreeCache)
jboss-minimal.lib=jboss-minimal.jar
-jboss-minimal.version=4.2.0.GA_CP04
+jboss-minimal.version=4.2.0.GA_CP05
jboss-minimal.when=runtime, optional (required by TreeCache)
jboss-system.lib=jboss-system.jar
-jboss-system.version=4.2.0.GA_CP04
+jboss-system.version=4.2.0.GA_CP05
jboss-system.when=runtime, optional (required by TreeCache)
## Replication
Modified: core/branches/Branch_3_2_4_SP1_CP/lib/version.properties
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-10-10 20:14:22 UTC (rev 15319)
+++ core/branches/Branch_3_2_4_SP1_CP/lib/version.properties 2008-10-10 20:37:33 UTC (rev 15320)
@@ -39,7 +39,7 @@
cleanimports.name=cleanimports
cleanimports.when=buildtime
-hibernate.version=3.2.4.SP1_CP04-brew
+hibernate.version=3.2.4.SP1_CP05-brew
hibernate.name=Hibernate core
hibernate.when=runtime, required
@@ -103,7 +103,7 @@
## j2ee related
jboss-j2ee.lib=jboss-j2ee.jar
-jboss-j2ee.version=4.2.0.GA_CP04
+jboss-j2ee.version=4.2.0.GA_CP05
jboss-j2ee.name=J2EE API
jboss-j2ee.when=runtime, required for standalone operation (outside application server)
@@ -128,15 +128,15 @@
jboss-common.when=runtime, optional (required by TreeCache)
jboss-jmx.lib=jboss-jmx.jar
-jboss-jmx.version=4.2.0.GA_CP04
+jboss-jmx.version=4.2.0.GA_CP05
jboss-jmx.when=runtime, optional (required by TreeCache)
jboss-minimal.lib=jboss-minimal.jar
-jboss-minimal.version=4.2.0.GA_CP04
+jboss-minimal.version=4.2.0.GA_CP05
jboss-minimal.when=runtime, optional (required by TreeCache)
jboss-system.lib=jboss-system.jar
-jboss-system.version=4.2.0.GA_CP04
+jboss-system.version=4.2.0.GA_CP05
jboss-system.when=runtime, optional (required by TreeCache)
## Replication
Modified: core/branches/Branch_3_2_4_SP1_CP/readme.txt
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/readme.txt 2008-10-10 20:14:22 UTC (rev 15319)
+++ core/branches/Branch_3_2_4_SP1_CP/readme.txt 2008-10-10 20:37:33 UTC (rev 15320)
@@ -1,6 +1,6 @@
Hibernate - Relational Persistence for Idiomatic Java
=====================================================
-version 3.2.4.sp1.cp04
+version 3.2.4.sp1.cp05
Copyright © 2008 Red Hat, Inc.
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java 2008-10-10 20:14:22 UTC (rev 15319)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/cfg/Environment.java 2008-10-10 20:37:33 UTC (rev 15320)
@@ -153,7 +153,7 @@
*/
public final class Environment {
- public static final String VERSION = "3.2.4.sp1.cp04";
+ public static final String VERSION = "3.2.4.sp1.cp05";
/**
* <tt>ConnectionProvider</tt> implementor to use when obtaining connections
17 years, 3 months
Hibernate SVN: r15319 - validator/trunk/validation-api/src/main/java/javax/validation/constraints.
by hibernate-commits@lists.jboss.org
Author: epbernard
Date: 2008-10-10 16:14:22 -0400 (Fri, 10 Oct 2008)
New Revision: 15319
Added:
validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java
Log:
BVAL-38 add built-in constraints
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,25 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be false.
+ * Supported types are <code>boolean</code> and <code>Boolean</code>
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface AssertFalse {
+ String message() default "{constraint.assertFalse}";
+ String[] groups() default {};
+}
\ No newline at end of file
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,25 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be true.
+ * Supported types are <code>boolean</code> and <code>Boolean</code>
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface AssertTrue {
+ String message() default "{constraint.assertTrue}";
+ String[] groups() default {};
+}
\ No newline at end of file
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,41 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be a number within accepted range
+ * Supported types are:
+ * - <code>BigDecimal</code>
+ * - <code>BigInteger</code>
+ * - <code>Number</code>
+ * - <code>String</code> (TODO should we keep it?)
+ * - <code>short</code>, <code>int</code>, <code>long</code>, <code>float</code>, <code>double</code>
+ * TODO <code>byte</code>
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface Digits {
+ String message() default "{constraint.digits}";
+ String[] groups() default {};
+
+ /**
+ * @return maximum number of integral digits accepted for this number
+ */
+ int integer();
+
+ /**
+ * @return maximum number of fractional digits accepted for this numbe
+ */
+ int fraction();
+}
\ No newline at end of file
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,34 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be a date in the future.
+ * Now is defined as the current time according to the virtual machine
+ * The calendar used if the compared type is of type <code>Calendar</code>
+ * is the calendar based on the current timezone and the current locale.
+ *
+ * TODO what are the implications
+ *
+ * Supported types are:
+ * - <code>java.util.Date</code>
+ * - <code>java.util.Calendar</code>
+ * - TODO new date/time JSR types?
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface Future {
+ String message() default "{constraint.future}";
+ String[] groups() default {};
+}
\ No newline at end of file
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,38 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be a number whose value must be lower or
+ * equal than the specificed maximum.
+ *
+ * Supported types are:
+ * - <code>BigDecimal</code>
+ * - <code>BigInteger</code>
+ * - <code>Number</code>
+ * - <code>String</code> (TODO should we keep it?)
+ * - <code>short</code>, <code>int</code>, <code>long</code>, <code>float</code>, <code>double</code>
+ * TODO <code>byte</code>
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface Max {
+ String message() default "{constraint.max}";
+ String[] groups() default {};
+
+ /**
+ * @return Value the element must be lower or equal to
+ */
+ long value();
+}
\ No newline at end of file
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,38 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be a number whose value must be greater or
+ * equal than the specificed minimum
+ *
+ * Supported types are:
+ * - <code>BigDecimal</code>
+ * - <code>BigInteger</code>
+ * - <code>Number</code>
+ * - <code>String</code> (TODO should we keep it?)
+ * - <code>short</code>, <code>int</code>, <code>long</code>, <code>float</code>, <code>double</code>
+ * TODO <code>byte</code>
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface Min {
+ String message() default "{constraint.min}";
+ String[] groups() default {};
+
+ /**
+ * @return Value the element must be higher or equal to
+ */
+ long value();
+}
\ No newline at end of file
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,23 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must not be null.
+ * Accepts any type.
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface NotNull {
+ String message() default "{constraint.notNull}";
+ String[] groups() default {};
+}
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,24 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be null.
+ * Accepts any type.
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface Null {
+ String message() default "{constraint.null}";
+ String[] groups() default {};
+}
+
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,34 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element must be a date in the past.
+ * Now is defined as the current time according to the virtual machine
+ * The calendar used if the compared type is of type <code>Calendar</code>
+ * is the calendar based on the current timezone and the current locale.
+ *
+ * TODO what are the implications
+ *
+ * Supported types are:
+ * - <code>java.util.Date</code>
+ * - <code>java.util.Calendar</code>
+ * - TODO new date/time JSR types?
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface Past {
+ String message() default "{constraint.past}";
+ String[] groups() default {};
+}
\ No newline at end of file
Added: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java (rev 0)
+++ validator/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2008-10-10 20:14:22 UTC (rev 15319)
@@ -0,0 +1,39 @@
+package javax.validation.constraints;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * The annotated element size must be between the specified boundaries (included).
+ *
+ * Supported types are:
+ * - <code>String</code> (string length is evaludated)
+ * - <code>Collection</code> (collection size is evaluated)
+ * - Array (array length is evaludated)
+ *
+ * Null elements are considered valid
+ *
+ * @author Emmanuel Bernard
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Documented
+public @interface Size {
+ String message() default "{constraint.min}";
+ String[] groups() default {};
+
+ /**
+ * @return size the element must be higher or equal to
+ */
+ int min() default Integer.MIN_VALUE;
+
+ /**
+ * @return size the element must be lower or equal to
+ */
+ int max() default Integer.MAX_VALUE;
+}
\ No newline at end of file
17 years, 3 months