Author: hardy.ferentschik Date: 2009-03-25 06:07:47 -0400 (Wed, 25 Mar 2009) New Revision: 16210 Added: search/trunk/src/main/ search/trunk/src/main/assembly/ search/trunk/src/main/java/ search/trunk/src/main/resources/ search/trunk/src/test/java/ search/trunk/src/test/java/org/ search/trunk/src/test/resources/ Removed: search/trunk/build.properties.dist search/trunk/build.xml search/trunk/common-build.xml search/trunk/ivy.xml search/trunk/ivy/ search/trunk/jdbc/ search/trunk/src/assembly/ search/trunk/src/java/ search/trunk/src/test-resources/ search/trunk/src/test/org/ Modified: search/trunk/pom.xml search/trunk/src/main/java/org/hibernate/search/analyzer/Discriminator.java search/trunk/src/main/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java search/trunk/src/main/java/org/hibernate/search/impl/InitContext.java search/trunk/src/main/java/org/hibernate/search/reader/CacheableMultiReader.java search/trunk/src/main/java/org/hibernate/search/util/LoggerFactory.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/Article.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/BlogEntry.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/LanguageDiscriminator.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/BaseClass.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/SubClass.java search/trunk/src/test/java/org/hibernate/search/test/embedded/Country.java search/trunk/src/test/java/org/hibernate/search/test/embedded/Person.java search/trunk/src/test/java/org/hibernate/search/test/optimizer/OptimizerTestCase.java search/trunk/src/test/java/org/hibernate/search/test/session/OptimizeTest.java search/trunk/src/test/java/org/hibernate/search/test/shards/ShardsTest.java search/trunk/src/test/java/org/hibernate/search/test/similarity/DummySimilarity.java search/trunk/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java search/trunk/src/test/java/org/hibernate/search/test/similarity/Trash.java Log: HSEARCH-82 moved sources and resources into default maven location, removed obsolete ant files Deleted: search/trunk/build.properties.dist =================================================================== --- search/trunk/build.properties.dist 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/build.properties.dist 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,6 +0,0 @@ -common.dir=. -src.dir=src -test.dir=test -filter.dir=filters -testresources.dir=test-resources -test.resources.dir=test-resources \ No newline at end of file Deleted: search/trunk/build.xml =================================================================== --- search/trunk/build.xml 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/build.xml 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,352 +0,0 @@ -<!-- $Id$ --> -<!-- - - Hibernate Search ANT build script. - - You need JDK 5.0 installed to build Hibernate Search. - ---> - -<project name="Hibernate Search" default="dist" basedir="." - 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"/> - - <!-- Name of project and version, used to create filenames --> - <property name="Name" value="Hibernate Search"/> - <property name="name" value="hibernate-search"/> - <property name="version" value="3.1.0.GA"/> - <property name="javadoc.packagenames" value="org.hibernate.search.*"/> - <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="ivy.dep.dir" value="${basedir}/build/lib"/> - - <!-- ivy load --> - <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"/> - - <import file="common-build.xml"/> - - <property name="build.testresources.dir" value="${build.dir}/testresources"/> - <property name="testresources.dir" value="${basedir}/src/test-resources"/> - - - <path id="lib.class.path.required" description="Compile and runtime libraries. Required jars only."> - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - <exclude name="xml-apis.jar"/> - <exclude name="xerces*.jar"/> - <exclude name="solr*.jar"/> - <exclude name="ejb3-persistence.jar"/> - </fileset> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - </path> - - <path id="lib.class.path.optional" description="Compile and runtime libraries. Optional jars only."> - <fileset dir="${ivy.dep.dir}/core"> - <include name="solr*.jar"/> - <include name="ejb3-persistence.jar"/> - </fileset> - </path> - - <path id="lib.class.path" description="Compile and runtime libraries."> - <path refid="lib.class.path.required"/> - <path refid="lib.class.path.optional"/> - </path> - - <path id="junit.moduleclasspath.required" description="Test classes. Optional jars excluded."> - <fileset dir="${lib.dir}/test"> - <include name="*.jar"/> - </fileset> - <pathelement location="${src.dir}"/> - <pathelement location="${test.dir}"/> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - <exclude name="annotations.jar"/> - </fileset> - <fileset dir="${jdbc.dir}"> - <include name="*.jar"/> - <include name="*.zip"/> - </fileset> - </path> - - <path id="junit.moduleclasspath.optional" description="Optional test jars."> - <fileset dir="${ivy.dep.dir}/test"> - <include name="annotations.jar"/> - </fileset> - </path> - - <path id="junit.classpath.required.only" - description="Classpath containing all compile and test classes excluding the optional ones, eg Annotations, Solr, JPA"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${classes.dir}"/> - <pathelement path="${testclasses.dir}"/> - <path refid="junit.moduleclasspath.required"/> - <path refid="lib.class.path.required"/> - </path> - - <path id="junit.classpath" - description="Classpath containing all compile and test classes including the optional ones"> - <path refid="junit.classpath.required.only"/> - <path refid="junit.moduleclasspath.optional"/> - <path refid="lib.class.path.optional"/> - </path> - - <target name="init"> - <antcall target="common-build.init"/> - <tstamp> - <format property="now" pattern="yyyyMMddhhmmss"/> - </tstamp> - <mkdir dir="${ivy.dep.dir}/core"/> - <mkdir dir="${ivy.dep.dir}/test"/> - <ivy:configure file="${ivy.jar.dir}/ivyconf.xml"/> - <mkdir dir="${lib.dir}/test"/> - <mkdir dir="${build.testresources.dir}"/> - </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="compile" depends="init,get.deps.core" 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 - srcdir="${src.dir}" - destdir="${classes.dir}" - classpathref="lib.class.path" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on" - source="${javac.source}" - target="${javac.target}"> - <src path="${src.dir}"/> - </javac> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/resources/*.properties"/> - <include name="**/*.xsd"/> - </fileset> - </copy> - </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="${javac.source}" - target="${javac.target}"> - <src refid="testsrc.path"/> - </javac> - </target> - - <target name="prepare-test-resources" depends="compiletest"> - <copy todir="${build.testresources.dir}"> - <fileset dir="${testresources.dir}"> - <include name="**/*.*"/> - <exclude name="hibernate.properties"/> - </fileset> - </copy> - </target> - - <target name="junit" depends="compiletest, prepare-test-resources"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${testreports.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <junit forkmode="perBatch" printsummary="yes" haltonfailure="yes"> - <classpath> - <path path="${build.testresources.dir}"/> - <path refid="junit.classpath"/> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - </classpath> - <sysproperty key="build.dir" value="${build.dir}"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="${testreports.dir}/@{db}" haltonfailure="no"> - <fileset dir="${testclasses.dir}"> - <include name="**/*Test.class"/> - <exclude name="**/classloading/**"/> - </fileset> - </batchtest> - </junit> - <junit forkmode="perBatch" printsummary="yes" haltonfailure="yes"> - <classpath> - <path path="${build.testresources.dir}"/> - <path refid="junit.classpath.required.only"/> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - </classpath> - <sysproperty key="build.dir" value="${build.dir}"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="${testreports.dir}/@{db}" haltonfailure="no"> - <fileset dir="${testclasses.dir}"> - <include name="**/classloading/**/*Test.class"/> - </fileset> - </batchtest> - </junit> - </sequential> - </for> - </target> - - <!-- Run a single unit test. --> - <target name="junitsingle" depends="compiletest" - description="Run a single test suite (requires testname and jdbc.driver properties)"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${testreports.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> - <classpath> - <path path="${build.testresources.dir}"/> - <path refid="junit.classpath"/> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - </classpath> - <sysproperty key="build.dir" value="${build.dir}"/> - <formatter type="plain"/> - <formatter type="xml"/> - <test fork="yes" todir="${testreports.dir}/@{db}" haltonfailure="no" name="${testname}"/> - </junit> - </sequential> - </for> - </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}"/> - <attribute name="Implementation-Vendor" value="hibernate.org"/> - <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> - <attribute name="Implementation-URL" value="http://search.hibernate.org"/> - </manifest> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jar.file.name}" - basedir="${classes.dir}"/> - </target> - - <!-- Some of this can probably be moved to common-build... --> - <target name="dist" depends="get.deps.core,get.deps.test,jar,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="**/*.*"/> - <exclude name="en/master.xml"/> - </fileset> - </copy> - - <copy todir="${dist.dir}" failonerror="false"> - <fileset dir="${basedir}"> - <include name="common-build.xml"/> - </fileset> - </copy> - - <copy todir="${dist.dir}/test-resources" failonerror="false"> - <fileset dir="${testresources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <copy todir="${dist.dir}/ivy" failonerror="false"> - <fileset dir="${ivy.jar.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - - <!-- copy dependencies --> - <copy todir="${dist.lib.dir}" failonerror="false"> - <!-- 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"> - <include name="*.jar"/> - </fileset> - </copy> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset file="${lib.dir}/test/*.jar"/> - </copy> - - <mkdir dir="${dist.lib.dir}/build"/> - <copy todir="${dist.lib.dir}/build" failonerror="false"> - <fileset file="${lib.dir}/build/*.jar"/> - </copy> - - <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation --> - <move file="${dist.lib.dir}/commons-annotations.jar" tofile="${dist.lib.dir}/hibernate-commons-annotations.jar" - failonerror="false"/> - <move file="${dist.lib.dir}/test/commons-annotations.jar" - tofile="${dist.lib.dir}/test/hibernate-commons-annotations.jar" - failonerror="false"/> - <move file="${dist.lib.dir}/test/annotations.jar" tofile="${dist.lib.dir}/test/hibernate-annotations.jar" - failonerror="false"/> - <move file="${dist.lib.dir}/test/entitymanager.jar" tofile="${dist.lib.dir}/test/hibernate-entitymanager.jar" - failonerror="false"/> - - - <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> - </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> -</project> Deleted: search/trunk/common-build.xml =================================================================== --- search/trunk/common-build.xml 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/common-build.xml 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,420 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="common-build" default="dist" - xmlns:artifact="urn:maven-artifact-ant" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> - <description>Common properties and targets for the HibernateExt - project</description> - - - <!-- my.basedir property can be used to refer to files/directories relatively to the common-build.xml file --> - <dirname property="common-build.basedir" file="${ant.file.common-build}"/> - - <!-- Give user a chance to override without editing this file - (and without typing -D each time it compiles it) --> - <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="test.resources.dir" location="src/test-resources"/> - <property name="filter.dir" location="src/filters"/> - <property name="lib.dir" location="lib"/> - <property name="build.dir" location="build"/> - <property name="classes.dir" location="${build.dir}/classes"/> - <property name="testclasses.dir" location="${build.dir}/testclasses"/> - <property name="testreports.dir" location="${build.dir}/test-reports"/> - <property name="dist.target.dir" location="target"/> - <property name="dist.dir" location="${dist.target.dir}/${name}"/> - <property name="instrumenttest.out.dir" value="${build.dir}/test-reports/instrument"/> - <property name="doc.dir" location="doc"/> - <property name="doc.api.dir" location="${doc.dir}/api"/> - <property name="doc.reference.dir" location="${doc.dir}/reference"/> - - <property name="dist.doc.dir" location="${dist.dir}/doc"/> - <property name="dist.api.dir" location="${dist.dir}/doc/api"/> - - <property name="dist.src.dir" location="${dist.dir}/src"/> - <property name="dist.test.dir" location="${dist.dir}/test"/> - <property name="dist.lib.dir" location="${dist.dir}/lib"/> - <property name="dist.filter.dir" location="${dist.dir}/filters"/> - <property name="jar.name" value="${name}"/> - <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.debug" value="on"/> - <property name="javac.optimize" value="off"/> - <property name="javac.source" value="1.4"/> - <property name="javac.target" value="1.4"/> - - <property name="pom.file" value="pom.xml"/> - <property name="src.jar" value="${build.dir}/src.jar"/> - - <taskdef name="junit" - classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> - <!-- ${build.lib.dir} fails in reference doc build --> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef name="junitreport" - classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> - <!-- ${build.lib.dir} fails in reference doc build --> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> - <!-- ${build.lib.dir} fails in reference doc build --> - <include name="ant-contrib-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <!-- ivy load --> - <property name="ivy.jar.dir" value="${common-build.basedir}/ivy"/> - <property name="ivy.conf.dir" value="${common-build.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"/> - - <!-- maven task load --> - <path id="maven-ant-tasks.path" path="${ivy.jar.dir}/maven-ant-tasks.jar"/> - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" - uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.path"/> - - <artifact:remoteRepository id="offline.repository.jboss.org" - url="file://${offline.repository.jboss.org}"/> - - <path id="lib.class.path"> - <path refid="lib.moduleclass.path"/> - </path> - - <!-- overridable in modules --> - <path id="lib.moduleclass.path"/> - - <patternset id="support.files"> - <include name="**/*.jpg"/> - <include name="**/*.gif"/> - <include name="**/*.dtd"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - <include name="**/*.xslt"/> - - <!-- exclude everything we don't want in the jar --> - <exclude name="${build.dir}/**/*"/> - <exclude name="${doc.dir}/**/*"/> - <exclude name="classes/**/*"/> - <exclude name="build.xml"/> - <exclude name="**/*.properties"/> - <exclude name="**/*.ccf"/> - <exclude name="**/*.cfg.xml"/> - <exclude name="**/ehcache.xml"/> - </patternset> - - <patternset id="source.files"> - <include name="**/*.java"/> - <include name="**/*.properties"/> - </patternset> - - <!-- junit paths/filesets --> - <fileset dir="${testclasses.dir}" id="junit.batchtestset"> - <include name="**/*Test.class"/> - </fileset> - - <path id="testsrc.path"> - <pathelement location="${test.dir}"/> - </path> - - <!-- Determine the database against which to run tests--> - <if> - <equals arg1="${targetdb}" arg2="$${targetdb}"/> - <then> - <echo message="No target database specified using default HSQLDB"/> - <property name="targetdb" value="hsqldb"/> - </then> - </if> - - - <!-- Tasks --> - <target name="clean" description="Cleans up build and dist directories"> - <delete dir="${build.dir}"/> - <delete dir="${dist.target.dir}"/> - </target> - - <target name="init" description="Initialize the build"> - <tstamp> - <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> - </tstamp> - <echo message="Build ${Name}-${version} (${subversion})"/> - <mkdir dir="${classes.dir}"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - - <copy todir="${build.dir}"> - <fileset dir="."> - <include name="readme.txt"/> - <include name="lgpl.txt"/> - </fileset> - </copy> - </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.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="copytest" description="Copy tests to dist dir" if="copy.test"> - <mkdir dir="${dist.test.dir}"/> - <copy todir="${dist.test.dir}"> - <fileset dir="${test.dir}"/> - </copy> - <mkdir dir="${dist.filter.dir}"/> - <copy todir="${dist.filter.dir}"> - <fileset dir="${filter.dir}"/> - </copy> - </target> - - <target name="copysource" depends="copytest" - description="Copy sources to dist dir"> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - </target> - - <target name="copylib" description="Copy jars to lib dir"> - <mkdir dir="${dist.lib.dir}"/> - <copy todir="${dist.lib.dir}" verbose="true"> - <fileset dir="${lib.dir}"> - <include name="**/*.jar"/> - <exclude name="log4j.jar"/> - <exclude name="checkstyle*.jar"/> - <include name="*.txt"/> - </fileset> - </copy> - </target> - - <target name="copydoc" description="Copy doc to dist dir" if="copy.doc"> - <mkdir dir="${dist.doc.dir}"/> - <copy todir="${dist.doc.dir}"> - <fileset dir="${doc.dir}"> - <include name="**/*.html"/> - </fileset> - </copy> - </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}"/> - </target> - - <!-- DOCUMENTATION --> - - <target name="javadoc" - description="Compile the Javadoc API documentation to dist dir"> - <mkdir dir="${dist.api.dir}"/> - <javadoc packagenames="${javadoc.packagenames}" - classpathref="lib.class.path" destdir="${dist.api.dir}" use="true" - protected="true" version="true" - windowtitle="${Name} API Documentation" - Overview="${doc.api.dir}/package.html" - doctitle="${Name} API Documentation" - stylesheetfile="${doc.api.dir}/jdstyle.css" link="${javadoc}"> - <packageset dir="${src.dir}" defaultexcludes="yes"> - <include name="**/*"/> - </packageset> - <link href="http://lucene.apache.org/java/2_4_0/api"/> - </javadoc> - </target> - - <target name="extras" description="Copies miscellaneous files to root dir"> - <copy file="readme.txt" todir="${dist.dir}"/> - <copy file="lgpl.txt" todir="${dist.dir}"/> - <copy file="changelog.txt" todir="${dist.dir}"/> - <copy file="build.xml" todir="${dist.dir}"/> - <copy file="ivy.xml" todir="${dist.dir}"/> - <copy todir="${dist.dir}/jdbc"> - <fileset dir="jdbc"/> - </copy> - <replace file="${dist.dir}/build.xml"> - <replacetoken><![CDATA[../${name}-${version}]]> - </replacetoken> - <replacevalue><![CDATA[../${name}]]> - </replacevalue> - </replace> - </target> - - <target name="dist" depends="jar,javadoc,copysource,copydoc,extras" - description="Build everything"> - <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="info" description="Echoes useful system properties"> - <echo message="java.vm.info=${java.vm.info}"/> - <echo message="java.vm.name=${java.vm.name}"/> - <echo message="java.vm.vendor=${java.vm.vendor}"/> - <echo message="java.vm.version=${java.vm.version}"/> - <echo message="os.arch=${os.arch}"/> - <echo message="os.name=${os.name}"/> - <echo message="os.version=${os.version}"/> - <echo message="java.home = ${java.home}"/> - <echo message="java.class.path = ${java.class.path}"/> - <echo message="build.compiler = ${build.compiler}"/> - <echo message="file.encoding=${file.encoding}"/> - <echo message="user.home = ${user.home}"/> - <echo message="user.language=${user.language}"/> - </target> - - <target name="test-resources" description="Copies and filters test resources"> - <filter filtersfile="${filter.dir}/${db}.filter"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${testclasses.dir}" filtering="true" overwrite="true"> - <fileset dir="${test.resources.dir}"> - <include name="*.properties"/> - <include name="*.xml"/> - </fileset> - </copy> - </target> - - <target name="instrument" depends="compiletest" - description="Instrument the persistent classes"> <!-- depends="jar" --> - - <taskdef name="instrument" - classname="org.hibernate.tool.instrument.javassist.InstrumentTask"> - <classpath refid="junit.classpath"/> - </taskdef> - - <instrument verbose="true"> - <fileset dir="${testclasses.dir}/org/hibernate/test"> - <include name="**/*.class"/> - <exclude name="**/*Test$*.class"/> - <exclude name="**/*Test.class"/> - <exclude name="**/*Tests.class"/> - </fileset> - </instrument> - </target> - - <target name="junitinstrument" depends="compiletest,instrument" - description="Run the instrument test suite"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${instrumenttest.out.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <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}/@{db}" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </sequential> - </for> - </target> - - <target name="junitreport"> - <junitreport todir="${testreports.dir}"> - <fileset dir="${testreports.dir}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${testreports.dir}"/> - </junitreport> - </target> - - <target name="checkstyle" description="Check coding style"> - <taskdef resource="checkstyletask.properties"> - <classpath> - <path refid="lib.class.path"/> - <fileset dir="${common-build.basedir}/lib"> - <include name="checkstyle*.jar"/> - </fileset> - </classpath> - </taskdef> - - <checkstyle config="${common-build.basedir}/checkstyle_checks.xml"> - <fileset dir="${src.dir}"> - <include name="**/*.java"/> - </fileset> - <formatter type="plain"/> - </checkstyle> - </target> - - <target name="patch" depends="checkstyle" description="Create a patch"> - <cvs command="-q diff -u -N" output="patch.txt"/> - </target> - - <!-- maven deploy: to be used by the subbuild and delcare deps on jar --> - <target name="deploy" depends="jar"> - <fail unless="offline.repository.jboss.org" - message="offline.repository.jboss.org must be defined"/> - <jar jarfile="${src.jar}" basedir="${src.dir}"> - <include name="**/*.java"/> - <exclude name="**/test/*.java"/> - <!-- patternset refid="meta.files" / --> - </jar> - - <artifact:pom id="maven.project" file="${pom.file}"/> - - <artifact:install file="${jar.file.name}"> - <pom refid="maven.project"/> - </artifact:install> - - <artifact:deploy file="${jar.file.name}"> - <pom refid="maven.project"/> - <remoteRepository refId="offline.repository.jboss.org"> - </remoteRepository> - <attach file="${src.jar}" classifier="sources"/> - <attach file="${jar.file.name}" classifier=""/> - </artifact:deploy> - </target> - -</project> \ No newline at end of file Deleted: search/trunk/ivy.xml =================================================================== --- search/trunk/ivy.xml 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/ivy.xml 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="1.3" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= - "http://www.jayasoft.org/misc/ivy/ivy.xsd"> - <info organisation="org.hibernate" module="search"/> - <configurations> - <conf name="default" description="Core module dependencies"/> - <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> - </configurations> - <publications> - <artifact name="hibernate-search" conf="default"/> - </publications> - <dependencies> - - <!-- compile time dependencies --> - <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/> - <dependency name="commons-annotations" rev="3.1.0.GA" conf="default->default"/> - <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> - <dependency org="org.hibernate" name="hibernate-core" rev="3.3.1.GA" conf="default->default"/> - <dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/> - <dependency org="org.apache.lucene" name="lucene-core" rev="2.4.0" conf="default->default"/> - <dependency org="javax.jms" name="jms" rev="1.1" conf="default->default"/> <!-- optional --> - <dependency org="javax.annotation" name="jsr250-api" rev="1.0" conf="default->default"/> <!-- optional --> - <dependency org="org.apache.solr" name="solr-core" rev="1.3.0" conf="default->default"/> <!-- optional --> - <dependency org="org.apache.solr" name="solr-common" rev="1.3.0" conf="default->default"/> <!-- optional --> - - <!-- transitive dependencies --> - <dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/> - <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="test->default"/> - <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="test->default"/> - - <!-- test deps --> - <dependency name="annotations" rev="3.4.0.GA" conf="test->default"/> - <dependency name="entitymanager" rev="3.4.0.GA" conf="test->default"/> - <dependency org="org.apache.lucene" name="lucene-snowball" rev="2.4.0" conf="test->default"/> - <dependency org="org.apache.lucene" name="lucene-analyzers" rev="2.4.0" conf="test->default"/> - <dependency org="org.apache.commons" name="commons-codec" rev="1.3" conf="test->default"/> - <dependency org="org.apache.commons" name="commons-io" rev="1.3.2" conf="test->default"/> - <dependency org="javassist" name="javassist" rev="3.4.GA" conf="test->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"/> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/> - <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/> - <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/> - <dependency org="hsqldb" name="hsqldb" rev="1.8.0.2" conf="test->default"/> - <dependency org="postgresql" name="postgresql" rev="8.3-603.jdbc3" conf="test->default"/> - <dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="test->default"/> - <dependency org="org.apache.derby" name="derby" rev="10.2.1.6" conf="test->default"/> - <dependency org="org.apache.activemq" name="activemq-all" rev="5.2.0" conf="test->default"/> - - </dependencies> -</ivy-module> Modified: search/trunk/pom.xml =================================================================== --- search/trunk/pom.xml 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/pom.xml 2009-03-25 10:07:47 UTC (rev 16210) @@ -24,7 +24,32 @@ <url>http://www.hibernate.org</url> </organization> + <licenses> + <license> + <name>LGPL</name> + <url>lgpl.txt</url> + </license> + </licenses> + <developers> + <developer> + <id>epbernard</id> + <name>Emmanuel Bernard</name> + <email&gt;emmanuel(a)hibernate.org&lt;/email&gt; + <url>http://in.relation.to/Bloggers/Emmanuel</url> + </developer> + <developer> + <id>hardy.ferentschik</id> + <name>Hardy Ferentschik</name> + <url>http://in.relation.to/Bloggers/Hardy</url> + </developer> + </developers> + <contributors> + <contributor> + <name>Sanne Grinovero</name> + </contributor> + </contributors> + <dependencies> <!-- =============================== --> <!-- Required Dependencies --> @@ -90,8 +115,6 @@ </dependencies> <build> - <sourceDirectory>./src/java</sourceDirectory> - <testSourceDirectory>./src/test</testSourceDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -108,16 +131,103 @@ <forkMode>pertest</forkMode> <redirectTestOutputToFile>true</redirectTestOutputToFile> <systemProperties> - <property> - <name>build.dir</name> - <value>${basedir}/target</value> - </property> + <property> + <name>build.dir</name> + <value>${basedir}/target</value> + </property> </systemProperties> <excludes> <exclude>**/*.java</exclude> </excludes> </configuration> </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.0</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>1.0.2</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/doc/reference/en</sourceDirectory> + <masterTranslation>en-US</masterTranslation> + <imageResource> + <directory>${basedir}/doc/reference/en/images</directory> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> + <finalName>hibernate-validator-legacy-guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>true</useRelativeImageUris> + </options> + </configuration> + <executions> + <execution> + <id>make-doc</id> + <phase>site</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <stylesheetfile>${basedir}/doc/api/jdstyle.css</stylesheetfile> + </configuration> + <executions> + <execution> + <id>make-javadoc</id> + <phase>package</phase> + <goals> + <goal>javadoc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <releaseProfiles>release</releaseProfiles> + <goals>package site assembly:assembly</goals> + </configuration> + </plugin> </plugins> <filters> <filter>${filter.file}</filter> @@ -125,7 +235,7 @@ <testResources> <testResource> <filtering>true</filtering> - <directory>src/test-resources</directory> + <directory>src/test/resources</directory> <includes> <include>**/*.properties</include> <include>**/*.xml</include> @@ -168,7 +278,7 @@ <filter.file>src/filters/postgresql.filter</filter.file> </properties> </profile> - <profile> + <profile> <id>mysql</id> <dependencies> <dependency> @@ -302,92 +412,5 @@ </plugins> </build> </profile> - <profile> - <id>dist-build</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/assembly/dist.xml</descriptor> - </descriptors> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <stylesheetfile>${basedir}/doc/api/jdstyle.css</stylesheetfile> - </configuration> - <executions> - <execution> - <id>make-javadoc</id> - <phase>package</phase> - <goals> - <goal>javadoc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.0</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>1.0.2</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/doc/reference/en</sourceDirectory> - <masterTranslation>en-US</masterTranslation> - <imageResource> - <directory>${basedir}/doc/reference/en/images</directory> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> - <finalName>hibernate-validator-legacy-guide.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>true</useRelativeImageUris> - </options> - </configuration> - <executions> - <execution> - <id>make-doc</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Copied: search/trunk/src/main/assembly (from rev 16209, search/trunk/src/assembly) Property changes on: search/trunk/src/main/assembly ___________________________________________________________________ Name: svn:mergeinfo + Copied: search/trunk/src/main/java (from rev 16209, search/trunk/src/java) Property changes on: search/trunk/src/main/java ___________________________________________________________________ Name: svn:mergeinfo + Modified: search/trunk/src/main/java/org/hibernate/search/analyzer/Discriminator.java =================================================================== --- search/trunk/src/java/org/hibernate/search/analyzer/Discriminator.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/main/java/org/hibernate/search/analyzer/Discriminator.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.analyzer; /** Modified: search/trunk/src/main/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/main/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.annotations; import java.lang.annotation.Retention; Modified: search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java =================================================================== --- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -5,11 +5,11 @@ import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.Set; -import java.util.HashSet; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; @@ -146,11 +146,9 @@ protected void init(XClass clazz, InitContext context) { super.init( clazz, context ); - //if composite id, use of (a, b) in ((1,2)TwoWayString2FieldBridgeAdaptor, (3,4)) fails on most database + //if composite id, use of (a, b) in ((1,2),(3,4)) fails on most database //a TwoWayString2FieldBridgeAdaptor is never a composite id - safeFromTupleId = entityState != EntityState.INDEXED || TwoWayString2FieldBridgeAdaptor.class.isAssignableFrom( - idBridge.getClass() - ); + safeFromTupleId = TwoWayString2FieldBridgeAdaptor.class.isAssignableFrom( idBridge.getClass() ); checkAllowFieldSelection(); if ( log.isDebugEnabled() ) { Modified: search/trunk/src/main/java/org/hibernate/search/impl/InitContext.java =================================================================== --- search/trunk/src/java/org/hibernate/search/impl/InitContext.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/main/java/org/hibernate/search/impl/InitContext.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.impl; import java.util.ArrayList; Modified: search/trunk/src/main/java/org/hibernate/search/reader/CacheableMultiReader.java =================================================================== --- search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/main/java/org/hibernate/search/reader/CacheableMultiReader.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.reader; import java.io.IOException; Modified: search/trunk/src/main/java/org/hibernate/search/util/LoggerFactory.java =================================================================== --- search/trunk/src/java/org/hibernate/search/util/LoggerFactory.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/main/java/org/hibernate/search/util/LoggerFactory.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors Copied: search/trunk/src/test/java/org (from rev 16209, search/trunk/src/test/org) Property changes on: search/trunk/src/test/java/org ___________________________________________________________________ Name: svn:mergeinfo + Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/Article.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/analyzer/Article.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/Article.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.analyzer; import java.util.Set; Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/BlogEntry.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/analyzer/BlogEntry.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/BlogEntry.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.analyzer; import java.util.Set; Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/LanguageDiscriminator.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/analyzer/LanguageDiscriminator.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/LanguageDiscriminator.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.analyzer; import org.hibernate.search.analyzer.Discriminator; Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/BaseClass.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/analyzer/inheritance/BaseClass.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/BaseClass.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/SubClass.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/analyzer/inheritance/SubClass.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/inheritance/SubClass.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/Country.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/embedded/Country.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/embedded/Country.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.embedded; import java.util.ArrayList; Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/Person.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/embedded/Person.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/embedded/Person.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.embedded; /** Modified: search/trunk/src/test/java/org/hibernate/search/test/optimizer/OptimizerTestCase.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/optimizer/OptimizerTestCase.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/optimizer/OptimizerTestCase.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.optimizer; import java.io.File; Modified: search/trunk/src/test/java/org/hibernate/search/test/session/OptimizeTest.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/session/OptimizeTest.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/session/OptimizeTest.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.session; import java.io.File; Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/ShardsTest.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/shards/ShardsTest.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/shards/ShardsTest.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.shards; import java.io.File; Modified: search/trunk/src/test/java/org/hibernate/search/test/similarity/DummySimilarity.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/similarity/DummySimilarity.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.similarity; import org.apache.lucene.search.DefaultSimilarity; Modified: search/trunk/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/SimilarityTest.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.similarity; import java.util.List; Modified: search/trunk/src/test/java/org/hibernate/search/test/similarity/Trash.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/Trash.java 2009-03-24 18:19:27 UTC (rev 16209) +++ search/trunk/src/test/java/org/hibernate/search/test/similarity/Trash.java 2009-03-25 10:07:47 UTC (rev 16210) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.search.test.similarity; import javax.persistence.Id; Copied: search/trunk/src/test/resources (from rev 16209, search/trunk/src/test-resources) Property changes on: search/trunk/src/test/resources ___________________________________________________________________ Name: svn:mergeinfo +