June 2013 - hibernate-commits - Jboss List Archives

Hibernate SVN: r21140 - in annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src: test/java/org/hibernate/test and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: brmeyer Date: 2013-06-29 14:01:04 -0400 (Sat, 29 Jun 2013) New Revision: 21140 Added: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java Modified: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java Log: HHH-4412 JBPAPP-10800 bulk update with native sql queries Modified: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2013-06-29 17:59:13 UTC (rev 21139) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2013-06-29 18:01:04 UTC (rev 21140) @@ -48,7 +48,7 @@ queryName, getBoolean( queryName, "org.hibernate.cacheable", hints ), getString( queryName, "org.hibernate.cacheRegion", hints ), - getInteger( queryName, "org.hibernate.timeout", hints ), + getTimeout( queryName, hints ), getInteger( queryName, "org.hibernate.fetchSize", hints ), getFlushMode( queryName, hints ), getCacheMode( queryName, hints ), @@ -84,7 +84,7 @@ null, getBoolean( queryName, "org.hibernate.cacheable", hints ), getString( queryName, "org.hibernate.cacheRegion", hints ), - getInteger( queryName, "org.hibernate.timeout", hints ), + getTimeout( queryName, hints ), getInteger( queryName, "org.hibernate.fetchSize", hints ), getFlushMode( queryName, hints ), getCacheMode( queryName, hints ), @@ -105,7 +105,7 @@ null, getBoolean( queryName, "org.hibernate.cacheable", hints ), getString( queryName, "org.hibernate.cacheRegion", hints ), - getInteger( queryName, "org.hibernate.timeout", hints ), + getTimeout( queryName, hints ), getInteger( queryName, "org.hibernate.fetchSize", hints ), getFlushMode( queryName, hints ), getCacheMode( queryName, hints ), @@ -116,7 +116,21 @@ ); } else { - throw new NotYetImplementedException( "Pure native scalar queries are not yet supported" ); + query = new NamedSQLQueryDefinition( + queryName, + new NativeSQLQueryReturn[0], + null, + getBoolean( queryName, "org.hibernate.cacheable", hints ), + getString( queryName, "org.hibernate.cacheRegion", hints ), + getTimeout( queryName, hints ), + getInteger( queryName, "org.hibernate.fetchSize", hints ), + getFlushMode( queryName, hints ), + getCacheMode( queryName, hints ), + getBoolean( queryName, "org.hibernate.readOnly", hints ), + getString( queryName, "org.hibernate.comment", hints ), + null, + getBoolean( queryName, "org.hibernate.callable", hints ) + ); } if ( isDefault ) { mappings.addDefaultSQLQuery( queryAnn.name(), query ); @@ -386,4 +400,18 @@ } return null; } + + private static Integer getTimeout(String queryName, QueryHint[] hints) { + Integer timeout = getInteger(queryName, + "javax.persistence.query.timeout", hints); + + if (timeout != null) { + // convert milliseconds to seconds + timeout = (int) Math.round(timeout.doubleValue() / 1000.0); + } else { + // timeout is already in seconds + timeout = getInteger(queryName, "org.hibernate.timeout", hints); + } + return timeout; + } } Added: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java (rev 0) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java 2013-06-29 18:01:04 UTC (rev 21140) @@ -0,0 +1,99 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * JBoss, Home of Professional Open Source + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.hibernate.test.jpa.ql; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedNativeQueries; +import javax.persistence.NamedNativeQuery; +import javax.persistence.Table; + +/** + * @author Janario Oliveira + */ +@Entity +@Table(name = "destination_entity") +@NamedNativeQueries({ + @NamedNativeQuery(name = "DestinationEntity.insertSelect", query = "insert into destination_entity(id, from_id, fullNameFrom) " + + " select fe.id, fe.id, fe.name||fe.lastName from from_entity fe where fe.id in (:ids)"), + @NamedNativeQuery(name = "DestinationEntity.insert", query = "insert into destination_entity(id, from_id, fullNameFrom) " + + "values (:generatedId, :fromId, :fullName)"), + @NamedNativeQuery(name = "DestinationEntity.update", query = "update destination_entity set from_id=:idFrom, fullNameFrom=:fullName" + + " where id in (:ids)"), + @NamedNativeQuery(name = "DestinationEntity.delete", query = "delete from destination_entity where id in (:ids)"), + @NamedNativeQuery(name = "DestinationEntity.selectIds", query = "select id, from_id, fullNameFrom from destination_entity where id in (:ids)") }) +public class DestinationEntity { + + @Id + @GeneratedValue + Integer id; + @ManyToOne(optional = false) + @JoinColumn(name = "from_id") + FromEntity from; + @Column(nullable = false) + String fullNameFrom; + + public DestinationEntity() { + } + + public DestinationEntity(FromEntity from, String fullNameFrom) { + this.from = from; + this.fullNameFrom = fullNameFrom; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ( ( from == null ) ? 0 : from.hashCode() ); + result = prime * result + ( ( fullNameFrom == null ) ? 0 : fullNameFrom.hashCode() ); + return result; + } + + @Override + public boolean equals(Object obj) { + if ( this == obj ) + return true; + if ( obj == null ) + return false; + if ( getClass() != obj.getClass() ) + return false; + DestinationEntity other = (DestinationEntity) obj; + if ( from == null ) { + if ( other.from != null ) + return false; + } + else if ( !from.equals( other.from ) ) + return false; + if ( fullNameFrom == null ) { + if ( other.fullNameFrom != null ) + return false; + } + else if ( !fullNameFrom.equals( other.fullNameFrom ) ) + return false; + return true; + } + +} Added: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java (rev 0) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java 2013-06-29 18:01:04 UTC (rev 21140) @@ -0,0 +1,77 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * JBoss, Home of Professional Open Source + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.hibernate.test.jpa.ql; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * @author Janario Oliveira + */ +@Entity +@Table(name = "from_entity") +public class FromEntity { + + @Id + @GeneratedValue + Integer id; + @Column(nullable = false) + String name; + @Column(nullable = false) + String lastName; + + public FromEntity() { + } + + public FromEntity(String name, String lastName) { + this.name = name; + this.lastName = lastName; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 53 * hash + ( this.name != null ? this.name.hashCode() : 0 ); + hash = 53 * hash + ( this.lastName != null ? this.lastName.hashCode() : 0 ); + return hash; + } + + @Override + public boolean equals(Object obj) { + if ( obj == null ) { + return false; + } + if ( getClass() != obj.getClass() ) { + return false; + } + final FromEntity other = (FromEntity) obj; + if ( ( this.name == null ) ? ( other.name != null ) : !this.name.equals( other.name ) ) { + return false; + } + if ( ( this.lastName == null ) ? ( other.lastName != null ) : !this.lastName.equals( other.lastName ) ) { + return false; + } + return true; + } +} Added: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java (rev 0) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java 2013-06-29 18:01:04 UTC (rev 21140) @@ -0,0 +1,312 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * JBoss, Home of Professional Open Source + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.hibernate.test.jpa.ql; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.SQLServerDialect; +import org.hibernate.junit.SkipForDialect; +import org.hibernate.test.annotations.TestCase; + +/** + * @author Janario Oliveira + */ +public class NamedNativeQueryTest extends TestCase { + + private FromEntity createFrom(String name, String lastName) { + Session session = openSession(); + session.getTransaction().begin(); + FromEntity fromEntity = new FromEntity( name, lastName ); + session.save( fromEntity ); + session.getTransaction().commit(); + session.close(); + return fromEntity; + } + + private DestinationEntity createDestination(FromEntity fromEntity, String fullName) { + final DestinationEntity destinationEntity = new DestinationEntity( fromEntity, fullName ); + + Session session = openSession(); + session.getTransaction().begin(); + session.save( destinationEntity ); + session.getTransaction().commit(); + session.close(); + return destinationEntity; + } + + @SuppressWarnings("unchecked") + private List<DestinationEntity> findDestinationByIds(List<Integer> ids) { + Session session = openSession(); + List<DestinationEntity> list = session + .createQuery( "from DestinationEntity de where de.id in (:ids) order by id" ) + .setParameterList( "ids", ids ).list(); + session.close(); + return list; + } + + public void testSingleSelect() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + final DestinationEntity destination = createDestination( createFrom( name, lastName ), fullName ); + + Session session = openSession(); + Query select = session.getNamedQuery( "DestinationEntity.selectIds" ); + select.setParameterList( "ids", Collections.singletonList( destination.id ) ); + Object[] unique = (Object[]) select.uniqueResult(); + session.close(); + + // Compare the Strings, not the actual IDs. Can come back as, for ex, + // a BigDecimal in Oracle. + assertEquals( destination.id + "", unique[0] + "" ); + assertEquals( destination.from.id + "", unique[1] + "" ); + assertEquals( destination.fullNameFrom, unique[2] ); + } + + public void testMultipleSelect() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<DestinationEntity> destinations = new ArrayList<DestinationEntity>(); + for ( int i = 0; i < quantity; i++ ) { + DestinationEntity createDestination = createDestination( createFrom( name + i, lastName + i ), name + i + + lastName + i ); + ids.add( createDestination.id ); + destinations.add( createDestination ); + } + + Session session = openSession(); + Query select = session.getNamedQuery( "DestinationEntity.selectIds" ); + select.setParameterList( "ids", ids ); + List list = select.list(); + session.close(); + + assertEquals( quantity, list.size() ); + for ( int i = 0; i < list.size(); i++ ) { + Object[] object = (Object[]) list.get( i ); + DestinationEntity destination = destinations.get( i ); + // Compare the Strings, not the actual IDs. Can come back as, for ex, + // a BigDecimal in Oracle. + assertEquals( destination.id + "", object[0] + "" ); + assertEquals( destination.from.id + "", object[1] + "" ); + assertEquals( destination.fullNameFrom, object[2] ); + } + } + + public void testInsertSingleValue() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + final FromEntity fromEntity = createFrom( name, lastName ); + final int id = 10000;// id fake + + Session session = openSession(); + session.getTransaction().begin(); + Query insert = session.getNamedQuery( "DestinationEntity.insert" ); + insert.setParameter( "generatedId", id ); + insert.setParameter( "fromId", fromEntity.id ); + insert.setParameter( "fullName", fullName ); + int executeUpdate = insert.executeUpdate(); + assertEquals( 1, executeUpdate ); + session.getTransaction().commit(); + session.close(); + + session = openSession(); + DestinationEntity get = (DestinationEntity) session.get( DestinationEntity.class, id ); + session.close(); + + assertEquals( fromEntity, get.from ); + assertEquals( fullName, get.fullNameFrom ); + } + + @SkipForDialect( value = { MySQLDialect.class, SQLServerDialect.class }, + comment = "MySQL appears to have trouble with fe.id selected twice in one statement. SQL Server does not support the || operator.") + // TODO: Re-form DestinationEntity.insertSelect to something more supported? + public void testInsertMultipleValues() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<FromEntity> froms = new ArrayList<FromEntity>(); + for ( int i = 0; i < quantity; i++ ) { + FromEntity fe = createFrom( name + i, lastName + i ); + froms.add( fe ); + ids.add( fe.id ); + } + + Session session = openSession(); + session.getTransaction().begin(); + Query insertSelect = session.getNamedQuery( "DestinationEntity.insertSelect" ); + insertSelect.setParameterList( "ids", ids ); + int executeUpdate = insertSelect.executeUpdate(); + assertEquals( quantity, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + List<DestinationEntity> list = findDestinationByIds( ids ); + assertEquals( quantity, list.size() ); + + for ( int i = 0; i < quantity; i++ ) { + DestinationEntity de = (DestinationEntity) list.get( i ); + FromEntity from = froms.get( i ); + assertEquals( from, de.from ); + assertEquals( from.name + from.lastName, de.fullNameFrom ); + } + } + + public void testUpdateSingleValue() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + + final FromEntity fromEntity = createFrom( name, lastName ); + final DestinationEntity destinationEntity = createDestination( fromEntity, fullName ); + + final String inverseFullName = lastName + " " + name; + final FromEntity anotherFrom = createFrom( lastName, name ); + + Session session = openSession(); + session.getTransaction().begin(); + Query update = session.getNamedQuery( "DestinationEntity.update" ); + update.setParameter( "idFrom", anotherFrom.id ); + update.setParameter( "fullName", inverseFullName ); + update.setParameterList( "ids", Collections.singletonList( destinationEntity.id ) ); + + int executeUpdate = update.executeUpdate(); + assertEquals( 1, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + session = openSession(); + DestinationEntity get = (DestinationEntity) session.get( DestinationEntity.class, destinationEntity.id ); + + assertEquals( anotherFrom, get.from ); + assertEquals( inverseFullName, get.fullNameFrom ); + session.close(); + } + + public void testUpdateMultipleValues() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<DestinationEntity> destinations = new ArrayList<DestinationEntity>(); + for ( int i = 0; i < quantity; i++ ) { + FromEntity fe = createFrom( name + i, lastName + i ); + DestinationEntity destination = createDestination( fe, fe.name + fe.lastName ); + destinations.add( destination ); + ids.add( destination.id ); + } + + final String inverseFullName = lastName + " " + name; + final FromEntity anotherFrom = createFrom( lastName, name ); + + Session session = openSession(); + session.getTransaction().begin(); + Query update = session.getNamedQuery( "DestinationEntity.update" ); + update.setParameter( "idFrom", anotherFrom.id ); + update.setParameter( "fullName", inverseFullName ); + update.setParameterList( "ids", ids ); + + int executeUpdate = update.executeUpdate(); + assertEquals( quantity, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + List<DestinationEntity> list = findDestinationByIds( ids ); + assertEquals( quantity, list.size() ); + + for ( int i = 0; i < quantity; i++ ) { + DestinationEntity updated = (DestinationEntity) list.get( i ); + + assertEquals( anotherFrom, updated.from ); + assertEquals( inverseFullName, updated.fullNameFrom ); + } + } + + public void testDeleteSingleValue() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + + final FromEntity fromEntity = createFrom( name, lastName ); + final DestinationEntity destinationEntity = createDestination( fromEntity, fullName ); + + Session session = openSession(); + session.getTransaction().begin(); + Query delete = session.getNamedQuery( "DestinationEntity.delete" ); + delete.setParameterList( "ids", Collections.singletonList( destinationEntity.id ) ); + + int executeUpdate = delete.executeUpdate(); + assertEquals( 1, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + session = openSession(); + DestinationEntity get = (DestinationEntity) session.get( DestinationEntity.class, destinationEntity.id ); + session.close(); + + assertNull( get ); + } + + public void testDeleteMultipleValues() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<DestinationEntity> destinations = new ArrayList<DestinationEntity>(); + for ( int i = 0; i < quantity; i++ ) { + FromEntity fe = createFrom( name + i, lastName + i ); + DestinationEntity destination = createDestination( fe, fe.name + fe.lastName ); + destinations.add( destination ); + ids.add( destination.id ); + } + + Session session = openSession(); + session.getTransaction().begin(); + Query delete = session.getNamedQuery( "DestinationEntity.delete" ); + delete.setParameterList( "ids", ids ); + + int executeUpdate = delete.executeUpdate(); + assertEquals( quantity, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + List<DestinationEntity> list = findDestinationByIds( ids ); + assertTrue( list.isEmpty() ); + } + + @Override + protected Class[] getAnnotatedClasses() { + return new Class[] { FromEntity.class, DestinationEntity.class }; + } +}

11 years, 6 months

1
0
0 / 0

Hibernate SVN: r21139 - annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800.

by hibernate-commits＠lists.jboss.org

Author: brmeyer Date: 2013-06-29 13:59:13 -0400 (Sat, 29 Jun 2013) New Revision: 21139 Added: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/ Log: JBPAPP-10800 branching Copied: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt (from rev 21138, annotations/tags/3.4.0.GA_CP05/lgpl.txt) =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt (rev 0) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt 2013-06-29 17:59:13 UTC (rev 21139) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Copied: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml (from rev 21138, annotations/tags/3.4.0.GA_CP05/pom.xml) =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml (rev 0) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml 2013-06-29 17:59:13 UTC (rev 21139) @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.3.2.GA_CP05</version> + </parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <packaging>jar</packaging> + <version>3.4.0.GA_CP05</version> + + <name>Hibernate Annotations</name> + <description>Annotations metadata for Hibernate</description> + <url>http://annotations.hibernate.org</url> + + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA_CP05</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-testing</artifactId> + <version>3.3.2.GA_CP05</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-injection-plugin</artifactId> + <version>1.0.2</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>bytecode</goal> + </goals> + </execution> + </executions> + <configuration> + <bytecodeInjections> + <bytecodeInjection> + <expression>${pom.version}</expression> + <targetMembers> + <constant> + <className>org.hibernate.cfg.annotations.Version</className> + <fieldName>VERSION</fieldName> + </constant> + <methodBodyReturn> + <className>org.hibernate.cfg.annotations.Version</className> + <methodName>getVersionString</methodName> + </methodBodyReturn> + </targetMembers> + </bytecodeInjection> + </bytecodeInjections> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Specification-Vendor>jcp.org</Specification-Vendor> + <Specification-Version>1.0</Specification-Version> + <Specification-Title>Java Persistence</Specification-Title> + <Implementation-Vendor-Id>hibernate.org</Implementation-Vendor-Id> + <Implementation-URL>http://annotations.hibernate.org</Implementation-URL> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.5</version> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://download.oracle.com/javase/6/docs/api/</link> + <link>http://download.oracle.com/javaee/6/api/</link> + </links> + <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile> + </configuration> + </plugin> + </plugins> + </reporting> +</project>

11 years, 6 months

1
0
0 / 0

Hibernate SVN: r21138 - annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800.

by hibernate-commits＠lists.jboss.org

Author: brmeyer Date: 2013-06-29 13:58:38 -0400 (Sat, 29 Jun 2013) New Revision: 21138 Removed: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/ Log: JBPAPP-10800 branching Deleted: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt 2013-06-29 17:56:51 UTC (rev 21137) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt 2013-06-29 17:58:38 UTC (rev 21138) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Deleted: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml 2013-06-29 17:56:51 UTC (rev 21137) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml 2013-06-29 17:58:38 UTC (rev 21138) @@ -1,174 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <version>3.3.2.GA_CP05</version> - </parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <packaging>jar</packaging> - <version>3.4.0.GA_CP05</version> - - <name>Hibernate Annotations</name> - <description>Annotations metadata for Hibernate</description> - <url>http://annotations.hibernate.org</url> - - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA_CP05</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-testing</artifactId> - <version>3.3.2.GA_CP05</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-injection-plugin</artifactId> - <version>1.0.2</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>bytecode</goal> - </goals> - </execution> - </executions> - <configuration> - <bytecodeInjections> - <bytecodeInjection> - <expression>${pom.version}</expression> - <targetMembers> - <constant> - <className>org.hibernate.cfg.annotations.Version</className> - <fieldName>VERSION</fieldName> - </constant> - <methodBodyReturn> - <className>org.hibernate.cfg.annotations.Version</className> - <methodName>getVersionString</methodName> - </methodBodyReturn> - </targetMembers> - </bytecodeInjection> - </bytecodeInjections> - </configuration> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Specification-Vendor>jcp.org</Specification-Vendor> - <Specification-Version>1.0</Specification-Version> - <Specification-Title>Java Persistence</Specification-Title> - <Implementation-Vendor-Id>hibernate.org</Implementation-Vendor-Id> - <Implementation-URL>http://annotations.hibernate.org</Implementation-URL> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.5</version> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/dist.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://download.oracle.com/javase/6/docs/api/</link> - <link>http://download.oracle.com/javaee/6/api/</link> - </links> - <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile> - </configuration> - </plugin> - </plugins> - </reporting> -</project>

11 years, 6 months

1
0
0 / 0

Hibernate SVN: r21137 - annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800.

by hibernate-commits＠lists.jboss.org

Author: brmeyer Date: 2013-06-29 13:56:51 -0400 (Sat, 29 Jun 2013) New Revision: 21137 Added: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/src/ Log: JBPAPP-10800 branching Copied: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt (from rev 21136, annotations/branches/v3_4_0_GA_CP/lgpl.txt) =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt (rev 0) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/lgpl.txt 2013-06-29 17:56:51 UTC (rev 21137) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Copied: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml (from rev 21136, annotations/branches/v3_4_0_GA_CP/pom.xml) =================================================================== --- annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml (rev 0) +++ annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/pom.xml 2013-06-29 17:56:51 UTC (rev 21137) @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.3.2.GA_CP05</version> + </parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <packaging>jar</packaging> + <version>3.4.0.GA_CP05</version> + + <name>Hibernate Annotations</name> + <description>Annotations metadata for Hibernate</description> + <url>http://annotations.hibernate.org</url> + + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA_CP05</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-testing</artifactId> + <version>3.3.2.GA_CP05</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-injection-plugin</artifactId> + <version>1.0.2</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>bytecode</goal> + </goals> + </execution> + </executions> + <configuration> + <bytecodeInjections> + <bytecodeInjection> + <expression>${pom.version}</expression> + <targetMembers> + <constant> + <className>org.hibernate.cfg.annotations.Version</className> + <fieldName>VERSION</fieldName> + </constant> + <methodBodyReturn> + <className>org.hibernate.cfg.annotations.Version</className> + <methodName>getVersionString</methodName> + </methodBodyReturn> + </targetMembers> + </bytecodeInjection> + </bytecodeInjections> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Specification-Vendor>jcp.org</Specification-Vendor> + <Specification-Version>1.0</Specification-Version> + <Specification-Title>Java Persistence</Specification-Title> + <Implementation-Vendor-Id>hibernate.org</Implementation-Vendor-Id> + <Implementation-URL>http://annotations.hibernate.org</Implementation-URL> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.5</version> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://download.oracle.com/javase/6/docs/api/</link> + <link>http://download.oracle.com/javaee/6/api/</link> + </links> + <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile> + </configuration> + </plugin> + </plugins> + </reporting> +</project>

11 years, 6 months

1
0
0 / 0

Hibernate SVN: r21136 - annotations/patches.

by hibernate-commits＠lists.jboss.org

Author: brmeyer Date: 2013-06-29 13:55:55 -0400 (Sat, 29 Jun 2013) New Revision: 21136 Added: annotations/patches/annotations-3.4.0.GA_CP05_JBPAPP-10800/ Log: JBPAPP-10800 branching

11 years, 6 months

1
0
0 / 0

Hibernate SVN: r21135 - in annotations/branches/v3_4_0_GA_CP/src: test/java/org/hibernate/test and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: brmeyer Date: 2013-06-29 13:52:40 -0400 (Sat, 29 Jun 2013) New Revision: 21135 Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java Log: HHH-4412 JBPAPP-10799 bulk update with native sql queries Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2013-06-29 16:15:18 UTC (rev 21134) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2013-06-29 17:52:40 UTC (rev 21135) @@ -48,7 +48,7 @@ queryName, getBoolean( queryName, "org.hibernate.cacheable", hints ), getString( queryName, "org.hibernate.cacheRegion", hints ), - getInteger( queryName, "org.hibernate.timeout", hints ), + getTimeout( queryName, hints ), getInteger( queryName, "org.hibernate.fetchSize", hints ), getFlushMode( queryName, hints ), getCacheMode( queryName, hints ), @@ -84,7 +84,7 @@ null, getBoolean( queryName, "org.hibernate.cacheable", hints ), getString( queryName, "org.hibernate.cacheRegion", hints ), - getInteger( queryName, "org.hibernate.timeout", hints ), + getTimeout( queryName, hints ), getInteger( queryName, "org.hibernate.fetchSize", hints ), getFlushMode( queryName, hints ), getCacheMode( queryName, hints ), @@ -105,7 +105,7 @@ null, getBoolean( queryName, "org.hibernate.cacheable", hints ), getString( queryName, "org.hibernate.cacheRegion", hints ), - getInteger( queryName, "org.hibernate.timeout", hints ), + getTimeout( queryName, hints ), getInteger( queryName, "org.hibernate.fetchSize", hints ), getFlushMode( queryName, hints ), getCacheMode( queryName, hints ), @@ -116,7 +116,21 @@ ); } else { - throw new NotYetImplementedException( "Pure native scalar queries are not yet supported" ); + query = new NamedSQLQueryDefinition( + queryName, + new NativeSQLQueryReturn[0], + null, + getBoolean( queryName, "org.hibernate.cacheable", hints ), + getString( queryName, "org.hibernate.cacheRegion", hints ), + getTimeout( queryName, hints ), + getInteger( queryName, "org.hibernate.fetchSize", hints ), + getFlushMode( queryName, hints ), + getCacheMode( queryName, hints ), + getBoolean( queryName, "org.hibernate.readOnly", hints ), + getString( queryName, "org.hibernate.comment", hints ), + null, + getBoolean( queryName, "org.hibernate.callable", hints ) + ); } if ( isDefault ) { mappings.addDefaultSQLQuery( queryAnn.name(), query ); @@ -386,4 +400,18 @@ } return null; } + + private static Integer getTimeout(String queryName, QueryHint[] hints) { + Integer timeout = getInteger(queryName, + "javax.persistence.query.timeout", hints); + + if (timeout != null) { + // convert milliseconds to seconds + timeout = (int) Math.round(timeout.doubleValue() / 1000.0); + } else { + // timeout is already in seconds + timeout = getInteger(queryName, "org.hibernate.timeout", hints); + } + return timeout; + } } Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java 2013-06-29 17:52:40 UTC (rev 21135) @@ -0,0 +1,99 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * JBoss, Home of Professional Open Source + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.hibernate.test.jpa.ql; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedNativeQueries; +import javax.persistence.NamedNativeQuery; +import javax.persistence.Table; + +/** + * @author Janario Oliveira + */ +@Entity +@Table(name = "destination_entity") +@NamedNativeQueries({ + @NamedNativeQuery(name = "DestinationEntity.insertSelect", query = "insert into destination_entity(id, from_id, fullNameFrom) " + + " select fe.id, fe.id, fe.name||fe.lastName from from_entity fe where fe.id in (:ids)"), + @NamedNativeQuery(name = "DestinationEntity.insert", query = "insert into destination_entity(id, from_id, fullNameFrom) " + + "values (:generatedId, :fromId, :fullName)"), + @NamedNativeQuery(name = "DestinationEntity.update", query = "update destination_entity set from_id=:idFrom, fullNameFrom=:fullName" + + " where id in (:ids)"), + @NamedNativeQuery(name = "DestinationEntity.delete", query = "delete from destination_entity where id in (:ids)"), + @NamedNativeQuery(name = "DestinationEntity.selectIds", query = "select id, from_id, fullNameFrom from destination_entity where id in (:ids)") }) +public class DestinationEntity { + + @Id + @GeneratedValue + Integer id; + @ManyToOne(optional = false) + @JoinColumn(name = "from_id") + FromEntity from; + @Column(nullable = false) + String fullNameFrom; + + public DestinationEntity() { + } + + public DestinationEntity(FromEntity from, String fullNameFrom) { + this.from = from; + this.fullNameFrom = fullNameFrom; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ( ( from == null ) ? 0 : from.hashCode() ); + result = prime * result + ( ( fullNameFrom == null ) ? 0 : fullNameFrom.hashCode() ); + return result; + } + + @Override + public boolean equals(Object obj) { + if ( this == obj ) + return true; + if ( obj == null ) + return false; + if ( getClass() != obj.getClass() ) + return false; + DestinationEntity other = (DestinationEntity) obj; + if ( from == null ) { + if ( other.from != null ) + return false; + } + else if ( !from.equals( other.from ) ) + return false; + if ( fullNameFrom == null ) { + if ( other.fullNameFrom != null ) + return false; + } + else if ( !fullNameFrom.equals( other.fullNameFrom ) ) + return false; + return true; + } + +} Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/FromEntity.java 2013-06-29 17:52:40 UTC (rev 21135) @@ -0,0 +1,77 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * JBoss, Home of Professional Open Source + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.hibernate.test.jpa.ql; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * @author Janario Oliveira + */ +@Entity +@Table(name = "from_entity") +public class FromEntity { + + @Id + @GeneratedValue + Integer id; + @Column(nullable = false) + String name; + @Column(nullable = false) + String lastName; + + public FromEntity() { + } + + public FromEntity(String name, String lastName) { + this.name = name; + this.lastName = lastName; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 53 * hash + ( this.name != null ? this.name.hashCode() : 0 ); + hash = 53 * hash + ( this.lastName != null ? this.lastName.hashCode() : 0 ); + return hash; + } + + @Override + public boolean equals(Object obj) { + if ( obj == null ) { + return false; + } + if ( getClass() != obj.getClass() ) { + return false; + } + final FromEntity other = (FromEntity) obj; + if ( ( this.name == null ) ? ( other.name != null ) : !this.name.equals( other.name ) ) { + return false; + } + if ( ( this.lastName == null ) ? ( other.lastName != null ) : !this.lastName.equals( other.lastName ) ) { + return false; + } + return true; + } +} Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java 2013-06-29 17:52:40 UTC (rev 21135) @@ -0,0 +1,312 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * JBoss, Home of Professional Open Source + * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors + * as indicated by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.hibernate.test.jpa.ql; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.SQLServerDialect; +import org.hibernate.junit.SkipForDialect; +import org.hibernate.test.annotations.TestCase; + +/** + * @author Janario Oliveira + */ +public class NamedNativeQueryTest extends TestCase { + + private FromEntity createFrom(String name, String lastName) { + Session session = openSession(); + session.getTransaction().begin(); + FromEntity fromEntity = new FromEntity( name, lastName ); + session.save( fromEntity ); + session.getTransaction().commit(); + session.close(); + return fromEntity; + } + + private DestinationEntity createDestination(FromEntity fromEntity, String fullName) { + final DestinationEntity destinationEntity = new DestinationEntity( fromEntity, fullName ); + + Session session = openSession(); + session.getTransaction().begin(); + session.save( destinationEntity ); + session.getTransaction().commit(); + session.close(); + return destinationEntity; + } + + @SuppressWarnings("unchecked") + private List<DestinationEntity> findDestinationByIds(List<Integer> ids) { + Session session = openSession(); + List<DestinationEntity> list = session + .createQuery( "from DestinationEntity de where de.id in (:ids) order by id" ) + .setParameterList( "ids", ids ).list(); + session.close(); + return list; + } + + public void testSingleSelect() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + final DestinationEntity destination = createDestination( createFrom( name, lastName ), fullName ); + + Session session = openSession(); + Query select = session.getNamedQuery( "DestinationEntity.selectIds" ); + select.setParameterList( "ids", Collections.singletonList( destination.id ) ); + Object[] unique = (Object[]) select.uniqueResult(); + session.close(); + + // Compare the Strings, not the actual IDs. Can come back as, for ex, + // a BigDecimal in Oracle. + assertEquals( destination.id + "", unique[0] + "" ); + assertEquals( destination.from.id + "", unique[1] + "" ); + assertEquals( destination.fullNameFrom, unique[2] ); + } + + public void testMultipleSelect() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<DestinationEntity> destinations = new ArrayList<DestinationEntity>(); + for ( int i = 0; i < quantity; i++ ) { + DestinationEntity createDestination = createDestination( createFrom( name + i, lastName + i ), name + i + + lastName + i ); + ids.add( createDestination.id ); + destinations.add( createDestination ); + } + + Session session = openSession(); + Query select = session.getNamedQuery( "DestinationEntity.selectIds" ); + select.setParameterList( "ids", ids ); + List list = select.list(); + session.close(); + + assertEquals( quantity, list.size() ); + for ( int i = 0; i < list.size(); i++ ) { + Object[] object = (Object[]) list.get( i ); + DestinationEntity destination = destinations.get( i ); + // Compare the Strings, not the actual IDs. Can come back as, for ex, + // a BigDecimal in Oracle. + assertEquals( destination.id + "", object[0] + "" ); + assertEquals( destination.from.id + "", object[1] + "" ); + assertEquals( destination.fullNameFrom, object[2] ); + } + } + + public void testInsertSingleValue() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + final FromEntity fromEntity = createFrom( name, lastName ); + final int id = 10000;// id fake + + Session session = openSession(); + session.getTransaction().begin(); + Query insert = session.getNamedQuery( "DestinationEntity.insert" ); + insert.setParameter( "generatedId", id ); + insert.setParameter( "fromId", fromEntity.id ); + insert.setParameter( "fullName", fullName ); + int executeUpdate = insert.executeUpdate(); + assertEquals( 1, executeUpdate ); + session.getTransaction().commit(); + session.close(); + + session = openSession(); + DestinationEntity get = (DestinationEntity) session.get( DestinationEntity.class, id ); + session.close(); + + assertEquals( fromEntity, get.from ); + assertEquals( fullName, get.fullNameFrom ); + } + + @SkipForDialect( value = { MySQLDialect.class, SQLServerDialect.class }, + comment = "MySQL appears to have trouble with fe.id selected twice in one statement. SQL Server does not support the || operator.") + // TODO: Re-form DestinationEntity.insertSelect to something more supported? + public void testInsertMultipleValues() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<FromEntity> froms = new ArrayList<FromEntity>(); + for ( int i = 0; i < quantity; i++ ) { + FromEntity fe = createFrom( name + i, lastName + i ); + froms.add( fe ); + ids.add( fe.id ); + } + + Session session = openSession(); + session.getTransaction().begin(); + Query insertSelect = session.getNamedQuery( "DestinationEntity.insertSelect" ); + insertSelect.setParameterList( "ids", ids ); + int executeUpdate = insertSelect.executeUpdate(); + assertEquals( quantity, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + List<DestinationEntity> list = findDestinationByIds( ids ); + assertEquals( quantity, list.size() ); + + for ( int i = 0; i < quantity; i++ ) { + DestinationEntity de = (DestinationEntity) list.get( i ); + FromEntity from = froms.get( i ); + assertEquals( from, de.from ); + assertEquals( from.name + from.lastName, de.fullNameFrom ); + } + } + + public void testUpdateSingleValue() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + + final FromEntity fromEntity = createFrom( name, lastName ); + final DestinationEntity destinationEntity = createDestination( fromEntity, fullName ); + + final String inverseFullName = lastName + " " + name; + final FromEntity anotherFrom = createFrom( lastName, name ); + + Session session = openSession(); + session.getTransaction().begin(); + Query update = session.getNamedQuery( "DestinationEntity.update" ); + update.setParameter( "idFrom", anotherFrom.id ); + update.setParameter( "fullName", inverseFullName ); + update.setParameterList( "ids", Collections.singletonList( destinationEntity.id ) ); + + int executeUpdate = update.executeUpdate(); + assertEquals( 1, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + session = openSession(); + DestinationEntity get = (DestinationEntity) session.get( DestinationEntity.class, destinationEntity.id ); + + assertEquals( anotherFrom, get.from ); + assertEquals( inverseFullName, get.fullNameFrom ); + session.close(); + } + + public void testUpdateMultipleValues() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<DestinationEntity> destinations = new ArrayList<DestinationEntity>(); + for ( int i = 0; i < quantity; i++ ) { + FromEntity fe = createFrom( name + i, lastName + i ); + DestinationEntity destination = createDestination( fe, fe.name + fe.lastName ); + destinations.add( destination ); + ids.add( destination.id ); + } + + final String inverseFullName = lastName + " " + name; + final FromEntity anotherFrom = createFrom( lastName, name ); + + Session session = openSession(); + session.getTransaction().begin(); + Query update = session.getNamedQuery( "DestinationEntity.update" ); + update.setParameter( "idFrom", anotherFrom.id ); + update.setParameter( "fullName", inverseFullName ); + update.setParameterList( "ids", ids ); + + int executeUpdate = update.executeUpdate(); + assertEquals( quantity, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + List<DestinationEntity> list = findDestinationByIds( ids ); + assertEquals( quantity, list.size() ); + + for ( int i = 0; i < quantity; i++ ) { + DestinationEntity updated = (DestinationEntity) list.get( i ); + + assertEquals( anotherFrom, updated.from ); + assertEquals( inverseFullName, updated.fullNameFrom ); + } + } + + public void testDeleteSingleValue() { + final String name = "Name"; + final String lastName = "LastName"; + final String fullName = name + " " + lastName; + + final FromEntity fromEntity = createFrom( name, lastName ); + final DestinationEntity destinationEntity = createDestination( fromEntity, fullName ); + + Session session = openSession(); + session.getTransaction().begin(); + Query delete = session.getNamedQuery( "DestinationEntity.delete" ); + delete.setParameterList( "ids", Collections.singletonList( destinationEntity.id ) ); + + int executeUpdate = delete.executeUpdate(); + assertEquals( 1, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + session = openSession(); + DestinationEntity get = (DestinationEntity) session.get( DestinationEntity.class, destinationEntity.id ); + session.close(); + + assertNull( get ); + } + + public void testDeleteMultipleValues() { + final String name = "Name"; + final String lastName = "LastName"; + final List<Integer> ids = new ArrayList<Integer>(); + final int quantity = 10; + final List<DestinationEntity> destinations = new ArrayList<DestinationEntity>(); + for ( int i = 0; i < quantity; i++ ) { + FromEntity fe = createFrom( name + i, lastName + i ); + DestinationEntity destination = createDestination( fe, fe.name + fe.lastName ); + destinations.add( destination ); + ids.add( destination.id ); + } + + Session session = openSession(); + session.getTransaction().begin(); + Query delete = session.getNamedQuery( "DestinationEntity.delete" ); + delete.setParameterList( "ids", ids ); + + int executeUpdate = delete.executeUpdate(); + assertEquals( quantity, executeUpdate ); + + session.getTransaction().commit(); + session.close(); + + List<DestinationEntity> list = findDestinationByIds( ids ); + assertTrue( list.isEmpty() ); + } + + @Override + protected Class[] getAnnotatedClasses() { + return new Class[] { FromEntity.class, DestinationEntity.class }; + } +}

11 years, 6 months

1
0
0 / 0

[hibernate/hibernate-orm] 4ab29b: HHH-8335 Hibernate OSGi not included in build's /l...

by GitHub

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 4ab29b481104e4136958a2e6b41e42af489255fc https://github.com/hibernate/hibernate-orm/commit/4ab29b481104e4136958a2e... Author: Brett Meyer <brett(a)3riverdev.com> Date: 2013-06-29 (Sat, 29 Jun 2013) Changed paths: M release/release.gradle Log Message: ----------- HHH-8335 Hibernate OSGi not included in build's /lib

11 years, 6 months

1
0
0 / 0

[hibernate/hibernate-orm] a61832: HHH-8335 Hibernate OSGi not included in build's /l...

by GitHub

Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: a618323e572238dcd214bd76f757453848cdc9eb https://github.com/hibernate/hibernate-orm/commit/a618323e572238dcd214bd7... Author: Brett Meyer <brett(a)3riverdev.com> Date: 2013-06-29 (Sat, 29 Jun 2013) Changed paths: M release/release.gradle Log Message: ----------- HHH-8335 Hibernate OSGi not included in build's /lib

11 years, 6 months

1
0
0 / 0

Hibernate SVN: r21134 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception.

by hibernate-commits＠lists.jboss.org

Author: brmeyer Date: 2013-06-29 12:15:18 -0400 (Sat, 29 Jun 2013) New Revision: 21134 Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java Log: JBPAPP-10779 SQLExceptionConversionTest.testIntegrityViolation fails on 3.3.2, JDK7, and Postgres 9.1 Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java 2013-06-27 18:00:57 UTC (rev 21133) +++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java 2013-06-29 16:15:18 UTC (rev 21134) @@ -85,6 +85,7 @@ SQLExceptionConverter converter = getDialect().buildSQLExceptionConverter(); Session session = openSession(); + session.beginTransaction(); Connection connection = session.connection(); // prepare/execute a query against a non-existent table @@ -109,6 +110,7 @@ } } + session.getTransaction().rollback(); session.close(); } }

11 years, 6 months

1
0
0 / 0

[hibernate/hibernate-orm] 4ee9ad: HHH-8210 JdbcCoordinatorImpl logs excessive warnin...

by GitHub

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 4ee9ade3532406a2a74fcfa3e21a490a69f4011d https://github.com/hibernate/hibernate-orm/commit/4ee9ade3532406a2a74fcfa... Author: Brett Meyer <brett(a)3riverdev.com> Date: 2013-06-27 (Thu, 27 Jun 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java Log Message: ----------- HHH-8210 JdbcCoordinatorImpl logs excessive warnings with some connection pools

11 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits June 2013