Author: epbernard Date: 2006-10-16 00:07:21 -0400 (Mon, 16 Oct 2006) New Revision: 10581 Added: trunk/HibernateExt/ejb-api/etc/jdstyle.css Modified: trunk/HibernateExt/ejb-api/build.xml trunk/HibernateExt/ejb/build.xml trunk/HibernateExt/ejb/changelog.txt trunk/HibernateExt/ejb/doc/reference/en/master.xml trunk/HibernateExt/ejb/doc/reference/en/modules/configuration.xml trunk/HibernateExt/ejb/lib/hibernate-annotations.jar trunk/HibernateExt/ejb/readme.txt trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java trunk/HibernateExt/metadata/build.xml trunk/HibernateExt/metadata/changelog.txt trunk/HibernateExt/metadata/doc/reference/en/master.xml trunk/HibernateExt/metadata/doc/reference/en/modules/entity.xml trunk/HibernateExt/metadata/doc/reference/en/modules/setup.xml trunk/HibernateExt/metadata/readme.txt trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java Log: GA release ANN-459 and EJB-239 add EJB 3.0 javadoc to the distribution Modified: trunk/HibernateExt/ejb/build.xml =================================================================== --- trunk/HibernateExt/ejb/build.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb/build.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -16,13 +16,15 @@ <!-- 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.0.CR3"/> + <property name="version" value="3.2.0.GA"/> <property name="javadoc.packagenames" value="org.hibernate.ejb.*"/> <property name="jdbc.dir" value="jdbc"/> <property name="copy.test" value="true"/> <property name="common.dir" value="../common"/> + <available property="jpa-present" file="${basedir}/../ejb-api" type="dir"/> <import file="${common.dir}/common-build.xml"/> + <property name="jpa-javadoc.dir" value="${dist.doc.dir}/ejb-api"/> <property name="resources.dir" value="src/resources"/> @@ -212,9 +214,19 @@ <!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> <echo>Skipping java doc since ant's javadoc task cannot handle an alternative javadoc</echo> </target --> + + <target name="jpa-javadoc" if="jpa-present"> + <mkdir dir="${jpa-javadoc.dir}"/> + <ant dir="../ejb-api" target="javadoc" inheritAll="false"/> + <copy todir="${jpa-javadoc.dir}"> + <fileset dir="${basedir}/../ejb-api/build/api"> + <include name="**/*.*"/> + </fileset> + </copy> + </target> <!-- Some of this can probably be moved to common-build... --> - <target name="dist" depends="jar,javadoc,copysource,copytest,copylib,extras" description="Build everything"> + <target name="dist" depends="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"> Modified: trunk/HibernateExt/ejb/changelog.txt =================================================================== --- trunk/HibernateExt/ejb/changelog.txt 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb/changelog.txt 2006-10-16 04:07:21 UTC (rev 10581) @@ -1,7 +1,15 @@ Hibernate EntityManager Changelog ================================== -3.2.0.CR3 (4-10-2006) +3.2.0.GA (16-10-2006) +--------------------- +Same code base as 3.2.0.CR3 + +** Task + * [EJB-239] - Add EJB 3.0 JavaDoc to the distribution + + +3.2.0.CR3 (04-10-2006) ---------------------- ** Bug * [EJB-150] - JarVisitor.addElement does not close passed input streams Modified: trunk/HibernateExt/ejb/doc/reference/en/master.xml =================================================================== --- trunk/HibernateExt/ejb/doc/reference/en/master.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb/doc/reference/en/master.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -16,7 +16,7 @@ <subtitle>User guide</subtitle> - <releaseinfo>3.2.0 CR3</releaseinfo> + <releaseinfo>3.2.0.GA</releaseinfo> <mediaobject> <imageobject> Modified: trunk/HibernateExt/ejb/doc/reference/en/modules/configuration.xml =================================================================== --- trunk/HibernateExt/ejb/doc/reference/en/modules/configuration.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb/doc/reference/en/modules/configuration.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -8,8 +8,8 @@ <para>The EJB 3.0 / JPA compatible Hibernate EntityManager is built on top of Hibernate core and Hibernate Annotations. You have to use compatible versions of each module. This version is known to work on Hibernate Core - 3.2.0.CR5 (and 3.2.0.GA at the time of writing) and Hibernate Annotations - 3.2.0.CR3. The following libraries have to be in your classpath: + 3.2.0.CR5 and 3.2.0.GA and Hibernate Annotations + 3.2.0.CR3 and 3.2.0.GA. The following libraries have to be in your classpath: hibernate3.jar, hibernate-annotations.jar, hibernate-entitymanager.jar and all needed third party libraries for each package.(incl. ejb-persistence.jar).</para> Modified: trunk/HibernateExt/ejb/lib/hibernate-annotations.jar =================================================================== (Binary files differ) Modified: trunk/HibernateExt/ejb/readme.txt =================================================================== --- trunk/HibernateExt/ejb/readme.txt 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb/readme.txt 2006-10-16 04:07:21 UTC (rev 10581) @@ -1,8 +1,8 @@ Hibernate EntityManager ================================================== -Version: 3.2.0.CR3, 4.10.2006 +Version: 3.2.0.GA, 16.10.2006 -THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.2.0.CR5 AND +THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.2.0.GA (or CR5) AND DOES NOT WORK WITH HIBERNATE 3.1.x OR ANY OLDER VERSION OF HIBERNATE. Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java =================================================================== --- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-10-16 04:07:21 UTC (rev 10581) @@ -8,7 +8,7 @@ * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.2.0.CR3"; + public static final String VERSION = "3.2.0.GA"; private static Log log = LogFactory.getLog( Version.class ); static { Modified: trunk/HibernateExt/ejb-api/build.xml =================================================================== --- trunk/HibernateExt/ejb-api/build.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb-api/build.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -95,11 +95,13 @@ version="true" windowtitle="EJB 3.0 Persistence API Documentation" doctitle="EJB 3.0 Persistence API Documentation" + stylesheetfile="./etc/jdstyle.css" link="http://java.sun.com/j2se/1.5/docs/api"> <packageset dir="${src.dir}" defaultexcludes="yes" > <include name="**/*" /> </packageset> </javadoc> + </target> Added: trunk/HibernateExt/ejb-api/etc/jdstyle.css =================================================================== --- trunk/HibernateExt/ejb-api/etc/jdstyle.css 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/ejb-api/etc/jdstyle.css 2006-10-16 04:07:21 UTC (rev 10581) @@ -0,0 +1,117 @@ +/* Javadoc style sheet */ + +/* Define colors, fonts and other style attributes here to override the defaults */ + +/* Page background color */ +body { font-family: Arial; + background-color: white; + font-size: 10pt; + } +td { font-family: Arial; + font-size: 10pt; + } +/* Table colors */ +.TableHeadingColor { background: #F4F4F4 } +.TableSubHeadingColor { background: #F4F4F4 } +.TableRowColor { background: #FFFFFF } + +/* Font used in left-hand frame lists */ +.FrameTitleFont { font-size: normal; font-family: Arial } +.FrameHeadingFont { font-size: normal; font-family: Arial } +.FrameItemFont { font-size: normal; font-family: Arial } + +/* Example of smaller, sans-serif font in frames */ +/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ + +/* Navigation bar fonts and colors */ +.NavBarCell1 { background-color:#F4F4F4;} +.NavBarCell1Rev { background-color:silver;} + +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} + +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} + +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +/*H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; }*/ + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 90%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +} Modified: trunk/HibernateExt/metadata/build.xml =================================================================== --- trunk/HibernateExt/metadata/build.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/metadata/build.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -12,17 +12,19 @@ (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.2.0.CR3"/> + <property name="version" value="3.2.0.GA"/> <property name="javadoc.packagenames" value="org.hibernate.*"/> <property name="jdbc.dir" value="jdbc"/> <property name="copy.test" value="true"/> <property name="common.dir" value="../common"/> - + + <available property="jpa-present" file="${basedir}/../ejb-api" type="dir"/> <import file="${common.dir}/common-build.xml"/> + <property name="jpa-javadoc.dir" value="${dist.doc.dir}/ejb-api"/> <target name="compile" depends="init" description="Compile the Java source code"> <available @@ -142,9 +144,19 @@ <!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> <echo>Skipping java doc since ant's javadoc task cannot handle an alternative javadoc</echo> </target --> + + <target name="jpa-javadoc" if="jpa-present"> + <mkdir dir="${jpa-javadoc.dir}"/> + <ant dir="../ejb-api" target="javadoc" inheritAll="false"/> + <copy todir="${jpa-javadoc.dir}"> + <fileset dir="${basedir}/../ejb-api/build/api"> + <include name="**/*.*"/> + </fileset> + </copy> + </target> <!-- Some of this can probably be moved to common-build... --> - <target name="dist" depends="jar,javadoc,copysource,copytest,copylib,extras" description="Build everything"> + <target name="dist" depends="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"> Modified: trunk/HibernateExt/metadata/changelog.txt =================================================================== --- trunk/HibernateExt/metadata/changelog.txt 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/metadata/changelog.txt 2006-10-16 04:07:21 UTC (rev 10581) @@ -1,6 +1,14 @@ Hibernate Annotations Changelog =============================== +3.2.0.GA (16-10-2006) +--------------------- +Same code base as 3.2.0.CR3 + +** Task + * [ANN-459] - Add EJB 3.0 JavaDoc to the distribution + + 3.2.0.CR3 (04-10-2006) ---------------------- ** Bug Modified: trunk/HibernateExt/metadata/doc/reference/en/master.xml =================================================================== --- trunk/HibernateExt/metadata/doc/reference/en/master.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/metadata/doc/reference/en/master.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -13,7 +13,7 @@ <subtitle>Reference Guide</subtitle> - <releaseinfo>3.2.0 CR3</releaseinfo> + <releaseinfo>3.2.0.GA</releaseinfo> <mediaobject> <imageobject> Modified: trunk/HibernateExt/metadata/doc/reference/en/modules/entity.xml =================================================================== --- trunk/HibernateExt/metadata/doc/reference/en/modules/entity.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/metadata/doc/reference/en/modules/entity.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -5,14 +5,14 @@ <sect1 id="entity-overview" revision="1"> <title>Intro</title> - <para>This section covers EJB 3.0 entity bean annotations and + <para>This section covers EJB 3.0 (aka JPA) entity annotations and Hibernate-specific extensions.</para> </sect1> <sect1 id="entity-mapping" revision="2"> - <title>Mapping with EJB3 Annotations</title> + <title>Mapping with EJB3/JPA Annotations</title> - <para>EJB3 entity beans are plain POJOs. Actually they represent the exact + <para>EJB3 entities are plain POJOs. Actually they represent the exact same concept as the Hibernate persistent entities. Their mappings are defined through JDK 5.0 annotations (an XML descriptor syntax for overriding is defined in the EJB3 specification). Annotations can be split Modified: trunk/HibernateExt/metadata/doc/reference/en/modules/setup.xml =================================================================== --- trunk/HibernateExt/metadata/doc/reference/en/modules/setup.xml 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/metadata/doc/reference/en/modules/setup.xml 2006-10-16 04:07:21 UTC (rev 10581) @@ -12,15 +12,14 @@ </listitem> <listitem> - <para><emphasis>This release requires Hibernate 3.2.0.CR5 and above. + <para><emphasis>This release requires Hibernate 3.2.0.GA and above. Do not use this release of Hibernate Annotations with an older version of Hibernate 3.x!</emphasis></para> </listitem> <listitem> - <para>This release is known to work on Hibernate core 3.2.0.CR5 and is - expected (at the time of writing) to work on Hibernate Core - 3.2.0.GA</para> + <para>This release is known to work on Hibernate core 3.2.0.CR5 + and 3.2.0.GA</para> </listitem> <listitem> Modified: trunk/HibernateExt/metadata/readme.txt =================================================================== --- trunk/HibernateExt/metadata/readme.txt 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/metadata/readme.txt 2006-10-16 04:07:21 UTC (rev 10581) @@ -1,8 +1,8 @@ Hibernate Annotations ================================================== -Version: 3.2.0 CR3, 4.10.2006 +Version: 3.2.0.GA, 16.10.2006 -THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.2.0.CR5 AND DOES NOT +THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.2.0.GA (or CR5) AND DOES NOT WORK WITH HIBERNATE 3.1.x OR ANY OLDER VERSION OF HIBERNATE. Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java 2006-10-16 02:48:43 UTC (rev 10580) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java 2006-10-16 04:07:21 UTC (rev 10581) @@ -8,7 +8,7 @@ * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.2.0.CR3"; + public static final String VERSION = "3.2.0.GA"; private static Log log = LogFactory.getLog( Version.class ); static {