[hibernate-commits] Hibernate SVN: r11167 - in branches/HAN_SPLIT/HibernateExt: ejb/lib and 2 other directories.

Author: epbernard Date: 2007-02-07 19:08:26 -0500 (Wed, 07 Feb 2007) New Revision: 11167 Removed: branches/HAN_SPLIT/HibernateExt/ejb/lib/ejb3-persistence.jar branches/HAN_SPLIT/HibernateExt/ejb/lib/hibernate-annotations.jar branches/HAN_SPLIT/HibernateExt/ejb/lib/javassist.jar branches/HAN_SPLIT/HibernateExt/metadata/lib/ejb3-persistence.jar branches/HAN_SPLIT/HibernateExt/metadata/lib/jms.jar branches/HAN_SPLIT/HibernateExt/metadata/lib/jta.jar branches/HAN_SPLIT/HibernateExt/metadata/lib/jta.licence.txt branches/HAN_SPLIT/HibernateExt/metadata/lib/lucene-core-2.0.0.jar Modified: branches/HAN_SPLIT/HibernateExt/ejb/build.properties.dist branches/HAN_SPLIT/HibernateExt/ejb/build.xml branches/HAN_SPLIT/HibernateExt/ejb/lib/README.txt branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist Log: Java Persistence build system Modified: branches/HAN_SPLIT/HibernateExt/ejb/build.properties.dist =================================================================== --- branches/HAN_SPLIT/HibernateExt/ejb/build.properties.dist 2007-02-07 23:07:10 UTC (rev 11166) +++ branches/HAN_SPLIT/HibernateExt/ejb/build.properties.dist 2007-02-08 00:08:26 UTC (rev 11167) @@ -3,4 +3,11 @@ test.dir=test resources.dir=resources testresources.dir=test-resources -hibernate-core.home=../hibernate-3.2 \ No newline at end of file +hibernate-core.home=../hibernate-3.2 + + +#locally present jars +jpa-api.jar=./lib/ejb3-persistence.jar +validator.jar=./lib/hibernate-validator.jar +commons-annotations.jar=./lib/hibernate-commons-annotations.jar +annotations.jar=./lib/hibernate-annotations.jar \ No newline at end of file Modified: branches/HAN_SPLIT/HibernateExt/ejb/build.xml =================================================================== --- branches/HAN_SPLIT/HibernateExt/ejb/build.xml 2007-02-07 23:07:10 UTC (rev 11166) +++ branches/HAN_SPLIT/HibernateExt/ejb/build.xml 2007-02-08 00:08:26 UTC (rev 11167) @@ -16,13 +16,23 @@ <!-- Name of project and version, used to create filenames --> <property name="Name" value="Hibernate EntityManager"/> <property name="name" value="hibernate-entitymanager"/> - <property name="version" value="3.2.1.GA"/> + <property name="version" value="3.2.2.GA"/> <property name="javadoc.packagenames" value="org.hibernate.ejb.*"/> <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="../common"/> <available property="jpa-present" file="${basedir}/../ejb-api" type="dir"/> + <property name="jpa-api.jar" value="${basedir}/../ejb-api/build/ejb3-persistence.jar"/> + <property name="annotations.jar" + value="${basedir}/../metadata/target/hibernate-annotations/hibernate-annotations.jar"/> + <property name="validator.jar" + value="${basedir}/../validator/target/hibernate-validator/hibernate-validator.jar"/> + <property name="commons-annotations.jar" + value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/> + <import file="${common.dir}/common-build.xml"/> <property name="jpa-javadoc.dir" value="${dist.doc.dir}/ejb-api"/> @@ -32,20 +42,70 @@ <property name="build.testresources.dir" value="${build.dir}/testresources"/> <property name="build.temp.dir" value="${build.dir}/temp"/> - <target name="compile" depends="init" description="Compile the Java source code"> + <path id="lib.moduleclass.path"> + <pathelement location="${jpa-api.jar}"/> + <pathelement location="${commons-annotations.jar}"/> + <pathelement location="${annotations.jar}"/> + <pathelement location="${validator.jar}"/> + </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="${lib.dir}/test"> + <include name="*.jar"/> + <include name="*.zip"/> + </fileset> + </path> + + <target name="init"> + <antcall target="common-build.init"/> + <!-- check for dependency artefacts --> + <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> + <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/> + <available file="${annotations.jar}" type="file" property="annotations.jar.available"/> + <available file="${validator.jar}" type="file" property="validator.jar.available"/> + <mkdir dir="${lib.dir}/test"/> + </target> + + <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available"> + <ant inheritall="false" dir="${basedir}/../ejb-api" target="clean"/> + <ant inheritall="false" dir="${basedir}/../ejb-api" target="jar"/> + </target> + + <target name="get.commons-annotations" depends="init" unless="commons-annotations.jar.available"> + <ant inheritall="false" dir="${basedir}/../commons-annotations" target="clean"/> + <ant inheritall="false" dir="${basedir}/../commons-annotations" target="jar"/> + </target> + + <target name="get.annotations" depends="init" unless="annotations.jar.available"> + <ant inheritall="false" dir="${basedir}/../metadata" target="clean"/> + <ant inheritall="false" dir="${basedir}/../metadata" target="jar"/> + </target> + + <target name="get.validator" depends="init" unless="validator.jar.available"> + <ant inheritall="false" dir="${basedir}/../validator" target="clean"/> + <ant inheritall="false" dir="${basedir}/../validator" target="jar"/> + </target> + + <target name="compile" depends="init,get.jpa-api,get.commons-annotations,get.annotations,get.validator" 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 - source="1.5" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="lib.class.path" debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on" + source="${javac.source}" + target="${javac.target}" </javac> </target> @@ -127,12 +187,13 @@ value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> <javac - source="1.5" srcdir="${test.dir}" destdir="${classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}" - nowarn="on"> + nowarn="on" + source="${javac.source}" + target="${javac.target}"> <classpath> <path refid="lib.class.path"/> </classpath> @@ -261,6 +322,16 @@ <include name="common-build.xml"/> </fileset> </copy> + + <!-- copy dependencies --> + <copy todir="${dist.lib.dir}" failonerror="false"> + <fileset file="${jpa-api.jar}"/> + <fileset file="${commons-annotations.jar}"/> + <fileset file="${annotations.jar}"/> + <fileset file="${validator.jar}"/> + </copy> + <mkdir dir="${dist.lib.dir}/test"/> + <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> </copy> <antcall target="common-build.dist"/> Modified: branches/HAN_SPLIT/HibernateExt/ejb/lib/README.txt =================================================================== --- branches/HAN_SPLIT/HibernateExt/ejb/lib/README.txt 2007-02-07 23:07:10 UTC (rev 11166) +++ branches/HAN_SPLIT/HibernateExt/ejb/lib/README.txt 2007-02-08 00:08:26 UTC (rev 11167) @@ -1,7 +1,19 @@ -Hibernate Metadata dependencies -=============================== +Hibernate Entity Manager dependencies +===================================== -ejb3-persistence (final release): required + +Core +==== +hibernate-commons-annotations.jar: required +ejb3-persistence.jar: required hibernate-annotations: required -javassist (3.3): required +hibernate-validator: required +hibernate3.jar: required +hibernate core dependencies: required (see Hibernate Core for more information) +javassist.jar: required (part of Hibernate Core dependencies) jboss-archive-browsing (5.0.0alpha build: CVSTag=HEAD date=200607201 119): required + + +Test +==== +(no extra dependency) \ No newline at end of file Deleted: branches/HAN_SPLIT/HibernateExt/ejb/lib/ejb3-persistence.jar =================================================================== (Binary files differ) Deleted: branches/HAN_SPLIT/HibernateExt/ejb/lib/hibernate-annotations.jar =================================================================== (Binary files differ) Deleted: branches/HAN_SPLIT/HibernateExt/ejb/lib/javassist.jar =================================================================== (Binary files differ) Deleted: branches/HAN_SPLIT/HibernateExt/metadata/lib/ejb3-persistence.jar =================================================================== (Binary files differ) Deleted: branches/HAN_SPLIT/HibernateExt/metadata/lib/jms.jar =================================================================== (Binary files differ) Deleted: branches/HAN_SPLIT/HibernateExt/metadata/lib/jta.jar =================================================================== (Binary files differ) Deleted: branches/HAN_SPLIT/HibernateExt/metadata/lib/jta.licence.txt =================================================================== --- branches/HAN_SPLIT/HibernateExt/metadata/lib/jta.licence.txt 2007-02-07 23:07:10 UTC (rev 11166) +++ branches/HAN_SPLIT/HibernateExt/metadata/lib/jta.licence.txt 2007-02-08 00:08:26 UTC (rev 11167) @@ -1,49 +0,0 @@ - -Sun Microsystems, Inc. -Binary Code License Agreement - -READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA PACKAGE. BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT. - -1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer hardware for which the corresponding fee has been paid. - -2. RESTRICTIONS. Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software. Licensee acknowledges that Licensed Software is not designed or intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun Microsystems, Inc. disclaims any express or implied warranty of fitness for such uses. No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. - -3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use. Except for the foregoing, Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software. - -4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. - -5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Software under this Agreement. The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. - -6. Termination. This Agreement is effective until terminated. You may terminate this Agreement at any time by destroying all copies of Software. This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement. Upon Termination, you must destroy all copies of Software. - -7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. - -8. U.S. Government Restricted Rights. If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). - -9. Governing Law. Any action related to this Agreement will be governed by California law and controlling U.S. federal law. No choice of law rules of any jurisdiction will apply. - -10. Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. - -11. Integration. This Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. - -JAVATM INTERFACE CLASSES -JAVA TRANSACTION API (JTA), VERSION 1.0.1B, MAINTENANCE RELEASE -SUPPLEMENTAL LICENSE TERMS - -These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software. - -1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications ("Programs"). - -2. License to Distribute Software. In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settle! ment amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software. - -3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or modification of the classes in the JPI. In the event that you create an additional class and associated API(s) which (i) extends the functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. - -4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit. - -5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement. Source code may not be redistributed unless expressly provided for in this Agreement. - -6. Termination for Infringement. Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. - -For inquiries please contact: Sun Microsystems, Inc. 4150 Network Circle, Santa Clara, California 95054. - - Deleted: branches/HAN_SPLIT/HibernateExt/metadata/lib/lucene-core-2.0.0.jar =================================================================== (Binary files differ) Modified: branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist =================================================================== --- branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist 2007-02-07 23:07:10 UTC (rev 11166) +++ branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist 2007-02-08 00:08:26 UTC (rev 11167) @@ -6,6 +6,6 @@ #locally present jars jpa-api.jar=./lib/ejb3-persistence.jar jpa.jar=./lib/test/hibernate-entitymanager.jar -archive-browsing.jar=./lib/test/hibernate-entitymanager.jar +archive-browsing.jar=./lib/test/jboss-archive-browsing.jar commons-annotations.jar=./lib/hibernate-commons-annotations.jar annotations.jar=./lib/test/hibernate-annotations.jar \ No newline at end of file