Hibernate SVN: r19401 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-07 06:58:10 -0400 (Fri, 07 May 2010)
New Revision: 19401
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java
Log:
javadoc typo
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java 2010-05-07 07:23:22 UTC (rev 19400)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java 2010-05-07 10:58:10 UTC (rev 19401)
@@ -382,7 +382,7 @@
* @param types The value types
* @param copy an array indicating which values to include in the copy
* @param target The array into which to copy the values
- * @param session The orginating session
+ * @param session The originating session
*/
public static void deepCopy(
final Object[] values,
@@ -409,7 +409,7 @@
*
* @param row The values
* @param types The value types
- * @param session The orginating session
+ * @param session The originating session
*/
public static void beforeAssemble(
final Serializable[] row,
@@ -428,7 +428,7 @@
*
* @param row The values
* @param types The value types
- * @param session The orginating session
+ * @param session The originating session
* @param owner The entity "owning" the values
* @return The assembled state
*/
@@ -454,8 +454,8 @@
*
* @param row The values
* @param types The value types
- * @param nonCacheable An array indicating which values to include in the disassemled state
- * @param session The orginating session
+ * @param nonCacheable An array indicating which values to include in the disassembled state
+ * @param session The originating session
* @param owner The entity "owning" the values
* @return The disassembled state
*/
@@ -486,7 +486,7 @@
* @param original The source of the state
* @param target The target into which to replace the source values.
* @param types The value types
- * @param session The orginating session
+ * @param session The originating session
* @param owner The entity "owning" the values
* @param copyCache A map representing a cache of already replaced state
* @return The replaced state
@@ -517,7 +517,7 @@
* @param original The source of the state
* @param target The target into which to replace the source values.
* @param types The value types
- * @param session The orginating session
+ * @param session The originating session
* @param owner The entity "owning" the values
* @param copyCache A map representing a cache of already replaced state
* @param foreignKeyDirection FK directionality to be applied to the replacement
@@ -549,12 +549,12 @@
* long as the corresponding {@link Type} is an association.
* <p/>
* If the corresponding type is a component type, then apply {@link #replaceAssociations}
- * accross the component subtypes but do not replace the component value itself.
+ * across the component subtypes but do not replace the component value itself.
*
* @param original The source of the state
* @param target The target into which to replace the source values.
* @param types The value types
- * @param session The orginating session
+ * @param session The originating session
* @param owner The entity "owning" the values
* @param copyCache A map representing a cache of already replaced state
* @param foreignKeyDirection FK directionality to be applied to the replacement
14 years, 8 months
- 1
- 0
Hibernate SVN: r19400 - in entitymanager/branches/v3_4_0_GA_CP: src/test/java/org/hibernate/ejb/test and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-07 03:23:22 -0400 (Fri, 07 May 2010)
New Revision: 19400
Modified:
entitymanager/branches/v3_4_0_GA_CP/pom.xml
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java
Log:
JBPAPP-4235 HHH-4822 Add @FailureExpected annotation to annotations and entitymananger modules to allow the skipping of tests
Modified: entitymanager/branches/v3_4_0_GA_CP/pom.xml
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/pom.xml 2010-05-07 07:18:16 UTC (rev 19399)
+++ entitymanager/branches/v3_4_0_GA_CP/pom.xml 2010-05-07 07:23:22 UTC (rev 19400)
@@ -64,8 +64,13 @@
<artifactId>hibernate-core</artifactId>
<version>3.3.2.GA_CP01</version>
</dependency>
-
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>3.3.2.GA_CP01</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
@@ -168,6 +173,10 @@
</descriptors>
</configuration>
</plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -178,16 +187,7 @@
</links>
<stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
</configuration>
- <executions>
- <execution>
- <id>make-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
- </build>
+ </reporting>
</project>
\ No newline at end of file
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-05-07 07:18:16 UTC (rev 19399)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-05-07 07:23:22 UTC (rev 19400)
@@ -40,11 +40,13 @@
public class PackagedEntityManagerTest extends TestCase {
public Class[] getAnnotatedClasses() {
- return new Class[] {
+ return new Class[] {Item.class,Distributor.class
};
}
- public void setUp() {
+ @Override
+ protected void buildConfiguration() throws Exception {
+ super.buildConfiguration();
factory = Persistence.createEntityManagerFactory( "manager1" );
}
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java 2010-05-07 07:18:16 UTC (rev 19399)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java 2010-05-07 07:23:22 UTC (rev 19400)
@@ -1,11 +1,11 @@
-//$Id$
+// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
@@ -27,29 +27,39 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
+import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.ejb.HibernatePersistence;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.test.annotations.HibernateTestCase;
-
/**
+ * A base class for all ejb tests.
+ *
* @author Emmanuel Bernard
+ * @author Hardy Ferentschik
*/
-public abstract class TestCase extends junit.framework.TestCase {
- protected EntityManagerFactory factory;
- protected EntityManager em;
- private static Logger log = LoggerFactory.getLogger( TestCase.class );
+public abstract class TestCase extends HibernateTestCase {
+ private static final Log log = LogFactory.getLog( TestCase.class );
+
+ protected static EntityManagerFactory factory;
+ private EntityManager em;
+ private ArrayList isolatedEms = new ArrayList();
+
+
public TestCase() {
super();
}
@@ -58,54 +68,90 @@
super( name );
}
- public void setUp() {
- factory = new HibernatePersistence().createEntityManagerFactory( getConfig() );
+
+ public void tearDown() throws Exception {
+ super.tearDown();
}
- public void tearDown() {
- factory.close();
- }
-
@Override
- public void runTest() throws Throwable {
- try {
- em = getOrCreateEntityManager();
- super.runTest();
- if (em.getTransaction().isActive()) {
- em.getTransaction().rollback();
- fail("You left an open transaction! Fix your test case. For now, we are closing it for you.");
- }
- } catch (Throwable t) {
- if (em.getTransaction().isActive())
- em.getTransaction().rollback();
- throw t;
- } finally {
- if (em.isOpen()) {
- em.close();
- log.warn("The test case didn't closed the Entity Manager. Make sure you close it always!");
- }
+ protected void buildConfiguration() throws Exception {
+ Ejb3Configuration ejbconfig = new Ejb3Configuration();
+ TestCase.cfg = ejbconfig.getHibernateConfiguration();
+ if ( recreateSchema() ) {
+ cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
}
+ //cfg.setProperty( AnnotationConfiguration.USE_NEW_ID_GENERATOR_MAPPINGS, "true" );
+
+ for ( String mappingFile : getMappings() ) {
+ cfg.addResource( mappingFile );
+ }
+
+ factory = ejbconfig.createEntityManagerFactory( getConfig() );
}
-
+
+ private void cleanUnclosed(EntityManager em) {
+ if ( em == null ) {
+ return;
+ }
+ if ( em.getTransaction().isActive() ) {
+ em.getTransaction().rollback();
+ log.warn( "You left an open transaction! Fix your test case. For now, we are closing it for you." );
+ }
+ if ( em.isOpen() ) {
+ // as we open an EM before the test runs, it will still be open if the test uses a custom EM.
+ // or, the person may have forgotten to close. So, do not raise a "fail", but log the fact.
+ em.close();
+ log.warn( "The EntityManager is not closed. Closing it." );
+ }
+ }
+
+ protected void handleUnclosedResources() {
+ cleanUnclosed( this.em );
+ for ( Iterator iter = isolatedEms.iterator(); iter.hasNext(); ) {
+ cleanUnclosed( ( EntityManager ) iter.next() );
+ }
+
+ cfg = null;
+ }
+
+ protected void closeResources() {
+ if ( factory != null ) {
+ factory.close();
+ }
+ }
+
protected EntityManager getOrCreateEntityManager() {
- if (em == null || !em.isOpen())
+ if ( em == null || !em.isOpen() ) {
em = factory.createEntityManager();
+ }
return em;
}
- /** always reopen a new EM and close the existing one */
+ protected EntityManager createIsolatedEntityManager() {
+ EntityManager isolatedEm = factory.createEntityManager();
+ isolatedEms.add( isolatedEm );
+ return isolatedEm;
+ }
+
+ protected EntityManager createIsolatedEntityManager(Map props) {
+ EntityManager isolatedEm = factory.createEntityManager(props);
+ isolatedEms.add( isolatedEm );
+ return isolatedEm;
+ }
+
+ /**
+ * always reopen a new EM and clse the existing one
+ */
protected EntityManager createEntityManager(Map properties) {
- if (em != null && em.isOpen() ) {
+ if ( em != null && em.isOpen() ) {
em.close();
}
- em = factory.createEntityManager(properties);
+ em = factory.createEntityManager( properties );
return em;
}
- public abstract Class[] getAnnotatedClasses();
-
public String[] getEjb3DD() {
- return new String[] {};
+ return new String[] { };
}
public Map<Class, String> getCachedClasses() {
@@ -123,14 +169,14 @@
try {
props.load( stream );
}
- catch (Exception e) {
+ catch ( Exception e ) {
throw new RuntimeException( "could not load hibernate.properties" );
}
finally {
try {
stream.close();
}
- catch (IOException ioe) {
+ catch ( IOException ioe ) {
}
}
}
@@ -139,12 +185,9 @@
}
public Map getConfig() {
- Map config = loadProperties();
+ Map<Object, Object> config = loadProperties();
ArrayList<Class> classes = new ArrayList<Class>();
-
- for ( Class clazz : getAnnotatedClasses() ) {
- classes.add( clazz );
- }
+ classes.addAll( Arrays.asList( getAnnotatedClasses() ) );
config.put( HibernatePersistence.LOADED_CLASSES, classes );
for ( Map.Entry<Class, String> entry : getCachedClasses().entrySet() ) {
config.put(
@@ -160,40 +203,26 @@
}
if ( getEjb3DD().length > 0 ) {
ArrayList<String> dds = new ArrayList<String>();
- for ( String dd : getEjb3DD() ) {
- dds.add( dd );
- }
+ dds.addAll( Arrays.asList( getEjb3DD() ) );
config.put( HibernatePersistence.XML_FILE_NAMES, dds );
}
+
+ addConfigOptions( config );
return config;
}
+ protected void addConfigOptions(Map options) {
+ }
+
@Override
public void runBare() throws Throwable {
-
- if (!appliesTo(Dialect.getDialect()))
+ if ( !appliesTo( Dialect.getDialect() ) ) {
return;
-
- Throwable exception = null;
- setUp();
- try {
- runTest();
- } catch (Throwable running) {
- exception = running;
- } finally {
- try {
- tearDown();
- } catch (Throwable tearingDown) {
- if (exception == null)
- exception = tearingDown;
- }
}
- if (exception != null)
- throw exception;
+ super.runBare();
}
public boolean appliesTo(Dialect dialect) {
return true;
}
-
}
14 years, 8 months
- 1
- 0
Hibernate SVN: r19399 - in annotations/branches/v3_4_0_GA_CP: src/test/java/org/hibernate/test/annotations and 52 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-07 03:18:16 -0400 (Fri, 07 May 2010)
New Revision: 19399
Added:
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
Removed:
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
Modified:
annotations/branches/v3_4_0_GA_CP/pom.xml
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
Log:
JBPAPP-4235 HHH-4822 Add @FailureExpected annotation to annotations and entitymananger modules to allow the skipping of tests
Modified: annotations/branches/v3_4_0_GA_CP/pom.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP/pom.xml 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/pom.xml 2010-05-07 07:18:16 UTC (rev 19399)
@@ -64,6 +64,12 @@
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>3.3.2.GA_CP01</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -136,36 +142,22 @@
</descriptors>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
- <link>http://docs.jboss.org/hibernate/stable/core/api</link>
- </links>
- <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
- </configuration>
- <executions>
- <execution>
- <id>make-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <releaseProfiles>release</releaseProfiles>
- <goals>package javadoc:javadoc org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:resources org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:generate assembly:assembly
- </goals>
- </configuration>
- </plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+ <link>http://docs.jboss.org/hibernate/stable/core/api</link>
+ </links>
+ <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -376,9 +376,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Flight.class,
Company.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -93,9 +93,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Boat.class,
Ferry.class,
Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -1,20 +0,0 @@
-// $Id$
-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();
-}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -1,86 +1,113 @@
//$Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.test.annotations;
import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
-import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.jdbc.Work;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.engine.SessionFactoryImplementor;
/**
- * A base class for all tests.
+ * A base class for all annotation tests.
*
* @author Emmnauel Bernand
* @author Hardy Ferentschik
*/
-public abstract class TestCase extends junit.framework.TestCase {
+public abstract class TestCase extends HibernateTestCase {
- public static final Logger log = LoggerFactory.getLogger( TestCase.class );
-
- private static SessionFactory sessions;
- private static AnnotationConfiguration cfg;
- private static Class<?> lastTestClass;
+ protected static SessionFactory sessions;
private Session session;
- /**
- * The test method.
- */
- private Method runMethod = null;
+ public TestCase() {
+ super();
+ }
- /**
- * Flag indicating whether the test should be run or skipped.
- */
- private boolean runTest = true;
+ public TestCase(String name) {
+ super( name );
+ }
- /**
- * 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 Session openSession() throws HibernateException {
+ rebuildSessionFactory();
+ session = getSessions().openSession();
+ return session;
+ }
- public TestCase() {
- super();
+ public Session openSession(Interceptor interceptor) throws HibernateException {
+ rebuildSessionFactory();
+ session = getSessions().openSession( interceptor );
+ return session;
}
- public TestCase(String x) {
- super( x );
+ private void rebuildSessionFactory() {
+ if ( sessions == null ) {
+ try {
+ buildConfiguration();
+ }
+ catch ( Exception e ) {
+ throw new HibernateException( e );
+ }
+ }
+ }
+
+ protected void setSessions(SessionFactory sessions) {
+ TestCase.sessions = sessions;
}
- protected void buildSessionFactory(Class<?>[] classes, String[] packages, String[] xmlFiles) throws Exception {
+ protected SessionFactory getSessions() {
+ return sessions;
+ }
+ protected SessionFactoryImplementor sfi() {
+ return (SessionFactoryImplementor) getSessions();
+ }
+
+ @Override
+ protected void buildConfiguration() throws Exception {
if ( getSessions() != null ) {
getSessions().close();
}
try {
setCfg( new AnnotationConfiguration() );
+ // by default use the new id generator scheme...
+ //cfg.setProperty( AnnotationConfiguration.USE_NEW_ID_GENERATOR_MAPPINGS, "true" );
configure( cfg );
if ( recreateSchema() ) {
cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
}
- for ( String aPackage : packages ) {
- getCfg().addPackage( aPackage );
+ for ( String aPackage : getAnnotatedPackages() ) {
+ ( ( AnnotationConfiguration ) getCfg() ).addPackage( aPackage );
}
- for ( Class<?> aClass : classes ) {
- getCfg().addAnnotatedClass( aClass );
+ for ( Class<?> aClass : getAnnotatedClasses() ) {
+ ( ( AnnotationConfiguration ) getCfg() ).addAnnotatedClass( aClass );
}
- for ( String xmlFile : xmlFiles ) {
+ for ( String xmlFile : getXmlFiles() ) {
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile );
getCfg().addInputStream( is );
}
@@ -92,111 +119,8 @@
}
}
- protected void setUp() throws Exception {
- runMethod = findTestMethod();
- setRunTestFlag( runMethod );
- if ( runTest ) {
- if ( getSessions() == null || lastTestClass != getClass() ) {
- buildSessionFactory( getMappings(), getAnnotatedPackages(), getXmlFiles() );
- lastTestClass = getClass();
- }
- else {
- runSchemaGeneration();
- }
- }
- }
-
- protected void runTest() throws Throwable {
- try {
- if ( runTest ) {
- runTestMethod( runMethod );
- handleUnclosedSession();
- }
- }
- catch ( Throwable e ) {
- closeSession( e );
- }
- }
-
- private void setRunTestFlag(Method runMethod) {
- updateRequiredDialectList( runMethod );
-
- 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();
- requiredDialectList.addAll( Arrays.asList( requiredDialects ) );
- }
-
- RequiresDialect requiresDialectClassAnn = getClass().getAnnotation( RequiresDialect.class );
- if ( requiresDialectClassAnn != null ) {
- Class<? extends Dialect>[] requiredDialects = requiresDialectClassAnn.value();
- requiredDialectList.addAll( Arrays.asList( requiredDialects ) );
- }
- }
-
- 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() ) ) && appliesTo( Dialect.getDialect() ) ){
- return true;
- }
- }
- return false;
- }
- }
- protected boolean appliesTo( Dialect dialect ){
- return true;
- }
- private void runTestMethod(Method runMethod) throws Throwable {
- try {
- runMethod.invoke( this, new Class[0] );
- }
- catch ( InvocationTargetException e ) {
- e.fillInStackTrace();
- throw e.getTargetException();
- }
- catch ( IllegalAccessException e ) {
- e.fillInStackTrace();
- throw e;
- }
- }
-
- private Method findTestMethod() {
- String fName = getName();
- assertNotNull( fName );
- Method runMethod = null;
- try {
- runMethod = getClass().getMethod( fName, null );
- }
- catch ( NoSuchMethodException e ) {
- fail( "Method \"" + fName + "\" not found" );
- }
- if ( !Modifier.isPublic( runMethod.getModifiers() ) ) {
- fail( "Method \"" + fName + "\" should be public" );
- }
- return runMethod;
- }
-
- private void handleUnclosedSession() {
+ @Override
+ protected void handleUnclosedResources() {
if ( session != null && session.isOpen() ) {
if ( session.isConnected() ) {
session.doWork( new RollbackWork() );
@@ -210,7 +134,8 @@
}
}
- private void closeSession(Throwable e) throws Throwable {
+ @Override
+ protected void closeResources() {
try {
if ( session != null && session.isOpen() ) {
if ( session.isConnected() ) {
@@ -229,65 +154,5 @@
}
catch ( Exception ignore ) {
}
- throw e;
}
-
- public Session openSession() throws HibernateException {
- session = getSessions().openSession();
- return session;
- }
-
- public Session openSession(Interceptor interceptor) throws HibernateException {
- session = getSessions().openSession( interceptor );
- return session;
- }
-
- protected abstract Class<?>[] getMappings();
-
- protected String[] getAnnotatedPackages() {
- return new String[] { };
- }
-
- protected String[] getXmlFiles() {
- return new String[] { };
- }
-
- private void setSessions(SessionFactory sessions) {
- TestCase.sessions = sessions;
- }
-
- protected SessionFactory getSessions() {
- return sessions;
- }
-
- protected Dialect getDialect() {
- return Dialect.getDialect();
- }
-
- protected static void setCfg(AnnotationConfiguration cfg) {
- TestCase.cfg = cfg;
- }
-
- protected static AnnotationConfiguration getCfg() {
- return cfg;
- }
-
- protected void configure(Configuration cfg) {
- }
-
- protected boolean recreateSchema() {
- return true;
- }
-
- protected void runSchemaGeneration() {
- SchemaExport export = new SchemaExport( cfg );
- export.create( true, true );
- }
-
- public class RollbackWork implements Work {
-
- public void execute(Connection connection) throws SQLException {
- connection.rollback();
- }
- }
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -116,7 +116,7 @@
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Bed.class,
Chair.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -138,7 +138,7 @@
}
@Override
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
StringProperty.class,
IntegerProperty.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -45,7 +45,7 @@
}
@SuppressWarnings("unchecked")
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Competitor.class,
Contest.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -35,7 +35,7 @@
super( name );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[0];
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -106,7 +106,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Mouth.class,
Tooth.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -1,17 +1,12 @@
//$Id$
package org.hibernate.test.annotations.cid;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.dialect.Dialect;
import org.hibernate.test.annotations.TestCase;
/**
@@ -319,7 +314,7 @@
// transaction.rollback();
// s.close();
// }
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Parent.class,
Child.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -202,7 +202,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Boy.class,
Country.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -15,7 +15,7 @@
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
//A.class,
//B.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -24,7 +24,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Sale.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -369,7 +369,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Person.class,
RegionalArticle.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -344,7 +344,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Forest.class,
Tree.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -115,7 +115,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Race.class,
Bid.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -54,7 +54,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Address.class,
WashingMachine.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -33,7 +33,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Phone.class,
Voice.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -114,7 +114,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Person.class,
Stay.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -47,7 +47,7 @@
session.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Classes.Book.class,
Classes.PopularBook.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -48,7 +48,7 @@
super.configure( cfg );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Paper.class,
PaperType.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -34,7 +34,7 @@
}
@Override
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Gene.class,
DNA.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -13,7 +13,7 @@
s.close();
//mapping is tested
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
ChildHierarchy1.class,
ParentHierarchy1.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -54,9 +54,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] { PlanetCheatSheet.class };
}
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -30,7 +30,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Tower.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -275,9 +275,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] { Ball.class, Shoe.class, Store.class,
Department.class, Dog.class, Computer.class, Home.class,
Phone.class, Tree.class, FirTree.class, Footballer.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -56,9 +56,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {};
}
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -54,9 +54,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] { PlanetCheatSheet.class };
}
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -31,7 +31,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Tower.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -282,9 +282,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] { Ball.class, Shoe.class, Store.class,
Department.class, Dog.class, Computer.class, Home.class,
Phone.class, Tree.class, FirTree.class, Footballer.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -56,9 +56,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {};
}
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -36,7 +36,7 @@
tx.rollback();
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Passport.class,
Stamp.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -60,7 +60,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Store.class,
Customer.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -12,7 +12,7 @@
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
B.class,
C.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -11,7 +11,7 @@
//test through deployment
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Acces.class,
Droitacces.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -150,9 +150,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] { Country.class, State.class};
}
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -10,7 +10,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.test.annotations.RequiresDialect;
+import org.hibernate.junit.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
/**
@@ -523,7 +523,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Wardrobe.class,
Drawer.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -31,7 +31,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
GenerationUser.class,
GenerationGroup.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -149,9 +149,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
A320b.class, //subclasses should be properly reordered
Plane.class,
Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -1,33 +0,0 @@
-//$Id$
-package org.hibernate.test.annotations.inheritance.joined;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.test.annotations.TestCase;
-
-/**
- * @author Emmanuel Bernard
- */
-public class JoinedSubclassAndSecondaryTable extends TestCase {
-
- public void testSecondaryTableAndJoined() throws Exception {
- Session s = openSession();
- Transaction tx = s.beginTransaction();
- SwimmingPool sp = new SwimmingPool();
- sp.setAddress( "Park Avenue" );
- s.persist( sp );
- tx.rollback();
- s.close();
- }
-
- /**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
- */
- protected Class[] getMappings() {
- return new Class[]{
- Pool.class,
- SwimmingPool.class
- };
- }
-
-}
Copied: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java (from rev 19378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java)
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -0,0 +1,33 @@
+//$Id$
+package org.hibernate.test.annotations.inheritance.joined;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class JoinedSubclassAndSecondaryTable extends TestCase {
+
+ public void testSecondaryTableAndJoined() throws Exception {
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ SwimmingPool sp = new SwimmingPool();
+ sp.setAddress( "Park Avenue" );
+ s.persist( sp );
+ tx.rollback();
+ s.close();
+ }
+
+ /**
+ * @see org.hibernate.test.annotations.TestCase#getMappings()
+ */
+ protected Class[] getAnnotatedClasses() {
+ return new Class[]{
+ Pool.class,
+ SwimmingPool.class
+ };
+ }
+
+}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -155,9 +155,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
File.class,
Folder.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -62,9 +62,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
File.class,
Folder.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -54,9 +54,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
File.class,
Folder.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -11,7 +11,7 @@
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
ContactImpl.class,
UserImpl.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -202,9 +202,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Life.class,
Death.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -56,9 +56,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Player.class,
Team.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -32,7 +32,7 @@
import org.hibernate.dialect.Sybase11Dialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
-import org.hibernate.test.annotations.RequiresDialect;
+import org.hibernate.junit.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.util.ArrayHelper;
@@ -161,7 +161,7 @@
return new String[] { "org.hibernate.test.annotations.lob" };
}
- public Class<?>[] getMappings() {
+ public Class<?>[] getAnnotatedClasses() {
return new Class[] { ImageHolder.class };
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -123,7 +123,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Book.class,
CompiledCode.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -32,7 +32,7 @@
import org.hibernate.dialect.Sybase11Dialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
-import org.hibernate.test.annotations.RequiresDialect;
+import org.hibernate.junit.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.util.ArrayHelper;
@@ -45,7 +45,7 @@
public class TextTest extends TestCase {
@Override
- protected Class<?>[] getMappings() {
+ protected Class<?>[] getAnnotatedClasses() {
return new Class[] { LongStringHolder.class };
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -642,9 +642,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Friend.class,
Employer.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -52,7 +52,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
BiggestForest.class,
ForestType.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -42,7 +42,7 @@
//
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
//Carz.class,
//Lotz.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -317,9 +317,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected java.lang.Class[] getMappings() {
+ protected java.lang.Class[] getAnnotatedClasses() {
return new java.lang.Class[]{
Deal.class,
org.hibernate.test.annotations.manytoone.Customer.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -44,7 +44,7 @@
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Item.class,
Vendor.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -93,7 +93,7 @@
cfg.setProperty( "hibernate.cache.use_query_cache", "true" );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] { Citizen.class, State.class,
NaturalIdOnManyToOne.class };
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -107,7 +107,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] { Citizen.class, State.class,
NaturalIdOnManyToOne.class };
}
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -36,7 +36,7 @@
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Coin.class,
Currency.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -13,10 +13,11 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.junit.FailureExpected;
+import org.hibernate.junit.RequiresDialect;
import org.hibernate.test.annotations.Customer;
import org.hibernate.test.annotations.Discount;
import org.hibernate.test.annotations.Passport;
-import org.hibernate.test.annotations.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.test.annotations.Ticket;
import org.hibernate.test.annotations.TicketComparator;
@@ -404,9 +405,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Troop.class,
Soldier.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -43,7 +43,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Order.class,
OrderItem.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -242,9 +242,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
PartyAffiliate.class,
Party.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -36,7 +36,7 @@
}
@Override
- protected Class<?>[] getMappings() {
+ protected Class<?>[] getAnnotatedClasses() {
return new Class<?>[] {
Hardware.class,
DeviceGroupConfig.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -37,7 +37,7 @@
}
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Location.class,
Move.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -35,9 +35,9 @@
}
/**
- * @see org.hibernate.test.annotations.TestCase#getMappings()
+ * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Card.class,
Deck.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -28,7 +28,7 @@
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Car.class,
SportCar.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -350,7 +350,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Plane.class,
A320.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -26,7 +26,7 @@
assertEquals( "User_Role", getCfg().getCollectionMapping( role ).getCollectionTable().getName() );
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
User.class,
Role.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -178,7 +178,7 @@
super( x );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
House.class,
Postman.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -36,7 +36,7 @@
//cfg.getSessionEventListenerConfig().setAutoFlushEventListener( new EJB3AutoFlushEventListener() );
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Storm.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -77,7 +77,7 @@
super( x ); //To change body of overridden methods use File | Settings | File Templates.
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Robot.class,
T800.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -73,7 +73,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
LuggageImpl.class,
Brand.class
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -26,7 +26,7 @@
s.getTransaction().rollback();
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Cuisine.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -23,7 +23,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Dvd.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -22,7 +22,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Antenna.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -52,7 +52,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
Conductor.class,
Vehicule.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -33,7 +33,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[] {
Conductor.class
};
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -65,7 +65,7 @@
s.close();
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
CarModel.class,
Manufacturer.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -63,7 +63,7 @@
}
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
PrimeMinister.class,
Sky.class,
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-05-07 07:10:13 UTC (rev 19398)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-05-07 07:18:16 UTC (rev 19399)
@@ -32,7 +32,7 @@
- protected Class[] getMappings() {
+ protected Class[] getAnnotatedClasses() {
return new Class[]{
ZImpl.class
};
14 years, 8 months
- 1
- 0
Hibernate SVN: r19398 - in core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate: test and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-07 03:10:13 -0400 (Fri, 07 May 2010)
New Revision: 19398
Added:
core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/FailureExpected.java
core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/RequiresDialect.java
core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/SkipForDialect.java
core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/
core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java
Log:
JBPAPP-4235 HHH-4822 Add @FailureExpected annotation to annotations and entitymananger modules to allow the skipping of tests
Added: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/FailureExpected.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/FailureExpected.java (rev 0)
+++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/FailureExpected.java 2010-05-07 07:10:13 UTC (rev 19398)
@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.junit;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotations used to mark a test as an expected failure.
+ *
+ * @author Hardy Ferentschik
+ * @author Steve Ebersole
+ */
+(a)Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+public @interface FailureExpected {
+ /**
+ * The key of a JIRA issue which covers this expected failure.
+ * @return The jira issue key
+ */
+ String jiraKey();
+
+ /**
+ * A message explaining the reason for the expected failure. Optional.
+ * @return The reason
+ */
+ String message() default "";
+}
\ No newline at end of file
Added: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/RequiresDialect.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/RequiresDialect.java (rev 0)
+++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/RequiresDialect.java 2010-05-07 07:10:13 UTC (rev 19398)
@@ -0,0 +1,54 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.junit;
+
+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;
+
+/**
+ * Annotation used to indicate that a test should be run only when run against the
+ * indicated dialects.
+ *
+ * @author Hardy Ferentschik
+ */
+(a)Target({ElementType.METHOD, ElementType.TYPE})
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface RequiresDialect {
+ /**
+ * The dialects against which to run the test
+ * @return The dialects
+ */
+ Class<? extends Dialect>[] value();
+
+ /**
+ * Used to indicate if the dialects should be matched strictly (classes equal) or
+ * non-strictly (instanceof).
+ * @return Should strict matching be used?
+ */
+ boolean strictMatching() default false;
+}
Added: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/SkipForDialect.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/SkipForDialect.java (rev 0)
+++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/SkipForDialect.java 2010-05-07 07:10:13 UTC (rev 19398)
@@ -0,0 +1,68 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.junit;
+
+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;
+
+/**
+ * Annotation used to indicate that a test should be skipped when run against the
+ * indicated dialects.
+ *
+ * @author Hardy Ferentschik
+ * @author Steve Ebersole
+ */
+(a)Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+public @interface SkipForDialect {
+ /**
+ * The dialects against which to skip the test
+ * @return The dialects
+ */
+ Class<? extends Dialect>[] value();
+
+ /**
+ * Used to indicate if the dialects should be matched strictly (classes equal) or
+ * non-strictly (instanceof).
+ * @return Should strict matching be used?
+ */
+ boolean strictMatching() default false;
+
+ /**
+ * Comment describing the reason for the skip.
+ * @return The comment
+ */
+ String comment() default "";
+
+ /**
+ * The key of a JIRA issue which covers the reason for this skip. Eventually we should make this
+ * a requirement.
+ * @return The jira issue key
+ */
+ String jiraKey() default "";
+}
\ No newline at end of file
Added: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java (rev 0)
+++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java 2010-05-07 07:10:13 UTC (rev 19398)
@@ -0,0 +1,363 @@
+// $Id: HibernateTestCase.java 18858 2010-02-23 12:57:17Z hardy.ferentschik $
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.jdbc.Work;
+import org.hibernate.junit.FailureExpected;
+import org.hibernate.junit.RequiresDialect;
+import org.hibernate.junit.SkipForDialect;
+import org.hibernate.junit.SkipLog;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.util.StringHelper;
+
+/**
+ * A base class for all tests.
+ *
+ * @author Emmnauel Bernand
+ * @author Hardy Ferentschik
+ */
+public abstract class HibernateTestCase extends TestCase {
+
+ public static final Logger log = LoggerFactory.getLogger( HibernateTestCase.class );
+
+ protected static Configuration cfg;
+ private static Class<?> lastTestClass;
+
+
+ /**
+ * Flag indicating whether the test should be run or skipped.
+ */
+ 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>>();
+
+ /**
+ * List of dialects for which the current {@code runMethod} should be skipped.
+ */
+ private final Set<Class<? extends Dialect>> skipForDialectList = new HashSet<Class<? extends Dialect>>();
+
+ public HibernateTestCase() {
+ super();
+ }
+
+ public HibernateTestCase(String x) {
+ super( x );
+ }
+
+ @Override
+ public void runBare() throws Throwable {
+ Method runMethod = findTestMethod();
+
+ final Skip skip = determineSkipByDialect( Dialect.getDialect(), runMethod );
+ if ( skip != null ) {
+ reportSkip( skip );
+ return;
+ }
+
+ setUp();
+ try {
+ runTest();
+ }
+ finally {
+ tearDown();
+ }
+ }
+
+ @Override
+ protected void runTest() throws Throwable {
+ Method runMethod = findTestMethod();
+ FailureExpected failureExpected = locateAnnotation( FailureExpected.class, runMethod );
+ try {
+ super.runTest();
+ if ( failureExpected != null ) {
+ throw new FailureExpectedTestPassedException();
+ }
+ }
+ catch ( FailureExpectedTestPassedException t ) {
+ closeResources();
+ throw t;
+ }
+ catch ( Throwable t ) {
+ if ( t instanceof InvocationTargetException ) {
+ t = ( ( InvocationTargetException ) t ).getTargetException();
+ }
+ if ( t instanceof IllegalAccessException ) {
+ t.fillInStackTrace();
+ }
+ closeResources();
+ if ( failureExpected != null ) {
+ StringBuilder builder = new StringBuilder();
+ if ( StringHelper.isNotEmpty( failureExpected.message() ) ) {
+ builder.append( failureExpected.message() );
+ }
+ else {
+ builder.append( "ignoring @FailureExpected test" );
+ }
+ builder.append( " (" )
+ .append( failureExpected.jiraKey() )
+ .append( ")" );
+ SkipLog.LOG.warn( builder.toString(), t );
+ }
+ else {
+ throw t;
+ }
+ }
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ if ( cfg == null || lastTestClass != getClass() ) {
+ buildConfiguration();
+ lastTestClass = getClass();
+ }
+ else {
+ runSchemaGeneration();
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ runSchemaDrop();
+ handleUnclosedResources();
+ }
+
+ protected static class Skip {
+ private final String reason;
+ private final String testDescription;
+
+ public Skip(String reason, String testDescription) {
+ this.reason = reason;
+ this.testDescription = testDescription;
+ }
+ }
+
+ protected final Skip determineSkipByDialect(Dialect dialect, Method runMethod) {
+ // skips have precedence, so check them first
+ SkipForDialect skipForDialectAnn = locateAnnotation( SkipForDialect.class, runMethod );
+ if ( skipForDialectAnn != null ) {
+ for ( Class<? extends Dialect> dialectClass : skipForDialectAnn.value() ) {
+ if ( skipForDialectAnn.strictMatching() ) {
+ if ( dialectClass.equals( dialect.getClass() ) ) {
+ return buildSkip( dialect, skipForDialectAnn.comment(), skipForDialectAnn.jiraKey() );
+ }
+ }
+ else {
+ if ( dialectClass.isInstance( dialect ) ) {
+ return buildSkip( dialect, skipForDialectAnn.comment(), skipForDialectAnn.jiraKey() );
+ }
+ }
+ }
+ }
+
+ // then check against the requires
+ RequiresDialect requiresDialectAnn = locateAnnotation( RequiresDialect.class, runMethod );
+ if ( requiresDialectAnn != null ) {
+ for ( Class<? extends Dialect> dialectClass : requiresDialectAnn.value() ) {
+ if ( requiresDialectAnn.strictMatching() ) {
+ if ( dialectClass.equals( dialect.getClass() ) ) {
+ return buildSkip( dialect, null, null );
+ }
+ }
+ else {
+ if ( dialectClass.isInstance( dialect ) ) {
+ return buildSkip( dialect, null, null );
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
+ protected <T extends Annotation> T locateAnnotation(Class<T> annotationClass, Method runMethod) {
+ T annotation = runMethod.getAnnotation( annotationClass );
+ if ( annotation == null ) {
+ annotation = getClass().getAnnotation( annotationClass );
+ }
+ if ( annotation == null ) {
+ annotation = runMethod.getDeclaringClass().getAnnotation( annotationClass );
+ }
+ return annotation;
+ }
+
+ protected Skip buildSkip(Dialect dialect, String comment, String jiraKey) {
+ StringBuilder buffer = new StringBuilder();
+ buffer.append( "skipping database-specific test [" );
+ buffer.append( fullTestName() );
+ buffer.append( "] for dialect [" );
+ buffer.append( dialect.getClass().getName() );
+ buffer.append( ']' );
+
+ if ( StringHelper.isNotEmpty( comment ) ) {
+ buffer.append( "; " ).append( comment );
+ }
+
+ if ( StringHelper.isNotEmpty( jiraKey ) ) {
+ buffer.append( " (" ).append( jiraKey ).append( ')' );
+ }
+
+ return new Skip( buffer.toString(), null );
+ }
+
+ public String fullTestName() {
+ return this.getClass().getName() + "#" + this.getName();
+ }
+
+ protected boolean runForCurrentDialect() {
+ boolean runTestForCurrentDialect = true;
+
+ // 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() ) ) {
+ runTestForCurrentDialect = true;
+ break;
+ }
+ runTestForCurrentDialect = false;
+ }
+
+ // check whether the current dialect is assignableFrom from any of the specified skip for dialects.
+ for ( Class<? extends Dialect> dialect : skipForDialectList ) {
+ if ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) {
+ runTestForCurrentDialect = false;
+ break;
+ }
+ runTestForCurrentDialect = true;
+ }
+
+ return runTestForCurrentDialect;
+ }
+
+ private Method findTestMethod() {
+ String fName = getName();
+ assertNotNull( fName );
+ Method runMethod = null;
+ try {
+ runMethod = getClass().getMethod( fName );
+ }
+ catch ( NoSuchMethodException e ) {
+ fail( "Method \"" + fName + "\" not found" );
+ }
+ if ( !Modifier.isPublic( runMethod.getModifiers() ) ) {
+ fail( "Method \"" + fName + "\" should be public" );
+ }
+ return runMethod;
+ }
+
+ protected abstract void buildConfiguration() throws Exception;
+
+ protected abstract Class<?>[] getAnnotatedClasses();
+
+ protected String[] getMappings() {
+ return new String[]{};
+ }
+
+ protected abstract void handleUnclosedResources();
+
+ protected abstract void closeResources();
+
+ protected String[] getAnnotatedPackages() {
+ return new String[] { };
+ }
+
+ protected String[] getXmlFiles() {
+ return new String[] { };
+ }
+
+ protected Dialect getDialect() {
+ return Dialect.getDialect();
+ }
+
+ protected static void setCfg(Configuration cfg) {
+ HibernateTestCase.cfg = cfg;
+ }
+
+ protected static Configuration getCfg() {
+ return cfg;
+ }
+
+ protected void configure(Configuration cfg) {
+ }
+
+ protected boolean recreateSchema() {
+ return true;
+ }
+
+ protected void runSchemaGeneration() {
+ SchemaExport export = new SchemaExport( cfg );
+ export.create( true, true );
+ }
+
+ protected void runSchemaDrop() {
+ SchemaExport export = new SchemaExport( cfg );
+ export.drop( true, true );
+ }
+
+ private void reportSkip(Skip skip) {
+ reportSkip( skip.reason, skip.testDescription );
+ }
+
+ protected void reportSkip(String reason, String testDescription) {
+ StringBuilder builder = new StringBuilder();
+ builder.append( "*** skipping test [" );
+ builder.append( fullTestName() );
+ builder.append( "] - " );
+ builder.append( testDescription );
+ builder.append( " : " );
+ builder.append( reason );
+ SkipLog.LOG.warn( builder.toString() );
+ }
+
+ public class RollbackWork implements Work {
+
+ public void execute(Connection connection) throws SQLException {
+ connection.rollback();
+ }
+ }
+
+ private static class FailureExpectedTestPassedException extends Exception {
+ public FailureExpectedTestPassedException() {
+ super( "Test marked as @FailureExpected, but did not fail!" );
+ }
+ }
+}
14 years, 8 months
- 1
- 0
Hibernate SVN: r19397 - search/branches/v3_1_1_GA_CP.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-07 03:07:28 -0400 (Fri, 07 May 2010)
New Revision: 19397
Modified:
search/branches/v3_1_1_GA_CP/pom.xml
Log:
JBPAPP-4228 update pom to add source plugin and disable unnecessary sub-modules
Modified: search/branches/v3_1_1_GA_CP/pom.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/pom.xml 2010-05-06 23:19:03 UTC (rev 19396)
+++ search/branches/v3_1_1_GA_CP/pom.xml 2010-05-07 07:07:28 UTC (rev 19397)
@@ -153,6 +153,7 @@
</testResources>
</build>
<reporting>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -164,6 +165,7 @@
</links>
</configuration>
</plugin>
+ </plugins>
</reporting>
<profiles>
14 years, 8 months
- 1
- 0
Your transaction has been processed
by Amazon Team
Your transaction has been processed by WorldPay, on behalf of Amazon Inc.
The invoice file is attached to this message.
This is not a tax receipt.
We processed your payment.
Amazon Inc has received your order,
and will inform you about delivery.
Sincerely,
Amazon Team
14 years, 8 months
- 1
- 0
Hibernate SVN: r19396 - search/branches/v3_1_1_GA_CP.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-06 19:19:03 -0400 (Thu, 06 May 2010)
New Revision: 19396
Modified:
search/branches/v3_1_1_GA_CP/pom.xml
Log:
JBPAPP-4228 update pom to add source plugin and disable unnecessary sub-modules
Modified: search/branches/v3_1_1_GA_CP/pom.xml
===================================================================
--- search/branches/v3_1_1_GA_CP/pom.xml 2010-05-06 22:45:33 UTC (rev 19395)
+++ search/branches/v3_1_1_GA_CP/pom.xml 2010-05-06 23:19:03 UTC (rev 19396)
@@ -30,7 +30,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-parent</artifactId>
+ <version>3.3.2.GA_CP01</version>
+ </parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
<packaging>jar</packaging>
@@ -45,81 +49,7 @@
<url>http://hibernate.org</url>
</organization>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- <comments>See discussion at http://hibernate.org/356.html for more
- details.</comments>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/tags/v3_1_1_GA_CP01</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/search/tags/v3_1_1_GA_CP01</developerConnection>
- <url>http://fisheye.jboss.com/browse/Hibernate/search/tags/v3_1_1_GA_CP01</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH</url>
- </issueManagement>
-
- <developers>
- <developer>
- <id>epbernard</id>
- <name>Emmanuel Bernard</name>
- <email>emmanuel(a)hibernate.org</email>
- <url>http://in.relation.to/Bloggers/Emmanuel</url>
- </developer>
- <developer>
- <id>hardy.ferentschik</id>
- <name>Hardy Ferentschik</name>
- <url>http://in.relation.to/Bloggers/Hardy</url>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Sanne Grinovero</name>
- </contributor>
- </contributors>
-
- <mailingLists>
- <mailingList>
- <name>Hibernate Announcements</name>
- <post>hibernate-announce(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Commit Notificatons</name>
- <post>hibernate-commits(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Developers</name>
- <post>hibernate-dev(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Hibernate Issue Notifications</name>
- <post>hibernate-issues(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive>
- </mailingList>
- </mailingLists>
-
<dependencies>
<!-- =============================== -->
<!-- Required Dependencies -->
@@ -145,11 +75,6 @@
<version>${luceneVersion}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
- <dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
@@ -170,18 +95,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4jVersion}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -204,14 +117,6 @@
</plugin>
<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.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
@@ -228,82 +133,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>2.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
- <masterTranslation>en-US</masterTranslation>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US/images</directory>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
- <finalName>hibernate-search-guide.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>true</useRelativeImageUris>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- </options>
- </configuration>
- <executions>
- <execution>
- <id>make-doc</id>
- <phase>site</phase>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
- </links>
- </configuration>
- <executions>
- <execution>
- <id>make-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
@@ -311,26 +140,6 @@
</descriptors>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <releaseProfiles>release</releaseProfiles>
- <goals>package javadoc:javadoc org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:resources org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:generate assembly:assembly
- </goals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- <version>1.1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>extend</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<testResources>
<testResource>
@@ -343,475 +152,21 @@
</testResource>
</testResources>
</build>
-
- <distributionManagement>
- <repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- </distributionManagement>
-
+ <reporting>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </reporting>
<profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
- <!-- The MySQL 5.1 test envionment -->
- <profile>
- <id>mysql51</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL 8.2.4 test envionment -->
- <profile>
- <id>postgresql824</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL 8.3.7 test envionment -->
- <profile>
- <id>postgresql837</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The DB2 9.7 test envionment (using 9x drivers)-->
- <profile>
- <id>db2v97</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.57.86</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.57.86</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa
- </jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 9.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v91</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10
- </jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
- <!-- The Oracle11g test envionment -->
- <profile>
- <id>oracle11g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>11.1.0.7.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Oracle11gRAC test envionment -->
- <profile>
- <id>oracle11gRAC</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>11.1.0.7.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Sybase 15 test envionment -->
- <profile>
- <id>sybase15</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2005</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2008</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>2.0.1008.2</version>
- <classifier>4</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- <!-- The Oracle11g test envionment for jdk1.5 -->
- <profile>
- <id>oracle11g-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Oracle11gRAC test envionment for jdk1.5-->
- <profile>
- <id>oracle11gRAC-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The SQLServer2005 (MS JDBC) test envionment for jdk1.5 -->
- <profile>
- <id>mssql2005-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment for jdk1.5-->
- <profile>
- <id>mssql2008-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>2.0.1008.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
- <profile>
- <id>oracle11gR2RAC</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(LOAD_BALANCE=on)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <profile>
- <id>oracle11gR2</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@vmg27.mw.lab.eng.bos.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
<!-- ================================ -->
<!-- Dependecy profiles to test w and -->
<!-- w/o optional dependencies -->
@@ -957,7 +312,6 @@
</profiles>
<properties>
- <slf4jVersion>1.4.2</slf4jVersion>
<luceneVersion>2.4.1</luceneVersion>
</properties>
14 years, 8 months
- 1
- 0
Hibernate SVN: r19395 - entitymanager/branches/v3_4_0_GA_CP.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-06 18:45:33 -0400 (Thu, 06 May 2010)
New Revision: 19395
Modified:
entitymanager/branches/v3_4_0_GA_CP/pom.xml
Log:
JBPAPP-4228 add hibernate-parent as entitymanager's parent pom
Modified: entitymanager/branches/v3_4_0_GA_CP/pom.xml
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/pom.xml 2010-05-06 22:30:42 UTC (rev 19394)
+++ entitymanager/branches/v3_4_0_GA_CP/pom.xml 2010-05-06 22:45:33 UTC (rev 19395)
@@ -29,7 +29,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-parent</artifactId>
+ <version>3.3.2.GA_CP01</version>
+ </parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<packaging>jar</packaging>
@@ -39,61 +43,6 @@
<description>Hibernate Entity Manager</description>
<url>http://entitymanager.hibernate.org</url>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- <comments>See discussion at http://hibernate.org/356.html for more
- details.</comments>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/entitymanager/branches/v...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/entitymanager/branches/v3_4...</developerConnection>
- <url>http://fisheye.jboss.com/browse/Hibernate/entitymanager/branches/v3_4_0_G...</url>
- </scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://opensource.atlassian.com/projects/hibernate/browse/EJB</url>
- </issueManagement>
-
- <mailingLists>
- <mailingList>
- <name>Hibernate Announcements</name>
- <post>hibernate-announce(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Commit Notificatons</name>
- <post>hibernate-commits(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Developers</name>
- <post>hibernate-dev(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Hibernate Issue Notifications</name>
- <post>hibernate-issues(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive>
- </mailingList>
- </mailingLists>
-
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
@@ -115,15 +64,10 @@
<artifactId>hibernate-core</artifactId>
<version>3.3.2.GA_CP01</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
+
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
@@ -133,29 +77,7 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.4.GA</version>
</dependency>
- <!-- =============================== -->
- <!-- Testing Dependencies -->
- <!-- =============================== -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4jVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4jVersion}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -170,7 +92,7 @@
<targetPath>../bundles</targetPath>
</testResource>
</testResources>
-<plugins>
+ <plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -194,62 +116,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- require at least JDK 1.5 to run the build -->
- <!-- ... -->
- <!--
- we need at least Maven 2.0.8 because of a bug fix affecting our
- antlr usage
- -->
- <!--
- 2.0.8 not released at this time, so I instead say anything greater
- that 2.0.7
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.5,)</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>(2.0.7,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- <version>1.1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>extend</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- by default, compile to JDK 1.4 compatibility (individual modules
- and/or user can override)
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+
<!-- add specification/implementation details to the manifests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -302,65 +169,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>2.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
- <masterTranslation>en</masterTranslation>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en/images</directory>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
- <finalName>hibernate_entitymanager_reference.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl
- </stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl
- </stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- </options>
- </configuration>
- <executions>
- <execution>
- <id>make-doc</id>
- <phase>package</phase>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -380,531 +188,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <releaseProfiles>release</releaseProfiles>
- <goals>package javadoc:javadoc org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:resources org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:generate assembly:assembly
- </goals>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <linkXRef>true</linkXRef>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <tags>
- <tag>@FIXME</tag>
- <tag>@fixme</tag>
- <tag>FIXME</tag>
- <tag>fixme</tag>
- <tag>@TODO</tag>
- <tag>@todo</tag>
- <tag>TODO</tag>
- <tag>todo</tag>
- </tags>
- </configuration>
- </plugin>
- <plugin>
- <!--
- Note: aggregate-able, may cause problems if we aggregate jxr and
- not this because of the xref links
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <onlyAnalyze>org.hibernate.*</onlyAnalyze>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
- <!-- The MySQL 5.1 test envionment -->
- <profile>
- <id>mysql51</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL 8.2.4 test envionment -->
- <profile>
- <id>postgresql824</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL 8.3.7 test envionment -->
- <profile>
- <id>postgresql837</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The DB2 9.7 test envionment (using 9x drivers)-->
- <profile>
- <id>db2v97</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.57.86</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.57.86</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa
- </jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 9.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v91</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10
- </jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
- <!-- The Oracle11g test envionment -->
- <profile>
- <id>oracle11g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>11.1.0.7.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Oracle11gRAC test envionment -->
- <profile>
- <id>oracle11gRAC</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>11.1.0.7.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Sybase 15 test envionment -->
- <profile>
- <id>sybase15</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2005</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2008</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>2.0.1008.2</version>
- <classifier>4</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
- <!-- The Oracle11g test envionment for jdk1.5 -->
- <profile>
- <id>oracle11g-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Oracle11gRAC test envionment for jdk1.5-->
- <profile>
- <id>oracle11gRAC-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The SQLServer2005 (MS JDBC) test envionment for jdk1.5 -->
- <profile>
- <id>mssql2005-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment for jdk1.5-->
- <profile>
- <id>mssql2008-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>2.0.1008.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
- <profile>
- <id>oracle11gR2</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@vmg27.mw.lab.eng.bos.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <profile>
- <id>oracle11gR2RAC</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(LOAD_BALANCE=on)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- </profiles>
- <properties>
- <slf4jVersion>1.5.8</slf4jVersion>
- </properties>
- </project>
\ No newline at end of file
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
14 years, 8 months
- 1
- 0
Hibernate SVN: r19394 - annotations/branches/v3_4_0_GA_CP.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-06 18:30:42 -0400 (Thu, 06 May 2010)
New Revision: 19394
Modified:
annotations/branches/v3_4_0_GA_CP/pom.xml
Log:
JBPAPP-4228 add hibernate-parent as annotations' parent module
Modified: annotations/branches/v3_4_0_GA_CP/pom.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP/pom.xml 2010-05-06 22:27:57 UTC (rev 19393)
+++ annotations/branches/v3_4_0_GA_CP/pom.xml 2010-05-06 22:30:42 UTC (rev 19394)
@@ -29,7 +29,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-parent</artifactId>
+ <version>3.3.2.GA_CP01</version>
+ </parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<packaging>jar</packaging>
@@ -39,66 +43,6 @@
<description>Annotations metadata for Hibernate</description>
<url>http://annotations.hibernate.org</url>
- <organization>
- <name>Hibernate.org</name>
- <url>http://hibernate.org</url>
- </organization>
-
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- <comments>See discussion at http://hibernate.org/356.html for more
- details.</comments>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/annotations/branches/v3_...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/annotations/branches/v3_4_0...</developerConnection>
- <url>http://fisheye.jboss.com/browse/Hibernate/annotations/branches/v3_4_0_GA_CP</url>
- </scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://opensource.atlassian.com/projects/hibernate/browse/ANN</url>
- </issueManagement>
-
- <mailingLists>
- <mailingList>
- <name>Hibernate Announcements</name>
- <post>hibernate-announce(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Commit Notificatons</name>
- <post>hibernate-commits(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Developers</name>
- <post>hibernate-dev(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Hibernate Issue Notifications</name>
- <post>hibernate-issues(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive>
- </mailingList>
- </mailingLists>
-
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
@@ -116,58 +60,14 @@
<version>3.1.0.GA</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <!-- =============================== -->
- <!-- Testing Dependencies -->
- <!-- =============================== -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4jVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4jVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.9.0.GA</version>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
- <testResource>
- <filtering>true</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
+
<plugins>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
@@ -195,62 +95,7 @@
</bytecodeInjections>
</configuration>
</plugin>
- <plugin>
- <!-- require at least JDK 1.5 to run the build -->
- <!-- ... -->
- <!--
- we need at least Maven 2.0.8 because of a bug fix affecting our
- antlr usage
- -->
- <!--
- 2.0.8 not released at this time, so I instead say anything greater
- that 2.0.7
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.5,)</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>(2.0.7,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- <version>1.1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>extend</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- by default, compile to JDK 1.4 compatibility (individual modules
- and/or user can override)
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+
<!-- add specification/implementation details to the manifests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -291,74 +136,8 @@
</descriptors>
</configuration>
</plugin>
+
<plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>2.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>Hibernate_Annotations_Reference_Guide.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
- <masterTranslation>en-US</masterTranslation>
- <translations>
- <translation>es-ES</translation>
- <translation>fr-FR</translation>
- <translation>ja-JP</translation>
- <translation>pt-BR</translation>
- <translation>zh-CN</translation>
- </translations>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US/images</directory>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
- <finalName>hibernate_annotations_reference.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl
- </stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl
- </stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- </options>
- </configuration>
- <executions>
- <execution>
- <id>make-doc</id>
- <phase>site</phase>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- <!-- <goal>translate</goal> -->
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -389,522 +168,4 @@
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <linkXRef>true</linkXRef>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <tags>
- <tag>@FIXME</tag>
- <tag>@fixme</tag>
- <tag>FIXME</tag>
- <tag>fixme</tag>
- <tag>@TODO</tag>
- <tag>@todo</tag>
- <tag>TODO</tag>
- <tag>todo</tag>
- </tags>
- </configuration>
- </plugin>
- <plugin>
- <!--
- Note: aggregate-able, may cause problems if we aggregate jxr and
- not this because of the xref links
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javancss-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <onlyAnalyze>org.hibernate.*</onlyAnalyze>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-
- <profiles>
- <!-- HSQLDB is the default (eventually move to H2) -->
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
- <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
- <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The H2 test envionment -->
- <profile>
- <id>h2</id>
- <dependencies>
- <dependency>
- <groupId>org.h2database</groupId>
- <artifactId>h2database</artifactId>
- <version>1.0.20061217</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
- <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
- <jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Profiles naming db instances in the Red Hat QA/QE lab
-
- First, those with OSS drivers
- ###################################################################
- -->
-
- <!-- The MySQL5 test envionment -->
- <profile>
- <id>mysql5</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
- <!-- The MySQL 5.1 test envionment -->
- <profile>
- <id>mysql51</id>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
- <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL 8.2.4 test envionment -->
- <profile>
- <id>postgresql824</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL 8.3.7 test envionment -->
- <profile>
- <id>postgresql837</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- The DB2 9.7 test envionment (using 9x drivers)-->
- <profile>
- <id>db2v97</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.57.86</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.57.86</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa
- </jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The DB2 9.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2v91</id>
- <dependencies>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>3.1.57</version>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>3.1.57</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
- <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
- <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle9i test envionment -->
- <profile>
- <id>oracle9i</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The Oracle10g test envionment -->
- <profile>
- <id>oracle10g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <!-- use the 10g drivers which are surprisingly largely bug free -->
- <version>10.0.2.0</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10
- </jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
- <!-- The Oracle11g test envionment -->
- <profile>
- <id>oracle11g</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>11.1.0.7.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Oracle11gRAC test envionment -->
- <profile>
- <id>oracle11gRAC</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>11.1.0.7.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Sybase 15 test envionment -->
- <profile>
- <id>sybase15</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation />
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2005</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>mssql2008</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>2.0.1008.2</version>
- <classifier>4</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
- <!-- The Oracle11g test envionment for jdk1.5 -->
- <profile>
- <id>oracle11g-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The Oracle11gRAC test envionment for jdk1.5-->
- <profile>
- <id>oracle11gRAC-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <!-- The SQLServer2005 (MS JDBC) test envionment for jdk1.5 -->
- <profile>
- <id>mssql2005-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment for jdk1.5-->
- <profile>
- <id>mssql2008-jdbc3</id>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <version>2.0.1008.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
- <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
- <profile>
- <id>oracle11gR2</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@vmg27.mw.lab.eng.bos.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- <profile>
- <id>oracle11gR2RAC</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
- <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
- <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(LOAD_BALANCE=on)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
- </profiles>
- <properties>
- <slf4jVersion>1.5.8</slf4jVersion>
- </properties>
</project>
14 years, 8 months
- 1
- 0
Hibernate SVN: r19393 - core/branches/Branch_3_3_2_GA_CP/core.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-05-06 18:27:57 -0400 (Thu, 06 May 2010)
New Revision: 19393
Modified:
core/branches/Branch_3_3_2_GA_CP/core/pom.xml
Log:
JBPAPP-4234 HHH-4548 Alter poms to not use javax.* artifacts under Sun proprietary license
Modified: core/branches/Branch_3_3_2_GA_CP/core/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/pom.xml 2010-05-06 19:08:18 UTC (rev 19392)
+++ core/branches/Branch_3_3_2_GA_CP/core/pom.xml 2010-05-06 22:27:57 UTC (rev 19393)
@@ -49,18 +49,26 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>javax.security</groupId>
- <artifactId>jaas</artifactId>
- <version>1.0.01</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ <version>1.1.0.GA</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-servlet-api_3.0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.security</groupId>
- <artifactId>jacc</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
14 years, 8 months
- 1
- 0