[hibernate-commits] Hibernate SVN: r19675 - in core/branches/gradle2: annotations and 13 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Jun 2 16:07:12 EDT 2010
Author: steve.ebersole at jboss.com
Date: 2010-06-02 16:07:11 -0400 (Wed, 02 Jun 2010)
New Revision: 19675
Added:
core/branches/gradle2/annotations/build.gradle
core/branches/gradle2/build.gradle
core/branches/gradle2/cache-ehcache/build.gradle
core/branches/gradle2/cache-infinispan/build.gradle
core/branches/gradle2/cache-jbosscache/build.gradle
core/branches/gradle2/cache-oscache/build.gradle
core/branches/gradle2/cache-swarmcache/build.gradle
core/branches/gradle2/connection-c3p0/build.gradle
core/branches/gradle2/connection-proxool/build.gradle
core/branches/gradle2/core/build.gradle
core/branches/gradle2/entitymanager/build.gradle
core/branches/gradle2/envers/build.gradle
core/branches/gradle2/jmx/build.gradle
core/branches/gradle2/settings.gradle
core/branches/gradle2/testing/build.gradle
Modified:
core/branches/gradle2/
core/branches/gradle2/jmx/src/test/java/org/hibernate/jmx/TrivialTest.java
Log:
Property changes on: core/branches/gradle2
___________________________________________________________________
Name: svn:ignore
- target
local
.idea
*.ipr
*.iws
*.iml
atlassian-ide-plugin.xml
.classpath
.project
.settings
.nbattrs
*.log
*.properties
.clover
+ target
local
.idea
*.ipr
*.iws
*.iml
atlassian-ide-plugin.xml
.classpath
.project
.settings
.nbattrs
*.log
*.properties
.clover
.gradle
Added: core/branches/gradle2/annotations/build.gradle
===================================================================
--- core/branches/gradle2/annotations/build.gradle (rev 0)
+++ core/branches/gradle2/annotations/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,32 @@
+dependencies {
+ compile (
+ project(':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(':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]
+ )
+}
+
+processTestResources.doLast(
+ {
+ copy {
+ from( sourceSets.test.java.srcDirs ) {
+ include '**/*.properties'
+ include '**/*.xml'
+ }
+ into sourceSets.test.classesDir
+ }
+ }
+)
Added: core/branches/gradle2/build.gradle
===================================================================
--- core/branches/gradle2/build.gradle (rev 0)
+++ core/branches/gradle2/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,225 @@
+buildscript {
+ repositories {
+ mavenRepo urls: 'http://gradle.artifactoryonline.com/gradle/plugins'
+ }
+ dependencies {
+ classpath "org.gradle.plugins:gradle-idea-plugin:0.2"
+ }
+}
+
+allprojects {
+ apply plugin: 'org.gradle.idea'
+}
+
+subprojects {
+ apply plugin: 'java'
+
+ group = 'org.hibernate.gradlePoC'
+ version = '1.0.0-SNAPSHOT'
+
+ defaultTasks 'classes'
+
+ repositories {
+ mavenCentral()
+ mavenRepo name: 'jboss-nexus', urls: "https://repository.jboss.org/nexus/content/groups/public/"
+ mavenRepo name: "jboss-snapshots", urls: "http://snapshots.jboss.org/maven2/"
+ mavenRepo urls: "file://" + System.getProperty('user.home') + "/.m2/repository/"
+ }
+
+ configurations {
+ provided {
+ // todo : need to make sure these are non-exported
+ description = 'Non-exported compile-time dependencies.'
+ }
+ }
+
+ dependencies {
+ slf4jVersion = '1.5.8'
+ dom4jVersion = '1.6.1'
+ antlrVersion = '2.7.7'
+ annotationsCommonsVersion = '3.2.0.Final'
+ jpaVersion = '1.0.0.Final'
+ jtaVersion = '1.1'
+ javassistVersion = '3.12.0.GA'
+ cglibVersion = '2.2'
+ javaxValidationVersion = '1.0.0.GA'
+ hibernateValidatorVersion = '4.0.2.GA'
+
+ junitVersion = '3.8.2'
+ testngVersion = '5.8'
+
+ h2Version = '1.2.134'
+
+ compile(
+ group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+ )
+ testCompile(
+ [group: 'junit', name: 'junit', version: junitVersion]
+ )
+ testRuntime(
+ [group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4jVersion],
+ [group: 'org.slf4j', name: 'slf4j-log4j12', version: slf4jVersion],
+ [group: 'com.h2database', name: 'h2', version: h2Version]
+ )
+ }
+
+ sourceSets {
+ main {
+ compileClasspath = compileClasspath + configurations.provided
+ }
+ }
+
+ manifest.mainAttributes(
+ provider: 'gradle',
+ 'Implementation-Url': 'http://hibernate.org',
+ 'Implementation-Version': version,
+ 'Implementation-Vendor': 'Hibernate.org',
+ 'Implementation-Vendor-Id': 'org.hibernate'
+ )
+
+ // minimize changes, at least for now..
+ buildDirName = "target"
+
+ // by default, compile to 1.5 compatibility
+ targetCompatibility = "1.5"
+ sourceCompatibility = "1.5"
+
+ ideaModule {
+ downloadJavadoc = false
+ scopes.COMPILE.plus.add(configurations.provided)
+ }
+}
+
+dependsOnChildren()
+
+
+documentationBuildDir = dir( buildDirName + "/documentation" );
+
+task documentation(dependsOn: documentationBuildDir) << {
+}
+
+distBuildDir = dir( buildDirName + "/dist" );
+
+task uberJar(type: Jar, dependsOn: distBuildDir) {
+ destinationDir = distBuildDir.dir
+ customName = 'hibernate3.jar'
+ from( allCompilationOutputDirectories() )
+}
+
+subprojects.each { Project project ->
+ if ( project.name != 'hibernate-testing' ) {
+ uberJar.dependsOn project.getTasksByName( "classes", false );
+ }
+}
+
+task prepareDistribution(dependsOn: [uberJar, documentation]) << {
+ File requiredLibDir = new File( distBuildDir.dir, "stage/lib/required" );
+ copy {
+ from project('core').getConfigurations().getByName( 'runtime' )
+ into requiredLibDir
+ }
+ copy {
+ from project('core').getConfigurations().getByName( 'provided' ).files{ dep -> dep.name == 'jboss-transaction-api' }
+ into requiredLibDir
+ rename 'jboss-transaction-api(.*).jar', 'jta-1.1.jar'
+ }
+
+ File cglibLibDir = new File( distBuildDir.dir, "stage/lib/bytecode/cglib" );
+ copy {
+ from project('core').getConfigurations().getByName( 'provided' ).files{ dep -> dep.name == 'cglib' }
+ into cglibLibDir
+ }
+
+ File javassistLibDir = new File( distBuildDir.dir, "stage/lib/bytecode/javassist" );
+ copy {
+ from project('core').getConfigurations().getByName( 'provided' ).files{ dep -> dep.name == 'javassist' }
+ into javassistLibDir
+ }
+
+// ['c3p0', 'proxool', 'ehcache', 'jbosscache', 'infinispan', 'oscache', 'swarmcache'].each { feature ->
+ ['connection-c3p0', 'connection-proxool', 'cache-ehcache', 'cache-oscache', 'cache-swarmcache'].each { feature ->
+ File featureLibDir = new File( distBuildDir.dir, "stage/lib/optional/${feature}" );
+// Set libs = project("hibernate-${feature}").configurations.runtime.files - project("hibernate-core").configurations.runtime.files
+ Set libs = project("${feature}").configurations.runtime.files
+ - files(requiredLibDir)
+ - files( cglibLibDir )
+ - files( javassistLibDir )
+ copy {
+ from libs
+ into featureLibDir
+ }
+ }
+
+// File c3p0LibDir = new File( distBuildDir.dir, "stage/lib/optional/c3p0" );
+// c3p0LibDir.mkdirs();
+// copy {
+// from project('hibernate-c3p0').getConfigurations().getByName( 'runtime' )
+// into c3p0LibDir
+// }
+//
+// File proxoolLibDir = new File( distBuildDir.dir, "stage/lib/optional/proxool" );
+// proxoolLibDir.mkdirs();
+// copy {
+// from project('hibernate-proxool').getConfigurations().getByName( 'runtime' )
+// into proxoolLibDir
+// }
+//
+// File ehcacheLibDir = new File( distBuildDir.dir, "stage/lib/optional/ehcache" );
+// ehcacheLibDir.mkdirs();
+// copy {
+// from project('hibernate-ehcache').getConfigurations().getByName( 'runtime' )
+// into ehcacheLibDir
+// }
+//
+//// File jbcLibDir = new File( distBuildDir.dir, "stage/lib/optional/jbosscache" );
+//// jbcLibDir.mkdirs();
+//// copy {
+//// from project('hibernate-jbosscache').getConfigurations().getByName( 'runtime' )
+//// into jbcLibDir
+//// }
+////
+//// File infinispanLibDir = new File( distBuildDir.dir, "stage/lib/optional/infinispan" );
+//// infinispanLibDir.mkdirs();
+//// copy {
+//// from project('hibernate-infinispan').getConfigurations().getByName( 'runtime' )
+//// into infinispanLibDir
+//// }
+//
+// File oscacheLibDir = new File( distBuildDir.dir, "stage/lib/optional/oscache" );
+// oscacheLibDir.mkdirs();
+// copy {
+// from project('hibernate-oscache').getConfigurations().getByName( 'runtime' )
+// into oscacheLibDir
+// }
+//
+// File swarmcacheLibDir = new File( distBuildDir.dir, "stage/lib/optional/swarmcache" );
+// swarmcacheLibDir.mkdirs();
+// copy {
+// from project('hibernate-swarmcache').getConfigurations().getByName( 'runtime' )
+// into swarmcacheLibDir
+// }
+}
+
+FileCollection[] allCompilationOutputDirectories() {
+ ArrayList<File> compilationOutputDirectories = new ArrayList<File>();
+ for ( Project project : getSubprojects() ) {
+ if ( project.name == 'hibernate-testing' ) {
+ continue;
+ }
+ compilationOutputDirectories.add( project.sourceSets.main.classes.asFileTree );
+ }
+ return compilationOutputDirectories as FileCollection[];
+}
+
+task distributionZip(/*type: Zip,*/ dependsOn: prepareDistribution) << {
+// println 'building zip dist (todo)...'
+}
+
+task distributionTgz(/*type: Tar,*/ dependsOn: prepareDistribution) << {
+// compression = Compression.GZIP
+// println 'building tgz dist (todo)...'
+}
+
+task distribution(dependsOn: [distributionZip, distributionTgz]) << {
+// println 'building dists (todo)...'
+}
Added: core/branches/gradle2/cache-ehcache/build.gradle
===================================================================
--- core/branches/gradle2/cache-ehcache/build.gradle (rev 0)
+++ core/branches/gradle2/cache-ehcache/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,15 @@
+dependencies {
+ ehcacheVersion = '1.5.0'
+
+ compile (
+ project(':core'),
+ [group: 'net.sf.ehcache', name: 'ehcache', version: ehcacheVersion]
+ )
+ testCompile (
+ project(':testing')
+ )
+ testRuntime (
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion]
+ )
+}
\ No newline at end of file
Added: core/branches/gradle2/cache-infinispan/build.gradle
===================================================================
--- core/branches/gradle2/cache-infinispan/build.gradle (rev 0)
+++ core/branches/gradle2/cache-infinispan/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,57 @@
+// todo : need to account for skipUnitTests from pom.xml
+// todo : need to account for groups.bind_addr from pom.xml
+// todo : need to account for surefire system-properties from pom.xml
+
+dependencies {
+ infinispanVersion = '4.0.0.FINAL'
+ jbossCommonCoreVersion = '2.2.14.GA'
+
+ compile (
+ project(':core')
+ )
+ compile (
+ [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion]
+ ) {
+ artifact {
+ name = "infinispan-core"
+ type = 'jar'
+ }
+ }
+ testCompile (
+ project(':testing'),
+ [group: 'org.jboss', name: 'jboss-common-core', version: jbossCommonCoreVersion]
+ )
+// ewww... http://jira.codehaus.org/browse/GRADLE-739
+ testCompile (
+ [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion]
+ ) {
+ artifact {
+ name = "infinispan-core"
+ type = 'jar'
+ }
+ artifact {
+ name = "infinispan-core"
+ classifier = 'tests'
+ type = 'jar'
+ }
+ }
+ testRuntime (
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion]
+ )
+}
+
+sourceCompatibility = "1.6"
+targetCompatibility = "1.6"
+
+compileJava {
+ options.fork(executable: '/opt/java/jdk-1.6/bin/javac')
+}
+
+compileTestJava {
+ options.fork(executable: '/opt/java/jdk-1.6/bin/javac')
+}
+
+test {
+ jvm: '/opt/java/jdk-1.6/bin/java'
+}
\ No newline at end of file
Added: core/branches/gradle2/cache-jbosscache/build.gradle
===================================================================
--- core/branches/gradle2/cache-jbosscache/build.gradle (rev 0)
+++ core/branches/gradle2/cache-jbosscache/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,19 @@
+// todo : need to account for skipUnitTests from pom.xml
+// todo : need to account for groups.bind_addr from pom.xml
+// todo : need to account for surefire system-properties from pom.xml
+
+dependencies {
+ jbcVersion = '3.2.1.GA'
+
+ compile (
+ project(':core'),
+ [group: 'org.jboss.cache', name: 'jbosscache-core', version: jbcVersion]
+ )
+ testCompile(
+ project(':testing')
+ )
+ testRuntime (
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion]
+ )
+}
Added: core/branches/gradle2/cache-oscache/build.gradle
===================================================================
--- core/branches/gradle2/cache-oscache/build.gradle (rev 0)
+++ core/branches/gradle2/cache-oscache/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,8 @@
+dependencies {
+ oscacheVersion = '2.1';
+
+ compile (
+ project(':core'),
+ [group: 'opensymphony', name: 'oscache', version: oscacheVersion]
+ )
+}
\ No newline at end of file
Added: core/branches/gradle2/cache-swarmcache/build.gradle
===================================================================
--- core/branches/gradle2/cache-swarmcache/build.gradle (rev 0)
+++ core/branches/gradle2/cache-swarmcache/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,8 @@
+dependencies {
+ swarmcacheVersion = '1.0RC2'
+
+ compile (
+ project(':core'),
+ [group: 'swarmcache', name: 'swarmcache', version: swarmcacheVersion]
+ )
+}
\ No newline at end of file
Added: core/branches/gradle2/connection-c3p0/build.gradle
===================================================================
--- core/branches/gradle2/connection-c3p0/build.gradle (rev 0)
+++ core/branches/gradle2/connection-c3p0/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,8 @@
+dependencies {
+ c3p0Version = '0.9.1'
+
+ compile (
+ project(':core'),
+ [group: 'c3p0', name: 'c3p0', version: c3p0Version]
+ )
+}
\ No newline at end of file
Added: core/branches/gradle2/connection-proxool/build.gradle
===================================================================
--- core/branches/gradle2/connection-proxool/build.gradle (rev 0)
+++ core/branches/gradle2/connection-proxool/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,8 @@
+dependencies {
+ proxoolVersion = '0.8.3'
+
+ compile (
+ project(':core'),
+ [group: 'proxool', name: 'proxool', version: proxoolVersion]
+ )
+}
\ No newline at end of file
Added: core/branches/gradle2/core/build.gradle
===================================================================
--- core/branches/gradle2/core/build.gradle (rev 0)
+++ core/branches/gradle2/core/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,25 @@
+apply plugin: 'java'
+apply plugin: 'antlr'
+
+dependencies {
+ antVersion = '1.6.5'
+
+ compile (
+ [group: 'commons-collections', name: 'commons-collections', version: '3.1'],
+ [group: 'dom4j', name: 'dom4j', version: dom4jVersion, transitive: false],
+ "javax.transaction:jta:1.1"
+ )
+ antlr (
+ [group: 'antlr', name: 'antlr', version: antlrVersion]
+ )
+ provided(
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion, transitive: true],
+ [group: 'ant', name: 'ant', version: antVersion],
+ [group: 'org.jboss.javaee', name: 'jboss-jacc-api_JDK4', version: '1.1.0', transitive: false]
+ )
+}
+
+manifest.mainAttributes(
+ 'Main-Class': 'org.hibernate.Version'
+)
Added: core/branches/gradle2/entitymanager/build.gradle
===================================================================
--- core/branches/gradle2/entitymanager/build.gradle (rev 0)
+++ core/branches/gradle2/entitymanager/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,53 @@
+dependencies {
+ compile(
+ project(':core'),
+ project(':annotations'),
+ [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],
+ [group: 'javax.transaction', name: 'jta', version: jtaVersion],
+ [group: 'javassist', name: 'javassist', version: javassistVersion]
+ )
+ testCompile(
+ project(':testing'),
+ [group: 'cglib', name: 'cglib', version: cglibVersion],
+ [group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '1.0.0.Final']
+ )
+ testRuntime(
+ [group: 'javax.validation', name: 'validation-api', version: javaxValidationVersion],
+ [group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion]
+ )
+}
+
+processTestResources.doLast(
+ {
+ copy {
+ from( sourceSets.test.java.srcDirs ) {
+ include '**/*.properties'
+ include '**/*.xml'
+ }
+ into sourceSets.test.classesDir
+ }
+ }
+)
+
+procTargetDir = dir( buildDirName + "/generated-src/jpamodelgen" )
+
+task generateTestStaticMetamodelClasses(dependsOn: procTargetDir) << {
+ ant.javac(
+ srcdir: file( 'src/test/java' ),
+ destdir: procTargetDir.dir,
+ failonerror: false,
+ fork: true,
+ executable: '/opt/java/jdk-1.6/bin/javac',
+ target: '1.5'
+ ) {
+ compilerArg( value: "-proc:only" )
+ sourceSets.test.runtimeClasspath.addToAntBuilder( ant, 'classpath' )
+ }
+
+ sourceSets.test.java.srcDir( procTargetDir.dir );
+}
+
+compileTestJava.dependsOn generateTestStaticMetamodelClasses
+
Added: core/branches/gradle2/envers/build.gradle
===================================================================
--- core/branches/gradle2/envers/build.gradle (rev 0)
+++ core/branches/gradle2/envers/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,22 @@
+dependencies {
+ hibernateToolsVersion = '3.2.0.ga'
+
+ compile (
+ project(':core'),
+ project(':annotations'),
+ project(':entitymanager'),
+ [group: 'org.hibernate', name: 'hibernate-tools', version: hibernateToolsVersion],
+ [group: 'dom4j', name: 'dom4j', version: dom4jVersion, transitive: false],
+ [group: 'org.hibernate', name: 'hibernate-commons-annotations', version: annotationsCommonsVersion],
+ [group: 'ant', name: 'ant', version: '1.6.5']
+ )
+ testCompile (
+ [group: 'org.testng', name: 'testng', version: testngVersion]
+ )
+ testRuntime (
+ [group: 'com.h2database', name: 'h2', version: h2Version],
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion]
+ )
+}
+
Added: core/branches/gradle2/jmx/build.gradle
===================================================================
--- core/branches/gradle2/jmx/build.gradle (rev 0)
+++ core/branches/gradle2/jmx/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,5 @@
+dependencies {
+ compile (
+ project(':core')
+ )
+}
\ No newline at end of file
Modified: core/branches/gradle2/jmx/src/test/java/org/hibernate/jmx/TrivialTest.java
===================================================================
--- core/branches/gradle2/jmx/src/test/java/org/hibernate/jmx/TrivialTest.java 2010-06-02 16:15:17 UTC (rev 19674)
+++ core/branches/gradle2/jmx/src/test/java/org/hibernate/jmx/TrivialTest.java 2010-06-02 20:07:11 UTC (rev 19675)
@@ -1,11 +1,13 @@
package org.hibernate.jmx;
+import junit.framework.TestCase;
+
/**
* Test copied over from o.h.t.legacy.FooBarTest
*
* @author Steve Ebersole
*/
-public class TrivialTest {
+public class TrivialTest extends TestCase {
public void testService() throws Exception {
HibernateService hs = new HibernateService();
hs.setJndiName( "SessionFactory" );
Added: core/branches/gradle2/settings.gradle
===================================================================
--- core/branches/gradle2/settings.gradle (rev 0)
+++ core/branches/gradle2/settings.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,17 @@
+include (
+ 'core',
+ 'envers',
+ 'annotations',
+ 'entitymanager',
+ 'connection-c3p0',
+ 'connection-proxool',
+ 'cache-ehcache',
+ 'cache-infinispan',
+ 'cache-jbosscache',
+ 'cache-oscache',
+ 'cache-swarmcache',
+ 'jmx',
+ 'testing'
+// ,
+// 'hibernate-release'
+)
Added: core/branches/gradle2/testing/build.gradle
===================================================================
--- core/branches/gradle2/testing/build.gradle (rev 0)
+++ core/branches/gradle2/testing/build.gradle 2010-06-02 20:07:11 UTC (rev 19675)
@@ -0,0 +1,6 @@
+dependencies {
+ compile (
+ project(':core'),
+ [group: 'junit', name: 'junit', version: junitVersion]
+ )
+}
\ No newline at end of file
More information about the hibernate-commits
mailing list