Changeset 6672


Ignore:
Timestamp:
Dec 19, 2014, 1:45:18 PM (8 years ago)
Author:
Nicklas Nordborg
Message:

References #1742: Upgrade to Hibernate 4.x

XDoclet generation of Hibernate mapping files generated error messages for files not containing andy hibnernate mapping annotations and not specified in build.xml as something that should be parsed.

Solved by copying net/sf/based/core/data/* to a temporary directory before running XDoclet on only the files in the temporary directory.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.4-stable/build.xml

    r6641 r6672  
    477477    depends="core.init,core.compile,check.hibernate"
    478478    description="Generates Hibernate mapping files from the source code"
    479     unless="nohibernate"
     479   
    480480    >
    481481    <delete>
     
    486486      <fileset dir="${core.src}" includes="**/*.hbm.xml" />
    487487    </copy>
     488    <copy todir="${build}/hbm"
     489      description="Copy our data class files so xdoclet doesn't parse other code">
     490      <fileset dir="${core.src}" includes="net/sf/basedb/core/data/**/*" />
     491    </copy>
     492   
    488493    <hibernatedoclet
    489494      destdir="${core.build}"
    490495      excludedtags="@version,@author,@todo"
    491496      mergedir="${core.build}"
    492       verbose="${xdoclet.verbose}">
    493       <fileset dir="${core.src}">
     497      verbose="true"
     498      >
     499      <fileset dir="${build}/hbm">
    494500        <include name="net/sf/basedb/core/data/**/*.java"/>
    495501      </fileset>
    496       <hibernate version="2.0"/>
     502      <hibernate version="2.0" />
    497503    </hibernatedoclet>
    498504   
Note: See TracChangeset for help on using the changeset viewer.