Hibernate SVN: r17726 - in core/trunk/annotations/src/test/java/org/hibernate/test/annotations: xml/hbm and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-13 11:57:41 -0400 (Tue, 13 Oct 2009)
New Revision: 17726
Added:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
Modified:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
Log:
HHH-4397 Split test involving database specific features (like sequence / identity)
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2009-10-13 15:49:38 UTC (rev 17725)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2009-10-13 15:57:41 UTC (rev 17726)
@@ -34,6 +34,14 @@
s.close();
}
+
+ @Override
+ protected boolean runForCurrentDialect() {
+ return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+ }
+
+
+
protected Class[] getMappings() {
return new Class[] {
Item.class,
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2009-10-13 15:49:38 UTC (rev 17725)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2009-10-13 15:57:41 UTC (rev 17726)
@@ -4,7 +4,6 @@
import java.util.HashSet;
import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
import org.hibernate.test.annotations.TestCase;
/**
@@ -63,32 +62,10 @@
s.close();
}
- public void testManyToOneAndInterface() throws Exception {
- Session s = openSession();
- s.getTransaction().begin();
- B b = new BImpl();
- b.setBId( 1 );
- s.persist( b );
- Z z = new ZImpl();
- z.setB( b );
- s.persist( z );
- s.flush();
- s.getTransaction().rollback();
- s.close();
- }
-
- @Override
- protected void configure(Configuration cfg) {
- super.configure( cfg );
- //cfg.addClass( Government.class );
- }
-
protected Class[] getMappings() {
return new Class[]{
PrimeMinister.class,
Sky.class,
- ZImpl.class
-
};
}
@@ -97,8 +74,6 @@
return new String[]{
"org/hibernate/test/annotations/xml/hbm/Government.hbm.xml",
"org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml",
- "org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
- "org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
};
}
}
Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2009-10-13 15:57:41 UTC (rev 17726)
@@ -0,0 +1,47 @@
+//$Id:HbmTest.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $
+package org.hibernate.test.annotations.xml.hbm;
+
+import org.hibernate.Session;
+import org.hibernate.test.annotations.TestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class HbmWithIdentityTest extends TestCase {
+ public void testManyToOneAndInterface() throws Exception {
+ Session s = openSession();
+ s.getTransaction().begin();
+ B b = new BImpl();
+ b.setBId( 1 );
+ s.persist( b );
+ Z z = new ZImpl();
+ z.setB( b );
+ s.persist( z );
+ s.flush();
+ s.getTransaction().rollback();
+ s.close();
+ }
+
+ @Override
+ protected boolean runForCurrentDialect() {
+ return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+ }
+
+
+
+ protected Class[] getMappings() {
+ return new Class[]{
+ Sky.class,
+ ZImpl.class
+
+ };
+ }
+
+ @Override
+ protected String[] getXmlFiles() {
+ return new String[]{
+ "org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
+ "org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
+ };
+ }
+}
14 years, 11 months
Hibernate SVN: r17725 - annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/referencedcolumnname.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-13 11:49:38 -0400 (Tue, 13 Oct 2009)
New Revision: 17725
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
Log:
JBPAPP-2910 HHH-4415 : TestCase could check for superclass of Dialect before skipping it
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2009-10-13 15:47:59 UTC (rev 17724)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2009-10-13 15:49:38 UTC (rev 17725)
@@ -34,6 +34,16 @@
s.close();
}
+
+
+
+ @Override
+ protected boolean runForCurrentDialect() {
+ return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+ }
+
+
+
protected Class[] getMappings() {
return new Class[] {
Item.class,
14 years, 11 months
Hibernate SVN: r17724 - in annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations: id and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-13 11:47:59 -0400 (Tue, 13 Oct 2009)
New Revision: 17724
Added:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
Modified:
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/id/IdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/lob/LobTest.java
annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
Log:
JBPAPP-2910 HHH-4415 : TestCase could check for superclass of Dialect before skipping it
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java 2009-10-13 15:30:21 UTC (rev 17723)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java 2009-10-13 15:47:59 UTC (rev 17724)
@@ -11,6 +11,9 @@
import java.util.HashSet;
import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
import org.hibernate.Session;
@@ -21,22 +24,19 @@
import org.hibernate.dialect.Dialect;
import org.hibernate.jdbc.Work;
import org.hibernate.tool.hbm2ddl.SchemaExport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A base class for all tests.
- *
+ *
* @author Emmnauel Bernand
* @author Hardy Ferentschik
*/
public abstract class TestCase extends junit.framework.TestCase {
- public static final Logger log = LoggerFactory.getLogger(TestCase.class);
+ public static final Logger log = LoggerFactory.getLogger( TestCase.class );
private static SessionFactory sessions;
private static AnnotationConfiguration cfg;
- private static Dialect dialect;
private static Class<?> lastTestClass;
private Session session;
@@ -46,41 +46,48 @@
private Method runMethod = null;
/**
- * Flag indicating whether the test should be skipped.
+ * Flag indicating whether the test should be run or skipped.
*/
- private boolean skip = false;
+ private boolean runTest = true;
+ /**
+ * List of required dialect for the current {@code runMethod}. If the list is empty any dialect is allowed.
+ * Otherwise the current dialect or a superclass of the current dialect must be in the list.
+ */
+ private final Set<Class<? extends Dialect>> requiredDialectList = new HashSet<Class<? extends Dialect>>();
+
public TestCase() {
super();
}
public TestCase(String x) {
- super(x);
+ super( x );
}
- protected void buildSessionFactory( Class<?>[] classes, String[] packages, String[] xmlFiles ) throws Exception {
+ protected void buildSessionFactory(Class<?>[] classes, String[] packages, String[] xmlFiles) throws Exception {
- if ( getSessions() != null )
+ if ( getSessions() != null ) {
getSessions().close();
+ }
try {
- setCfg(new AnnotationConfiguration());
- configure(cfg);
+ setCfg( new AnnotationConfiguration() );
+ configure( cfg );
if ( recreateSchema() ) {
- cfg.setProperty(Environment.HBM2DDL_AUTO, "create-drop");
+ cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
}
- for ( int i = 0; i < packages.length; i++ ) {
- getCfg().addPackage(packages[i]);
+ for ( String aPackage : packages ) {
+ getCfg().addPackage( aPackage );
}
- for ( int i = 0; i < classes.length; i++ ) {
- getCfg().addAnnotatedClass(classes[i]);
+ for ( Class<?> aClass : classes ) {
+ getCfg().addAnnotatedClass( aClass );
}
- for ( int i = 0; i < xmlFiles.length; i++ ) {
- InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(xmlFiles[i]);
- getCfg().addInputStream(is);
+ for ( String xmlFile : xmlFiles ) {
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile );
+ getCfg().addInputStream( is );
}
- setDialect(Dialect.getDialect());
- setSessions(getCfg().buildSessionFactory( /* new TestInterceptor() */));
- } catch ( Exception e ) {
+ setSessions( getCfg().buildSessionFactory( /* new TestInterceptor() */ ) );
+ }
+ catch ( Exception e ) {
e.printStackTrace();
throw e;
}
@@ -88,59 +95,85 @@
protected void setUp() throws Exception {
runMethod = findTestMethod();
- checkSkip(runMethod);
- if ( !skip ) {
+ setRunTestFlag( runMethod );
+ if ( runTest ) {
if ( getSessions() == null || lastTestClass != getClass() ) {
- buildSessionFactory(getMappings(), getAnnotatedPackages(), getXmlFiles());
+ buildSessionFactory( getMappings(), getAnnotatedPackages(), getXmlFiles() );
lastTestClass = getClass();
- } else {
+ }
+ else {
runSchemaGeneration();
}
}
}
-
+
protected void runTest() throws Throwable {
try {
- if ( !skip ) {
- runTestMethod(runMethod);
+ if ( runTest ) {
+ runTestMethod( runMethod );
handleUnclosedSession();
}
- } catch ( Throwable e ) {
- closeSession(e);
}
+ catch ( Throwable e ) {
+ closeSession( e );
+ }
}
- private void checkSkip( Method runMethod ) {
- Set<Class<? extends Dialect>> dialectList = new HashSet<Class<? extends Dialect>>();
+ private void setRunTestFlag(Method runMethod) {
+ updateRequiredDialectList( runMethod );
- RequiresDialect requiresDialectMethodAnn = runMethod.getAnnotation(RequiresDialect.class);
+ if ( runForCurrentDialect() ) {
+ runTest = true;
+ }
+ else {
+ log.warn(
+ "Skipping test {}, because test does not apply for dialect {}", runMethod.getName(), Dialect
+ .getDialect().getClass()
+ );
+ runTest = false;
+ }
+ }
+
+ private void updateRequiredDialectList(Method runMethod) {
+ requiredDialectList.clear();
+
+ RequiresDialect requiresDialectMethodAnn = runMethod.getAnnotation( RequiresDialect.class );
if ( requiresDialectMethodAnn != null ) {
Class<? extends Dialect>[] requiredDialects = requiresDialectMethodAnn.value();
- dialectList.addAll(Arrays.asList(requiredDialects));
+ requiredDialectList.addAll( Arrays.asList( requiredDialects ) );
}
- RequiresDialect requiresDialectClassAnn = getClass().getAnnotation(RequiresDialect.class);
+ RequiresDialect requiresDialectClassAnn = getClass().getAnnotation( RequiresDialect.class );
if ( requiresDialectClassAnn != null ) {
Class<? extends Dialect>[] requiredDialects = requiresDialectClassAnn.value();
- dialectList.addAll(Arrays.asList(requiredDialects));
+ requiredDialectList.addAll( Arrays.asList( requiredDialects ) );
}
+ }
- if ( dialectList.isEmpty() || dialectList.contains(Dialect.getDialect().getClass()) ) {
- skip = false;
- } else {
- log.warn("Skipping test {}, because test does not apply for dialect {}", runMethod.getName(), Dialect
- .getDialect().getClass());
- skip = true;
+ protected boolean runForCurrentDialect() {
+ if ( requiredDialectList.isEmpty() ) {
+ return true;
}
+ else {
+ // check whether the current dialect is assignableFrom from any of the specified required dialects.
+ for ( Class<? extends Dialect> dialect : requiredDialectList ) {
+ if ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
}
- private void runTestMethod( Method runMethod ) throws Throwable, IllegalAccessException {
+ private void runTestMethod(Method runMethod) throws Throwable {
try {
- runMethod.invoke(this, new Class[0]);
- } catch ( InvocationTargetException e ) {
+ runMethod.invoke( this, new Class[0] );
+ }
+ catch ( InvocationTargetException e ) {
e.fillInStackTrace();
throw e.getTargetException();
- } catch ( IllegalAccessException e ) {
+ }
+ catch ( IllegalAccessException e ) {
e.fillInStackTrace();
throw e;
}
@@ -148,47 +181,53 @@
private Method findTestMethod() {
String fName = getName();
- assertNotNull(fName);
+ assertNotNull( fName );
Method runMethod = null;
try {
- runMethod = getClass().getMethod(fName, null);
- } catch ( NoSuchMethodException e ) {
- fail("Method \"" + fName + "\" not found");
+ runMethod = getClass().getMethod( fName, null );
}
- if ( !Modifier.isPublic(runMethod.getModifiers()) ) {
- fail("Method \"" + fName + "\" should be public");
+ catch ( NoSuchMethodException e ) {
+ fail( "Method \"" + fName + "\" not found" );
}
+ if ( !Modifier.isPublic( runMethod.getModifiers() ) ) {
+ fail( "Method \"" + fName + "\" should be public" );
+ }
return runMethod;
}
private void handleUnclosedSession() {
if ( session != null && session.isOpen() ) {
- if ( session.isConnected() )
- session.doWork(new RollbackWork());
+ if ( session.isConnected() ) {
+ session.doWork( new RollbackWork() );
+ }
session.close();
session = null;
- fail("unclosed session");
- } else {
+ fail( "unclosed session" );
+ }
+ else {
session = null;
}
}
- private void closeSession( Throwable e ) throws Throwable {
+ private void closeSession(Throwable e) throws Throwable {
try {
if ( session != null && session.isOpen() ) {
- if ( session.isConnected() )
- session.doWork(new RollbackWork());
+ if ( session.isConnected() ) {
+ session.doWork( new RollbackWork() );
+ }
session.close();
}
- } catch ( Exception ignore ) {
}
+ catch ( Exception ignore ) {
+ }
try {
if ( sessions != null ) {
sessions.close();
sessions = null;
}
- } catch ( Exception ignore ) {
}
+ catch ( Exception ignore ) {
+ }
throw e;
}
@@ -197,22 +236,22 @@
return session;
}
- public Session openSession( Interceptor interceptor ) throws HibernateException {
- session = getSessions().openSession(interceptor);
+ public Session openSession(Interceptor interceptor) throws HibernateException {
+ session = getSessions().openSession( interceptor );
return session;
}
protected abstract Class<?>[] getMappings();
protected String[] getAnnotatedPackages() {
- return new String[] {};
+ return new String[] { };
}
protected String[] getXmlFiles() {
- return new String[] {};
+ return new String[] { };
}
- private void setSessions( SessionFactory sessions ) {
+ private void setSessions(SessionFactory sessions) {
TestCase.sessions = sessions;
}
@@ -220,15 +259,11 @@
return sessions;
}
- private void setDialect( Dialect dialect ) {
- TestCase.dialect = dialect;
- }
-
protected Dialect getDialect() {
- return dialect;
+ return Dialect.getDialect();
}
- protected static void setCfg( AnnotationConfiguration cfg ) {
+ protected static void setCfg(AnnotationConfiguration cfg) {
TestCase.cfg = cfg;
}
@@ -236,7 +271,7 @@
return cfg;
}
- protected void configure( Configuration cfg ) {
+ protected void configure(Configuration cfg) {
}
protected boolean recreateSchema() {
@@ -244,13 +279,13 @@
}
protected void runSchemaGeneration() {
- SchemaExport export = new SchemaExport(cfg);
- export.create(true, true);
+ SchemaExport export = new SchemaExport( cfg );
+ export.create( true, true );
}
public class RollbackWork implements Work {
- public void execute( Connection connection ) throws SQLException {
+ public void execute(Connection connection) throws SQLException {
connection.rollback();
}
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/id/IdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/id/IdTest.java 2009-10-13 15:30:21 UTC (rev 17723)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/id/IdTest.java 2009-10-13 15:47:59 UTC (rev 17724)
@@ -3,9 +3,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.dialect.HSQLDialect;
import org.hibernate.mapping.Column;
-import org.hibernate.test.annotations.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.test.annotations.id.entities.Ball;
import org.hibernate.test.annotations.id.entities.BreakDance;
@@ -29,7 +27,6 @@
* @author Emmanuel Bernard
*/
@SuppressWarnings("unchecked")
-(a)RequiresDialect(HSQLDialect.class)
public class IdTest extends TestCase {
// FIXME split Sequence and Id tests to explicit the run failure on Oracle etc
public void testGenericGenerator() throws Exception {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/lob/LobTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/lob/LobTest.java 2009-10-13 15:30:21 UTC (rev 17723)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/lob/LobTest.java 2009-10-13 15:47:59 UTC (rev 17724)
@@ -113,6 +113,11 @@
s.close();
}
+ @Override
+ protected boolean runForCurrentDialect() {
+ return super.runForCurrentDialect() && getDialect().supportsExpectedLobUsagePattern();
+ }
+
public LobTest(String x) {
super( x );
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2009-10-13 15:30:21 UTC (rev 17723)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2009-10-13 15:47:59 UTC (rev 17724)
@@ -63,31 +63,11 @@
s.close();
}
- public void testManyToOneAndInterface() throws Exception {
- Session s = openSession();
- s.getTransaction().begin();
- B b = new BImpl();
- b.setBId( 1 );
- s.persist( b );
- Z z = new ZImpl();
- z.setB( b );
- s.persist( z );
- s.flush();
- s.getTransaction().rollback();
- s.close();
- }
- @Override
- protected void configure(Configuration cfg) {
- super.configure( cfg );
- //cfg.addClass( Government.class );
- }
-
protected Class[] getMappings() {
return new Class[]{
PrimeMinister.class,
Sky.class,
- ZImpl.class
};
}
@@ -97,8 +77,6 @@
return new String[]{
"org/hibernate/test/annotations/xml/hbm/Government.hbm.xml",
"org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml",
- "org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
- "org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
};
}
}
Added: annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2009-10-13 15:47:59 UTC (rev 17724)
@@ -0,0 +1,51 @@
+//$Id:HbmTest.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $
+package org.hibernate.test.annotations.xml.hbm;
+
+import java.util.HashSet;
+
+import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.test.annotations.TestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class HbmWithIdentityTest extends TestCase {
+
+ public void testManyToOneAndInterface() throws Exception {
+ Session s = openSession();
+ s.getTransaction().begin();
+ B b = new BImpl();
+ b.setBId( 1 );
+ s.persist( b );
+ Z z = new ZImpl();
+ z.setB( b );
+ s.persist( z );
+ s.flush();
+ s.getTransaction().rollback();
+ s.close();
+ }
+
+
+
+ @Override
+ protected boolean runForCurrentDialect() {
+ return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+ }
+
+
+
+ protected Class[] getMappings() {
+ return new Class[]{
+ ZImpl.class
+ };
+ }
+
+ @Override
+ protected String[] getXmlFiles() {
+ return new String[]{
+ "org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
+ "org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
+ };
+ }
+}
14 years, 11 months
Hibernate SVN: r17723 - core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-10-13 11:30:21 -0400 (Tue, 13 Oct 2009)
New Revision: 17723
Modified:
core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/preface.xml
Log:
Reference EAP instead of JEMS
Modified: core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/preface.xml
===================================================================
--- core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/preface.xml 2009-10-13 15:08:53 UTC (rev 17722)
+++ core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/preface.xml 2009-10-13 15:30:21 UTC (rev 17723)
@@ -158,9 +158,9 @@
<para>
Commercial development support, production support, and training for Hibernate is
- available through Red Hat Inc. (see http://www.hibernate.org/SupportTraining/).
+ available through Red Hat, Inc. (see http://www.hibernate.org/SupportTraining/).
Hibernate is a Professional Open Source project and a critical component of the
- JBoss Enterprise Middleware System (JEMS) suite of products.
+ JBoss Enterprise Application Platform.
</para>
</preface>
14 years, 11 months
Hibernate SVN: r17722 - core/branches/gradle/hibernate-envers.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-13 11:08:53 -0400 (Tue, 13 Oct 2009)
New Revision: 17722
Modified:
core/branches/gradle/hibernate-envers/build.gradle
Log:
typo
Modified: core/branches/gradle/hibernate-envers/build.gradle
===================================================================
--- core/branches/gradle/hibernate-envers/build.gradle 2009-10-13 15:05:53 UTC (rev 17721)
+++ core/branches/gradle/hibernate-envers/build.gradle 2009-10-13 15:08:53 UTC (rev 17722)
@@ -15,7 +15,7 @@
)
testRuntime (
[group: 'com.h2database', name: 'h2', version: h2Version],
- [group: 'javassist', name: 'javassist', javassistVersion],
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
[group: 'cglib', name: 'cglib', version: cglibVersion]
)
}
14 years, 11 months
Hibernate SVN: r17721 - core/branches/gradle/hibernate-testing.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-13 11:05:53 -0400 (Tue, 13 Oct 2009)
New Revision: 17721
Added:
core/branches/gradle/hibernate-testing/build.gradle
Log:
added hibernate-testing module
Added: core/branches/gradle/hibernate-testing/build.gradle
===================================================================
--- core/branches/gradle/hibernate-testing/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-testing/build.gradle 2009-10-13 15:05:53 UTC (rev 17721)
@@ -0,0 +1,6 @@
+dependencies {
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'junit', name: 'junit', version: junitVersion]
+ )
+}
\ No newline at end of file
14 years, 11 months
Hibernate SVN: r17720 - core/branches/gradle.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-13 10:42:47 -0400 (Tue, 13 Oct 2009)
New Revision: 17720
Added:
core/branches/gradle/hibernate-testing/
Removed:
core/branches/gradle/testing/
Log:
renaming module dirs to better follow convention
Copied: core/branches/gradle/hibernate-testing (from rev 17719, core/branches/gradle/testing)
14 years, 11 months
Hibernate SVN: r17719 - in core/branches/gradle: hibernate-annotations and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-13 10:39:58 -0400 (Tue, 13 Oct 2009)
New Revision: 17719
Added:
core/branches/gradle/hibernate-c3p0/build.gradle
core/branches/gradle/hibernate-ehcache/build.gradle
core/branches/gradle/hibernate-infinispan/build.gradle
core/branches/gradle/hibernate-jbosscache/build.gradle
core/branches/gradle/hibernate-jmx/build.gradle
core/branches/gradle/hibernate-oscache/build.gradle
core/branches/gradle/hibernate-proxool/build.gradle
core/branches/gradle/hibernate-swarmcache/build.gradle
Removed:
core/branches/gradle/hibernate-c3p0/pom.xml
core/branches/gradle/hibernate-ehcache/pom.xml
core/branches/gradle/hibernate-jmx/pom.xml
core/branches/gradle/hibernate-oscache/pom.xml
core/branches/gradle/hibernate-proxool/pom.xml
core/branches/gradle/hibernate-swarmcache/pom.xml
Modified:
core/branches/gradle/build.gradle
core/branches/gradle/hibernate-annotations/build.gradle
core/branches/gradle/hibernate-core/build.gradle
core/branches/gradle/hibernate-entitymanager/build.gradle
core/branches/gradle/hibernate-envers/build.gradle
core/branches/gradle/settings.gradle
Log:
expanded build
Modified: core/branches/gradle/build.gradle
===================================================================
--- core/branches/gradle/build.gradle 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -8,6 +8,13 @@
mavenRepo name: "artifactory", urls: "http://localhost:8081/artifactory/repo/"
}
+ 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'
@@ -18,18 +25,28 @@
javassistVersion = '3.9.0.GA'
cglibVersion = '2.2'
+ junitVersion = '3.8.2'
+ testngVersion = '5.8'
+
+ hsqldbVersion = '1.8.0.2'
+ h2Version = '1.0.79'
+
compile(
group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
)
testCompile(
- [group: 'junit', name: 'junit', version: '3.8.2'],
+ [group: 'junit', name: 'junit', version: junitVersion],
[group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4jVersion],
- [group: 'org.slf4j', name: 'slf4j-log4j12', version: slf4jVersion],
- [group: 'commons-logging', name: 'commons-logging', version: '99.0-does-not-exist'],
- [group: 'commons-logging', name: 'commons-logging-api', version: '99.0-does-not-exist']
+ [group: 'org.slf4j', name: 'slf4j-log4j12', version: slf4jVersion]
)
}
+ sourceSets {
+ main {
+ compileClasspath = compileClasspath + configurations.provided
+ }
+ }
+
group = 'org.hibernate.gradlePoC'
version = '1.0.0-SNAPSHOT'
manifest.mainAttributes(
Modified: core/branches/gradle/hibernate-annotations/build.gradle
===================================================================
--- core/branches/gradle/hibernate-annotations/build.gradle 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-annotations/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,10 +1,11 @@
dependencies {
compile (
- project(':hibernate-core'),
+ this.project(':hibernate-core').sourceSets.main.classes,
[group: 'dom4j', name: 'dom4j', version: dom4jVersion],
[group: 'org.hibernate', name: 'hibernate-commons-annotations', version: annotationsCommonsVersion],
[group: 'org.hibernate.java-persistence', name: 'jpa-api', version: jpaVersion],
- // need to be 'optional'/'provided'
+ )
+ provided (
[group: 'javax.validation', name: 'validation-api', version: '1.0.CR4']
)
testCompile (
Added: core/branches/gradle/hibernate-c3p0/build.gradle
===================================================================
--- core/branches/gradle/hibernate-c3p0/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-c3p0/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,8 @@
+dependencies {
+ c3p0Version = '0.9.1'
+
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'c3p0', name: 'c3p0', version: c3p0Version]
+ )
+}
\ No newline at end of file
Deleted: core/branches/gradle/hibernate-c3p0/pom.xml
===================================================================
--- core/branches/gradle/hibernate-c3p0/pom.xml 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-c3p0/pom.xml 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,31 +0,0 @@
-<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.5.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate C3P0 ConnectionProvider</name>
- <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1</version>
- </dependency>
- </dependencies>
-</project>
Modified: core/branches/gradle/hibernate-core/build.gradle
===================================================================
--- core/branches/gradle/hibernate-core/build.gradle 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-core/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,5 +1,7 @@
configurations {
- antAntlr
+ antAntlr {
+ description = 'Classpath used to define and execute the Antlr Ant task.'
+ }
}
dependencies {
@@ -8,8 +10,9 @@
compile (
[group: 'antlr', name: 'antlr', version: antlrVersion],
[group: 'commons-collections', name: 'commons-collections', version: '3.1'],
- [group: 'dom4j', name: 'dom4j', version: dom4jVersion],
- // need to be 'optional'/'provided'
+ [group: 'dom4j', name: 'dom4j', version: dom4jVersion]
+ )
+ provided(
[group: 'javassist', name: 'javassist', version: javassistVersion],
[group: 'cglib', name: 'cglib', version: cglibVersion, transitive: true],
[group: 'ant', name: 'ant', version: antVersion],
@@ -84,4 +87,5 @@
}
compileJava.dependsOn antlrGeneratedSourceFiles.builtBy
-sourceSets.main.java.srcDir( antlrGeneratedSourceFiles )
\ No newline at end of file
+sourceSets.main.java.srcDir( antlrGeneratedSourceFiles )
+
Added: core/branches/gradle/hibernate-ehcache/build.gradle
===================================================================
--- core/branches/gradle/hibernate-ehcache/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-ehcache/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,16 @@
+dependencies {
+ ehcacheVersion = '1.5.0'
+
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'net.sf.ehcache', name: 'ehcache', version: ehcacheVersion]
+ )
+ testCompile (
+ this.project(':hibernate-testing').sourceSets.main.classes,
+ )
+ testRuntime (
+ [group: 'hsqldb', name: 'hsqldb', version: hsqldbVersion],
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion]
+ )
+}
\ No newline at end of file
Deleted: core/branches/gradle/hibernate-ehcache/pom.xml
===================================================================
--- core/branches/gradle/hibernate-ehcache/pom.xml 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-ehcache/pom.xml 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,53 +0,0 @@
-<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.5.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate Ehcache Integration</name>
- <description>Integration of Hibernate with Ehcache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Modified: core/branches/gradle/hibernate-entitymanager/build.gradle
===================================================================
--- core/branches/gradle/hibernate-entitymanager/build.gradle 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-entitymanager/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,7 +1,7 @@
dependencies {
compile(
- project(':hibernate-core'),
- project(':hibernate-annotations'),
+ this.project(':hibernate-core').sourceSets.main.classes,
+ this.project(':hibernate-annotations').sourceSets.main.classes,
[group: 'dom4j', name: 'dom4j', version: dom4jVersion],
[group: 'org.hibernate', name: 'hibernate-commons-annotations', version: annotationsCommonsVersion],
[group: 'org.hibernate.java-persistence', name: 'jpa-api', version: jpaVersion],
Modified: core/branches/gradle/hibernate-envers/build.gradle
===================================================================
--- core/branches/gradle/hibernate-envers/build.gradle 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-envers/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,19 +1,23 @@
dependencies {
+ hibernateToolsVersion = '3.2.0.ga'
+
compile (
- project(':hibernate-core'),
- project(':hibernate-annotations'),
- project(':hibernate-entitymanager'),
- 'org.hibernate:hibernate-tools:3.2.0.ga',
+ this.project(':hibernate-core').sourceSets.main.classes,
+ this.project(':hibernate-annotations').sourceSets.main.classes,
+ this.project(':hibernate-entitymanager').sourceSets.main.classes,
+ [group: 'org.hibernate', name: 'hibernate-tools', version: hibernateToolsVersion]
)
runtime(
- 'ant:ant:1.6.5'
+ [group: 'ant', name: 'ant', version: '1.6.5']
)
testCompile (
- 'org.testng:testng:5.8',
- 'com.h2database:h2:1.0.79',
- 'javassist:javassist:3.9.0.GA',
- 'cglib:cglib:2.2'
+ [group: 'org.testng', name: 'testng', version: testngVersion]
)
+ testRuntime (
+ [group: 'com.h2database', name: 'h2', version: h2Version],
+ [group: 'javassist', name: 'javassist', javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion]
+ )
}
sourceTarget = "1.5"
Added: core/branches/gradle/hibernate-infinispan/build.gradle
===================================================================
--- core/branches/gradle/hibernate-infinispan/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-infinispan/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,24 @@
+// 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-SNAPSHOT'
+
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion]
+ )
+ testCompile(
+ this.project(':hibernate-testing').sourceSets.main.classes,
+ [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion, classifier: 'test-jar']
+ )
+ testRuntime (
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion],
+ [group: 'hsqldb', name: 'hsqldb', version: hsqldbVersion]
+ )
+}
+
+sourceTarget = "1.5"
+sourceCompatibility = "1.5"
\ No newline at end of file
Added: core/branches/gradle/hibernate-jbosscache/build.gradle
===================================================================
--- core/branches/gradle/hibernate-jbosscache/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-jbosscache/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,23 @@
+// 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 (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'org.jboss.cache', name: 'jbosscache-core', version: jbcVersion]
+ )
+ testCompile(
+ this.project(':hibernate-testing').sourceSets.main.classes
+ )
+ testRuntime (
+ [group: 'javassist', name: 'javassist', version: javassistVersion],
+ [group: 'cglib', name: 'cglib', version: cglibVersion],
+ [group: 'hsqldb', name: 'hsqldb', version: hsqldbVersion]
+ )
+}
+
+sourceTarget = "1.5"
+sourceCompatibility = "1.5"
\ No newline at end of file
Added: core/branches/gradle/hibernate-jmx/build.gradle
===================================================================
--- core/branches/gradle/hibernate-jmx/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-jmx/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,5 @@
+dependencies {
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes
+ )
+}
\ No newline at end of file
Deleted: core/branches/gradle/hibernate-jmx/pom.xml
===================================================================
--- core/branches/gradle/hibernate-jmx/pom.xml 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-jmx/pom.xml 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,50 +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.5.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jmx</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate JMX Module</name>
- <description>Defines Hibernate JMX capabilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
-</project>
Added: core/branches/gradle/hibernate-oscache/build.gradle
===================================================================
--- core/branches/gradle/hibernate-oscache/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-oscache/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,8 @@
+dependencies {
+ oscacheVersion = '2.1';
+
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'opensymphony', name: 'oscache', version: oscacheVersion]
+ )
+}
\ No newline at end of file
Deleted: core/branches/gradle/hibernate-oscache/pom.xml
===================================================================
--- core/branches/gradle/hibernate-oscache/pom.xml 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-oscache/pom.xml 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,31 +0,0 @@
-<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.5.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-oscache</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate OSCache Integration</name>
- <description>Integration of Hibernate with OSCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
-</project>
Added: core/branches/gradle/hibernate-proxool/build.gradle
===================================================================
--- core/branches/gradle/hibernate-proxool/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-proxool/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,8 @@
+dependencies {
+ proxoolVersion = '0.8.3'
+
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'proxool', name: 'proxool', version: proxoolVersion]
+ )
+}
\ No newline at end of file
Deleted: core/branches/gradle/hibernate-proxool/pom.xml
===================================================================
--- core/branches/gradle/hibernate-proxool/pom.xml 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-proxool/pom.xml 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,31 +0,0 @@
-<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.5.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-proxool</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate Proxool ConnectionProvider</name>
- <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>proxool</groupId>
- <artifactId>proxool</artifactId>
- <version>0.8.3</version>
- </dependency>
- </dependencies>
-</project>
Added: core/branches/gradle/hibernate-swarmcache/build.gradle
===================================================================
--- core/branches/gradle/hibernate-swarmcache/build.gradle (rev 0)
+++ core/branches/gradle/hibernate-swarmcache/build.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -0,0 +1,8 @@
+dependencies {
+ swarmcacheVersion = '0.8.3'
+
+ compile (
+ this.project(':hibernate-core').sourceSets.main.classes,
+ [group: 'swarmcache', name: 'swarmcache', version: swarmcacheVersion]
+ )
+}
\ No newline at end of file
Deleted: core/branches/gradle/hibernate-swarmcache/pom.xml
===================================================================
--- core/branches/gradle/hibernate-swarmcache/pom.xml 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/hibernate-swarmcache/pom.xml 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,31 +0,0 @@
-<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.5.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-swarmcache</artifactId>
- <packaging>jar</packaging>
-
- <name>Hibernate SwarmCache Integration</name>
- <description>Integration of Hibernate with SwarmCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>swarmcache</groupId>
- <artifactId>swarmcache</artifactId>
- <version>1.0RC2</version>
- </dependency>
- </dependencies>
-</project>
Modified: core/branches/gradle/settings.gradle
===================================================================
--- core/branches/gradle/settings.gradle 2009-10-13 14:17:46 UTC (rev 17718)
+++ core/branches/gradle/settings.gradle 2009-10-13 14:39:58 UTC (rev 17719)
@@ -1,20 +1,15 @@
-//include (
-// "hibernate-core",
-// "hibernate-envers",
-// "hibernate-annotations",
-// "hibernate-entitymanager",
-// "hibernate-c3p0",
-// "hibernate-proxool",
-// "hibernate-ehcache",
-// "hibernate-infinispan",
-// "hibernate-jbosscache",
-// "hibernate-oscache",
-// "hibernate-swarmcache",
-// "hibernate-jmx"
-//)
include (
- "hibernate-core",
- "hibernate-envers",
- "hibernate-annotations",
- "hibernate-entitymanager"
-)
\ No newline at end of file
+ 'hibernate-core',
+ 'hibernate-envers',
+ 'hibernate-annotations',
+ 'hibernate-entitymanager',
+ 'hibernate-c3p0',
+ 'hibernate-proxool',
+ 'hibernate-ehcache',
+ 'hibernate-infinispan',
+ 'hibernate-jbosscache',
+ 'hibernate-oscache',
+ 'hibernate-swarmcache',
+ 'hibernate-jmx',
+ 'hibernate-testing'
+)
14 years, 11 months
Hibernate SVN: r17718 - in validator/trunk: hibernate-validator-tck-runner and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-13 10:17:46 -0400 (Tue, 13 Oct 2009)
New Revision: 17718
Modified:
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/src/main/assembly/dist.xml
Log:
changed the directory the docs gets placed in the assembly. made project dependend on latest tck snapshot
Modified: validator/trunk/hibernate-validator/src/main/assembly/dist.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/assembly/dist.xml 2009-10-13 13:31:07 UTC (rev 17717)
+++ validator/trunk/hibernate-validator/src/main/assembly/dist.xml 2009-10-13 14:17:46 UTC (rev 17718)
@@ -81,8 +81,8 @@
<outputDirectory>docs/api</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/docbook/publish/en-US</directory>
- <outputDirectory>docs/manual</outputDirectory>
+ <directory>target/docbook/publish</directory>
+ <outputDirectory>docs/reference</outputDirectory>
</fileSet>
<fileSet>
<directory>.</directory>
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-13 13:31:07 UTC (rev 17717)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-10-13 14:17:46 UTC (rev 17718)
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
<artifactId>jsr303-tck</artifactId>
- <version>1.0.0.GA</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.test-harness</groupId>
14 years, 11 months
Hibernate SVN: r17717 - in annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations: xml/hbm and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-10-13 09:31:07 -0400 (Tue, 13 Oct 2009)
New Revision: 17717
Added:
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/RequiresDialect.java
annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
Log:
JBPAPP-2910 HHH-4415 : TestCase could check for superclass of Dialect before skipping it
Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/RequiresDialect.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/RequiresDialect.java (rev 0)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/RequiresDialect.java 2009-10-13 13:31:07 UTC (rev 17717)
@@ -0,0 +1,20 @@
+// $Id: RequiresDialect.java 15025 2008-08-11 09:14:39Z hardy.ferentschik $
+package org.hibernate.test.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.hibernate.dialect.Dialect;
+
+/**
+ * Annotations used to mark a test to be specific to a given dialect.
+ *
+ * @author Hardy Ferentschik
+ */
+(a)Target({ElementType.METHOD, ElementType.TYPE})
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface RequiresDialect {
+ Class<? extends Dialect>[] value();
+}
Added: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java (rev 0)
+++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2009-10-13 13:31:07 UTC (rev 17717)
@@ -0,0 +1,54 @@
+//$Id:HbmTest.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $
+package org.hibernate.test.annotations.xml.hbm;
+
+import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.test.annotations.TestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class HbmWithIdentityTest extends TestCase {
+
+
+ public void testManyToOneAndInterface() throws Exception {
+ Session s = openSession();
+ s.getTransaction().begin();
+ B b = new BImpl();
+ b.setBId( 1 );
+ s.persist( b );
+ Z z = new ZImpl();
+ z.setB( b );
+ s.persist( z );
+ s.flush();
+ s.getTransaction().rollback();
+ s.close();
+ }
+
+ @Override
+ protected void configure(Configuration cfg) {
+ super.configure( cfg );
+ }
+
+
+
+ @Override
+ protected boolean runForCurrentDialect() {
+ return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
+ }
+
+ protected Class[] getMappings() {
+ return new Class[]{
+ ZImpl.class
+
+ };
+ }
+
+ @Override
+ protected String[] getXmlFiles() {
+ return new String[]{
+ "org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
+ "org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
+ };
+ }
+}
14 years, 11 months