forked from hibernate/hibernate-orm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into HHH-2394
- Loading branch information
Showing
28 changed files
with
336 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ | |
| */target | ||
| /build | ||
| */build | ||
| testdb | ||
|
|
||
| # IntelliJ specific files/directories | ||
| out | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * Copyright (c) 2011, Red Hat Inc. or third-party contributors as | ||
| * indicated by the @author tags or express copyright attribution | ||
| * statements applied by the authors. All third-party contributions are | ||
| * distributed under license by Red Hat Inc. | ||
| * | ||
| * 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, as published by the Free Software Foundation. | ||
| * | ||
| * This program 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 distribution; if not, write to: | ||
| * Free Software Foundation, Inc. | ||
| * 51 Franklin Street, Fifth Floor | ||
| * Boston, MA 02110-1301 USA | ||
| */ | ||
|
|
||
| jdbcDependency "org.apache.derby:derby:10.8.2.2" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # | ||
| # Hibernate, Relational Persistence for Idiomatic Java | ||
| # | ||
| # Copyright (c) 2011, Red Hat Inc. or third-party contributors as | ||
| # indicated by the @author tags or express copyright attribution | ||
| # statements applied by the authors. All third-party contributions are | ||
| # distributed under license by Red Hat Inc. | ||
| # | ||
| # 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, as published by the Free Software Foundation. | ||
| # | ||
| # This program 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 distribution; if not, write to: | ||
| # Free Software Foundation, Inc. | ||
| # 51 Franklin Street, Fifth Floor | ||
| # Boston, MA 02110-1301 USA | ||
| # | ||
|
|
||
| hibernate.dialect org.hibernate.dialect.DerbyTenSevenDialect | ||
| hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver | ||
| hibernate.connection.url jdbc:derby:testdb;create=true | ||
| hibernate.connection.username sa | ||
|
|
||
| hibernate.connection.pool_size 5 | ||
|
|
||
| hibernate.show_sql true | ||
| hibernate.format_sql true | ||
|
|
||
| hibernate.max_fetch_depth 5 | ||
|
|
||
| hibernate.cache.region_prefix hibernate.test | ||
| hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Forest2.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * Copyright (c) 2012, Red Hat Inc. or third-party contributors as | ||
| * indicated by the @author tags or express copyright attribution | ||
| * statements applied by the authors. All third-party contributions are | ||
| * distributed under license by Red Hat Inc. | ||
| * | ||
| * 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, as published by the Free Software Foundation. | ||
| * | ||
| * This program 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 distribution; if not, write to: | ||
| * Free Software Foundation, Inc. | ||
| * 51 Franklin Street, Fifth Floor | ||
| * Boston, MA 02110-1301 USA | ||
| */ | ||
| package org.hibernate.test.annotations.entity; | ||
|
|
||
| import javax.persistence.Entity; | ||
| import javax.persistence.GeneratedValue; | ||
| import javax.persistence.Id; | ||
|
|
||
| import org.hibernate.annotations.DynamicInsert; | ||
| import org.hibernate.annotations.DynamicUpdate; | ||
| import org.hibernate.annotations.OptimisticLock; | ||
| import org.hibernate.annotations.OptimisticLockType; | ||
| import org.hibernate.annotations.OptimisticLocking; | ||
| import org.hibernate.annotations.Polymorphism; | ||
| import org.hibernate.annotations.PolymorphismType; | ||
| import org.hibernate.annotations.SelectBeforeUpdate; | ||
| import org.hibernate.annotations.Type; | ||
|
|
||
| /** | ||
| * Mapping following lines of {@link Forest}, but using the replacements for the now deprecated | ||
| * {@link org.hibernate.annotations.Entity} annotation. | ||
| * | ||
| * @author Steve Ebersole | ||
| */ | ||
| @Entity | ||
| @DynamicInsert | ||
| @DynamicUpdate | ||
| @SelectBeforeUpdate | ||
| @OptimisticLocking( type = OptimisticLockType.ALL ) | ||
| @Polymorphism( type = PolymorphismType.EXPLICIT ) | ||
| public class Forest2 { | ||
| private Integer id; | ||
| private String name; | ||
| private String longDescription; | ||
|
|
||
| @Id | ||
| @GeneratedValue | ||
| public Integer getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(Integer id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| @OptimisticLock(excluded=true) | ||
| @Type(type = "text") | ||
| public String getLongDescription() { | ||
| return longDescription; | ||
| } | ||
|
|
||
| public void setLongDescription(String longDescription) { | ||
| this.longDescription = longDescription; | ||
| } | ||
| } |
Oops, something went wrong.