[jboss-cvs] Repository SVN: r11252 - in hibernate-annotations: 3.2.1.GA_CP02-brew and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 3 16:01:42 EDT 2008
Author: permaine
Date: 2008-07-03 16:01:42 -0400 (Thu, 03 Jul 2008)
New Revision: 11252
Added:
hibernate-annotations/3.2.1.GA_CP02-brew/
hibernate-annotations/3.2.1.GA_CP02-brew/component-info.xml
hibernate-annotations/3.2.1.GA_CP02-brew/lib/
hibernate-annotations/3.2.1.GA_CP02-brew/lib/hibernate-annotations.jar
hibernate-annotations/3.2.1.GA_CP02-brew/src/
hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-3.2.1.cp02-src.tar.gz
hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-ANN-551.patch
hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-JBPAPP-936.patch
hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-common-build_xml.patch
hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-jdstyle.css
Log:
Add Brew-build 3.2.1.GA_CP02-brew
Added: hibernate-annotations/3.2.1.GA_CP02-brew/component-info.xml
===================================================================
--- hibernate-annotations/3.2.1.GA_CP02-brew/component-info.xml (rev 0)
+++ hibernate-annotations/3.2.1.GA_CP02-brew/component-info.xml 2008-07-03 20:01:42 UTC (rev 11252)
@@ -0,0 +1,27 @@
+<project name="hibernate-annotations-component-info">
+ <component id="hibernate-annotations"
+ licenseType="lgpl"
+ version="3.2.1.GA_CP02-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-4_GA_CP02_1jpp_ep1_4_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"/>
+ <compatible version="3.2.4.SP1_CP03-brew"/>
+ <compatible version="3.2.4.SP1_CP04-brew"/>
+ </import>
+ <export>
+ <include input="hibernate-annotations.jar"/>
+ </export>
+
+ </component>
+
+</project>
Added: hibernate-annotations/3.2.1.GA_CP02-brew/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)
Property changes on: hibernate-annotations/3.2.1.GA_CP02-brew/lib/hibernate-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-3.2.1.cp02-src.tar.gz
===================================================================
(Binary files differ)
Property changes on: hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-3.2.1.cp02-src.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-ANN-551.patch
===================================================================
--- hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-ANN-551.patch (rev 0)
+++ hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-ANN-551.patch 2008-07-03 20:01:42 UTC (rev 11252)
@@ -0,0 +1,37 @@
+--- ./src/java/org/hibernate/cfg/AnnotationBinder.java.orig 2008-06-26 11:36:51.000000000 -0400
++++ ./src/java/org/hibernate/cfg/AnnotationBinder.java 2008-06-26 11:39:41.000000000 -0400
+@@ -10,6 +10,8 @@ import java.util.List;
+ 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 @@ public final class AnnotationBinder {
+
+ 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(
+--- src/test/org/hibernate/test/annotations/query/Chaos.java.orig 2008-06-26 11:40:18.000000000 -0400
++++ src/test/org/hibernate/test/annotations/query/Chaos.java 2008-06-26 11:41:06.000000000 -0400
+@@ -22,8 +22,8 @@ import org.hibernate.annotations.Loader;
+ */
+ @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_CP02-brew/src/hibernate-annotations-JBPAPP-936.patch
===================================================================
--- hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-JBPAPP-936.patch (rev 0)
+++ hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-JBPAPP-936.patch 2008-07-03 20:01:42 UTC (rev 11252)
@@ -0,0 +1,11 @@
+--- src/java/org/hibernate/cfg/AnnotationBinder.java.orig 2008-06-30 16:25:12.000000000 -0400
++++ src/java/org/hibernate/cfg/AnnotationBinder.java 2008-06-30 16:27:42.000000000 -0400
+@@ -1025,7 +1025,7 @@ public final class AnnotationBinder {
+ //TODO make those hardcoded tests more portable (through the bytecode provider?)
+ return property.isAnnotationPresent( Transient.class )
+ || "net.sf.cglib.transform.impl.InterceptFieldCallback".equals( property.getType().getName() )
+- || "org.hibernate.tool.instrument.javassist.FieldHandler".equals( property.getType().getName() );
++ || "org.hibernate.bytecode.javassist.FieldHandler".equals( property.getType().getName() );
+ }
+
+ /**
Added: hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-common-build_xml.patch
===================================================================
--- hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-common-build_xml.patch (rev 0)
+++ hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-common-build_xml.patch 2008-07-03 20:01:42 UTC (rev 11252)
@@ -0,0 +1,47 @@
+--- common-build.xml.sav 2008-06-27 16:42:06.000000000 -0400
++++ common-build.xml 2008-06-30 13:40:38.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="**/*" />
+@@ -395,7 +394,7 @@
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest todir="${instrumenttest.out.dir}" haltonfailure="no">
+- <fileset dir="${classes.dir}">
++ <fileset dir="${testclasses.dir}">
+ <include name="org/hibernate/test/**/*Test.class"/>
+ </fileset>
+ </batchtest>
+@@ -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_CP02-brew/src/hibernate-annotations-jdstyle.css
===================================================================
--- hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-jdstyle.css (rev 0)
+++ hibernate-annotations/3.2.1.GA_CP02-brew/src/hibernate-annotations-jdstyle.css 2008-07-03 20:01:42 UTC (rev 11252)
@@ -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