[jboss-cvs] Repository SVN: r2426 - in hibernate-annotations: 3.2.1.GA.patch02-brew and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jan 25 07:39:30 EST 2008


Author: fnasser at redhat.com
Date: 2008-01-25 07:39:30 -0500 (Fri, 25 Jan 2008)
New Revision: 2426

Added:
   hibernate-annotations/3.2.1.GA.patch02-brew/
   hibernate-annotations/3.2.1.GA.patch02-brew/component-info.xml
   hibernate-annotations/3.2.1.GA.patch02-brew/lib/
   hibernate-annotations/3.2.1.GA.patch02-brew/lib/hibernate-annotations.jar
   hibernate-annotations/3.2.1.GA.patch02-brew/src/
   hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-3.2.1.GA.tar.gz
   hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-551.patch
   hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-556.patch
   hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-common-build_xml.patch
   hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-jdstyle.css
Log:
Add Brew-built hibernate-annotations 3.2.1.GA.patch02 (fix for ANN-556)

Added: hibernate-annotations/3.2.1.GA.patch02-brew/component-info.xml
===================================================================
--- hibernate-annotations/3.2.1.GA.patch02-brew/component-info.xml	                        (rev 0)
+++ hibernate-annotations/3.2.1.GA.patch02-brew/component-info.xml	2008-01-25 12:39:30 UTC (rev 2426)
@@ -0,0 +1,25 @@
+<project name="hibernate-annotations-component-info">
+   <component id="hibernate-annotations"
+               licenseType="lgpl"
+               version="3.2.1.GA.patch02-brew"
+               projectHome="http://annotations.hibernate.org"
+      description="Annotations for Hibernate/EJB3 - Patch for ANN-551"
+      scm=":ext:cvs.devel.redhat.com:/cvs/dist/hibernate3-annotations"
+      tag="hibernate3-annotations-3_2_1-1_patch02_1jpp_ep1_1_el4">
+      <!-- Built using JDK 5 -->
+      <artifact id="hibernate-annotations.jar"/>
+      <import componentref="hibernate">
+         <compatible version="3.2.0.GA"/>
+         <compatible version="3.2.1.GA"/>
+         <compatible version="3.2.3.GA"/>
+         <compatible version="3.2.4.SP1"/>         
+         <compatible version="3.2.4.SP1_CP01-brew"/>         
+         <compatible version="3.2.4.SP1_CP02-brew"/>         
+      </import>
+      <export>
+         <include input="hibernate-annotations.jar"/>         
+      </export>
+      
+   </component>
+
+</project>

Added: hibernate-annotations/3.2.1.GA.patch02-brew/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)


Property changes on: hibernate-annotations/3.2.1.GA.patch02-brew/lib/hibernate-annotations.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-3.2.1.GA.tar.gz
===================================================================
(Binary files differ)


Property changes on: hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-3.2.1.GA.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-551.patch
===================================================================
--- hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-551.patch	                        (rev 0)
+++ hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-551.patch	2008-01-25 12:39:30 UTC (rev 2426)
@@ -0,0 +1,37 @@
+--- src/org/hibernate/cfg/AnnotationBinder.java.orig	2007-08-24 11:32:24.432112000 -0400
++++ src/org/hibernate/cfg/AnnotationBinder.java	2007-08-24 11:35:47.002337000 -0400
+@@ -10,6 +10,8 @@
+ import java.util.Map;
+ import java.util.Properties;
+ import java.util.Set;
++import java.util.Collections;
++import java.util.Comparator;
+ import javax.persistence.Basic;
+ import javax.persistence.Column;
+ import javax.persistence.DiscriminatorType;
+@@ -943,6 +945,12 @@
+ 
+ 		log.debug( "Processing " + propertyHolder.getEntityName() + " " + accessType + " annotation" );
+ 		List<XProperty> properties = annotatedClass.getDeclaredProperties( accessType );
++               //order so that property are used int he same order when binding native query
++               Collections.sort( properties, new Comparator<XProperty>() {
++                       public int compare(XProperty property1, XProperty property2) {
++                               return property1.getName().compareTo( property2.getName() );
++                       }
++               } );
+ 		for ( XProperty p : properties ) {
+ 			if ( !p.isTypeResolved() && !discoverTypeWithoutReflection( p ) && !mustBeSkipped( p, mappings ) ) {
+ 				throw new AnnotationException(
+--- test/org/hibernate/test/annotations/query/Chaos.java.orig	(.../Chaos.java)	(revision 11171)
++++ test/org/hibernate/test/annotations/query/Chaos.java	(.../Chaos.java)	(revision 11182)
+@@ -22,8 +22,8 @@
+  */
+ @Entity
+ @Table(name="CHAOS")
+- at SQLInsert( sql="INSERT INTO CHAOS(size, name, nickname, id) VALUES(?,upper(?),?,?)")
+- at SQLUpdate( sql="UPDATE CHAOS SET size = ?, name = upper(?), nickname = ? WHERE id = ?")
++ at SQLInsert( sql="INSERT INTO CHAOS(name, nickname, size, id) VALUES(upper(?),?,?,?)")
++ at SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nickname = ?, size = ? WHERE id = ?")
+ @SQLDelete( sql="DELETE CHAOS WHERE id = ?")
+ @SQLDeleteAll( sql="DELETE CHAOS")
+ @Loader(namedQuery = "chaos")

Added: hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-556.patch
===================================================================
--- hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-556.patch	                        (rev 0)
+++ hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-ANN-556.patch	2008-01-25 12:39:30 UTC (rev 2426)
@@ -0,0 +1,45 @@
+diff -u -b -r src/org/hibernate/cfg/AnnotationBinder.java CP/hibernate-annotations-3.2.1.GA_CP01/src/java/org/hibernate/cfg/AnnotationBinder.java
+--- src/org/hibernate/cfg/AnnotationBinder.java	2006-12-08 13:25:52.000000000 -0500
++++ src/java/org/hibernate/cfg/AnnotationBinder.java	2007-12-18 04:53:54.000000000 -0500
+@@ -1,4 +1,4 @@
+-//$Id: AnnotationBinder.java 10938 2006-12-07 05:21:17Z epbernard $
++//$Id: AnnotationBinder.java 14248 2007-12-18 09:53:54Z anthonyHib $
+ package org.hibernate.cfg;
+ 
+ import java.util.ArrayList;
+@@ -1902,7 +1902,7 @@
+ 			}
+ 			else {
+ 				mappings.addSecondPass(
+-						secondPass
++						secondPass, BinderHelper.isDefault( mappedBy )
+ 				);
+ 			}
+ 		}
+diff -u -b -r src/org/hibernate/cfg/AnnotationConfiguration.java CP/hibernate-annotations-3.2.1.GA_CP01/src/java/org/hibernate/cfg/AnnotationConfiguration.java
+--- src/org/hibernate/cfg/AnnotationConfiguration.java	2006-12-08 13:25:51.000000000 -0500
++++ src/java/org/hibernate/cfg/AnnotationConfiguration.java	2007-12-18 04:53:54.000000000 -0500
+@@ -1,4 +1,4 @@
+-// $Id: AnnotationConfiguration.java 10650 2006-10-25 01:18:29Z epbernard $
++// $Id: AnnotationConfiguration.java 14248 2007-12-18 09:53:54Z anthonyHib $
+ package org.hibernate.cfg;
+ 
+ import java.io.File;
+@@ -293,6 +293,17 @@
+ 				iter.remove();
+ 			}
+ 		}
++		//process OneToManySecondPass in order: first
++		iter = secondPasses.iterator();
++		while ( iter.hasNext() ) {
++			SecondPass sp = (SecondPass) iter.next();
++
++			if ( sp instanceof CreateKeySecondPass ) {
++				sp.doSecondPass( classes );
++				iter.remove();
++			}
++		}
++		
+ 		super.secondPassCompile();
+ 		inSecondPass = false;
+ 		Iterator tables = (Iterator<Map.Entry<Table, List<String[]>>>) tableUniqueConstraints.entrySet().iterator();

Added: hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-common-build_xml.patch
===================================================================
--- hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-common-build_xml.patch	                        (rev 0)
+++ hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-common-build_xml.patch	2008-01-25 12:39:30 UTC (rev 2426)
@@ -0,0 +1,38 @@
+--- common-build.xml.sav	2006-05-13 20:08:02.000000000 -0400
++++ common-build.xml	2006-08-02 12:08:49.000000000 -0400
+@@ -39,7 +39,7 @@
+ 
+ 
+     <!-- set Hibernate core related properties -->
+-    <property name="hibernate-core.home" location="${common-build.basedir}/../../hibernate-3.2"/>
++    <property name="hibernate-core.home" location="${common-build.basedir}"/>
+     <property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/>
+     <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/>
+     <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/>  <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 -->
+@@ -225,7 +225,7 @@
+     <target name="instrument" depends="compiletest"
+ 			description="Instrument the persistent classes"> <!-- depends="jar" -->
+ 
+-		<taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask">
++		<taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
+ 			<classpath path="${classes.dir}"/>
+             <classpath path="${testclasses.dir}"/>         
+ 			<classpath refid="lib.class.path"/>
+@@ -320,9 +320,8 @@
+         	protected="true"
+         	version="true"
+         	windowtitle="${Name} API Documentation"
+-        	Overview="${doc.api.dir}/package.html"
+         	doctitle="${Name} API Documentation"
+-        	stylesheetfile="${hibernate-core.doc.api}/jdstyle.css"
++        	stylesheetfile="${doc.api.dir}/jdstyle.css"
+         	link="${javadoc}">
+         	<packageset dir="${src.dir}" defaultexcludes="yes" >
+ 		      <include name="**/*" />
+@@ -443,4 +442,4 @@
+ 		<cvs command="-q diff -u -N" output="patch.txt"/>
+ 	</target>
+ 
+-</project>
+\ No newline at end of file
++</project>

Added: hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-jdstyle.css
===================================================================
--- hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-jdstyle.css	                        (rev 0)
+++ hibernate-annotations/3.2.1.GA.patch02-brew/src/hibernate-annotations-jdstyle.css	2008-01-25 12:39:30 UTC (rev 2426)
@@ -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;
+}




More information about the jboss-cvs-commits mailing list