Author: hardy.ferentschik Date: 2008-10-03 10:41:53 -0400 (Fri, 03 Oct 2008) New Revision: 15253 Added: validator/trunk/hibernate-validator-legacy/src/main/ validator/trunk/hibernate-validator-legacy/src/main/java/ validator/trunk/hibernate-validator-legacy/src/main/resources/ validator/trunk/hibernate-validator-legacy/src/main/resources/org/ validator/trunk/hibernate-validator-legacy/src/main/resources/org/hibernate/ validator/trunk/hibernate-validator-legacy/src/main/resources/org/hibernate/validator/ validator/trunk/hibernate-validator-legacy/src/main/resources/org/hibernate/validator/resources/ validator/trunk/hibernate-validator-legacy/src/test/java/ validator/trunk/hibernate-validator-legacy/src/test/java/org/ validator/trunk/hibernate-validator-legacy/src/test/resources/ validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages.properties validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_da.properties validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_fr.properties validator/trunk/hibernate-validator-legacy/src/test/resources/hibernate.properties validator/trunk/hibernate-validator-legacy/src/test/resources/log4j.properties validator/trunk/hibernate-validator-legacy/src/test/resources/messages_en.properties Removed: validator/trunk/hibernate-validator-legacy/src/java/ validator/trunk/hibernate-validator-legacy/src/main/java/org/hibernate/validator/resources/ validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages.properties validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_da.properties validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_fr.properties validator/trunk/hibernate-validator-legacy/src/test/hibernate.properties validator/trunk/hibernate-validator-legacy/src/test/log4j.properties validator/trunk/hibernate-validator-legacy/src/test/messages_en.properties validator/trunk/hibernate-validator-legacy/src/test/org/ Modified: validator/trunk/hibernate-validator-legacy/build.xml validator/trunk/hibernate-validator-legacy/common-build.xml validator/trunk/hibernate-validator-legacy/doc/reference/build.xml validator/trunk/hibernate-validator-legacy/ivy.xml validator/trunk/hibernate-validator-legacy/pom.xml Log: Refactored build so that compile and test can be run by ant or maven. Still needs ant to build dist. Long term goal is to remove the ant specific stuff Modified: validator/trunk/hibernate-validator-legacy/build.xml =================================================================== --- validator/trunk/hibernate-validator-legacy/build.xml 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/build.xml 2008-10-03 14:41:53 UTC (rev 15253) @@ -15,117 +15,105 @@ --> <project name="Hibernate Validator" default="dist" basedir="." - xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <!-- Give user a chance to override without editing this file (and without typing -D each time it compiles it) --> - <property file="build.properties"/> - <property file="${user.home}/.ant.properties"/> + <property file="build.properties"/> + <property file="${user.home}/.ant.properties"/> - <!-- Name of project and version, used to create filenames --> - <property name="Name" value="Hibernate Validator"/> - <property name="name" value="hibernate-validator"/> - <property name="version" value="3.1.0.GA"/> - <property name="javadoc.packagenames" value="org.hibernate.validator.*"/> - <property name="copy.test" value="true"/> - <property name="javac.source" value="1.5"/> - <property name="javac.target" value="1.5"/> - <property name="jdbc.dir" value="jdbc"/> - <property name="common.dir" value="${basedir}"/> + <!-- Name of project and version, used to create filenames --> + <property name="Name" value="Hibernate Validator"/> + <property name="name" value="hibernate-validator"/> + <property name="version" value="3.1.0.GA"/> + <property name="javadoc.packagenames" value="org.hibernate.validator.*"/> + <property name="copy.test" value="true"/> + <property name="javac.source" value="1.5"/> + <property name="javac.target" value="1.5"/> + <property name="jdbc.dir" value="jdbc"/> + <property name="common.dir" value="${basedir}"/> - <property name="ivy.dep.dir" value="${basedir}/build/lib" /> + <property name="ivy.dep.dir" value="${basedir}/target/lib"/> - <!-- dependencies --> - <!-- property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/> - <property name="annotations.jar" - value="${basedir}/../annotations/target/hibernate-annotations/hibernate-annotations.jar"/> - <property name="jpa.jar" - value="${basedir}/../entitymanager/target/hibernate-entitymanager/hibernate-entitymanager.jar"/> - <property name="archive-browsing.jar" - value="${basedir}/../entitymanager/lib/jboss-archive-browsing.jar"/> - <property name="commons-annotations.jar" - value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/ --> <import file="${common.dir}/common-build.xml"/> - <path id="lib.moduleclass.path"> - <!-- pathelement location="${jpa-api.jar}"/> - <pathelement location="${commons-annotations.jar}"/ --> + <path id="lib.moduleclass.path"> <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> + <include name="*.jar"/> + </fileset> </path> - <path id="junit.moduleclasspath"> - <pathelement location="${src.dir}"/> - <pathelement location="${test.dir}"/> - <!-- pathelement location="${annotations.jar}"/> - <pathelement location="${jpa.jar}"/> - <pathelement location="${archive-browsing.jar}"/ --> + <path id="junit.moduleclasspath"> + <pathelement location="${src.dir}"/> + <pathelement location="${test.dir}"/> <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> + <include name="*.jar"/> + </fileset> <fileset dir="${jdbc.dir}"> - <include name="*.jar"/> - <include name="*.zip"/> - </fileset> + <include name="*.jar"/> + <include name="*.zip"/> + </fileset> <fileset dir="${lib.dir}/test"> - <include name="*.jar"/> - <include name="*.zip"/> - </fileset> + <include name="*.jar"/> + <include name="*.zip"/> + </fileset> </path> <!-- ivy load --> - <property name="ivy.jar.dir" value="${basedir}/ivy" /> - <property name="ivy.conf.dir" value="${basedir}" /> + <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"/> + uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> <target name="init"> - <antcall target="common-build.init"/> + <antcall target="common-build.init"/> <tstamp> <format property="now" pattern="yyyyMMddhhmmss"/> </tstamp> - <!-- check for dependency artefacts --> - <!-- 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="${annotations.jar}" type="file" property="annotations.jar.available"/> - <available file="${jpa.jar}" type="file" property="jpa.jar.available"/ --> <mkdir dir="${ivy.dep.dir}/core"/> <mkdir dir="${ivy.dep.dir}/test"/> - <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> + <ivy:configure file="${ivy.jar.dir}/ivyconf.xml"/> <mkdir dir="${lib.dir}/test"/> </target> - <!-- target name="get.jpa-api" depends="init" unless="jpa-api.jar.available"> - <ant inheritall="false" dir="${basedir}/../jpa-api" target="clean"/> - <ant inheritall="false" dir="${basedir}/../jpa-api" target="jar"/> - </target> + <target name="get.deps.core" depends="init" description="retrieve the core dependencies"> + <ivy:resolve conf="default"/> + <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="default"/> + </target> - <target name="get.commons-annotations" depends="init" unless="commons-annotations.jar.available"> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="clean"/> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="jar"/> - </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="get.annotations" depends="init" unless="annotations.jar.available"> - <ant inheritall="false" dir="${basedir}/../annotations" target="clean"/> - <ant inheritall="false" dir="${basedir}/../annotations" target="jar"/> - </target> - - <target name="get.jpa" depends="init" unless="jpa.jar.available"> - <ant inheritall="false" dir="${basedir}/../entitymanager" target="clean"/> - <ant inheritall="false" dir="${basedir}/../entitymanager" target="jar"/> - </target --> - - <target name="get.deps.core" depends="init" description="retrieve the core dependencies"> - <ivy:resolve conf="default" /> - <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="default" /> + <!-- 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> + <fileset dir="${jdbc.dir}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + <path refid="lib.class.path"/> + <pathelement path="${classes.dir}"/> + <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"/> + <test fork="yes" todir="${test.output}" haltonfailure="no" name="${testname}"/> + </junit> </target> - <target name="compile" depends="init,get.deps.core" description="Compile the Java source code"> + <target name="compile" depends="init,get.deps.core,resources" description="Compile the Java source code"> <available classname="org.eclipse.core.launcher.Main" property="build.compiler" @@ -148,124 +136,43 @@ <include name="**/*.xsd"/> </fileset> </copy> - </target> + </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="init,get.deps.test,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 - destdir="${testclasses.dir}" - classpathref="junit.classpath" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on" - source="1.5" - target="1.5"> - <src refid="testsrc.path"/> - </javac> - </target> - - - <!-- 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> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> - <fileset dir="${classes.dir}"> - <include name="**/*Test.class"/> - </fileset> - </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> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <path refid="lib.class.path"/> - <pathelement path="${classes.dir}"/> - <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"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> - </junit> - </target> - - <!-- target name="report"> - <mkdir dir="test_output"/> - <junitreport todir="test_output"> - <fileset dir="test_output"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="test_output/report"/> - </junitreport> - </target --> - - <target name="jar" depends="compile" description="Build the distribution .jar file"> - <mkdir dir="${classes.dir}/META-INF"/> - <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> - <attribute name="Implementation-Title" value="${Name}"/> - <attribute name="Implementation-Version" value="${version}"/> + <target name="jar" depends="compile" description="Build the distribution .jar file"> + <mkdir dir="${classes.dir}/META-INF"/> + <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> + <attribute name="Implementation-Title" value="${Name}"/> + <attribute name="Implementation-Version" value="${version}"/> <attribute name="Implementation-Vendor" value="hibernate.org"/> <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> <attribute name="Implementation-URL" value="http://validator.hibernate.org"/> - </manifest> - <antcall target="common-build.jar"/> + </manifest> + <antcall target="common-build.jar"/> <ivy:resolve conf="default"/> <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" - resolver="local" - pubrevision="latest" - pubdate="${now}" - status="integration" - /> + resolver="local" + pubrevision="latest" + pubdate="${now}" + status="integration" + /> </target> - <!-- Some of this can probably be moved to common-build... --> - <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,copysource,copytest,copylib,extras" - description="Build everything"> + <!-- Some of this can probably be moved to common-build... --> + <target name="dist" depends="get.deps.core,get.deps.test,jar,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> + <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}" failonerror="false"> - <fileset dir="${common.dir}"> - <include name="common-build.xml"/> - </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="**/*.*"/> @@ -274,23 +181,23 @@ <!-- copy dependencies --> <copy todir="${dist.lib.dir}" failonerror="false"> - <!-- fileset file="${jpa-api.jar}"/> - <fileset file="${commons-annotations.jar}"/ --> + <!-- 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"> + <fileset dir="${ivy.dep.dir}/test"> <include name="*.jar"/> </fileset> </copy> <mkdir dir="${dist.lib.dir}/build"/> <copy todir="${dist.lib.dir}/build" failonerror="false"> - <fileset file="${lib.dir}/build/*.jar"/> + <fileset file="${lib.dir}/build/*.jar"/> </copy> <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation --> @@ -302,18 +209,18 @@ failonerror="false"/> <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> - </copy> - <antcall target="common-build.dist"/> - </target> + </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="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> </project> Modified: validator/trunk/hibernate-validator-legacy/common-build.xml =================================================================== --- validator/trunk/hibernate-validator-legacy/common-build.xml 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/common-build.xml 2008-10-03 14:41:53 UTC (rev 15253) @@ -11,10 +11,13 @@ <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="src.dir" location="src/main/java"/> + <property name="resources.dir" location="src/main/resources"/> + <property name="test.dir" location="src/test/java"/> + <property name="test.resources.dir" location="src/test/resources"/> <property name="lib.dir" location="lib"/> - <property name="build.dir" location="build"/> + <property name="build.dir" location="target"/> + <property name="test.output" location="${build.dir}/test-reports"/> <property name="classes.dir" location="${build.dir}/classes"/> <property name="testclasses.dir" location="${build.dir}/testclasses"/> <property name="dist.target.dir" location="target"/> @@ -44,7 +47,7 @@ <property name="src.jar" value="${build.dir}/src.jar"/> <!-- build related properties --> - <property name="build.lib.dir" value="${lib.dir}/build"/> + <property name="build.lib.dir" value="${lib.dir}/target"/> <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> <classpath> @@ -123,6 +126,7 @@ <path id="testsrc.path"> <pathelement location="${test.dir}"/> + <pathelement location="${test.resources.dir}"/> </path> <!-- Clover --> @@ -188,25 +192,7 @@ </copy> </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"> + <target name="compiletest" depends="compile,get.deps.test,test-resources" description="Compile the tests"> <available classname="org.eclipse.core.launcher.Main" property="build.compiler" @@ -224,6 +210,26 @@ </javac> </target> + <target name="test-resources" description="Copies test resources"> + <mkdir dir="${testclasses.dir}"/> + <copy todir="${testclasses.dir}" overwrite="true"> + <fileset dir="${test.resources.dir}"> + <include name="*.properties"/> + <include name="*.xml"/> + </fileset> + </copy> + </target> + + <target name="resources" description="Copies resources"> + <mkdir dir="${classes.dir}"/> + <copy todir="${classes.dir}" overwrite="true"> + <fileset dir="${resources.dir}"> + <include name="**/*.properties"/> + <include name="**/*.xml"/> + </fileset> + </copy> + </target> + <target name="instrument" depends="compiletest" description="Instrument the persistent classes"> <!-- depends="jar" --> @@ -241,14 +247,6 @@ <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" > @@ -303,7 +301,7 @@ <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> <target name="jartest" depends="compiletest" description="Build the distribution .jar file"> <mkdir dir="${dist.dir}"/> @@ -330,8 +328,6 @@ <include name="**/*" /> </packageset> </javadoc> - - </target> @@ -377,12 +373,12 @@ </target> <target name="junit" depends="compiletest"> - <mkdir dir="test_output"/> + <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"> + <batchtest fork="yes" todir="${test.output}" haltonfailure="no"> <fileset refid="junit.batchtestset"/> </batchtest> </junit> @@ -390,12 +386,12 @@ <!-- 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.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}"/> + <test fork="yes" todir="${test.output}" haltonfailure="no" name="${testname}"/> </junit> </target> @@ -416,11 +412,11 @@ </target> <target name="junitreport" depends=""> - <junitreport todir="./test_output"> - <fileset dir="test_output"> + <junitreport todir="${test.output}"> + <fileset dir="${test.output}"> <include name="TEST-*.xml"/> </fileset> - <report format="frames" todir="./test_output"/> + <report format="frames" todir="./${test.output}"/> </junitreport> </target> @@ -432,7 +428,6 @@ </java> </target> - <target name="checkstyle" description="Check coding style"> <taskdef resource="checkstyletask.properties"> <classpath> @@ -444,7 +439,7 @@ </taskdef> <checkstyle config="${common-build.basedir}/checkstyle_checks.xml"> - <fileset dir="${src.dir}"> + <fileset dir="src/main/java"> <include name="**/*.java"/> </fileset> <formatter type="plain"/> Modified: validator/trunk/hibernate-validator-legacy/doc/reference/build.xml =================================================================== --- validator/trunk/hibernate-validator-legacy/doc/reference/build.xml 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/doc/reference/build.xml 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,7 +1,7 @@ <project name="Documentation" default="all.doc" basedir="."> <!-- Use the core Hibernate3 doc build system --> - <import file="../../common-build.xml"/> + <!--import file="../../common-build.xml"/--> <import file="docbook-common-build.xml"/> Modified: validator/trunk/hibernate-validator-legacy/ivy.xml =================================================================== --- validator/trunk/hibernate-validator-legacy/ivy.xml 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/ivy.xml 2008-10-03 14:41:53 UTC (rev 15253) @@ -24,8 +24,8 @@ <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="test->default"/> <!-- test deps --> - <dependency name="annotations" rev="3.4.0.CR1" conf="test->default"/> - <dependency name="entitymanager" rev="3.4.0.CR1" conf="test->default"/> + <dependency name="annotations" rev="3.4.0.GA" conf="test->default"/> + <dependency name="entitymanager" rev="3.4.0.GA" conf="test->default"/> <dependency org="javassist" name="javassist" rev="3.4.GA" conf="default->default"/> <dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/> <dependency org="asm" name="asm-attrs" rev="1.5.3" conf="test->default"/> Modified: validator/trunk/hibernate-validator-legacy/pom.xml =================================================================== --- validator/trunk/hibernate-validator-legacy/pom.xml 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/pom.xml 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,56 +1,116 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <packaging>jar</packaging> - <name>Hibernate Validator</name> - <version>3.1.0.GA</version> - <url>http://validator.hibernate.org</url> - <licenses> - <license> - <name>GNU LESSER GENERAL PUBLIC LICENSE</name> - <url>http://www.gnu.org/licenses/lgpl.txt</url> - </license> - </licenses> - <description>Following the DRY (Don't Repeat Yourself) principle, Hibernate Validator let's you express your domain constraints once (and only once) and ensure their compliance at various level of your system automatically.</description> - <scm> - <url>http://anonhibernate.labs.jboss.com/trunk/HibernateExt/validator&l... - </scm> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.0.SP1</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.4.2</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - <optional>true</optional> - </dependency> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>hibernate-validator-parent</artifactId> + <groupId>org.hibernate</groupId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hibernate-validator-legacy</artifactId> + <packaging>jar</packaging> + <name>Hibernate Validator</name> + <version>3.1.0.GA</version> + <url>http://validator.hibernate.org</url> + <licenses> + <license> + <name>GNU LESSER GENERAL PUBLIC LICENSE</name> + <url>http://www.gnu.org/licenses/lgpl.txt</url> + </license> + </licenses> + <description>Following the DRY (Don't Repeat Yourself) principle, Hibernate Validator let's you express your domain + constraints once (and only once) and ensure their compliance at various level of your system automatically. + </description> + <scm> + <url>http://anonhibernate.labs.jboss.com/trunk/HibernateExt/validator&l... + </scm> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.0.SP1</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.4.2</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>1.5.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.5.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Copied: validator/trunk/hibernate-validator-legacy/src/main/java (from rev 15246, validator/trunk/hibernate-validator-legacy/src/java) Copied: validator/trunk/hibernate-validator-legacy/src/main/resources/org/hibernate/validator/resources (from rev 15246, validator/trunk/hibernate-validator-legacy/src/java/org/hibernate/validator/resources) Property changes on: validator/trunk/hibernate-validator-legacy/src/main/resources/org/hibernate/validator/resources ___________________________________________________________________ Name: svn:mergeinfo + Deleted: validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages.properties =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages.properties 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,7 +0,0 @@ -#overriding of default keys - -#specific to my project -long=is too damn long -floor.name=Floor -out.of.range=lower that {min} and greater than {max} -floor.out.of.range={floor.name} cannot be {out.of.range} \ No newline at end of file Deleted: validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_da.properties =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_da.properties 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_da.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,7 +0,0 @@ -#overriding of default keys - -#specific to my project -long=is too damn long -floor.name=Floor -out.of.range=lower that {min} and greater than {max} -floor.out.of.range={floor.name} cannot be {out.of.range} \ No newline at end of file Deleted: validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_fr.properties =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_fr.properties 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_fr.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,7 +0,0 @@ -#overriding of default keys - -#specific to my project -long=est grave trop long -floor.name=Etage -out.of.range=plus petit que {min} ou plus grand que {max} -floor.out.of.range={floor.name} ne peut pas �tre {out.of.range} \ No newline at end of file Deleted: validator/trunk/hibernate-validator-legacy/src/test/hibernate.properties =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/hibernate.properties 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/src/test/hibernate.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,472 +0,0 @@ -###################### -### Query Language ### -###################### - -## define query language constants / function names - -hibernate.query.substitutions true 1, false 0, yes 'Y', no 'N' - - -## select the classic query parser - -#hibernate.query.factory_class org.hibernate.hql.classic.ClassicQueryTranslatorFactory - -hibernate.format_sql true - - - -################# -### Platforms ### -################# - -## JNDI Datasource - -#hibernate.connection.datasource jdbc/test -#hibernate.connection.username db2 -#hibernate.connection.password db2 - - -## HypersonicSQL - -hibernate.dialect org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class org.hsqldb.jdbcDriver -hibernate.connection.username sa -hibernate.connection.password -hibernate.connection.url jdbc:hsqldb:hsql://localhost -hibernate.connection.url jdbc:hsqldb:test -hibernate.connection.url jdbc:hsqldb:. - - -## MySQL - -#hibernate.dialect org.hibernate.dialect.MySQLDialect -#hibernate.dialect org.hibernate.dialect.MySQLInnoDBDialect -#hibernate.dialect org.hibernate.dialect.MySQLMyISAMDialect -#hibernate.connection.driver_class com.mysql.jdbc.Driver -#hibernate.connection.url jdbc:mysql:///test -#hibernate.connection.username emmanuel -#hibernate.connection.password - - -## Oracle - -#hibernate.dialect org.hibernate.dialect.OracleDialect -#hibernate.dialect org.hibernate.dialect.Oracle9Dialect -#hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver -#hibernate.connection.username ora -#hibernate.connection.password ora -#hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test - - -## PostgreSQL - -#hibernate.dialect org.hibernate.dialect.PostgreSQLDialect -#hibernate.connection.driver_class org.postgresql.Driver -#hibernate.connection.url jdbc:postgresql:annotations -#hibernate.connection.username postgres -#hibernate.connection.password hibernate -#hibernate.query.substitutions yes 'Y', no 'N' - - -## DB2 - -#hibernate.dialect org.hibernate.dialect.DB2Dialect -#hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver -#hibernate.connection.url jdbc:db2:test -#hibernate.connection.username db2 -#hibernate.connection.password db2 - -## TimesTen (not supported yet) - -#hibernate.dialect org.hibernate.dialect.TimesTenDialect -#hibernate.connection.driver_class com.timesten.jdbc.TimesTenDriver -#hibernate.connection.url jdbc:timesten:direct:test -#hibernate.connection.username -#hibernate.connection.password - -## DB2/400 - -#hibernate.dialect org.hibernate.dialect.DB2400Dialect -#hibernate.connection.username user -#hibernate.connection.password password - -## Native driver -#hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver -#hibernate.connection.url jdbc:db2://systemname - -## Toolbox driver -#hibernate.connection.driver_class com.ibm.as400.access.AS400JDBCDriver -#hibernate.connection.url jdbc:as400://systemname - - -## Derby (Not supported!) - -#hibernate.dialect org.hibernate.dialect.DerbyDialect -#hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver -#hibernate.connection.username -#hibernate.connection.password -#hibernate.connection.url jdbc:derby:/test;create=true - - -## Sybase - -#hibernate.dialect org.hibernate.dialect.SybaseDialect -#hibernate.connection.driver_class com.sybase.jdbc2.jdbc.SybDriver -#hibernate.connection.username sa -#hibernate.connection.password sasasa -#hibernate.connection.url jdbc:sybase:Tds:co3061835-a:5000/tempdb - - -## Mckoi SQL - -#hibernate.dialect org.hibernate.dialect.MckoiDialect -#hibernate.connection.driver_class com.mckoi.JDBCDriver -#hibernate.connection.url jdbc:mckoi:/// -#hibernate.connection.url jdbc:mckoi:local://C:/mckoi1.00/db.conf -#hibernate.connection.username admin -#hibernate.connection.password nimda - - -## SAP DB - -#hibernate.dialect org.hibernate.dialect.SAPDBDialect -#hibernate.connection.driver_class com.sap.dbtech.jdbc.DriverSapDB -#hibernate.connection.url jdbc:sapdb://localhost/TST -#hibernate.connection.username TEST -#hibernate.connection.password TEST -#hibernate.query.substitutions yes 'Y', no 'N' - - -## MS SQL Server - -#hibernate.dialect org.hibernate.dialect.SQLServerDialect -#hibernate.connection.username sa -#hibernate.connection.password sa - -## JSQL Driver -#hibernate.connection.driver_class com.jnetdirect.jsql.JSQLDriver -#hibernate.connection.url jdbc:JSQLConnect://1E1/test - -## JTURBO Driver -#hibernate.connection.driver_class com.newatlanta.jturbo.driver.Driver -#hibernate.connection.url jdbc:JTurbo://1E1:1433/test - -## WebLogic Driver -#hibernate.connection.driver_class weblogic.jdbc.mssqlserver4.Driver -#hibernate.connection.url jdbc:weblogic:mssqlserver4:1E1:1433 - -## Microsoft Driver (not recommended!) -#hibernate.connection.driver_class com.microsoft.jdbc.sqlserver.SQLServerDriver -#hibernate.connection.url jdbc:microsoft:sqlserver://1E1;DatabaseName=test;SelectMethod=cursor - -## jTDS (since version 0.9) -#hibernate.connection.driver_class net.sourceforge.jtds.jdbc.Driver -#hibernate.connection.url jdbc:jtds:sqlserver://1E1/test - -## Interbase - -#hibernate.dialect org.hibernate.dialect.InterbaseDialect -#hibernate.connection.username sysdba -#hibernate.connection.password masterkey - -## DO NOT specify hibernate.connection.sqlDialect - -## InterClient - -#hibernate.connection.driver_class interbase.interclient.Driver -#hibernate.connection.url jdbc:interbase://localhost:3060/C:/firebird/test.gdb - -## Pure Java - -#hibernate.connection.driver_class org.firebirdsql.jdbc.FBDriver -#hibernate.connection.url jdbc:firebirdsql:localhost/3050:/firebird/test.gdb - - -## Pointbase - -#hibernate.dialect org.hibernate.dialect.PointbaseDialect -#hibernate.connection.driver_class com.pointbase.jdbc.jdbcUniversalDriver -#hibernate.connection.url jdbc:pointbase:embedded:sample -#hibernate.connection.username PBPUBLIC -#hibernate.connection.password PBPUBLIC - - - -################################# -### Hibernate Connection Pool ### -################################# - -hibernate.connection.pool_size 1 - - - -########################### -### C3P0 Connection Pool### -########################### - -#hibernate.c3p0.max_size 2 -#hibernate.c3p0.min_size 2 -#hibernate.c3p0.timeout 5000 -#hibernate.c3p0.max_statements 100 -#hibernate.c3p0.idle_test_period 3000 -#hibernate.c3p0.acquire_increment 2 -#hibernate.c3p0.validate false - - - -############################## -### Proxool Connection Pool### -############################## - -## Properties for external configuration of Proxool - -hibernate.proxool.pool_alias pool1 - -## Only need one of the following - -#hibernate.proxool.existing_pool true -#hibernate.proxool.xml proxool.xml -#hibernate.proxool.properties proxool.properties - - - -################################# -### Plugin ConnectionProvider ### -################################# - -## use a custom ConnectionProvider (if not set, Hibernate will choose a built-in ConnectionProvider using hueristics) - -#hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider - - - -####################### -### Transaction API ### -####################### - -## Enable automatic flush during the JTA beforeCompletion() callback -## (This setting is relevant with or without the Transaction API) - -#hibernate.transaction.flush_before_completion - - -## Enable automatic session close at the end of transaction -## (This setting is relevant with or without the Transaction API) - -#hibernate.transaction.auto_close_session - - -## the Transaction API abstracts application code from the underlying JTA or JDBC transactions - -#hibernate.transaction.factory_class org.hibernate.transaction.JTATransactionFactory -#hibernate.transaction.factory_class org.hibernate.transaction.JDBCTransactionFactory - - -## to use JTATransactionFactory, Hibernate must be able to locate the UserTransaction in JNDI -## default is java:comp/UserTransaction -## you do NOT need this setting if you specify hibernate.transaction.manager_lookup_class - -#jta.UserTransaction jta/usertransaction -#jta.UserTransaction javax.transaction.UserTransaction -#jta.UserTransaction UserTransaction - - -## to use the second-level cache with JTA, Hibernate must be able to obtain the JTA TransactionManager - -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.JBossTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WeblogicTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WebSphereTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.OrionTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.ResinTransactionManagerLookup - - - -############################## -### Miscellaneous Settings ### -############################## - -## print all generated SQL to the console - -#hibernate.show_sql true - - -## add comments to the generated SQL - -#hibernate.use_sql_comments true - - -## generate statistics - -#hibernate.generate_statistics true - - -## auto schema export - -#hibernate.hbm2ddl.auto create-drop -#hibernate.hbm2ddl.auto create -#hibernate.hbm2ddl.auto update - - -## specify a default schema and catalog for unqualified tablenames - -#hibernate.default_schema test -#hibernate.default_catalog test - - -## enable ordering of SQL UPDATEs by primary key - -hibernate.order_updates true - - -## set the maximum depth of the outer join fetch tree - -hibernate.max_fetch_depth 1 - - -## set the default batch size for batch fetching - -hibernate.default_batch_fetch_size 100 - - -## rollback generated identifier values of deleted entities to default values - -#hibernate.use_identifer_rollback true - - -## enable CGLIB reflection optimizer (enabled by default) - -#hibernate.cglib.use_reflection_optimizer false - - - -##################### -### JDBC Settings ### -##################### - -## specify a JDBC isolation level - -#hibernate.connection.isolation 4 - - -## enable JDBC autocommit (not recommended!) - -#hibernate.connection.autocommit true - - -## set the JDBC fetch size - -#hibernate.jdbc.fetch_size 25 - - -## set the maximum JDBC 2 batch size (a nonzero value enables batching) - -#hibernate.jdbc.batch_size 0 - - -## enable batch updates even for versioned data - -hibernate.jdbc.batch_versioned_data true - - -## enable use of JDBC 2 scrollable ResultSets (specifying a Dialect will cause Hibernate to use a sensible default) - -#hibernate.jdbc.use_scrollable_resultset true - - -## use streams when writing binary types to / from JDBC - -hibernate.jdbc.use_streams_for_binary true - - -## use JDBC 3 PreparedStatement.getGeneratedKeys() to get the identifier of an inserted row - -#hibernate.jdbc.use_get_generated_keys false - - -## choose a custom JDBC batcher - -# hibernate.jdbc.factory_class - - -## enable JDBC result set column alias caching -## (minor performance enhancement for broken JDBC drivers) - -# hibernate.jdbc.wrap_result_sets - - -## choose a custom SQL exception converter - -#hibernate.jdbc.sql_exception_converter - - - -########################## -### Second-level Cache ### -########################## - -## optimize chache for minimal "puts" instead of minimal "gets" (good for clustered cache) - -#hibernate.cache.use_minimal_puts true - - -## set a prefix for cache region names - -hibernate.cache.region_prefix hibernate.test - - -## disable the second-level cache - -#hibernate.cache.use_second_level_cache false - - -## enable the query cache - -hibernate.cache.use_query_cache true - - -## store the second-level cache entries in a more human-friendly format - -#hibernate.cache.use_structured_entries true - - -## choose a cache implementation - -#hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.EmptyCacheProvider -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.TreeCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.OSCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.SwarmCacheProvider - - -## choose a custom query cache implementation - -#hibernate.cache.query_cache_factory - - - -############ -### JNDI ### -############ - -## specify a JNDI name for the SessionFactory - -#hibernate.session_factory_name hibernate/session_factory - - -## Hibernate uses JNDI to bind a name to a SessionFactory and to look up the JTA UserTransaction; -## if hibernate.jndi.* are not specified, Hibernate will use the default InitialContext() which -## is the best approach in an application server - -#file system -#hibernate.jndi.class com.sun.jndi.fscontext.RefFSContextFactory -#hibernate.jndi.url file:/ - -#WebSphere -#hibernate.jndi.class com.ibm.websphere.naming.WsnInitialContextFactory -#hibernate.jndi.url iiop://localhost:900/ - Copied: validator/trunk/hibernate-validator-legacy/src/test/java/org (from rev 15246, validator/trunk/hibernate-validator-legacy/src/test/org) Deleted: validator/trunk/hibernate-validator-legacy/src/test/log4j.properties =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/log4j.properties 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/src/test/log4j.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,44 +0,0 @@ -### direct log messages to stdout ### -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -### direct messages to file hibernate.log ### -#log4j.appender.file=org.apache.log4j.FileAppender -#log4j.appender.file.File=hibernate.log -#log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -### set log levels - for more verbose logging change 'info' to 'debug' ### - -log4j.rootLogger=warn, stdout - -log4j.logger.org.hibernate=info - - -### log just the SQL -log4j.logger.org.hibernate.SQL=debug - -#log4j.logger.org.hibernate.engine.CascadingAction=debug - -### log JDBC bind parameters ### -#log4j.logger.org.hibernate.type=debug - -### log schema export/update ### -log4j.logger.org.hibernate.tool.hbm2ddl=debug - -### log cache activity ### -#log4j.logger.org.hibernate.cache=debug - -### enable the following line if you want to track down connection ### -### leakages when using DriverManagerConnectionProvider ### -#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace - -### annotation logs -#log4j.logger.org.hibernate.annotation=info -#log4j.logger.org.hibernate.cfg=info -#log4j.logger.org.hibernate.cfg.SettingsFactory=info -#log4j.logger.org.hibernate.cfg.AnnotationBinder=info -#log4j.logger.org.hibernate.cfg.AnnotationConfiguration=info -#log4j.logger.org.hibernate.cfg.Ejb3Column=info \ No newline at end of file Deleted: validator/trunk/hibernate-validator-legacy/src/test/messages_en.properties =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/messages_en.properties 2008-10-03 03:03:21 UTC (rev 15252) +++ validator/trunk/hibernate-validator-legacy/src/test/messages_en.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -1,15 +0,0 @@ -long=is too damn long -floor.name=Floor -out.of.range=lower that {min} and greater than {max} -floor.out.of.range={floor.name} cannot (escaping #{el}) be {out.of.range} - -validator.assertFalse=assertion failed -validator.assertTrue=assertion failed -validator.length=length must be between {min} and {max} -validator.max=must less than or equal to {value} -validator.min=must greater than or equal to {value} -validator.notNull=may not be null -validator.past=must be a past date -validator.pattern=must match "{regex}" -validator.range=must be between {min} and {max} -validator.size=size must be between {min} and {max} \ No newline at end of file Copied: validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages.properties (from rev 15246, validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages.properties) =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages.properties (rev 0) +++ validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -0,0 +1,7 @@ +#overriding of default keys + +#specific to my project +long=is too damn long +floor.name=Floor +out.of.range=lower that {min} and greater than {max} +floor.out.of.range={floor.name} cannot be {out.of.range} \ No newline at end of file Property changes on: validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_da.properties (from rev 15246, validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_da.properties) =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_da.properties (rev 0) +++ validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_da.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -0,0 +1,7 @@ +#overriding of default keys + +#specific to my project +long=is too damn long +floor.name=Floor +out.of.range=lower that {min} and greater than {max} +floor.out.of.range={floor.name} cannot be {out.of.range} \ No newline at end of file Property changes on: validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_da.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_fr.properties (from rev 15246, validator/trunk/hibernate-validator-legacy/src/test/ValidatorMessages_fr.properties) =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_fr.properties (rev 0) +++ validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_fr.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -0,0 +1,7 @@ +#overriding of default keys + +#specific to my project +long=est grave trop long +floor.name=Etage +out.of.range=plus petit que {min} ou plus grand que {max} +floor.out.of.range={floor.name} ne peut pas �tre {out.of.range} \ No newline at end of file Property changes on: validator/trunk/hibernate-validator-legacy/src/test/resources/ValidatorMessages_fr.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: validator/trunk/hibernate-validator-legacy/src/test/resources/hibernate.properties (from rev 15246, validator/trunk/hibernate-validator-legacy/src/test/hibernate.properties) =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/resources/hibernate.properties (rev 0) +++ validator/trunk/hibernate-validator-legacy/src/test/resources/hibernate.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -0,0 +1,472 @@ +###################### +### Query Language ### +###################### + +## define query language constants / function names + +hibernate.query.substitutions true 1, false 0, yes 'Y', no 'N' + + +## select the classic query parser + +#hibernate.query.factory_class org.hibernate.hql.classic.ClassicQueryTranslatorFactory + +hibernate.format_sql true + + + +################# +### Platforms ### +################# + +## JNDI Datasource + +#hibernate.connection.datasource jdbc/test +#hibernate.connection.username db2 +#hibernate.connection.password db2 + + +## HypersonicSQL + +hibernate.dialect org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class org.hsqldb.jdbcDriver +hibernate.connection.username sa +hibernate.connection.password +hibernate.connection.url jdbc:hsqldb:hsql://localhost +hibernate.connection.url jdbc:hsqldb:test +hibernate.connection.url jdbc:hsqldb:. + + +## MySQL + +#hibernate.dialect org.hibernate.dialect.MySQLDialect +#hibernate.dialect org.hibernate.dialect.MySQLInnoDBDialect +#hibernate.dialect org.hibernate.dialect.MySQLMyISAMDialect +#hibernate.connection.driver_class com.mysql.jdbc.Driver +#hibernate.connection.url jdbc:mysql:///test +#hibernate.connection.username emmanuel +#hibernate.connection.password + + +## Oracle + +#hibernate.dialect org.hibernate.dialect.OracleDialect +#hibernate.dialect org.hibernate.dialect.Oracle9Dialect +#hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver +#hibernate.connection.username ora +#hibernate.connection.password ora +#hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test + + +## PostgreSQL + +#hibernate.dialect org.hibernate.dialect.PostgreSQLDialect +#hibernate.connection.driver_class org.postgresql.Driver +#hibernate.connection.url jdbc:postgresql:annotations +#hibernate.connection.username postgres +#hibernate.connection.password hibernate +#hibernate.query.substitutions yes 'Y', no 'N' + + +## DB2 + +#hibernate.dialect org.hibernate.dialect.DB2Dialect +#hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver +#hibernate.connection.url jdbc:db2:test +#hibernate.connection.username db2 +#hibernate.connection.password db2 + +## TimesTen (not supported yet) + +#hibernate.dialect org.hibernate.dialect.TimesTenDialect +#hibernate.connection.driver_class com.timesten.jdbc.TimesTenDriver +#hibernate.connection.url jdbc:timesten:direct:test +#hibernate.connection.username +#hibernate.connection.password + +## DB2/400 + +#hibernate.dialect org.hibernate.dialect.DB2400Dialect +#hibernate.connection.username user +#hibernate.connection.password password + +## Native driver +#hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver +#hibernate.connection.url jdbc:db2://systemname + +## Toolbox driver +#hibernate.connection.driver_class com.ibm.as400.access.AS400JDBCDriver +#hibernate.connection.url jdbc:as400://systemname + + +## Derby (Not supported!) + +#hibernate.dialect org.hibernate.dialect.DerbyDialect +#hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver +#hibernate.connection.username +#hibernate.connection.password +#hibernate.connection.url jdbc:derby:/test;create=true + + +## Sybase + +#hibernate.dialect org.hibernate.dialect.SybaseDialect +#hibernate.connection.driver_class com.sybase.jdbc2.jdbc.SybDriver +#hibernate.connection.username sa +#hibernate.connection.password sasasa +#hibernate.connection.url jdbc:sybase:Tds:co3061835-a:5000/tempdb + + +## Mckoi SQL + +#hibernate.dialect org.hibernate.dialect.MckoiDialect +#hibernate.connection.driver_class com.mckoi.JDBCDriver +#hibernate.connection.url jdbc:mckoi:/// +#hibernate.connection.url jdbc:mckoi:local://C:/mckoi1.00/db.conf +#hibernate.connection.username admin +#hibernate.connection.password nimda + + +## SAP DB + +#hibernate.dialect org.hibernate.dialect.SAPDBDialect +#hibernate.connection.driver_class com.sap.dbtech.jdbc.DriverSapDB +#hibernate.connection.url jdbc:sapdb://localhost/TST +#hibernate.connection.username TEST +#hibernate.connection.password TEST +#hibernate.query.substitutions yes 'Y', no 'N' + + +## MS SQL Server + +#hibernate.dialect org.hibernate.dialect.SQLServerDialect +#hibernate.connection.username sa +#hibernate.connection.password sa + +## JSQL Driver +#hibernate.connection.driver_class com.jnetdirect.jsql.JSQLDriver +#hibernate.connection.url jdbc:JSQLConnect://1E1/test + +## JTURBO Driver +#hibernate.connection.driver_class com.newatlanta.jturbo.driver.Driver +#hibernate.connection.url jdbc:JTurbo://1E1:1433/test + +## WebLogic Driver +#hibernate.connection.driver_class weblogic.jdbc.mssqlserver4.Driver +#hibernate.connection.url jdbc:weblogic:mssqlserver4:1E1:1433 + +## Microsoft Driver (not recommended!) +#hibernate.connection.driver_class com.microsoft.jdbc.sqlserver.SQLServerDriver +#hibernate.connection.url jdbc:microsoft:sqlserver://1E1;DatabaseName=test;SelectMethod=cursor + +## jTDS (since version 0.9) +#hibernate.connection.driver_class net.sourceforge.jtds.jdbc.Driver +#hibernate.connection.url jdbc:jtds:sqlserver://1E1/test + +## Interbase + +#hibernate.dialect org.hibernate.dialect.InterbaseDialect +#hibernate.connection.username sysdba +#hibernate.connection.password masterkey + +## DO NOT specify hibernate.connection.sqlDialect + +## InterClient + +#hibernate.connection.driver_class interbase.interclient.Driver +#hibernate.connection.url jdbc:interbase://localhost:3060/C:/firebird/test.gdb + +## Pure Java + +#hibernate.connection.driver_class org.firebirdsql.jdbc.FBDriver +#hibernate.connection.url jdbc:firebirdsql:localhost/3050:/firebird/test.gdb + + +## Pointbase + +#hibernate.dialect org.hibernate.dialect.PointbaseDialect +#hibernate.connection.driver_class com.pointbase.jdbc.jdbcUniversalDriver +#hibernate.connection.url jdbc:pointbase:embedded:sample +#hibernate.connection.username PBPUBLIC +#hibernate.connection.password PBPUBLIC + + + +################################# +### Hibernate Connection Pool ### +################################# + +hibernate.connection.pool_size 1 + + + +########################### +### C3P0 Connection Pool### +########################### + +#hibernate.c3p0.max_size 2 +#hibernate.c3p0.min_size 2 +#hibernate.c3p0.timeout 5000 +#hibernate.c3p0.max_statements 100 +#hibernate.c3p0.idle_test_period 3000 +#hibernate.c3p0.acquire_increment 2 +#hibernate.c3p0.validate false + + + +############################## +### Proxool Connection Pool### +############################## + +## Properties for external configuration of Proxool + +hibernate.proxool.pool_alias pool1 + +## Only need one of the following + +#hibernate.proxool.existing_pool true +#hibernate.proxool.xml proxool.xml +#hibernate.proxool.properties proxool.properties + + + +################################# +### Plugin ConnectionProvider ### +################################# + +## use a custom ConnectionProvider (if not set, Hibernate will choose a built-in ConnectionProvider using hueristics) + +#hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider +#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider +#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider +#hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider +#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider + + + +####################### +### Transaction API ### +####################### + +## Enable automatic flush during the JTA beforeCompletion() callback +## (This setting is relevant with or without the Transaction API) + +#hibernate.transaction.flush_before_completion + + +## Enable automatic session close at the end of transaction +## (This setting is relevant with or without the Transaction API) + +#hibernate.transaction.auto_close_session + + +## the Transaction API abstracts application code from the underlying JTA or JDBC transactions + +#hibernate.transaction.factory_class org.hibernate.transaction.JTATransactionFactory +#hibernate.transaction.factory_class org.hibernate.transaction.JDBCTransactionFactory + + +## to use JTATransactionFactory, Hibernate must be able to locate the UserTransaction in JNDI +## default is java:comp/UserTransaction +## you do NOT need this setting if you specify hibernate.transaction.manager_lookup_class + +#jta.UserTransaction jta/usertransaction +#jta.UserTransaction javax.transaction.UserTransaction +#jta.UserTransaction UserTransaction + + +## to use the second-level cache with JTA, Hibernate must be able to obtain the JTA TransactionManager + +#hibernate.transaction.manager_lookup_class org.hibernate.transaction.JBossTransactionManagerLookup +#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WeblogicTransactionManagerLookup +#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WebSphereTransactionManagerLookup +#hibernate.transaction.manager_lookup_class org.hibernate.transaction.OrionTransactionManagerLookup +#hibernate.transaction.manager_lookup_class org.hibernate.transaction.ResinTransactionManagerLookup + + + +############################## +### Miscellaneous Settings ### +############################## + +## print all generated SQL to the console + +#hibernate.show_sql true + + +## add comments to the generated SQL + +#hibernate.use_sql_comments true + + +## generate statistics + +#hibernate.generate_statistics true + + +## auto schema export + +#hibernate.hbm2ddl.auto create-drop +#hibernate.hbm2ddl.auto create +#hibernate.hbm2ddl.auto update + + +## specify a default schema and catalog for unqualified tablenames + +#hibernate.default_schema test +#hibernate.default_catalog test + + +## enable ordering of SQL UPDATEs by primary key + +hibernate.order_updates true + + +## set the maximum depth of the outer join fetch tree + +hibernate.max_fetch_depth 1 + + +## set the default batch size for batch fetching + +hibernate.default_batch_fetch_size 100 + + +## rollback generated identifier values of deleted entities to default values + +#hibernate.use_identifer_rollback true + + +## enable CGLIB reflection optimizer (enabled by default) + +#hibernate.cglib.use_reflection_optimizer false + + + +##################### +### JDBC Settings ### +##################### + +## specify a JDBC isolation level + +#hibernate.connection.isolation 4 + + +## enable JDBC autocommit (not recommended!) + +#hibernate.connection.autocommit true + + +## set the JDBC fetch size + +#hibernate.jdbc.fetch_size 25 + + +## set the maximum JDBC 2 batch size (a nonzero value enables batching) + +#hibernate.jdbc.batch_size 0 + + +## enable batch updates even for versioned data + +hibernate.jdbc.batch_versioned_data true + + +## enable use of JDBC 2 scrollable ResultSets (specifying a Dialect will cause Hibernate to use a sensible default) + +#hibernate.jdbc.use_scrollable_resultset true + + +## use streams when writing binary types to / from JDBC + +hibernate.jdbc.use_streams_for_binary true + + +## use JDBC 3 PreparedStatement.getGeneratedKeys() to get the identifier of an inserted row + +#hibernate.jdbc.use_get_generated_keys false + + +## choose a custom JDBC batcher + +# hibernate.jdbc.factory_class + + +## enable JDBC result set column alias caching +## (minor performance enhancement for broken JDBC drivers) + +# hibernate.jdbc.wrap_result_sets + + +## choose a custom SQL exception converter + +#hibernate.jdbc.sql_exception_converter + + + +########################## +### Second-level Cache ### +########################## + +## optimize chache for minimal "puts" instead of minimal "gets" (good for clustered cache) + +#hibernate.cache.use_minimal_puts true + + +## set a prefix for cache region names + +hibernate.cache.region_prefix hibernate.test + + +## disable the second-level cache + +#hibernate.cache.use_second_level_cache false + + +## enable the query cache + +hibernate.cache.use_query_cache true + + +## store the second-level cache entries in a more human-friendly format + +#hibernate.cache.use_structured_entries true + + +## choose a cache implementation + +#hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider +#hibernate.cache.provider_class org.hibernate.cache.EmptyCacheProvider +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider +#hibernate.cache.provider_class org.hibernate.cache.TreeCacheProvider +#hibernate.cache.provider_class org.hibernate.cache.OSCacheProvider +#hibernate.cache.provider_class org.hibernate.cache.SwarmCacheProvider + + +## choose a custom query cache implementation + +#hibernate.cache.query_cache_factory + + + +############ +### JNDI ### +############ + +## specify a JNDI name for the SessionFactory + +#hibernate.session_factory_name hibernate/session_factory + + +## Hibernate uses JNDI to bind a name to a SessionFactory and to look up the JTA UserTransaction; +## if hibernate.jndi.* are not specified, Hibernate will use the default InitialContext() which +## is the best approach in an application server + +#file system +#hibernate.jndi.class com.sun.jndi.fscontext.RefFSContextFactory +#hibernate.jndi.url file:/ + +#WebSphere +#hibernate.jndi.class com.ibm.websphere.naming.WsnInitialContextFactory +#hibernate.jndi.url iiop://localhost:900/ + Property changes on: validator/trunk/hibernate-validator-legacy/src/test/resources/hibernate.properties ___________________________________________________________________ Name: svn:mergeinfo + Copied: validator/trunk/hibernate-validator-legacy/src/test/resources/log4j.properties (from rev 15246, validator/trunk/hibernate-validator-legacy/src/test/log4j.properties) =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/resources/log4j.properties (rev 0) +++ validator/trunk/hibernate-validator-legacy/src/test/resources/log4j.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -0,0 +1,44 @@ +### direct log messages to stdout ### +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +### direct messages to file hibernate.log ### +#log4j.appender.file=org.apache.log4j.FileAppender +#log4j.appender.file.File=hibernate.log +#log4j.appender.file.layout=org.apache.log4j.PatternLayout +#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +### set log levels - for more verbose logging change 'info' to 'debug' ### + +log4j.rootLogger=warn, stdout + +log4j.logger.org.hibernate=warn + + +### log just the SQL +log4j.logger.org.hibernate.SQL=debug + +#log4j.logger.org.hibernate.engine.CascadingAction=debug + +### log JDBC bind parameters ### +#log4j.logger.org.hibernate.type=debug + +### log schema export/update ### +log4j.logger.org.hibernate.tool.hbm2ddl=debug + +### log cache activity ### +#log4j.logger.org.hibernate.cache=debug + +### enable the following line if you want to track down connection ### +### leakages when using DriverManagerConnectionProvider ### +#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace + +### annotation logs +#log4j.logger.org.hibernate.annotation=info +#log4j.logger.org.hibernate.cfg=info +#log4j.logger.org.hibernate.cfg.SettingsFactory=info +#log4j.logger.org.hibernate.cfg.AnnotationBinder=info +#log4j.logger.org.hibernate.cfg.AnnotationConfiguration=info +#log4j.logger.org.hibernate.cfg.Ejb3Column=info \ No newline at end of file Property changes on: validator/trunk/hibernate-validator-legacy/src/test/resources/log4j.properties ___________________________________________________________________ Name: svn:mergeinfo + Copied: validator/trunk/hibernate-validator-legacy/src/test/resources/messages_en.properties (from rev 15246, validator/trunk/hibernate-validator-legacy/src/test/messages_en.properties) =================================================================== --- validator/trunk/hibernate-validator-legacy/src/test/resources/messages_en.properties (rev 0) +++ validator/trunk/hibernate-validator-legacy/src/test/resources/messages_en.properties 2008-10-03 14:41:53 UTC (rev 15253) @@ -0,0 +1,15 @@ +long=is too damn long +floor.name=Floor +out.of.range=lower that {min} and greater than {max} +floor.out.of.range={floor.name} cannot (escaping #{el}) be {out.of.range} + +validator.assertFalse=assertion failed +validator.assertTrue=assertion failed +validator.length=length must be between {min} and {max} +validator.max=must less than or equal to {value} +validator.min=must greater than or equal to {value} +validator.notNull=may not be null +validator.past=must be a past date +validator.pattern=must match "{regex}" +validator.range=must be between {min} and {max} +validator.size=size must be between {min} and {max} \ No newline at end of file Property changes on: validator/trunk/hibernate-validator-legacy/src/test/resources/messages_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native