[hibernate-commits] Hibernate SVN: r19791 - in core/branches/gradle2/hibernate-annotations: src/intgTest/java/org/hibernate/test/annotations and 9 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Jun 23 03:27:39 EDT 2010
Author: steve.ebersole at jboss.com
Date: 2010-06-23 03:27:38 -0400 (Wed, 23 Jun 2010)
New Revision: 19791
Removed:
core/branches/gradle2/hibernate-annotations/pom.xml
Modified:
core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/TestCase.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/id/sequences/IdTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/ImageTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/LobTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/TextTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
Log:
converted hibernate-core and hibernate-annotations to use intgTest stuff
Modified: core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle
===================================================================
--- core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/hibernate-annotations.gradle 2010-06-23 07:27:38 UTC (rev 19791)
@@ -1,32 +1,33 @@
+apply plugin: 'java'
+apply plugin: org.hibernate.gradle.util.IntegrationTestPlugin
+
+sourceSets {
+// intgTest {
+// resources{
+// // resources inherently exclude sources
+// srcDir 'src/intgTest/java'
+// }
+// }
+}
+
dependencies {
- compile (
- project(':hibernate-core'),
- [group: 'dom4j', name: 'dom4j', version: dom4jVersion],
- [group: 'org.hibernate', name: 'hibernate-commons-annotations', version: annotationsCommonsVersion],
- [group: 'org.hibernate.javax.persistence', name: 'hibernate-jpa-2.0-api', version: jpaVersion]
- )
- provided (
- [group: 'javax.validation', name: 'validation-api', version: javaxValidationVersion]
- )
- testCompile (
- project(':hibernate-testing'),
- [group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion],
- [group: 'javax.validation', name: 'validation-api', version: javaxValidationVersion]
- )
- testRuntime (
- [group: 'javassist', name: 'javassist', version: javassistVersion],
- [group: 'cglib', name: 'cglib', version: cglibVersion, transitive: true]
- )
+ compile( project(':hibernate-core') )
+ compile( libraries.dom4j ) {
+ transitive = false
+ }
+ compile( libraries.commons_annotations )
+ compile( libraries.jpa )
+ provided( libraries.validation )
+ testCompile( libraries.validation )
+ testCompile( libraries.validator ) {
+ // for test runtime
+ transitive = true
+ }
+ testRuntime( libraries.javassist )
+ intgTestCompile( project(':hibernate-core').sourceSets.intgTest.classes )
}
-processTestResources.doLast(
- {
- copy {
- from( sourceSets.test.java.srcDirs ) {
- include '**/*.properties'
- include '**/*.xml'
- }
- into sourceSets.test.classesDir
- }
- }
-)
+ideaModule {
+ testSourceDirs.addAll( sourceSets.intgTest.java.srcDirs )
+ testSourceDirs.addAll( sourceSets.intgTest.resources.srcDirs )
+}
\ No newline at end of file
Deleted: core/branches/gradle2/hibernate-annotations/pom.xml
===================================================================
--- core/branches/gradle2/hibernate-annotations/pom.xml 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/pom.xml 2010-06-23 07:27:38 UTC (rev 19791)
@@ -1,184 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ Hibernate, Relational Persistence for Idiomatic Java
- ~
- ~ Copyright (c) 2008, Red Hat Middleware LLC 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 Middleware LLC.
- ~
- ~ 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
- -->
-<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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate Annotations</name>
- <description>Annotations metadata for Hibernate</description>
-
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-injection-plugin</artifactId>
- <configuration>
- <bytecodeInjections>
- <bytecodeInjection>
- <expression>${project.version}</expression>
- <targetMembers>
- <methodBodyReturn>
- <className>org.hibernate.cfg.annotations.Version</className>
- <methodName>getVersionString</methodName>
- </methodBodyReturn>
- </targetMembers>
- </bytecodeInjection>
- </bytecodeInjections>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.twdata.maven</groupId>
- <artifactId>maven-cli-plugin</artifactId>
- <version>0.6.4</version>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>jaxb</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>doc</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
- <masterTranslation>en</masterTranslation>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en/images</directory>
- </imageResource>
- </configuration>
- <executions>
- <execution>
- <id>make-doc</id>
- <phase>package</phase>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/TestCase.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/TestCase.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/TestCase.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -33,6 +33,7 @@
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.testing.junit.functional.annotations.HibernateTestCase;
/**
* A base class for all annotation tests.
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -1,7 +1,6 @@
package org.hibernate.test.annotations.derivedidentities.e6.a;
import org.hibernate.Session;
-import org.hibernate.junit.FailureExpected;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.test.util.SchemaUtil;
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -26,7 +26,7 @@
import java.util.List;
import org.hibernate.Session;
-import org.hibernate.junit.FailureExpected;
+import org.hibernate.testing.junit.FailureExpected;
import org.hibernate.test.annotations.TestCase;
/**
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/id/sequences/IdTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -28,8 +28,8 @@
import org.hibernate.Transaction;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
+import org.hibernate.testing.junit.DialectChecks;
+import org.hibernate.testing.junit.RequiresDialectFeature;
import org.hibernate.mapping.Column;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.test.annotations.id.sequences.entities.Ball;
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -22,7 +22,7 @@
*/
package org.hibernate.test.annotations.idclass.xml;
-import org.hibernate.junit.FailureExpected;
+import org.hibernate.testing.junit.FailureExpected;
import org.hibernate.test.annotations.TestCase;
/**
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -12,7 +12,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.junit.RequiresDialect;
+import org.hibernate.testing.junit.RequiresDialect;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
import org.hibernate.test.annotations.TestCase;
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/ImageTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -32,7 +32,7 @@
import org.hibernate.dialect.Sybase11Dialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
-import org.hibernate.junit.RequiresDialect;
+import org.hibernate.testing.junit.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.util.ArrayHelper;
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/LobTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/LobTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/LobTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -26,8 +26,8 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
+import org.hibernate.testing.junit.DialectChecks;
+import org.hibernate.testing.junit.RequiresDialectFeature;
import org.hibernate.test.annotations.TestCase;
/**
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/TextTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/TextTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/lob/TextTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -32,7 +32,7 @@
import org.hibernate.dialect.Sybase11Dialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
-import org.hibernate.junit.RequiresDialect;
+import org.hibernate.testing.junit.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.util.ArrayHelper;
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -27,8 +27,8 @@
import java.math.BigDecimal;
import org.hibernate.Session;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
+import org.hibernate.testing.junit.DialectChecks;
+import org.hibernate.testing.junit.RequiresDialectFeature;
import org.hibernate.test.annotations.TestCase;
/**
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -13,7 +13,7 @@
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.junit.FailureExpected;
+import org.hibernate.testing.junit.FailureExpected;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table;
Modified: core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-06-23 07:26:36 UTC (rev 19790)
+++ core/branches/gradle2/hibernate-annotations/src/intgTest/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-06-23 07:27:38 UTC (rev 19791)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.xml.hbm;
import org.hibernate.Session;
-import org.hibernate.junit.DialectChecks;
-import org.hibernate.junit.RequiresDialectFeature;
+import org.hibernate.testing.junit.DialectChecks;
+import org.hibernate.testing.junit.RequiresDialectFeature;
import org.hibernate.test.annotations.TestCase;
/**
More information about the hibernate-commits
mailing list