Hibernate SVN: r14498 - core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2008-04-07 22:33:26 -0400 (Mon, 07 Apr 2008)
New Revision: 14498
Modified:
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java
Log:
Fix broken functional tests
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java 2008-04-07 14:54:27 UTC (rev 14497)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java 2008-04-08 02:33:26 UTC (rev 14498)
@@ -56,7 +56,7 @@
getSessions().evictEntity(Item.class.getName());
Statistics stats = getSessions().getStatistics();
stats.clear();
- SecondLevelCacheStatistics statistics = stats.getSecondLevelCacheStatistics(Item.class.getName());
+ SecondLevelCacheStatistics statistics = stats.getSecondLevelCacheStatistics(getPrefixedRegionName(Item.class.getName()));
Map cacheEntries = statistics.getEntries();
assertEquals(0, cacheEntries.size());
}
@@ -102,7 +102,7 @@
// check the version value in the cache...
SecondLevelCacheStatistics slcs = sfi().getStatistics().getSecondLevelCacheStatistics(
- VersionedItem.class.getName());
+ getPrefixedRegionName(VersionedItem.class.getName()));
Object entry = slcs.getEntries().get(item.getId());
Long cachedVersionValue;
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java 2008-04-07 14:54:27 UTC (rev 14497)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java 2008-04-08 02:33:26 UTC (rev 14498)
@@ -63,7 +63,7 @@
s.close();
SecondLevelCacheStatistics slcs = s.getSessionFactory().getStatistics().getSecondLevelCacheStatistics(
- Item.class.getName());
+ getPrefixedRegionName(Item.class.getName()));
assertEquals(slcs.getPutCount(), 1);
assertEquals(slcs.getElementCountInMemory(), 1);
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java 2008-04-07 14:54:27 UTC (rev 14497)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java 2008-04-08 02:33:26 UTC (rev 14498)
@@ -83,6 +83,12 @@
protected String getRegionPrefix() {
return "test";
}
+
+ protected String getPrefixedRegionName(String regionName)
+ {
+ String prefix = getRegionPrefix() == null ? "" : getRegionPrefix() + ".";
+ return prefix + regionName;
+ }
public String getCacheConcurrencyStrategy() {
return "transactional";
16 years
- 1
- 0
Hibernate SVN: r14497 - search/trunk/src/java/org/hibernate/search/annotations.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-04-07 10:54:27 -0400 (Mon, 07 Apr 2008)
New Revision: 14497
Modified:
search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java
Log:
Javadoc cleanup
Modified: search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java 2008-04-03 19:47:49 UTC (rev 14496)
+++ search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java 2008-04-07 14:54:27 UTC (rev 14497)
@@ -11,7 +11,7 @@
@Target( { ElementType.FIELD, ElementType.METHOD } )
@Documented
/**
- * Specifies that an association (@*ToOne or @Embedded) is to be indexed
+ * Specifies that an association (@*To*, @Embedded, @CollectionOfEmbedded) is to be indexed
* in the root entity index
* It allows queries involving associated objects restrictions
*/
@@ -25,7 +25,7 @@
/**
* Stop indexing embedded elements when depth is reached
* depth=1 means the associated element is index, but not its embedded elements
- * Default: infinite (an exception will be raised in case of class circular reference when infinite is chosen)
+ * Default: infinite (an exception will be raised if a class circular reference occurs while infinite is chosen)
*/
int depth() default Integer.MAX_VALUE;
16 years
- 1
- 0
Hibernate SVN: r14496 - core/trunk/cache-jbosscache2/src/test/resources.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2008-04-03 15:47:49 -0400 (Thu, 03 Apr 2008)
New Revision: 14496
Modified:
core/trunk/cache-jbosscache2/src/test/resources/log4j.properties
Log:
Show thread names in test logs
Modified: core/trunk/cache-jbosscache2/src/test/resources/log4j.properties
===================================================================
--- core/trunk/cache-jbosscache2/src/test/resources/log4j.properties 2008-04-03 19:39:08 UTC (rev 14495)
+++ core/trunk/cache-jbosscache2/src/test/resources/log4j.properties 2008-04-03 19:47:49 UTC (rev 14496)
@@ -24,9 +24,15 @@
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p [%t] %c{1}:%L - %m%n
log4j.rootLogger=warn, stdout
log4j.logger.org.hibernate.test=info
+#log4j.logger.org.jgroups=info
+#log4j.logger.org.jboss.cache=trace
+#log4j.logger.org.jboss.cache.RegionManager=info
+#log4j.logger.org.jboss.cache.lock=info
+#log4j.logger.org.jboss.cache.interceptors.PessimisticLockInterceptor=info
+#log4j.logger.org.jboss.cache.interceptors.UnlockInterceptor=info
16 years, 1 month
- 1
- 0
Hibernate SVN: r14495 - in core/trunk/cache-jbosscache2: src/test/java/org/hibernate/test/cache/jbc2/functional/bulk and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2008-04-03 15:39:08 -0400 (Thu, 03 Apr 2008)
New Revision: 14495
Modified:
core/trunk/cache-jbosscache2/pom.xml
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java
Log:
[HHH-3141] Move toward JBC 2.1.1
Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2008-04-03 19:38:24 UTC (rev 14494)
+++ core/trunk/cache-jbosscache2/pom.xml 2008-04-03 19:39:08 UTC (rev 14495)
@@ -25,14 +25,8 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>2.1.0.CR4</version>
+ <version>2.1.1-SNAPSHOT</version>
</dependency>
- <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.6.1</version>
- </dependency>
<!-- test dependencies -->
<dependency>
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java 2008-04-03 19:38:24 UTC (rev 14494)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java 2008-04-03 19:39:08 UTC (rev 14495)
@@ -54,19 +54,6 @@
protected String getEntityCacheConfigName()
{
return "optimistic-entity";
- }
+ }
- /**
- * FIXME remove when JBC release with JBCACHE-1298 fix included is
- * integrated.
- *
- * @throws Exception
- */
- public void testBulkOperationsFailureExpected() throws Exception
- {
- super.testBulkOperations();
- }
-
-
-
}
16 years, 1 month
- 1
- 0
Hibernate SVN: r14494 - in core/trunk/cache-jbosscache2/src: test/java/org/hibernate/test/cache/jbc2/functional and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2008-04-03 15:38:24 -0400 (Thu, 03 Apr 2008)
New Revision: 14494
Added:
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/CustomClassLoaderCacheManager.java
Modified:
core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/DualNodeTestCaseBase.java
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/ClassLoaderTestDAO.java
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/PessimisticIsolatedClassLoaderTest.java
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionManagerImpl.java
core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/IsolatedCacheTestSetup.java
Log:
Fix classloader isolation tests
Modified: core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java
===================================================================
--- core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java 2008-04-03 03:49:05 UTC (rev 14493)
+++ core/trunk/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java 2008-04-03 19:38:24 UTC (rev 14494)
@@ -85,6 +85,11 @@
protected abstract Fqn<String> createRegionFqn(String regionName, String regionPrefix);
protected void activateLocalClusterNode() {
+
+ // Regions can get instantiated in the course of normal work (e.g.
+ // a named query region will be created the first time the query is
+ // executed), so suspend any ongoing tx
+ Transaction tx = suspend();
try {
Configuration cfg = jbcCache.getConfiguration();
if (cfg.isUseRegionBasedMarshalling()) {
@@ -128,6 +133,11 @@
catch (Exception e) {
throw new CacheException(e.getMessage(), e);
}
+ finally {
+ if (tx != null)
+ resume(tx);
+ }
+
}
private void establishRegionRootNode()
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/DualNodeTestCaseBase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/DualNodeTestCaseBase.java 2008-04-03 03:49:05 UTC (rev 14493)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/DualNodeTestCaseBase.java 2008-04-03 19:38:24 UTC (rev 14494)
@@ -16,9 +16,6 @@
package org.hibernate.test.cache.jbc2.functional;
-import javax.transaction.TransactionManager;
-
-import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Mappings;
import org.hibernate.dialect.Dialect;
@@ -28,7 +25,6 @@
import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl;
import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
import org.hibernate.test.cache.jbc2.functional.util.DualNodeTransactionManagerLookup;
-import org.hibernate.test.cache.jbc2.functional.util.TestCacheInstanceManager;
import org.hibernate.transaction.CMTTransactionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/ClassLoaderTestDAO.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/ClassLoaderTestDAO.java 2008-04-03 03:49:05 UTC (rev 14493)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/ClassLoaderTestDAO.java 2008-04-03 19:38:24 UTC (rev 14494)
@@ -212,6 +212,10 @@
try {
Query query = sessionFactory.getCurrentSession().createQuery("select account.balance from Account as account where account.accountHolder = ?");
query.setParameter(0, holder);
+ if (useRegion)
+ {
+ query.setCacheRegion("AccountRegion");
+ }
query.setCacheable(true);
results = query.list();
tm.commit();
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/PessimisticIsolatedClassLoaderTest.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2008-04-03 03:49:05 UTC (rev 14493)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2008-04-03 19:38:24 UTC (rev 14494)
@@ -73,6 +73,12 @@
static int test = 0;
+ private Cache localCache;
+ private CacheAccessListener localListener;
+
+ private Cache remoteCache;
+ private CacheAccessListener remoteListener;
+
public PessimisticIsolatedClassLoaderTest(String name)
{
super(name);
@@ -120,6 +126,22 @@
// Don't clean up the managers, just the transactions
// Managers are still needed by the long-lived caches
DualNodeJtaTransactionManagerImpl.cleanupTransactions();
+ }
+
+ @Override
+ protected void cleanupTest() throws Exception
+ {
+ try
+ {
+ if (localCache != null && localListener != null)
+ localCache.removeCacheListener(localListener);
+ if (remoteCache != null && remoteListener != null)
+ remoteCache.removeCacheListener(remoteListener);
+ }
+ finally
+ {
+ super.cleanupTest();
+ }
}
/**
@@ -145,9 +167,11 @@
org.jboss.cache.Fqn fqn = org.jboss.cache.Fqn.fromString("/isolated1");
org.jboss.cache.Region r = localCache.getRegion(fqn, true);
+ r.registerContextClassLoader(cl.getParent());
r.activate();
r = remoteCache.getRegion(fqn, true);
+ r.registerContextClassLoader(cl.getParent());
r.activate();
Thread.currentThread().setContextClassLoader(cl);
Account acct = new Account();
@@ -182,16 +206,16 @@
// Bind a listener to the "local" cache
// Our region factory makes its CacheManager available to us
CacheManager localManager = TestCacheInstanceManager.getTestCacheManager(DualNodeTestUtil.LOCAL);
- Cache localCache = localManager.getCache(getEntityCacheConfigName(), true);
- CacheAccessListener localListener = new CacheAccessListener();
+ this.localCache = localManager.getCache(getEntityCacheConfigName(), true);
+ this.localListener = new CacheAccessListener();
localCache.addCacheListener(localListener);
TransactionManager localTM = localCache.getConfiguration().getRuntimeConfig().getTransactionManager();
// Bind a listener to the "remote" cache
CacheManager remoteManager = TestCacheInstanceManager.getTestCacheManager(DualNodeTestUtil.REMOTE);
- Cache remoteCache = remoteManager.getCache(getEntityCacheConfigName(), true);
- CacheAccessListener remoteListener = new CacheAccessListener();
+ this.remoteCache = remoteManager.getCache(getEntityCacheConfigName(), true);
+ this.remoteListener = new CacheAccessListener();
remoteCache.addCacheListener(remoteListener);
TransactionManager remoteTM = remoteCache.getConfiguration().getRuntimeConfig().getTransactionManager();
Added: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/CustomClassLoaderCacheManager.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/CustomClassLoaderCacheManager.java (rev 0)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/CustomClassLoaderCacheManager.java 2008-04-03 19:38:24 UTC (rev 14494)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ *
+ * 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, v. 2.1. This program is distributed in the
+ * hope that it will be useful, but WITHOUT A 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, v.2.1 along with this
+ * distribution; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Red Hat Author(s): Brian Stansberry
+ */
+
+package org.hibernate.test.cache.jbc2.functional.util;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheManagerImpl;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jgroups.ChannelFactory;
+
+/**
+ * CacheManager implementation that lets us set a default ClassLoader
+ * on the created cache.
+ *
+ * @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1 $
+ */
+public class CustomClassLoaderCacheManager extends CacheManagerImpl
+{
+ private final ClassLoader defaultClassLoader;
+
+ /**
+ * Create a new CustomClassLoaderCacheManager.
+ *
+ * @param configFileName
+ * @param factory
+ */
+ public CustomClassLoaderCacheManager(String configFileName,
+ ChannelFactory factory,
+ ClassLoader defaultClassLoader)
+ {
+ super(configFileName, factory);
+ this.defaultClassLoader = defaultClassLoader;
+ }
+
+ @Override
+ protected Cache<Object, Object> createCache(Configuration config)
+ {
+ DefaultCacheFactory<Object, Object> factory = new DefaultCacheFactory<Object, Object>();
+ factory.setDefaultClassLoader(defaultClassLoader);
+ return factory.createCache(config, false);
+ }
+
+
+
+}
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionManagerImpl.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionManagerImpl.java 2008-04-03 03:49:05 UTC (rev 14493)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionManagerImpl.java 2008-04-03 19:38:24 UTC (rev 14494)
@@ -35,8 +35,6 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.hibernate.test.cache.jbc2.functional.classloader.ClassLoaderTestDAO;
-import org.hsqldb.lib.Iterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +50,7 @@
private static final Hashtable INSTANCES = new Hashtable();
- private DualNodeJtaTransactionImpl currentTransaction;
+ private ThreadLocal currentTransaction = new ThreadLocal();
private String nodeId;
public synchronized static DualNodeJtaTransactionManagerImpl getInstance(String nodeId) {
@@ -87,62 +85,66 @@
}
public int getStatus() throws SystemException {
- return currentTransaction == null ? Status.STATUS_NO_TRANSACTION : currentTransaction.getStatus();
+ Transaction tx = getCurrentTransaction();
+ return tx == null ? Status.STATUS_NO_TRANSACTION : tx.getStatus();
}
public Transaction getTransaction() throws SystemException {
- return currentTransaction;
+ return (Transaction) currentTransaction.get();
}
public DualNodeJtaTransactionImpl getCurrentTransaction() {
- return currentTransaction;
+ return (DualNodeJtaTransactionImpl) currentTransaction.get();
}
public void begin() throws NotSupportedException, SystemException {
- currentTransaction = new DualNodeJtaTransactionImpl( this );
+ currentTransaction.set(new DualNodeJtaTransactionImpl( this ));
}
public Transaction suspend() throws SystemException {
- log.trace(nodeId + ": Suspending " + currentTransaction + " for thread " + Thread.currentThread().getName());
- DualNodeJtaTransactionImpl suspended = currentTransaction;
- currentTransaction = null;
+ DualNodeJtaTransactionImpl suspended = getCurrentTransaction();
+ log.trace(nodeId + ": Suspending " + suspended + " for thread " + Thread.currentThread().getName());
+ currentTransaction.set(null);
return suspended;
}
public void resume(Transaction transaction)
throws InvalidTransactionException, IllegalStateException, SystemException {
- currentTransaction = ( DualNodeJtaTransactionImpl ) transaction;
- log.trace(nodeId + ": Resumed " + currentTransaction + " for thread " + Thread.currentThread().getName());
+ currentTransaction.set(( DualNodeJtaTransactionImpl ) transaction);
+ log.trace(nodeId + ": Resumed " + transaction + " for thread " + Thread.currentThread().getName());
}
public void commit()
throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException {
- if ( currentTransaction == null ) {
+ Transaction tx = getCurrentTransaction();
+ if ( tx == null ) {
throw new IllegalStateException( "no current transaction to commit" );
}
- currentTransaction.commit();
+ tx.commit();
}
public void rollback() throws IllegalStateException, SecurityException, SystemException {
- if ( currentTransaction == null ) {
+ Transaction tx = getCurrentTransaction();
+ if ( tx == null ) {
throw new IllegalStateException( "no current transaction" );
}
- currentTransaction.rollback();
+ tx.rollback();
}
public void setRollbackOnly() throws IllegalStateException, SystemException {
- if ( currentTransaction == null ) {
+ Transaction tx = getCurrentTransaction();
+ if ( tx == null ) {
throw new IllegalStateException( "no current transaction" );
}
- currentTransaction.setRollbackOnly();
+ tx.setRollbackOnly();
}
public void setTransactionTimeout(int i) throws SystemException {
}
void endCurrent(DualNodeJtaTransactionImpl transaction) {
- if ( transaction == currentTransaction ) {
- currentTransaction = null;
+ if ( transaction == currentTransaction.get() ) {
+ currentTransaction.set(null);
}
}
Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/IsolatedCacheTestSetup.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/IsolatedCacheTestSetup.java 2008-04-03 03:49:05 UTC (rev 14493)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/IsolatedCacheTestSetup.java 2008-04-03 19:38:24 UTC (rev 14494)
@@ -20,8 +20,6 @@
import org.hibernate.test.util.SelectedClassnameClassLoader;
import org.hibernate.test.util.SelectedClassnameClassLoaderTestSetup;
-import org.jboss.cache.Cache;
-import org.jboss.cache.config.Configuration;
/**
* A TestSetup that uses SelectedClassnameClassLoader to ensure that
@@ -55,36 +53,34 @@
protected void setUp() throws Exception
{
super.setUp();
-
+
// At this point the TCCL cannot see the isolatedClasses
+ // We want the caches to use this CL as their default classloader
+
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
org.jgroups.ChannelFactory cf = new org.jgroups.JChannelFactory();
cf.setMultiplexerConfig(DEF_JGROUPS_RESOURCE);
- org.jboss.cache.CacheManagerImpl cm = new org.jboss.cache.CacheManagerImpl(DEF_CACHE_FACTORY_RESOURCE, cf);
+ // Use a CacheManager that will inject the desired defaultClassLoader into our caches
+ CustomClassLoaderCacheManager cm = new CustomClassLoaderCacheManager(DEF_CACHE_FACTORY_RESOURCE, cf, tccl);
cm.start();
TestCacheInstanceManager.addTestCacheManager(DualNodeTestUtil.LOCAL, cm);
- // Inject the desired defaultClassLoader into our caches
- Configuration cfg = cm.getConfigurationRegistry().getConfiguration(cacheConfig);
- Cache cache = new CustomClassLoaderCacheFactory(tccl).createCache(cfg, false);
- cache.getConfiguration().getRuntimeConfig().setMuxChannelFactory(cm.getChannelFactory());
- cm.registerCache(cache, cacheConfig);
+ cm.getCache(cacheConfig, true);
+ // Repeat for the "remote" cache
+
cf = new org.jgroups.JChannelFactory();
cf.setMultiplexerConfig(DEF_JGROUPS_RESOURCE);
- cm = new org.jboss.cache.CacheManagerImpl(DEF_CACHE_FACTORY_RESOURCE, cf);
+ cm = new CustomClassLoaderCacheManager(DEF_CACHE_FACTORY_RESOURCE, cf, tccl);
cm.start();
TestCacheInstanceManager.addTestCacheManager(DualNodeTestUtil.REMOTE, cm);
- cfg = cm.getConfigurationRegistry().getConfiguration(cacheConfig);
- cache = new CustomClassLoaderCacheFactory(tccl).createCache(cfg, false);
- cache.getConfiguration().getRuntimeConfig().setMuxChannelFactory(cm.getChannelFactory());
- cm.registerCache(cache, cacheConfig);
+ cm.getCache(cacheConfig, true);
- // Now make the isolatedClasses visible
+ // Now make the isolatedClasses visible to the test driver itself
SelectedClassnameClassLoader visible = new SelectedClassnameClassLoader(isolatedClasses, null, null, tccl);
Thread.currentThread().setContextClassLoader(visible);
}
16 years, 1 month
- 1
- 0
Hibernate SVN: r14493 - in core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass: surrogateid/generated and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-04-02 23:49:05 -0400 (Wed, 02 Apr 2008)
New Revision: 14493
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml
core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
Log:
HHH-2801 : changes so tests work on all tested dialects
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml 2008-04-03 03:43:21 UTC (rev 14492)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml 2008-04-03 03:49:05 UTC (rev 14493)
@@ -58,11 +58,9 @@
</composite-id>
<property name="name" column="NAME" type="string" length="40" not-null="true"/>
<many-to-one column="USER_ID" name="user" class="org.hibernate.test.manytomanyassociationclass.User"
- not-null="true" unique-key="UK_MEMBERSHIP"
- insert="false" update="false"/>
+ not-null="true" insert="false" update="false"/>
<many-to-one column="GROUP_ID" name="group" class="org.hibernate.test.manytomanyassociationclass.Group"
- not-null="true" unique-key="UK_MEMBERSHIP"
- insert="false" update="false"/>
+ not-null="true" insert="false" update="false"/>
</class>
</hibernate-mapping>
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2008-04-03 03:43:21 UTC (rev 14492)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2008-04-03 03:49:05 UTC (rev 14493)
@@ -69,6 +69,7 @@
// will be thrown on the insert because the unique constraint on the
// user and group IDs in the join table is violated. See HHH-2801.
s.merge( getUser() );
+ s.getTransaction().commit();
fail( "should have failed because inserts are before deletes");
}
catch( ConstraintViolationException ex ) {
@@ -95,6 +96,7 @@
// will be thrown on the insert because the unique constraint on the
// user and group IDs in the join table is violated. See HHH-2801.
s.merge( getUser() );
+ s.getTransaction().commit();
fail( "should have failed because inserts are before deletes");
}
catch( ConstraintViolationException ex ) {
@@ -121,6 +123,7 @@
// will be thrown on the insert because the unique constraint on the
// user and group IDs in the join table is violated. See HHH-2801.
s.merge( getUser() );
+ s.getTransaction().commit();
fail( "should have failed because inserts are before deletes");
}
catch( ConstraintViolationException ex ) {
16 years, 1 month
- 1
- 0
Hibernate SVN: r14492 - in core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass: surrogateid/generated and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-04-02 23:43:21 -0400 (Wed, 02 Apr 2008)
New Revision: 14492
Modified:
core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml
core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
Log:
HHH-2801 : changes so tests work on all tested dialects
Modified: core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml 2008-04-01 16:29:34 UTC (rev 14491)
+++ core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml 2008-04-03 03:43:21 UTC (rev 14492)
@@ -58,11 +58,9 @@
</composite-id>
<property name="name" column="NAME" type="string" length="40" not-null="true"/>
<many-to-one column="USER_ID" name="user" class="org.hibernate.test.manytomanyassociationclass.User"
- not-null="true" unique-key="UK_MEMBERSHIP"
- insert="false" update="false"/>
+ not-null="true" insert="false" update="false"/>
<many-to-one column="GROUP_ID" name="group" class="org.hibernate.test.manytomanyassociationclass.Group"
- not-null="true" unique-key="UK_MEMBERSHIP"
- insert="false" update="false"/>
+ not-null="true" insert="false" update="false"/>
</class>
</hibernate-mapping>
Modified: core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2008-04-01 16:29:34 UTC (rev 14491)
+++ core/branches/Branch_3_2/test/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2008-04-03 03:43:21 UTC (rev 14492)
@@ -69,6 +69,7 @@
// will be thrown on the insert because the unique constraint on the
// user and group IDs in the join table is violated. See HHH-2801.
s.merge( getUser() );
+ s.getTransaction().commit();
fail( "should have failed because inserts are before deletes");
}
catch( ConstraintViolationException ex ) {
@@ -95,6 +96,7 @@
// will be thrown on the insert because the unique constraint on the
// user and group IDs in the join table is violated. See HHH-2801.
s.merge( getUser() );
+ s.getTransaction().commit();
fail( "should have failed because inserts are before deletes");
}
catch( ConstraintViolationException ex ) {
@@ -121,6 +123,7 @@
// will be thrown on the insert because the unique constraint on the
// user and group IDs in the join table is violated. See HHH-2801.
s.merge( getUser() );
+ s.getTransaction().commit();
fail( "should have failed because inserts are before deletes");
}
catch( ConstraintViolationException ex ) {
16 years, 1 month
- 1
- 0
Hibernate SVN: r14491 - in maven-poms/trunk: core-parent and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-04-01 12:29:34 -0400 (Tue, 01 Apr 2008)
New Revision: 14491
Modified:
maven-poms/trunk/core-manual-parent/pom.xml
maven-poms/trunk/core-parent/pom.xml
Log:
surefire plugin 2.4.2 + logging redirect
Modified: maven-poms/trunk/core-manual-parent/pom.xml
===================================================================
--- maven-poms/trunk/core-manual-parent/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
+++ maven-poms/trunk/core-manual-parent/pom.xml 2008-04-01 16:29:34 UTC (rev 14491)
@@ -35,7 +35,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core-parent</artifactId>
- <version>2</version>
+ <version>3</version>
<!-- if we have both parents checked out then use the realtive path... -->
<relativePath>../core-parent/pom.xml</relativePath>
</parent>
@@ -43,7 +43,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
<packaging>pom</packaging>
- <version>2</version>
+ <version>3</version>
<name>Hibernate Core Manual Parent</name>
<description>Parent POM for the Hibernate Core reference manual modules</description>
Modified: maven-poms/trunk/core-parent/pom.xml
===================================================================
--- maven-poms/trunk/core-parent/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
+++ maven-poms/trunk/core-parent/pom.xml 2008-04-01 16:29:34 UTC (rev 14491)
@@ -33,7 +33,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core-parent</artifactId>
<packaging>pom</packaging>
- <version>2</version>
+ <version>3</version>
<name>Hibernate Core Parent</name>
<description>The base POM for all Hibernate Core modules.</description>
@@ -112,6 +112,14 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </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 -->
16 years, 1 month
- 1
- 0
Hibernate SVN: r14490 - in core/trunk: cache-ehcache and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-04-01 11:57:12 -0400 (Tue, 01 Apr 2008)
New Revision: 14490
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-jbosscache2/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/eg/pom.xml
core/trunk/jmx/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/cache-ehcache/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Ehcache Integration</name>
@@ -91,10 +91,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/cache-jbosscache/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate JBossCache Integration</name>
@@ -122,10 +122,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/cache-jbosscache2/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache2</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate JBossCache2.x Integration</name>
@@ -202,10 +202,4 @@
</properties>
</profile>
</profiles>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/cache-oscache/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-oscache</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate OSCache Integration</name>
@@ -28,10 +28,4 @@
<version>2.1</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/cache-swarmcache/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-swarmcache</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate SwarmCache Integration</name>
@@ -28,10 +28,4 @@
<version>1.0RC2</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/connection-c3p0/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate C3P0 ConnectionProvider</name>
@@ -28,10 +28,4 @@
<version>0.9.1</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/connection-proxool/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-proxool</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Proxool ConnectionProvider</name>
@@ -28,10 +28,4 @@
<version>0.8.3</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/core/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Core</name>
@@ -141,10 +141,4 @@
<properties>
<antlrPluginVersion>2.1</antlrPluginVersion>
</properties>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/eg/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -12,7 +12,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-eg</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Example</name>
@@ -25,10 +25,4 @@
<version>${version}</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/jmx/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jmx</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate JMX Module</name>
@@ -34,10 +34,4 @@
<version>1.2.14</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -11,16 +11,16 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<packaging>pom</packaging>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<name>Hibernate Core Aggregator</name>
<description>Aggregator of the Hibernate Core modules.</description>
<url>http://hibernate.org</url>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
</scm>
<modules>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/testing/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Testing</name>
@@ -42,10 +42,4 @@
</resource>
</resources>
</build>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
+++ core/trunk/testsuite/pom.xml 2008-04-01 15:57:12 UTC (rev 14490)
@@ -10,7 +10,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testsuite</artifactId>
- <version>3.3.0.CR1</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Testsuite</name>
@@ -355,10 +355,4 @@
</profile>
</profiles>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
- </scm>
</project>
\ No newline at end of file
16 years, 1 month
- 1
- 0
Hibernate SVN: r14489 - in core/tags: hibernate-3.3.0.CR1 and 18 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-04-01 11:57:07 -0400 (Tue, 01 Apr 2008)
New Revision: 14489
Added:
core/tags/hibernate-3.3.0.CR1/
core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java
core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java
core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml
core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml
core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml
core/tags/hibernate-3.3.0.CR1/core/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml
core/tags/hibernate-3.3.0.CR1/eg/pom.xml
core/tags/hibernate-3.3.0.CR1/jmx/pom.xml
core/tags/hibernate-3.3.0.CR1/pom.xml
core/tags/hibernate-3.3.0.CR1/testing/pom.xml
core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml
Removed:
core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java
core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java
core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml
core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml
core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml
core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml
core/tags/hibernate-3.3.0.CR1/core/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/pom.xml
core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml
core/tags/hibernate-3.3.0.CR1/eg/pom.xml
core/tags/hibernate-3.3.0.CR1/jmx/pom.xml
core/tags/hibernate-3.3.0.CR1/pom.xml
core/tags/hibernate-3.3.0.CR1/testing/pom.xml
core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml
Log:
[maven-release-plugin] copy for tag hibernate-3.3.0.CR1
Copied: core/tags/hibernate-3.3.0.CR1 (from rev 14456, core/trunk)
Deleted: core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,97 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Ehcache Integration</name>
- <description>Integration of Hibernate with Ehcache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml (from rev 14488, core/trunk/cache-ehcache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,100 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Ehcache Integration</name>
+ <description>Integration of Hibernate with Ehcache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,128 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <version>1.4.1.GA</version>
- </dependency>
- <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-minimal</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2se</artifactId>
- <version>200504122039</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
- <version>2.2.7</version>
- </dependency>
-
- <!-- testing deps -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml (from rev 14488, core/trunk/cache-jbosscache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,131 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <version>1.4.1.GA</version>
+ </dependency>
+ <!-- jboss-cache (the one from the jboss repo, anyway) does not properly define its dependencies -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-minimal</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>200504122039</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups-all</artifactId>
+ <version>2.2.7</version>
+ </dependency>
+
+ <!-- testing deps -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,208 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache2</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JBossCache2.x Integration</name>
- <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>2.1.0.CR4</version>
- </dependency>
- <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.6.1</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <!-- these are optional on core :( and needed for testing -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </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.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>
- <excludes>
- <!-- Skip a long-running test of a prototype class -->
- <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude>
- </excludes>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- <property>
- <name>jgroups.bind_addr</name>
- <value>${jgroups.bind_addr}</value>
- </property>
- <!-- There are problems with multicast and IPv6 on some
- OS/JDK combos, so we tell Java to use IPv4. If you
- have problems with multicast when running the tests
- you can try setting this to 'false', although typically
- that won't be helpful.
- -->
- <property>
- <name>java.net.preferIPv4Stack</name>
- <value>true</value>
- </property>
- <!-- Tell JGroups to only wait a short time for PING
- responses before determining coordinator. Speeds cluster
- formation during integration tests. (This is too
- low a value for a real system; only use for tests.)
- -->
- <property>
- <name>jgroups.ping.timeout</name>
- <value>500</value>
- </property>
- <!-- Tell JGroups to only require one PING response
- before determining coordinator. Speeds cluster
- formation during integration tests. (This is too
- low a value for a real system; only use for tests.)
- -->
- <property>
- <name>jgroups.ping.num_initial_members</name>
- <value>1</value>
- </property>
- <!-- Disable the JGroups message bundling feature
- to speed tests and avoid FLUSH issue -->
- <property>
- <name>jgroups.udp.enable_bundling</name>
- <value>false</value>
- </property>
- </systemProperties>
- <skipExec>${skipUnitTests}</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <skipUnitTests>true</skipUnitTests>
- <!--
- Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
- may be problems with multicast on the interface JGroups uses by default on your machine. You can
- try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
- setting the value to an interface where you know multicast works
- -->
- <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
- </properties>
-
- <profiles>
- <profile>
- <id>test</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <skipUnitTests>false</skipUnitTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml (from rev 14488, core/trunk/cache-jbosscache2/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,211 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbosscache2</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JBossCache2.x Integration</name>
+ <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>2.1.0.CR4</version>
+ </dependency>
+ <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.6.1</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- these are optional on core :( and needed for testing -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </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.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>
+ <excludes>
+ <!-- Skip a long-running test of a prototype class -->
+ <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>jgroups.bind_addr</name>
+ <value>${jgroups.bind_addr}</value>
+ </property>
+ <!-- There are problems with multicast and IPv6 on some
+ OS/JDK combos, so we tell Java to use IPv4. If you
+ have problems with multicast when running the tests
+ you can try setting this to 'false', although typically
+ that won't be helpful.
+ -->
+ <property>
+ <name>java.net.preferIPv4Stack</name>
+ <value>true</value>
+ </property>
+ <!-- Tell JGroups to only wait a short time for PING
+ responses before determining coordinator. Speeds cluster
+ formation during integration tests. (This is too
+ low a value for a real system; only use for tests.)
+ -->
+ <property>
+ <name>jgroups.ping.timeout</name>
+ <value>500</value>
+ </property>
+ <!-- Tell JGroups to only require one PING response
+ before determining coordinator. Speeds cluster
+ formation during integration tests. (This is too
+ low a value for a real system; only use for tests.)
+ -->
+ <property>
+ <name>jgroups.ping.num_initial_members</name>
+ <value>1</value>
+ </property>
+ <!-- Disable the JGroups message bundling feature
+ to speed tests and avoid FLUSH issue -->
+ <property>
+ <name>jgroups.udp.enable_bundling</name>
+ <value>false</value>
+ </property>
+ </systemProperties>
+ <skipExec>${skipUnitTests}</skipExec>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <skipUnitTests>true</skipUnitTests>
+ <!--
+ Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there
+ may be problems with multicast on the interface JGroups uses by default on your machine. You can
+ try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and
+ setting the value to an interface where you know multicast works
+ -->
+ <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <skipUnitTests>false</skipUnitTests>
+ </properties>
+ </profile>
+ </profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,51 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.test.cache.jbc2.functional.util;
-
-import java.util.Properties;
-import javax.transaction.TransactionManager;
-
-import org.hibernate.transaction.TransactionManagerLookup;
-import org.hibernate.HibernateException;
-
-/**
- * SimpleJtaTransactionManagerLookupImpl subclass that finds a different
- * DualNodeTransactionManager based on the value of property
- * {@link DualNodeTestUtil#NODE_ID_PROP}.
- *
- * @author Brian Stansberry
- */
-public class DualNodeTransactionManagerLookup implements TransactionManagerLookup {
-
- public TransactionManager getTransactionManager(Properties props) throws HibernateException {
- String nodeId = props.getProperty(DualNodeTestUtil.NODE_ID_PROP);
- if (nodeId == null)
- throw new HibernateException(DualNodeTestUtil.NODE_ID_PROP + " not configured");
- return DualNodeJtaTransactionManagerImpl.getInstance(nodeId);
- }
-
- public String getUserTransactionName() {
- throw new UnsupportedOperationException( "jndi currently not implemented for these tests" );
- }
-}
Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java (from rev 14459, core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,56 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.cache.jbc2.functional.util;
+
+import java.util.Properties;
+import javax.transaction.TransactionManager;
+import javax.transaction.Transaction;
+
+import org.hibernate.transaction.TransactionManagerLookup;
+import org.hibernate.HibernateException;
+
+/**
+ * SimpleJtaTransactionManagerLookupImpl subclass that finds a different
+ * DualNodeTransactionManager based on the value of property
+ * {@link DualNodeTestUtil#NODE_ID_PROP}.
+ *
+ * @author Brian Stansberry
+ */
+public class DualNodeTransactionManagerLookup implements TransactionManagerLookup {
+
+ public TransactionManager getTransactionManager(Properties props) throws HibernateException {
+ String nodeId = props.getProperty(DualNodeTestUtil.NODE_ID_PROP);
+ if (nodeId == null)
+ throw new HibernateException(DualNodeTestUtil.NODE_ID_PROP + " not configured");
+ return DualNodeJtaTransactionManagerImpl.getInstance(nodeId);
+ }
+
+ public String getUserTransactionName() {
+ throw new UnsupportedOperationException( "jndi currently not implemented for these tests" );
+ }
+
+ public Object getTransactionIdentifier(Transaction transaction) {
+ return transaction;
+ }
+}
Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,56 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.test.tm.jbc2;
-
-import java.util.Properties;
-
-import javax.transaction.TransactionManager;
-
-import org.hibernate.HibernateException;
-import org.hibernate.transaction.TransactionManagerLookup;
-import org.jboss.cache.transaction.BatchModeTransactionManager;
-
-/**
- * Uses the JBoss Cache BatchModeTransactionManager. Should not be used in
- * any tests that simulate usage of database connections.
- *
- * @author Brian Stansberry
- */
-public class BatchModeTransactionManagerLookup
- implements TransactionManagerLookup {
-
- public TransactionManager getTransactionManager(Properties props) throws HibernateException {
- try {
- return BatchModeTransactionManager.getInstance();
- }
- catch (Exception e) {
- throw new HibernateException("Failed getting BatchModeTransactionManager", e);
- }
- }
-
- public String getUserTransactionName() {
- throw new UnsupportedOperationException();
- }
-
-}
Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java (from rev 14459, core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,61 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.tm.jbc2;
+
+import java.util.Properties;
+
+import javax.transaction.TransactionManager;
+import javax.transaction.Transaction;
+
+import org.hibernate.HibernateException;
+import org.hibernate.transaction.TransactionManagerLookup;
+import org.jboss.cache.transaction.BatchModeTransactionManager;
+
+/**
+ * Uses the JBoss Cache BatchModeTransactionManager. Should not be used in
+ * any tests that simulate usage of database connections.
+ *
+ * @author Brian Stansberry
+ */
+public class BatchModeTransactionManagerLookup
+ implements TransactionManagerLookup {
+
+ public TransactionManager getTransactionManager(Properties props) throws HibernateException {
+ try {
+ return BatchModeTransactionManager.getInstance();
+ }
+ catch (Exception e) {
+ throw new HibernateException("Failed getting BatchModeTransactionManager", e);
+ }
+ }
+
+ public String getUserTransactionName() {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object getTransactionIdentifier(Transaction transaction) {
+ return transaction;
+ }
+
+}
Deleted: core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-oscache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate OSCache Integration</name>
- <description>Integration of Hibernate with OSCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>oscache</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml (from rev 14488, core/trunk/cache-oscache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-oscache</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate OSCache Integration</name>
+ <description>Integration of Hibernate with OSCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>oscache</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-swarmcache</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate SwarmCache Integration</name>
- <description>Integration of Hibernate with SwarmCache</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>swarmcache</groupId>
- <artifactId>swarmcache</artifactId>
- <version>1.0RC2</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml (from rev 14488, core/trunk/cache-swarmcache/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-swarmcache</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate SwarmCache Integration</name>
+ <description>Integration of Hibernate with SwarmCache</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>swarmcache</groupId>
+ <artifactId>swarmcache</artifactId>
+ <version>1.0RC2</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate C3P0 ConnectionProvider</name>
- <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml (from rev 14488, core/trunk/connection-c3p0/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate C3P0 ConnectionProvider</name>
+ <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-proxool</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Proxool ConnectionProvider</name>
- <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>proxool</groupId>
- <artifactId>proxool</artifactId>
- <version>0.8.3</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml (from rev 14488, core/trunk/connection-proxool/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-proxool</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Proxool ConnectionProvider</name>
+ <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>proxool</groupId>
+ <artifactId>proxool</artifactId>
+ <version>0.8.3</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/core/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,147 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Core</name>
- <description>The core functionality of Hibernate</description>
-
- <dependencies>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
-
- <dependency>
- <!-- YUCK, YUCK, YUCK!!!! -->
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.security</groupId>
- <artifactId>jaas</artifactId>
- <version>1.0.01</version>
- <scope>provided</scope>
- </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>
- <scope>provided</scope>
- </dependency>
-
- <!-- optional deps for bytecode providers until those are finally properly scoped -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>antlr-maven-plugin</artifactId>
- <version>${antlrPluginVersion}</version>
- <configuration>
- <grammars>hql.g,hql-sql.g,sql-gen.g</grammars>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>antlr-maven-plugin</artifactId>
- <version>${antlrPluginVersion}</version>
- <configuration>
- <!-- eventually should be based on the second phase grammar -->
- <grammars>hql.g</grammars>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!--
- for the time being, gonna ignore the custom stylesheet (what did it do anyway???)
- <stylesheetfile>xyz</stylesheetfile>
- -->
- <groups>
- <group>
- <title>Core API</title>
- <packages>org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.usertype</packages>
- </group>
- <group>
- <title>Extension API</title>
- <packages>org.hibernate.id:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.action:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc</packages>
- </group>
- <group>
- <title>Miscellaneous API</title>
- <packages>org.hibernate.stat:org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.mapping:org.hibernate.tool.instrument</packages>
- </group>
- <group>
- <title>Internal Implementation</title>
- <packages>org.hibernate.engine:org.hibernate.impl:org.hibernate.sql:org.hibernate.lob:org.hibernate.util:org.hibernate.exception:org.hibernate.hql:org.hibernate.hql.ast:org.hibernate.hql.antlr:org.hibernate.hql.classic:org.hibernate.intercept:org.hibernate.secure:org.hibernate.pretty</packages>
- </group>
- </groups>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <antlrPluginVersion>2.1</antlrPluginVersion>
- </properties>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/core/pom.xml (from rev 14488, core/trunk/core/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/core/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/core/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,150 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Core</name>
+ <description>The core functionality of Hibernate</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <!-- YUCK, YUCK, YUCK!!!! -->
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ <version>1.0.01</version>
+ <scope>provided</scope>
+ </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>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- optional deps for bytecode providers until those are finally properly scoped -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>${antlrPluginVersion}</version>
+ <configuration>
+ <grammars>hql.g,hql-sql.g,sql-gen.g</grammars>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>${antlrPluginVersion}</version>
+ <configuration>
+ <!-- eventually should be based on the second phase grammar -->
+ <grammars>hql.g</grammars>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!--
+ for the time being, gonna ignore the custom stylesheet (what did it do anyway???)
+ <stylesheetfile>xyz</stylesheetfile>
+ -->
+ <groups>
+ <group>
+ <title>Core API</title>
+ <packages>org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.usertype</packages>
+ </group>
+ <group>
+ <title>Extension API</title>
+ <packages>org.hibernate.id:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.action:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc</packages>
+ </group>
+ <group>
+ <title>Miscellaneous API</title>
+ <packages>org.hibernate.stat:org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.mapping:org.hibernate.tool.instrument</packages>
+ </group>
+ <group>
+ <title>Internal Implementation</title>
+ <packages>org.hibernate.engine:org.hibernate.impl:org.hibernate.sql:org.hibernate.lob:org.hibernate.util:org.hibernate.exception:org.hibernate.hql:org.hibernate.hql.ast:org.hibernate.hql.antlr:org.hibernate.hql.classic:org.hibernate.intercept:org.hibernate.secure:org.hibernate.pretty</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <properties>
+ <antlrPluginVersion>2.1</antlrPluginVersion>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbc2-manual</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
-
- <name>Hibernate/JBoss Cache 2 Reference Manual</name>
- <description>The Hibernate / JBoss Cache 2 integration reference manual</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>Hibernate_JBC2_Reference.xml</sourceDocumentName>
- <masterTranslation>en-US</masterTranslation>
- <translations>
- <translation>es-ES</translation>
- <translation>fr-FR</translation>
- <translation>ja-JP</translation>
- <translation>ko-KR</translation>
- <translation>pt-BR</translation>
- <translation>zh-CN</translation>
- </translations>
- <imageResource>
- <directory>src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>true</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml (from rev 14457, core/trunk/documentation/jbosscache2/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,86 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jbc2-manual</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
+ <name>Hibernate/JBoss Cache 2 Reference Manual</name>
+ <description>The Hibernate / JBoss Cache 2 integration reference manual</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jdocbook-style</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>Hibernate_JBC2_Reference.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <translations>
+ <translation>es-ES</translation>
+ <translation>fr-FR</translation>
+ <translation>ja-JP</translation>
+ <translation>ko-KR</translation>
+ <translation>pt-BR</translation>
+ <translation>zh-CN</translation>
+ </translations>
+ <imageResource>
+ <directory>src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
+ <finalName>hibernate_reference.pdf</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>true</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,99 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-manual</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
-
- <name>Hibernate Manual</name>
- <description>The Hibernate reference manual</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <!--
- here we are attaching the translate goal so that the translations are processed
- before compilation so that the transated XML is also transformed during
- generation
- -->
- <phase>process-resources</phase>
- <goals>
- <goal>translate</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>Hibernate_Reference.xml</sourceDocumentName>
- <masterTranslation>en-US</masterTranslation>
- <translations>
- <translation>es-ES</translation>
- <translation>fr-FR</translation>
- <translation>ja-JP</translation>
- <translation>ko-KR</translation>
- <translation>pt-BR</translation>
- <translation>zh-CN</translation>
- </translations>
- <imageResource>
- <directory>${basedir}/src/main/docbook/en-US</directory>
- <excludes>
- <exclude>*.xml</exclude>
- <exclude>**/*.xml</exclude>
- <exclude>*.zargo</exclude>
- <exclude>**/*.zargo</exclude>
- </excludes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>true</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml (from rev 14457, core/trunk/documentation/manual/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,99 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-manual</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
+ <name>Hibernate Manual</name>
+ <description>The Hibernate reference manual</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <!--
+ here we are attaching the translate goal so that the translations are processed
+ before compilation so that the transated XML is also transformed during
+ generation
+ -->
+ <phase>process-resources</phase>
+ <goals>
+ <goal>translate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jdocbook-style</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>Hibernate_Reference.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <translations>
+ <translation>es-ES</translation>
+ <translation>fr-FR</translation>
+ <translation>ja-JP</translation>
+ <translation>ko-KR</translation>
+ <translation>pt-BR</translation>
+ <translation>zh-CN</translation>
+ </translations>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>*.zargo</exclude>
+ <exclude>**/*.zargo</exclude>
+ </excludes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
+ <finalName>hibernate_reference.pdf</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>true</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: core/tags/hibernate-3.3.0.CR1/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/documentation/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-documentation</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Hibernate Core - Documentation</name>
- <description>Grouping of Hibernate Core Project documentation modules</description>
-
- <modules>
- <module>manual</module>
- <module>tutorial</module>
- </modules>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/documentation/pom.xml (from rev 14457, core/trunk/documentation/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/documentation/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/documentation/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,26 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-documentation</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Hibernate Core - Documentation</name>
+ <description>Grouping of Hibernate Core Project documentation modules</description>
+
+ <modules>
+ <module>manual</module>
+ <module>tutorial</module>
+ </modules>
+
+</project>
Deleted: core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml
===================================================================
--- core/trunk/documentation/tutorial/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-tutorial</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <name>Hibernate Tutorial</name>
- <description>A tutorial project showcasing Hibernate usage</description>
-
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml (from rev 14457, core/trunk/documentation/tutorial/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tutorial</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>Hibernate Tutorial</name>
+ <description>A tutorial project showcasing Hibernate usage</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ </dependency>
+ </dependencies>
+
+</project>
Deleted: core/tags/hibernate-3.3.0.CR1/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/eg/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,31 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <!-- todo : this module should eventually make its way over to documentation/tutorial -->
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-eg</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Example</name>
- <description>A simple example of Hibernate functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/eg/pom.xml (from rev 14488, core/trunk/eg/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/eg/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/eg/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- todo : this module should eventually make its way over to documentation/tutorial -->
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-eg</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Example</name>
+ <description>A simple example of Hibernate functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/jmx/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jmx</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate JMX Module</name>
- <description>Defines Hibernate JMX capabilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/jmx/pom.xml (from rev 14488, core/trunk/jmx/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/jmx/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/jmx/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jmx</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate JMX Module</name>
+ <description>Defines Hibernate JMX capabilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/pom.xml
===================================================================
--- core/trunk/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,107 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <packaging>pom</packaging>
- <version>3.3.0-SNAPSHOT</version>
-
- <name>Hibernate Core Aggregator</name>
- <description>Aggregator of the Hibernate Core modules.</description>
- <url>http://hibernate.org</url>
-
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
- </scm>
-
- <modules>
- <module>core</module>
- <module>cache-ehcache</module>
- <module>cache-jbosscache</module>
- <module>cache-jbosscache2</module>
- <module>cache-oscache</module>
- <module>cache-swarmcache</module>
- <module>connection-c3p0</module>
- <module>connection-proxool</module>
- <module>jmx</module>
- <module>testing</module>
- <module>testsuite</module>
- <module>eg</module>
-<!-- Need to scope bytecode providers first
- <module>bytecode-cglib</module>
- <module>bytecode-javassist</module>
--->
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!--
- A profile used implicitly by the release plugin. Here we use it to enable documentation building
- as well as execution of the assembly plugin (to build the SourceForge dist).
- -->
- <id>release</id>
-<!--
- temporarily disable documentation module
- <modules>
- <module>documentation</module>
- </modules>
--->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>deploy</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- <descriptor>src/assembly/hibernate-all.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- seperate profile for documentation activation -->
- <profile>
- <id>docs</id>
- <modules>
- <module>documentation</module>
- </modules>
- </profile>
- </profiles>
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/pom.xml (from rev 14488, core/trunk/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,107 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <packaging>pom</packaging>
+ <version>3.3.0.CR1</version>
+
+ <name>Hibernate Core Aggregator</name>
+ <description>Aggregator of the Hibernate Core modules.</description>
+ <url>http://hibernate.org</url>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</url>
+ </scm>
+
+ <modules>
+ <module>core</module>
+ <module>cache-ehcache</module>
+ <module>cache-jbosscache</module>
+ <module>cache-jbosscache2</module>
+ <module>cache-oscache</module>
+ <module>cache-swarmcache</module>
+ <module>connection-c3p0</module>
+ <module>connection-proxool</module>
+ <module>jmx</module>
+ <module>testing</module>
+ <module>testsuite</module>
+ <module>eg</module>
+<!-- Need to scope bytecode providers first
+ <module>bytecode-cglib</module>
+ <module>bytecode-javassist</module>
+-->
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!--
+ A profile used implicitly by the release plugin. Here we use it to enable documentation building
+ as well as execution of the assembly plugin (to build the SourceForge dist).
+ -->
+ <id>release</id>
+<!--
+ temporarily disable documentation module
+ <modules>
+ <module>documentation</module>
+ </modules>
+-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+<!--
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+-->
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/hibernate-all.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- seperate profile for documentation activation -->
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>documentation</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/testing/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,48 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testing</name>
- <description>Hibernate JUnit test utilities</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.hbm.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/testing/pom.xml (from rev 14488, core/trunk/testing/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/testing/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/testing/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testing</name>
+ <description>Hibernate JUnit test utilities</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <!-- here we need to pull JUnit deps into compile scope, as opposed to the normal test scope -->
+ <version>3.8.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.hbm.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2008-03-18 07:26:18 UTC (rev 14456)
+++ core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -1,361 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core-parent</artifactId>
- <version>1</version>
- </parent>
-
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testsuite</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Hibernate Testsuite</name>
- <description>The testsuite of Hibernate functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- these are optional on core... :( -->
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- </dependency>
- <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1</version>
- </dependency>
- <!-- logging setup for the test suite -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>99.0-does-not-exist</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>99.0-does-not-exist</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </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.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-test-ext-plugin</artifactId>
- <version>1.1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>extend</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>hibernate.test.validatefailureexpected</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <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://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The PostgreSQL test envionment -->
- <profile>
- <id>pgsql8</id>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-504</version>
- <classifier>jdbc3</classifier>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
- <jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!--
- ###################################################################
- Then, those with commercial drivers
- ###################################################################
- -->
-
- <!-- 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>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</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:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The DB2 8.x test envionment (using 9x drivers)-->
- <profile>
- <id>db2-8</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://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hiber</jdbc.user>
- <jdbc.pass>hiber</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The Sybase 12 test envionment -->
- <profile>
- <id>sybase12</id>
- <dependencies>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <version>6.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
- <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (jTDS) test envionment -->
- <profile>
- <id>sqlserver-jtds</id>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- <properties>
- <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
- <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
- <jdbc.user>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation/>
- </properties>
- </profile>
-
- <!-- The SQLServer2005 (MS JDBC) test envionment -->
- <profile>
- <id>sqlserver-msjdbc</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>cruisecontrol</jdbc.user>
- <jdbc.pass>cruisecontrol</jdbc.pass>
- <jdbc.isolation>4096</jdbc.isolation>
- </properties>
- </profile>
-
- </profiles>
-
-</project>
Copied: core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml (from rev 14488, core/trunk/testsuite/pom.xml)
===================================================================
--- core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml (rev 0)
+++ core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml 2008-04-01 15:57:07 UTC (rev 14489)
@@ -0,0 +1,364 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testsuite</artifactId>
+ <version>3.3.0.CR1</version>
+ <packaging>jar</packaging>
+
+ <name>Hibernate Testsuite</name>
+ <description>The testsuite of Hibernate functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- these are optional on core... :( -->
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <!-- logging setup for the test suite -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>99.0-does-not-exist</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>99.0-does-not-exist</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </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.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-test-ext-plugin</artifactId>
+ <version>1.1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>extend</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>hibernate.test.validatefailureexpected</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <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://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The PostgreSQL test envionment -->
+ <profile>
+ <id>pgsql8</id>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504</version>
+ <classifier>jdbc3</classifier>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+ <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+ <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!--
+ ###################################################################
+ Then, those with commercial drivers
+ ###################################################################
+ -->
+
+ <!-- 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>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</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:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The DB2 8.x test envionment (using 9x drivers)-->
+ <profile>
+ <id>db2-8</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://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+ <jdbc.user>hiber</jdbc.user>
+ <jdbc.pass>hiber</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The Sybase 12 test envionment -->
+ <profile>
+ <id>sybase12</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>6.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
+ <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
+ <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (jTDS) test envionment -->
+ <profile>
+ <id>sqlserver-jtds</id>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+ <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
+ <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
+ <jdbc.user>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation />
+ </properties>
+ </profile>
+
+ <!-- The SQLServer2005 (MS JDBC) test envionment -->
+ <profile>
+ <id>sqlserver-msjdbc</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>cruisecontrol</jdbc.user>
+ <jdbc.pass>cruisecontrol</jdbc.pass>
+ <jdbc.isolation>4096</jdbc.isolation>
+ </properties>
+ </profile>
+
+ </profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url>
+ </scm>
+</project>
\ No newline at end of file
16 years, 1 month
- 1
- 0