[hibernate-commits] Hibernate SVN: r12920 - in trunk/HibernateExt/annotations: src/test/org/hibernate/test/annotations/tableperclass and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2007-08-11 02:02:44 -0400 (Sat, 11 Aug 2007)
New Revision: 12920

Modified:
   trunk/HibernateExt/annotations/build.xml
   trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/tableperclass/Component.java
Log:
Remove dependency in tests from ann -> validator

Modified: trunk/HibernateExt/annotations/build.xml
===================================================================
--- trunk/HibernateExt/annotations/build.xml	2007-08-10 19:46:42 UTC (rev 12919)
+++ trunk/HibernateExt/annotations/build.xml	2007-08-11 06:02:44 UTC (rev 12920)
@@ -25,8 +25,6 @@
     <property name="common.dir" value="../common"/>
 
 	<property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/>
-	<property name="validator.jar"
-			  value="${basedir}/../validator/target/hibernate-validator/hibernate-validator.jar"/>
 	<property name="commons-annotations.jar"
 			  value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/>
 
@@ -43,7 +41,6 @@
 	<path id="junit.moduleclasspath">
 		<pathelement location="${src.dir}"/>
 		<pathelement location="${test.dir}"/>
-        <pathelement location="${validator.jar}"/>
         <pathelement location="lib/testlibs/org.eclipse.jdt.core_3.1.0.jar"/>
 		<fileset dir="${jdbc.dir}">
 			<include name="**/*.jar"/>
@@ -55,7 +52,6 @@
 		<antcall target="common-build.init"/>
 		<available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/>
 		<available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/>
-		<available file="${validator.jar}" type="file" property="validator.jar.available"/>
         <mkdir dir="${lib.dir}/test"/>
     </target>
 
@@ -69,11 +65,6 @@
 		<ant inheritall="false" dir="${basedir}/../commons-annotations" target="jar"/>
 	</target>
 
-	<target name="get.validator" depends="init" unless="validator.jar.available">
-		<ant inheritall="false" dir="${basedir}/../validator" target="clean"/>
-		<ant inheritall="false" dir="${basedir}/../validator" target="jar"/>
-	</target>
-
 	<target name="compile" depends="init,get.jpa-api,get.commons-annotations"
 			description="Compile the Java source code">
 		<available
@@ -100,7 +91,7 @@
 		</copy>
 	</target>
 
-	<target name="compiletest" depends="compile,get.validator" description="Compile the tests">
+	<target name="compiletest" depends="compile" description="Compile the tests">
 		<available
 				classname="org.eclipse.core.launcher.Main"
 				property="build.compiler"

Modified: trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/tableperclass/Component.java
===================================================================
--- trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/tableperclass/Component.java	2007-08-10 19:46:42 UTC (rev 12919)
+++ trunk/HibernateExt/annotations/src/test/org/hibernate/test/annotations/tableperclass/Component.java	2007-08-11 06:02:44 UTC (rev 12920)
@@ -1,13 +1,12 @@
 //$Id: $
 package org.hibernate.test.annotations.tableperclass;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Inheritance;
-import javax.persistence.Entity;
 import javax.persistence.InheritanceType;
 
-import org.hibernate.validator.NotNull;
-import org.hibernate.validator.Length;
 import org.hibernate.annotations.Index;
 
 /**
@@ -32,15 +31,13 @@
 		return id;
 	}
 
-
-	@NotNull
-	@Length(max = 40)
+	@Column(nullable = false)
 	@Index(name = "manufacturerPartNumber")
 	public String getManufacturerPartNumber() {
 		return manufacturerPartNumber;
 	}
 
-	@NotNull
+	@Column(nullable = false)
 	public Long getManufacturerId() {
 		return manufacturerId;
 	}