[hibernate-commits] Hibernate SVN: r15428 - in core/trunk: annotations and 15 other directories.

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 17:41:58 -0400 (Tue, 28 Oct 2008) New Revision: 15428 Added: core/trunk/annotations/src/main/javadoc/ Removed: core/trunk/annotations/.cvsignore core/trunk/annotations/build.properties.dist core/trunk/annotations/build.xml core/trunk/annotations/common-build.xml core/trunk/annotations/doc/api/ core/trunk/annotations/ivy.xml core/trunk/annotations/lgpl.txt core/trunk/annotations/src/filters/ Modified: core/trunk/annotations/ core/trunk/annotations/pom.xml core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java core/trunk/annotations/src/test/resources/hibernate.properties core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java core/trunk/envers/pom.xml core/trunk/pom.xml Log: HHH-3550 : import annotations into core Property changes on: core/trunk/annotations ___________________________________________________________________ Name: svn:ignore - target build .* + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover .* Deleted: core/trunk/annotations/.cvsignore =================================================================== --- core/trunk/annotations/.cvsignore 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/.cvsignore 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,9 +0,0 @@ -target -build -build.properties -test_output -testout -common-build.xml -javadoc.bat -build.properties -instrumenttestout Deleted: core/trunk/annotations/build.properties.dist =================================================================== --- core/trunk/annotations/build.properties.dist 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/build.properties.dist 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +0,0 @@ -common.dir=. -src.dir=src -test.dir=test Deleted: core/trunk/annotations/build.xml =================================================================== --- core/trunk/annotations/build.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/build.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,232 +0,0 @@ -<!-- - - Hibernate Annotations ANT build script. - - You need JDK 5.0 installed to build Hibernate Annotations. - ---> - -<project name="Hibernate Annotations" 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 Annotations"/> - <property name="name" value="hibernate-annotations"/> - <property name="version" value="3.4.0.GA"/> - <property name="javadoc.packagenames" value="org.hibernate.*"/> - <property name="jdbc.dir" value="jdbc"/> - <property name="copy.test" value="true"/> - <property name="javac.source" value="1.5"/> - <property name="javac.target" value="1.5"/> - <property name="common.dir" value="${basedir}"/> - <property name="ivy.dep.dir" value="${basedir}/build/lib"/> - - <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/> - <property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/> - - <import file="${common.dir}/common-build.xml"/> - - <path id="lib.moduleclass.path"> - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - <fileset dir="${common-build.basedir}/lib/build"> - <!-- ${build.lib.dir} fails in reference doc build --> - <include name="junitext-*.jar"/> - </fileset> - </path> - - <path id="junit.moduleclasspath"> - <pathelement location="${src.dir}"/> - <pathelement location="${test.dir}"/> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </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"/> - </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="compiletest" depends="compile,get.deps.test" - 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="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://annotations.hibernate.org"/> - <attribute name="Specification-Title" value="Java Persistence"/> - <attribute name="Specification-Version" value="1.0"/> - <attribute name="Specification-Vendor" value="jcp.org"/> - </manifest> - <antcall target="common-build.jar"/> - <delete file="${dist.dir}/ivy.xml"/> - <!-- delete last produced ivy file to be sure a new one will be generated --> - <ivy:resolve conf="default"/> - <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" - resolver="local" pubrevision="latest" pubdate="${now}" - status="integration"/> - </target> - - <target name="junit" depends="compiletest"> - <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" haltonfailure="yes" forkmode="once"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="${testreports.dir}/@{db}" - haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </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 refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <test fork="yes" todir="${testreports.dir}/@{db}" - haltonfailure="no" name="${testname}"/> - </junit> - </sequential> - </for> - </target> - - <target name="jpa-javadoc" if="jpa-present"> - <mkdir dir="${jpa-javadoc.dir}"/> - <ant dir="../jpa-api" target="javadoc" inheritAll="false"/> - <copy todir="${jpa-javadoc.dir}"> - <fileset dir="${basedir}/../jpa-api/build/api"> - <include name="**/*.*"/> - </fileset> - </copy> - </target> - - <!-- Some of this can probably be moved to common-build... --> - <target name="dist" - depends="get.deps.core,get.deps.test,jar,javadoc,jpa-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> - - <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="**/*.*"/> - </fileset> - </copy> - - <!-- copy dependencies --> - <copy todir="${dist.lib.dir}" failonerror="false"> - <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> - - - <!-- 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"/> - - <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: core/trunk/annotations/common-build.xml =================================================================== --- core/trunk/annotations/common-build.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/common-build.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,455 +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="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="${build.dir}/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"/> - <pathelement path="${clover.jar}"/> - </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> - - <path id="junit.classpath"> - <pathelement path="${classes.dir}"/> - <pathelement path="${testclasses.dir}"/> - <path refid="lib.class.path"/> - <path refid="junit.moduleclasspath"/> - <path location="${clover.jar}"/> - </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> - - <!-- Clover tasks --> - <target name="with.clover"> - <clover-setup initString="clover_coverage.db"/> - </target> - - <target name="cloverreport.html" depends="with.clover" - description="Generate a clover report from the current clover database."> - <clover-report> - <current outfile="${clover.out.dir}"> - <format type="html"/> - </current> - </clover-report> - </target> - - <target name="cloverreport" - depends="with.clover,junitreport,cloverreport.html" - description="Run the tests and generate a clover report"> - </target> - - <!-- Tasks --> - <target name="clean" description="Cleans up build and dist directories"> - <delete dir="${build.dir}"/> - <delete dir="${dist.target.dir}"/> - <delete dir="${clover.out.dir}"/> - </target> - - <target name="init" description="Initialize the build"> - <tstamp> - <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> - </tstamp> - <tstamp> - <format property="releasedate" pattern="dd-MM-yyyy"/> - </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> - <filter token="version" value="${version}"/> - <filter token="releasedate" value="${releasedate}"/> - <copy todir="${build.dir}" filtering="true"> - <fileset dir="."> - <include name="readme.txt"/> - <include name="lgpl.txt"/> - <include name="pom.xml"/> - </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> - </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="jar" depends="compile" - description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jar.file.name}" - basedir="${classes.dir}"/> - </target> - - <target name="jartest" depends="compiletest" - description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jartest.file.name}" - basedir="${testclasses.dir}"/> - </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> - </javadoc> - </target> - - <target name="extras" description="Copies miscellaneous files to root dir"> - <copy todir="${dist.dir}/bin" failonerror="false"> - <fileset dir="bin"> - <include name="*.bat"/> - </fileset> - </copy> - <copy file="${build.dir}/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}"/> - <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" depends=""> - <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: core/trunk/annotations/ivy.xml =================================================================== --- core/trunk/annotations/ivy.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/ivy.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,39 +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="annotations"/> - <configurations> - <conf name="default" description="Core module dependencies"/> - <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> - </configurations> - <publications> - <artifact name="hibernate-annotations" 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.hibernate" name="hibernate-core" rev="3.3.0.SP1" conf="default->default"/> - <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/> - <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> - - - <!-- 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"/> - - <!-- test deps --> - <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="javax.transaction" name="jta" rev="1.1" 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"/> - </dependencies> -</ivy-module> \ No newline at end of file Deleted: core/trunk/annotations/lgpl.txt =================================================================== --- core/trunk/annotations/lgpl.txt 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/lgpl.txt 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Modified: core/trunk/annotations/pom.xml =================================================================== --- core/trunk/annotations/pom.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/pom.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,52 +1,364 @@ <?xml version="1.0"?> -<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-annotations</artifactId> - <packaging>jar</packaging> - <version>@version@</version> +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + ~ indicated by the @author tags or express copyright attribution + ~ statements applied by the authors. All third-party contributions are + ~ distributed under license by Red Hat Middleware LLC. + ~ + ~ This copyrighted material is made available to anyone wishing to use, modify, + ~ copy, or redistribute it subject to the terms and conditions of the GNU + ~ Lesser General Public License, as published by the Free Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public License + ~ along with this distribution; if not, write to: + ~ Free Software Foundation, Inc. + ~ 51 Franklin Street, Fifth Floor + ~ Boston, MA 02110-1301 USA + --> +<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/xsd/maven-4.0.0.xsd"> - <name>Hibernate Annotations</name> - <description>Annotations metadata for Hibernate</description> - <url>http://annotations.hibernate.org</url> + <modelVersion>4.0.0</modelVersion> - <licenses> - <license> - <name>GNU LESSER GENERAL PUBLIC LICENSE</name> - <url>http://www.gnu.org/licenses/lgpl.txt</url> - </license> - </licenses> + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.4.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> - </dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <packaging>jar</packaging> + + <name>Hibernate Annotations</name> + <description>Annotations metadata for Hibernate</description> + + <!-- Annotations and Commons-Annotations both use the ANN JIRA key --> + <issueManagement> + <system>jira</system> + <url>http://opensource.atlassian.com/projects/hibernate/browse/ANN</... + </issueManagement> + + <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.1.0.GA</version> - </dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.0.SP1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.4.2</version> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> </dependencies> -</project> \ No newline at end of file + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <testResources> + <testResource> + <filtering>false</filtering> + <directory>src/test/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-test-ext-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <goals> + <goal>extend</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + + <profiles> + <!-- HSQLDB is the default (eventually move to H2) --> + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> + <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> + <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The H2 test envionment --> + <profile> + <id>h2</id> + <dependencies> + <dependency> + <groupId>org.h2database</groupId> + <artifactId>h2database</artifactId> + <version>1.0.20061217</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> + <jdbc.driver>org.h2.Driver</jdbc.driver> + <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + + <!-- + ################################################################### + Profiles naming db instances in the Red Hat QA/QE lab + + First, those with OSS drivers + ################################################################### + --> + + <!-- The MySQL5 test envionment --> + <profile> + <id>mysql5</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.ur... + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The PostgreSQL test envionment --> + <profile> + <id>pgsql8</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504</version> + <classifier>jdbc3</classifier> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- + ################################################################### + Then, those with commercial drivers + ################################################################### + --> + + <!-- The Oracle9i test envionment --> + <profile> + <id>oracle9i</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <!-- use the 10g drivers which are surprisingly largely bug free --> + <version>10.0.2.0</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The Oracle10g test envionment --> + <profile> + <id>oracle10g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <!-- use the 10g drivers which are surprisingly largely bug free --> + <version>10.0.2.0</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The DB2 8.x test envionment (using 9x drivers)--> + <profile> + <id>db2-8</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hiber</jdbc.user> + <jdbc.pass>hiber</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The Sybase 12 test envionment --> + <profile> + <id>sybase12</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect> + <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> + <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The SQLServer2005 (jTDS) test envionment --> + <profile> + <id>sqlserver-jtds</id> + <dependencies> + <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The SQLServer2005 (MS JDBC) test envionment --> + <profile> + <id>sqlserver-msjdbc</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> + + </profiles> + +</project> Modified: core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,10 +1,30 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** @@ -5,7 +28,7 @@ * the Level 2 Cache. * * @author Emmanuel Bernard - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ public enum CacheModeType { Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,27 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + //$Id$ package org.hibernate.annotations; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** @@ -3,27 +26,27 @@ * Enumeration extending javax.persistence flush modes. * - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ public enum FlushModeType { /** - * see {@link org.hibernate.FlushMode.ALWAYS} + * see {@link org.hibernate.FlushMode#ALWAYS} */ ALWAYS, /** - * see {@link org.hibernate.FlushMode.AUTO} + * see {@link org.hibernate.FlushMode#AUTO} */ AUTO, /** - * see {@link org.hibernate.FlushMode.COMMIT} + * see {@link org.hibernate.FlushMode#COMMIT} */ COMMIT, /** - * see {@link org.hibernate.FlushMode.NEVER} + * see {@link org.hibernate.FlushMode#NEVER} * @deprecated use MANUAL, will be removed in a subsequent release */ NEVER, /** - * see {@link org.hibernate.FlushMode.MANUAL} + * see {@link org.hibernate.FlushMode#MANUAL} */ MANUAL, Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -10,7 +33,7 @@ /** * Loader Annotation for overwriting Hibernate default FIND method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.METHOD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.ElementType; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; @@ -11,7 +34,7 @@ * objects * * @author Emmanuel Bernard - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ @Target({TYPE, PACKAGE}) @Retention(RUNTIME) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; @@ -10,7 +32,7 @@ /** * Extends {@link javax.persistence.NamedQuery} with Hibernate features * - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ @Target({TYPE, PACKAGE}) @Retention(RUNTIME) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; @@ -10,7 +33,7 @@ /** * This specifies that a property is part of the natural id of the entity. * - * @author Nicol�s Lichtmaier + * @author Nicol�s Lichtmaier */ @Target( { METHOD, FIELD } ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.ElementType; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,10 +1,32 @@ -//$Id: +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** * Possible checks on Sql Insert, Delete, Update * - * @author L�szl� Benke + * @author L�szl� Benke */ public enum ResultCheckStyle { /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id:$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -11,7 +33,7 @@ /** * SqlDelete Annotation for overwriting Hibernate default DELETE method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; @@ -12,7 +34,7 @@ /** * SqlDelete Annotation for overwriting Hibernate default DELETE ALL method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RetentionPolicy.RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id:$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -11,7 +33,7 @@ /** * SqlInsert Annotation for overwriting Hibernate default INSERT INTO method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id:$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -11,7 +33,7 @@ /** * SqlUpdate Annotation for overwriting Hibernate default UPDATE method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.*; @@ -16,6 +38,6 @@ public @interface Tuplizer { /** tuplizer implementation */ Class impl(); - /** either pojo, dynamic-map or dom4j� */ + /** either pojo, dynamic-map or dom4j� */ String entityMode() default "pojo"; } Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.io.File; @@ -22,6 +44,7 @@ import javax.persistence.Entity; import javax.persistence.MappedSuperclass; +import javax.persistence.Embeddable; import org.dom4j.Attribute; import org.dom4j.Document; @@ -33,6 +56,10 @@ import org.hibernate.Interceptor; import org.hibernate.MappingException; import org.hibernate.SessionFactory; +import org.hibernate.DuplicateMappingException; +import org.hibernate.engine.NamedQueryDefinition; +import org.hibernate.engine.NamedSQLQueryDefinition; +import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.annotations.AnyMetaDef; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XClass; @@ -46,6 +73,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.mapping.UniqueKey; +import org.hibernate.mapping.IdGenerator; import org.hibernate.util.JoinedIterator; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; @@ -81,7 +109,7 @@ public static final String ARTEFACT = "hibernate.mapping.precedence"; public static final String DEFAULT_PRECEDENCE = "hbm, class"; - private Map namedGenerators; + private Map<String,IdGenerator> namedGenerators; private Map<String, Map<String, Join>> joins; private Map<String, AnnotatedClassType> classTypes; private Set<String> defaultNamedQueryNames; @@ -184,35 +212,7 @@ } public ExtendedMappings createExtendedMappings() { - return new ExtendedMappings( - classes, - collections, - tables, - namedQueries, - namedSqlQueries, - sqlResultSetMappings, - defaultNamedQueryNames, - defaultNamedNativeQueryNames, - defaultSqlResulSetMappingNames, - defaultNamedGenerators, - imports, - secondPasses, - propertyReferences, - namingStrategy, - typeDefs, - filterDefinitions, - namedGenerators, - joins, - classTypes, - extendsQueue, - tableNameBinding, columnNameBindingPerTable, auxiliaryDatabaseObjects, - generatorTables, - tableUniqueConstraints, - mappedByResolver, - propertyRefResolver, - anyMetaDefs, - reflectionManager - ); + return new ExtendedMappingsImpl(); } @Override @@ -490,14 +490,14 @@ * Recursively builds a list of FkSecondPass instances ready to be processed in this order. * Checking all dependencies recursively seems quite expensive, but the original code just relied * on some sort of table name sorting which failed in certain circumstances. + * <p/> + * See <tt>ANN-722</tt> and <tt>ANN-730</tt> * * @param orderedFkSecondPasses The list containing the <code>FkSecondPass<code> instances ready * for processing. * @param isADependencyOf Our lookup data structure to determine dependencies between tables * @param startTable Table name to start recursive algorithm. * @param currentTable The current table name used to check for 'new' dependencies. - * - * @see ANN-722 ANN-730 */ private void buildRecursiveOrderedFkSecondPasses( List orderedFkSecondPasses, @@ -1070,4 +1070,202 @@ public ReflectionManager getReflectionManager() { return reflectionManager; } + + protected class ExtendedMappingsImpl extends MappingsImpl implements ExtendedMappings { +// private final Map<String, IdGenerator> namedGenerators; +// private final Map<String, Map<String, Join>> joins; +// private final Map<String, AnnotatedClassType> classTypes; +// private final Map<String, Properties> generatorTables; +// private final Map<Table, List<String[]>> tableUniqueConstraints; +// private final Map<String, String> mappedByResolver; +// private final Map<String, String> propertyRefResolver; +// private final ReflectionManager reflectionManager; +// private final Set<String> defaultNamedQueryNames; +// private final Set<String> defaultNamedNativeQueryNames; +// private final Set<String> defaultSqlResulSetMappingNames; +// private final Set<String> defaultNamedGenerators; +// private final Map<String, AnyMetaDef> anyMetaDefs; + + public void addDefaultGenerator(IdGenerator generator) { + this.addGenerator( generator ); + defaultNamedGenerators.add( generator.getName() ); + } + + public IdGenerator getGenerator(String name) { + return getGenerator( name, null ); + } + + public IdGenerator getGenerator(String name, Map<String, IdGenerator> localGenerators) { + if ( localGenerators != null ) { + IdGenerator result = localGenerators.get( name ); + if ( result != null ) { + return result; + } + } + return namedGenerators.get( name ); + } + + public void addGenerator(IdGenerator generator) { + if ( !defaultNamedGenerators.contains( generator.getName() ) ) { + IdGenerator old = namedGenerators.put( generator.getName(), generator ); + if ( old != null ) { + log.warn( "duplicate generator name {}", old.getName() ); + } + } + } + + public void addGeneratorTable(String name, Properties params) { + Object old = generatorTables.put( name, params ); + if ( old != null ) { + log.warn( "duplicate generator table: {}", name ); + } + } + + public Properties getGeneratorTableProperties(String name, Map<String, Properties> localGeneratorTables) { + if ( localGeneratorTables != null ) { + Properties result = localGeneratorTables.get( name ); + if ( result != null ) { + return result; + } + } + return generatorTables.get( name ); + } + + public Map<String, Join> getJoins(String entityName) { + return joins.get( entityName ); + } + + public void addJoins(PersistentClass persistentClass, Map<String, Join> joins) { + Object old = AnnotationConfiguration.this.joins.put( persistentClass.getEntityName(), joins ); + if ( old != null ) { + log.warn( "duplicate joins for class: {}", persistentClass.getEntityName() ); + } + } + + public AnnotatedClassType getClassType(XClass clazz) { + AnnotatedClassType type = classTypes.get( clazz.getName() ); + if ( type == null ) { + return addClassType( clazz ); + } + else { + return type; + } + } + + public AnnotatedClassType addClassType(XClass clazz) { + AnnotatedClassType type; + if ( clazz.isAnnotationPresent( Entity.class ) ) { + type = AnnotatedClassType.ENTITY; + } + else if ( clazz.isAnnotationPresent( Embeddable.class ) ) { + type = AnnotatedClassType.EMBEDDABLE; + } + else if ( clazz.isAnnotationPresent( MappedSuperclass.class ) ) { + type = AnnotatedClassType.EMBEDDABLE_SUPERCLASS; + } + else { + type = AnnotatedClassType.NONE; + } + classTypes.put( clazz.getName(), type ); + return type; + } + + public Map<Table, List<String[]>> getTableUniqueConstraints() { + return tableUniqueConstraints; + } + + public void addUniqueConstraints(Table table, List uniqueConstraints) { + List oldConstraints = tableUniqueConstraints.get( table ); + if ( oldConstraints == null ) { + oldConstraints = new ArrayList(); + tableUniqueConstraints.put( table, oldConstraints ); + } + oldConstraints.addAll( uniqueConstraints ); + } + + public void addMappedBy(String entityName, String propertyName, String inversePropertyName) { + mappedByResolver.put( entityName + "." + propertyName, inversePropertyName ); + } + + public String getFromMappedBy(String entityName, String propertyName) { + return mappedByResolver.get( entityName + "." + propertyName ); + } + + public void addPropertyReferencedAssociation(String entityName, String propertyName, String propertyRef) { + propertyRefResolver.put( entityName + "." + propertyName, propertyRef ); + } + + public String getPropertyReferencedAssociation(String entityName, String propertyName) { + return propertyRefResolver.get( entityName + "." + propertyName ); + } + + @Override + public void addUniquePropertyReference(String referencedClass, String propertyName) { + super.addUniquePropertyReference( referencedClass, propertyName ); + } + + @Override + public void addPropertyReference(String referencedClass, String propertyName) { + super.addPropertyReference( referencedClass, propertyName ); + } + + public ReflectionManager getReflectionManager() { + return reflectionManager; + } + + public void addDefaultQuery(String name, NamedQueryDefinition query) { + super.addQuery( name, query ); + defaultNamedQueryNames.add( name ); + } + + public void addDefaultSQLQuery(String name, NamedSQLQueryDefinition query) { + super.addSQLQuery( name, query ); + defaultNamedNativeQueryNames.add( name ); + } + + public void addDefaultResultSetMapping(ResultSetMappingDefinition definition) { + final String name = definition.getName(); + if ( !defaultSqlResulSetMappingNames.contains( name ) + && super.getResultSetMapping( name ) != null ) { + removeResultSetMapping( name ); + } + super.addResultSetMapping( definition ); + defaultSqlResulSetMappingNames.add( name ); + } + + @Override + public void addQuery(String name, NamedQueryDefinition query) throws DuplicateMappingException { + if ( !defaultNamedQueryNames.contains( name ) ) { + super.addQuery( name, query ); + } + } + + @Override + public void addResultSetMapping(ResultSetMappingDefinition definition) throws DuplicateMappingException { + if ( !defaultSqlResulSetMappingNames.contains( definition.getName() ) ) + super.addResultSetMapping( definition ); + } + + @Override + public void addSQLQuery(String name, NamedSQLQueryDefinition query) throws DuplicateMappingException { + if ( !defaultNamedNativeQueryNames.contains( name ) ) { + super.addSQLQuery( name, query ); + } + } + + public Map getClasses() { + return classes; + } + + public void addAnyMetaDef(AnyMetaDef defAnn) throws AnnotationException { + if ( anyMetaDefs.containsKey( defAnn.name() ) ) { + throw new AnnotationException( "Two @AnyMetaDef with the same name defined: " + defAnn.name() ); + } + anyMetaDefs.put( defAnn.name(), defAnn ); + } + + public AnyMetaDef getAnyMetaDef(String name) { + return anyMetaDefs.get( name ); + } + } } Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import javax.persistence.JoinTable; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import javax.persistence.Column; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import org.hibernate.AssertionFailure; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.io.InputStream; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import javax.persistence.DiscriminatorColumn; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.HashSet; @@ -10,7 +32,7 @@ import org.hibernate.AnnotationException; import org.hibernate.MappingException; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.mapping.Column; import org.hibernate.mapping.Join; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,14 +1,31 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; import org.hibernate.AnnotationException; import org.hibernate.MappingException; @@ -22,8 +39,6 @@ import org.hibernate.mapping.Join; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** * Allow annotation related mappings @@ -32,251 +47,113 @@ * * @author Emmanuel Bernard */ -public class ExtendedMappings extends Mappings { +public interface ExtendedMappings extends Mappings { - private final Logger log = LoggerFactory.getLogger( ExtendedMappings.class ); + /** + * Adds a default id generator. + * + * @param generator The id generator + */ + public void addDefaultGenerator(IdGenerator generator); - private final Map<String, IdGenerator> namedGenerators; - private final Map<String, Map<String, Join>> joins; - private final Map<String, AnnotatedClassType> classTypes; - private final Map<String, Properties> generatorTables; - private final Map<Table, List<String[]>> tableUniqueConstraints; - private final Map<String, String> mappedByResolver; - private final Map<String, String> propertyRefResolver; - private final ReflectionManager reflectionManager; - private final Set<String> defaultNamedQueryNames; - private final Set<String> defaultNamedNativeQueryNames; - private final Set<String> defaultSqlResulSetMappingNames; - private final Set<String> defaultNamedGenerators; - private final Map<String, AnyMetaDef> anyMetaDefs; - - ExtendedMappings( - Map classes, Map collections, Map tables, Map queries, Map sqlqueries, Map sqlResultSetMappings, - Set<String> defaultNamedQueryNames, Set<String> defaultNamedNativeQueryNames, - Set<String> defaultSqlResulSetMappingNames, Set<String> defaultNamedGenerators, Map imports, - List secondPasses, List propertyReferences, NamingStrategy namingStrategy, Map typeDefs, - Map filterDefinitions, Map namedGenerators, Map<String, Map<String, Join>> joins, Map<String, - AnnotatedClassType> classTypes, Map extendsQueue, Map<String, TableDescription> tableNameBinding, - Map<Table, ColumnNames> columnNameBindingPerTable, - final List auxiliaryDatabaseObjects, - Map<String, Properties> generatorTables, - Map<Table, List<String[]>> tableUniqueConstraints, - Map<String, String> mappedByResolver, - Map<String, String> propertyRefResolver, - Map<String, AnyMetaDef> anyMetaDefs, - ReflectionManager reflectionManager - ) { - super( - classes, - collections, - tables, - queries, - sqlqueries, - sqlResultSetMappings, - imports, - secondPasses, - propertyReferences, - namingStrategy, - typeDefs, - filterDefinitions, - extendsQueue, - auxiliaryDatabaseObjects, - tableNameBinding, - columnNameBindingPerTable - ); - this.namedGenerators = namedGenerators; - this.joins = joins; - this.classTypes = classTypes; - this.generatorTables = generatorTables; - this.tableUniqueConstraints = tableUniqueConstraints; - this.mappedByResolver = mappedByResolver; - this.propertyRefResolver = propertyRefResolver; - this.reflectionManager = reflectionManager; - this.defaultNamedQueryNames = defaultNamedQueryNames; - this.defaultNamedNativeQueryNames = defaultNamedNativeQueryNames; - this.defaultSqlResulSetMappingNames = defaultSqlResulSetMappingNames; - this.defaultNamedGenerators = defaultNamedGenerators; - this.anyMetaDefs = anyMetaDefs; - } - - public void addGenerator(IdGenerator generator) throws MappingException { - if ( !defaultNamedGenerators.contains( generator.getName() ) ) { - Object old = namedGenerators.put( generator.getName(), generator ); - if ( old != null ) log.warn( "duplicate generator name: {}", generator.getName() ); - } - } - - public void addJoins(PersistentClass persistentClass, Map<String, Join> joins) throws MappingException { - Object old = this.joins.put( persistentClass.getEntityName(), joins ); - if ( old != null ) log.warn( "duplicate joins for class: {}", persistentClass.getEntityName() ); - } - - public AnnotatedClassType addClassType(XClass clazz) { - AnnotatedClassType type; - if ( clazz.isAnnotationPresent( Entity.class ) ) { - type = AnnotatedClassType.ENTITY; - } - else if ( clazz.isAnnotationPresent( Embeddable.class ) ) { - type = AnnotatedClassType.EMBEDDABLE; - } - else if ( clazz.isAnnotationPresent( MappedSuperclass.class ) ) { - type = AnnotatedClassType.EMBEDDABLE_SUPERCLASS; - } - else { - type = AnnotatedClassType.NONE; - } - classTypes.put( clazz.getName(), type ); - return type; - } - /** - * get and maintain a cache of class type. - * A class can be an entity, a embedded objet or nothing. + * Retrieve the id-generator by name. + * + * @param name The generator name. + * @return The generator, or null. */ - public AnnotatedClassType getClassType(XClass clazz) { - AnnotatedClassType type = classTypes.get( clazz.getName() ); - if ( type == null ) { - return addClassType( clazz ); - } - else { - return type; - } - } + public IdGenerator getGenerator(String name); - public IdGenerator getGenerator(String name) { - return getGenerator( name, null ); - } - - public Map<String, Join> getJoins(String persistentClass) { - return joins.get( persistentClass ); - } - /** * Try to find the generator from the localGenerators * and then from the global generator list * - * @param name generator name - * @param localGenerators local generators to find to + * @param name generator name + * @param localGenerators local generators * @return the appropriate idgenerator or null if not found */ - public IdGenerator getGenerator(String name, Map<String, IdGenerator> localGenerators) { - if ( localGenerators != null ) { - IdGenerator result = localGenerators.get( name ); - if ( result != null ) return result; - } - return namedGenerators.get( name ); - } + public IdGenerator getGenerator(String name, Map<String, IdGenerator> localGenerators); - public void addGeneratorTable(String name, Properties params) { - Object old = generatorTables.put( name, params ); - if ( old != null ) log.warn( "duplicate generator table: {}", name ); - } + /** + * Add a generator. + * + * @param generator The generator to add. + */ + public void addGenerator(IdGenerator generator); - public Properties getGeneratorTableProperties(String name, Map<String, Properties> localGeneratorTables) { - if ( localGeneratorTables != null ) { - Properties result = localGeneratorTables.get( name ); - if ( result != null ) return result; - } - return generatorTables.get( name ); - } + /** + * Add a generator table properties. + * + * @param name The generator name + * @param params The generator table properties. + */ + public void addGeneratorTable(String name, Properties params); - public void addUniqueConstraints(Table table, List uniqueConstraints) { - List oldConstraints = tableUniqueConstraints.get( table ); - if ( oldConstraints == null ) { - oldConstraints = new ArrayList(); - tableUniqueConstraints.put( table, oldConstraints ); - } - oldConstraints.addAll( uniqueConstraints ); - } + /** + * Retrieve the properties related to a generator table. + * + * @param name generator name + * @param localGeneratorTables local generator tables + * @return The properties, or null. + */ + public Properties getGeneratorTableProperties(String name, Map<String, Properties> localGeneratorTables); - public Map<Table, List<String[]>> getTableUniqueConstraints() { - return tableUniqueConstraints; - } + /** + * Retrieve join metadata for a particular persistent entity. + * + * @param entityName The entity name + * @return The join metadata + */ + public Map<String, Join> getJoins(String entityName); - public void addMappedBy(String entityName, String propertyName, String inversePropertyName) { - mappedByResolver.put( entityName + "." + propertyName, inversePropertyName ); - } + /** + * Add join metadata for a persistent entity. + * + * @param persistentClass The persistent entity metadata. + * @param joins The join metadata to add. + * @throws MappingException + */ + public void addJoins(PersistentClass persistentClass, Map<String, Join> joins); - public String getFromMappedBy(String entityName, String propertyName) { - return mappedByResolver.get( entityName + "." + propertyName ); - } + /** + * Get and maintain a cache of class type. + * + * @param clazz The XClass mapping + * @return The class type. + */ + public AnnotatedClassType getClassType(XClass clazz); - public void addPropertyReferencedAssociation(String entityName, String propertyName, String propertyRef) { - propertyRefResolver.put( entityName + "." + propertyName, propertyRef ); - } + /** + * Add a class type. + * + * @param clazz The XClass mapping. + * @return The class type. + */ + public AnnotatedClassType addClassType(XClass clazz); - public String getPropertyReferencedAssociation(String entityName, String propertyName) { - return propertyRefResolver.get( entityName + "." + propertyName ); - } + public Map<Table, List<String[]>> getTableUniqueConstraints(); - @Override - public void addUniquePropertyReference(String referencedClass, String propertyName) { - super.addUniquePropertyReference( referencedClass, propertyName ); - } + public void addUniqueConstraints(Table table, List uniqueConstraints); - @Override - public void addPropertyReference(String referencedClass, String propertyName) { - super.addPropertyReference( referencedClass, propertyName ); - } + public void addMappedBy(String entityName, String propertyName, String inversePropertyName); - public ReflectionManager getReflectionManager() { - return reflectionManager; - } + public String getFromMappedBy(String entityName, String propertyName); - public void addDefaultQuery(String name, NamedQueryDefinition query) { - super.addQuery( name, query ); - defaultNamedQueryNames.add( name ); - } + public void addPropertyReferencedAssociation(String entityName, String propertyName, String propertyRef); - public void addDefaultSQLQuery(String name, NamedSQLQueryDefinition query) { - super.addSQLQuery( name, query ); - defaultNamedNativeQueryNames.add( name ); - } + public String getPropertyReferencedAssociation(String entityName, String propertyName); - public void addDefaultGenerator(IdGenerator idGen) { - this.addGenerator( idGen ); - defaultNamedGenerators.add( idGen.getName() ); + public ReflectionManager getReflectionManager(); - } + public void addDefaultQuery(String name, NamedQueryDefinition query); - public void addDefaultResultSetMapping(ResultSetMappingDefinition definition) { - final String name = definition.getName(); - if ( !defaultSqlResulSetMappingNames.contains( name ) - && super.getResultSetMapping( name ) != null ) { - resultSetMappings.remove( name ); - } - super.addResultSetMapping( definition ); - defaultSqlResulSetMappingNames.add( name ); - } + public void addDefaultSQLQuery(String name, NamedSQLQueryDefinition query); - @Override - public void addQuery(String name, NamedQueryDefinition query) throws MappingException { - if ( !defaultNamedQueryNames.contains( name ) ) super.addQuery( name, query ); - } + public void addDefaultResultSetMapping(ResultSetMappingDefinition definition); - @Override - public void addResultSetMapping(ResultSetMappingDefinition definition) { - if ( !defaultSqlResulSetMappingNames.contains( definition.getName() ) ) - super.addResultSetMapping( definition ); - } + public Map getClasses(); - @Override - public void addSQLQuery(String name, NamedSQLQueryDefinition query) throws MappingException { - if ( !defaultNamedNativeQueryNames.contains( name ) ) super.addSQLQuery( name, query ); - } + public void addAnyMetaDef(AnyMetaDef defAnn) throws AnnotationException; - public Map getClasses() { - return classes; - } - - public void addAnyMetaDef(AnyMetaDef defAnn) { - if ( anyMetaDefs.containsKey( defAnn.name() ) ) { - throw new AnnotationException( "Two @AnyMetaDef with the same name defined: " + defAnn.name() ); - } - anyMetaDefs.put( defAnn.name(), defAnn ); - } - - public AnyMetaDef getAnyMetaDef(String name) { - return anyMetaDefs.get( name ); - } + public AnyMetaDef getAnyMetaDef(String name); } \ No newline at end of file Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.concurrent.atomic.AtomicInteger; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Iterator; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import javax.persistence.Column; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import org.hibernate.AnnotationException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import java.util.Iterator; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import org.hibernate.mapping.Array; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import org.hibernate.mapping.Collection; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.Collections; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.Map; @@ -8,7 +31,7 @@ import org.hibernate.annotations.Sort; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.cfg.CollectionSecondPass; import org.hibernate.cfg.Ejb3Column; import org.hibernate.cfg.Ejb3JoinColumn; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import org.hibernate.mapping.Collection; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import javax.persistence.EmbeddedId; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import org.hibernate.annotations.OrderBy; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import java.util.ArrayList; @@ -9,7 +31,7 @@ import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.annotations.Index; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.cfg.BinderHelper; import org.hibernate.cfg.Ejb3JoinColumn; import org.hibernate.cfg.ExtendedMappings; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations; import org.slf4j.Logger; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations.reflection; import java.beans.Introspector; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations.reflection; import java.lang.reflect.AnnotatedElement; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.annotations.reflection; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.cfg.search; import java.util.Properties; Modified: core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + ~ indicated by the @author tags or express copyright attribution + ~ statements applied by the authors. All third-party contributions are + ~ distributed under license by Red Hat Middleware LLC. + ~ + ~ This copyrighted material is made available to anyone wishing to use, modify, + ~ copy, or redistribute it subject to the terms and conditions of the GNU + ~ Lesser General Public License, as published by the Free Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public License + ~ along with this distribution; if not, write to: + ~ Free Software Foundation, Inc. + ~ 51 Franklin Street, Fifth Floor + ~ Boston, MA 02110-1301 USA + --> + <!-- Java Persistence API object-relational mapping file schema --> <xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" Modified: core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.mapping; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; import java.io.ByteArrayInputStream; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; import java.io.CharArrayReader; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; import java.io.IOException; @@ -15,7 +37,7 @@ import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.usertype.EnhancedUserType; import org.hibernate.usertype.ParameterizedType; import org.hibernate.util.ReflectHelper; @@ -25,10 +47,10 @@ /** * Enum type mapper * Try and find the appropriate SQL type depending on column metadata - * + * <p/> + * TODO implements readobject/writeobject to recalculate the enumclasses * @author Emmanuel Bernard */ -//TODO implements readobject/writeobject to recalculate the enumclasses public class EnumType implements EnhancedUserType, ParameterizedType, Serializable { /** * This is the old scheme where logging of parameter bindings and value extractions Modified: core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; import java.io.ByteArrayInputStream; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.type; import java.io.IOException; Modified: core/trunk/annotations/src/test/resources/hibernate.properties =================================================================== --- core/trunk/annotations/src/test/resources/hibernate.properties 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/test/resources/hibernate.properties 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,301 +1,39 @@ -###################### -### Query Language ### -###################### +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as +# indicated by the @author tags or express copyright attribution +# statements applied by the authors. All third-party contributions are +# distributed under license by Red Hat Middleware LLC. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# Lesser General Public License, as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License +# for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this distribution; if not, write to: +# Free Software Foundation, Inc. +# 51 Franklin Street, Fifth Floor +# Boston, MA 02110-1301 USA +# +hibernate.dialect ${db.dialect} +hibernate.connection.driver_class ${jdbc.driver} +hibernate.connection.url ${jdbc.url} +hibernate.connection.username ${jdbc.user} +hibernate.connection.password ${jdbc.pass} +hibernate.connection.isolation ${jdbc.isolation} -## define query language constants / function names +hibernate.connection.pool_size 5 -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.show_sql true hibernate.format_sql true +hibernate.max_fetch_depth 5 - -################# -### Platforms ### -################# - -hibernate.dialect @hibernate.dialect@ -hibernate.connection.driver_class @hibernate.connection.driver_class@ -hibernate.connection.username @hibernate.connection.username@ -hibernate.connection.password @hibernate.connection.password@ -hibernate.connection.url @hibernate.connection.url@ - -################################# -### 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/ - +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider \ No newline at end of file Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -2488,7 +2488,10 @@ if ( old != null ) { throw new DuplicateMappingException( "resultSet", sqlResultSetMapping.getName() ); } + } + protected void removeResultSetMapping(String name) { + sqlResultSetMappings.remove( name ); } public TypeDef getTypeDef(String typeName) { Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/envers/pom.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -75,63 +75,17 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <exclusions> - <!-- todo : only needed until we migrate annotations/em back to core --> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </exclusion> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - </exclusion> - </exclusions> + <artifactId>hibernate-commons-annotations</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <exclusions> - <!-- todo : only needed until we migrate annotations/em back to core --> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </exclusion> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - </exclusion> - </exclusions> + <artifactId>hibernate-annotations</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> <exclusions> - <!-- todo : only needed until we migrate annotations/em back to core --> + <!-- todo : only needed until we migrate EM back to core --> <exclusion> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> @@ -196,17 +150,15 @@ <artifactId>persistence-api</artifactId> <version>1.0</version> </dependency> - <!-- todo : change to work like hibernate-core after we import annotations and em back into core --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> + <version>${version}</version> </dependency> - <!-- todo : change to work like hibernate-core after we import annotations and em back into core --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> - <version>3.3.0.ga</version> + <version>${version}</version> </dependency> <!-- todo : change to work like hibernate-core after we import annotations and em back into core --> <dependency> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/pom.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -55,6 +55,7 @@ <module>connection-c3p0</module> <module>connection-proxool</module> <module>commons-annotations</module> + <module>annotations</module> <module>envers</module> <module>jmx</module> <module>testing</module>