Browse files

Revert "AS7-4857 correct JPA dependency injection (stop injecting jav…

…assist and let Hibernate include envers)."

This reverts commit 8dd5170.
  • Loading branch information...
1 parent 71cf9c9 commit c52a48edaee9f3041a9927f9a1d5d8181810979d @stuartwdouglas stuartwdouglas committed Sep 2, 2012
View
4 build/build.xml
@@ -664,13 +664,15 @@
<maven-resource group="org.hibernate" artifact="hibernate-core" />
<maven-resource group="org.hibernate" artifact="hibernate-entitymanager" />
<maven-resource group="org.hibernate" artifact="hibernate-infinispan"/>
- <maven-resource group="org.hibernate" artifact="hibernate-envers"/>
</module-def>
<module-def name="org.hibernate.commons-annotations">
<maven-resource group="org.hibernate.common" artifact="hibernate-commons-annotations"/>
</module-def>
+ <module-def name="org.hibernate.envers">
+ <maven-resource group="org.hibernate" artifact="hibernate-envers"/>
+ </module-def>
<module-def name="org.hibernate.validator">
<maven-resource group="org.hibernate" artifact="hibernate-validator"/>
</module-def>
View
7 build/pom.xml
@@ -2378,8 +2378,11 @@
</group>
<group>
<title>Module org.hibernate</title>
- <packages>org.hibernate.annotations.common:org.hibernate.annotations.common.annotationfactory:org.hibernate.annotations.common.reflection:org.hibernate.annotations.common.reflection.java:org.hibernate.annotations.common.reflection.java.generics:org.hibernate.annotations.common.util:org.hibernate.annotations.common.util.impl:org.hibernate.ejb:org.hibernate.ejb.cfg.spi:org.hibernate.ejb.connection:org.hibernate.ejb.criteria:org.hibernate.ejb.criteria.expression:org.hibernate.ejb.criteria.expression.function:org.hibernate.ejb.criteria.path:org.hibernate.ejb.criteria.predicate:org.hibernate.ejb.event:org.hibernate.ejb.instrument:org.hibernate.ejb.internal:org.hibernate.ejb.metamodel:org.hibernate.ejb.packaging:org.hibernate.ejb.util:org.hibernate.engine.spi:org.hibernate.cache.infinispan:org.hibernate.cache.infinispan.access:org.hibernate.cache.infinispan.collection:org.hibernate.cache.infinispan.entity:org.hibernate.cache.infinispan.impl:org.hibernate.cache.infinispan.naturalid:org.hibernate.cache.infinispan.query:org.hibernate.cache.infinispan.timestamp:org.hibernate.cache.infinispan.tm:org.hibernate.cache.infinispan.util:org.hibernate:org.hibernate.action.internal:org.hibernate.action.spi:org.hibernate.annotations:org.hibernate.bytecode.buildtime.internal:org.hibernate.bytecode.buildtime.spi:org.hibernate.bytecode.instrumentation.internal:org.hibernate.bytecode.instrumentation.internal.javassist:org.hibernate.bytecode.instrumentation.spi:org.hibernate.bytecode.internal.javassist:org.hibernate.bytecode.spi:org.hibernate.cache:org.hibernate.cache.internal:org.hibernate.cache.spi:org.hibernate.cache.spi.access:org.hibernate.cache.spi.entry:org.hibernate.cfg:org.hibernate.cfg.annotations:org.hibernate.cfg.annotations.reflection:org.hibernate.cfg.beanvalidation:org.hibernate.classic:org.hibernate.classic.:org.hibernate.collection.internal:org.hibernate.collection.spi:org.hibernate.context:org.hibernate.context.internal:org.hibernate.context.spi:org.hibernate.criterion:org.hibernate.dialect:org.hibernate.dialect.function:org.hibernate.dialect.lock:org.hibernate.dialect.resolver:org.hibernate.engine:org.hibernate.engine.internal:org.hibernate.engine.jdbc:org.hibernate.engine.jdbc.batch.internal:org.hibernate.engine.jdbc.batch.spi:org.hibernate.engine.jdbc.internal:org.hibernate.engine.jdbc.internal.proxy:org.hibernate.engine.jdbc.spi:org.hibernate.engine.loading.internal:org.hibernate.engine.profile:org.hibernate.engine.query.spi:org.hibernate.engine.query.spi.sql:org.hibernate.engine.transaction.internal:org.hibernate.engine.transaction.internal.jdbc:org.hibernate.engine.transaction.internal.jta:org.hibernate.engine.transaction.spi:org.hibernate.engine.transaction.synchronization.internal:org.hibernate.engine.transaction.synchronization.spi:org.hibernate.event.internal:org.hibernate.event.service.internal:org.hibernate.event.service.spi:org.hibernate.event.spi:org.hibernate.exception:org.hibernate.exception.internal:org.hibernate.exception.spi:org.hibernate.hql.internal:org.hibernate.hql.internal.antlr:org.hibernate.hql.internal.ast:org.hibernate.hql.internal.ast.exec:org.hibernate.hql.internal.ast.tree:org.hibernate.hql.internal.ast.util:org.hibernate.hql.internal.classic:org.hibernate.hql.internal.classic.:org.hibernate.hql.spi:org.hibernate.id:org.hibernate.id.enhanced:org.hibernate.id.factory:org.hibernate.id.factory.internal:org.hibernate.id.factory.spi:org.hibernate.id.insert:org.hibernate.id.uuid:org.hibernate.integrator.internal:org.hibernate.integrator.spi:org.hibernate.internal:org.hibernate.internal.jaxb:org.hibernate.internal.jaxb.cfg:org.hibernate.internal.jaxb.mapping.hbm:org.hibernate.internal.jaxb.mapping.orm:org.hibernate.internal.util:org.hibernate.internal.util.beans:org.hibernate.internal.util.collections:org.hibernate.internal.util.compare:org.hibernate.internal.util.config:org.hibernate.internal.util.io:org.hibernate.internal.util.jndi:org.hibernate.internal.util.xml:org.hibernate.jdbc:org.hibernate.jmx:org.hibernate.loader:org.hibernate.loader.collection:org.hibernate.loader.criteria:org.hibernate.loader.custom:org.hibernate.loader.custom.sql:org.hibernate.loader.entity:org.hibernate.loader.hql:org.hibernate.lob:org.hibernate.mapping:org.hibernate.metadata:org.hibernate.metamodel:org.hibernate.metamodel.binding:org.hibernate.metamodel.domain:org.hibernate.metamodel.relational:org.hibernate.metamodel.relational.state:org.hibernate.metamodel.source:org.hibernate.metamodel.source.annotations:org.hibernate.metamodel.source.annotations.attribute:org.hibernate.metamodel.source.annotations.attribute.type:org.hibernate.metamodel.source.annotations.entity:org.hibernate.metamodel.source.annotations.global:org.hibernate.metamodel.source.annotations.xml:org.hibernate.metamodel.source.annotations.xml.filter:org.hibernate.metamodel.source.annotations.xml.mocker:org.hibernate.metamodel.source.binder:org.hibernate.metamodel.source.hbm:org.hibernate.metamodel.source.internal:org.hibernate.param:org.hibernate.persister.collection:org.hibernate.persister.entity:org.hibernate.persister.internal:org.hibernate.persister.spi:org.hibernate.pretty:org.hibernate.property:org.hibernate.proxy:org.hibernate.proxy.dom4j:org.hibernate.proxy.map:org.hibernate.proxy.pojo:org.hibernate.proxy.pojo.javassist:org.hibernate.secure.internal:org.hibernate.service:org.hibernate.service.classloading.:org.hibernate.service.classloading.internal:org.hibernate.service.classloading.internal.:org.hibernate.service.classloading.spi:org.hibernate.service.classloading.spi.:org.hibernate.service.config.internal:org.hibernate.service.config.spi:org.hibernate.service.internal:org.hibernate.service.jdbc.connections.internal:org.hibernate.service.jdbc.connections.spi:org.hibernate.service.jdbc.dialect.internal:org.hibernate.service.jdbc.dialect.spi:org.hibernate.service.jmx.internal:org.hibernate.service.jmx.spi:org.hibernate.service.jndi:org.hibernate.service.jndi.internal:org.hibernate.service.jndi.spi:org.hibernate.service.jta.platform.internal:org.hibernate.service.jta.platform.spi:org.hibernate.service.spi:org.hibernate.sql:org.hibernate.sql.ordering.antlr:org.hibernate.stat:org.hibernate.stat.internal:org.hibernate.stat.spi:org.hibernate.tool.hbm2ddl:org.hibernate.tool.instrument:org.hibernate.tool.instrument.javassist:org.hibernate.transaction:org.hibernate.transform:org.hibernate.tuple:org.hibernate.tuple.component:org.hibernate.tuple.entity:org.hibernate.type:org.hibernate.type.descriptor:org.hibernate.type.descriptor.java:org.hibernate.type.descriptor.sql:org.hibernate.usertype:org.hibernate.envers:org.hibernate.envers.ant:org.hibernate.envers.configuration:org.hibernate.envers.configuration.metadata:org.hibernate.envers.configuration.metadata.reader:org.hibernate.envers.entities:org.hibernate.envers.entities.mapper:org.hibernate.envers.entities.mapper.id:org.hibernate.envers.entities.mapper.relation:org.hibernate.envers.entities.mapper.relation.component:org.hibernate.envers.entities.mapper.relation.lazy:org.hibernate.envers.entities.mapper.relation.lazy.initializor:org.hibernate.envers.entities.mapper.relation.lazy.proxy:org.hibernate.envers.entities.mapper.relation.query:org.hibernate.envers.event:org.hibernate.envers.exception:org.hibernate.envers.internal:org.hibernate.envers.query:org.hibernate.envers.query.criteria:org.hibernate.envers.query.impl:org.hibernate.envers.query.order:org.hibernate.envers.query.projection:org.hibernate.envers.query.property:org.hibernate.envers.reader:org.hibernate.envers.revisioninfo:org.hibernate.envers.strategy:org.hibernate.envers.synchronization:org.hibernate.envers.synchronization.work:org.hibernate.envers.tools:org.hibernate.envers.tools.graph:org.hibernate.envers.tools.query:org.hibernate.envers.tools.reflection:org.hibernate.tool:org.hibernate.tool.ant
-</packages>
+ <packages>org.hibernate.annotations.common:org.hibernate.annotations.common.annotationfactory:org.hibernate.annotations.common.reflection:org.hibernate.annotations.common.reflection.java:org.hibernate.annotations.common.reflection.java.generics:org.hibernate.annotations.common.util:org.hibernate.annotations.common.util.impl:org.hibernate.ejb:org.hibernate.ejb.cfg.spi:org.hibernate.ejb.connection:org.hibernate.ejb.criteria:org.hibernate.ejb.criteria.expression:org.hibernate.ejb.criteria.expression.function:org.hibernate.ejb.criteria.path:org.hibernate.ejb.criteria.predicate:org.hibernate.ejb.event:org.hibernate.ejb.instrument:org.hibernate.ejb.internal:org.hibernate.ejb.metamodel:org.hibernate.ejb.packaging:org.hibernate.ejb.util:org.hibernate.engine.spi:org.hibernate.cache.infinispan:org.hibernate.cache.infinispan.access:org.hibernate.cache.infinispan.collection:org.hibernate.cache.infinispan.entity:org.hibernate.cache.infinispan.impl:org.hibernate.cache.infinispan.naturalid:org.hibernate.cache.infinispan.query:org.hibernate.cache.infinispan.timestamp:org.hibernate.cache.infinispan.tm:org.hibernate.cache.infinispan.util:org.hibernate:org.hibernate.action.internal:org.hibernate.action.spi:org.hibernate.annotations:org.hibernate.bytecode.buildtime.internal:org.hibernate.bytecode.buildtime.spi:org.hibernate.bytecode.instrumentation.internal:org.hibernate.bytecode.instrumentation.internal.javassist:org.hibernate.bytecode.instrumentation.spi:org.hibernate.bytecode.internal.javassist:org.hibernate.bytecode.spi:org.hibernate.cache:org.hibernate.cache.internal:org.hibernate.cache.spi:org.hibernate.cache.spi.access:org.hibernate.cache.spi.entry:org.hibernate.cfg:org.hibernate.cfg.annotations:org.hibernate.cfg.annotations.reflection:org.hibernate.cfg.beanvalidation:org.hibernate.classic:org.hibernate.classic.:org.hibernate.collection.internal:org.hibernate.collection.spi:org.hibernate.context:org.hibernate.context.internal:org.hibernate.context.spi:org.hibernate.criterion:org.hibernate.dialect:org.hibernate.dialect.function:org.hibernate.dialect.lock:org.hibernate.dialect.resolver:org.hibernate.engine:org.hibernate.engine.internal:org.hibernate.engine.jdbc:org.hibernate.engine.jdbc.batch.internal:org.hibernate.engine.jdbc.batch.spi:org.hibernate.engine.jdbc.internal:org.hibernate.engine.jdbc.internal.proxy:org.hibernate.engine.jdbc.spi:org.hibernate.engine.loading.internal:org.hibernate.engine.profile:org.hibernate.engine.query.spi:org.hibernate.engine.query.spi.sql:org.hibernate.engine.transaction.internal:org.hibernate.engine.transaction.internal.jdbc:org.hibernate.engine.transaction.internal.jta:org.hibernate.engine.transaction.spi:org.hibernate.engine.transaction.synchronization.internal:org.hibernate.engine.transaction.synchronization.spi:org.hibernate.event.internal:org.hibernate.event.service.internal:org.hibernate.event.service.spi:org.hibernate.event.spi:org.hibernate.exception:org.hibernate.exception.internal:org.hibernate.exception.spi:org.hibernate.hql.internal:org.hibernate.hql.internal.antlr:org.hibernate.hql.internal.ast:org.hibernate.hql.internal.ast.exec:org.hibernate.hql.internal.ast.tree:org.hibernate.hql.internal.ast.util:org.hibernate.hql.internal.classic:org.hibernate.hql.internal.classic.:org.hibernate.hql.spi:org.hibernate.id:org.hibernate.id.enhanced:org.hibernate.id.factory:org.hibernate.id.factory.internal:org.hibernate.id.factory.spi:org.hibernate.id.insert:org.hibernate.id.uuid:org.hibernate.integrator.internal:org.hibernate.integrator.spi:org.hibernate.internal:org.hibernate.internal.jaxb:org.hibernate.internal.jaxb.cfg:org.hibernate.internal.jaxb.mapping.hbm:org.hibernate.internal.jaxb.mapping.orm:org.hibernate.internal.util:org.hibernate.internal.util.beans:org.hibernate.internal.util.collections:org.hibernate.internal.util.compare:org.hibernate.internal.util.config:org.hibernate.internal.util.io:org.hibernate.internal.util.jndi:org.hibernate.internal.util.xml:org.hibernate.jdbc:org.hibernate.jmx:org.hibernate.loader:org.hibernate.loader.collection:org.hibernate.loader.criteria:org.hibernate.loader.custom:org.hibernate.loader.custom.sql:org.hibernate.loader.entity:org.hibernate.loader.hql:org.hibernate.lob:org.hibernate.mapping:org.hibernate.metadata:org.hibernate.metamodel:org.hibernate.metamodel.binding:org.hibernate.metamodel.domain:org.hibernate.metamodel.relational:org.hibernate.metamodel.relational.state:org.hibernate.metamodel.source:org.hibernate.metamodel.source.annotations:org.hibernate.metamodel.source.annotations.attribute:org.hibernate.metamodel.source.annotations.attribute.type:org.hibernate.metamodel.source.annotations.entity:org.hibernate.metamodel.source.annotations.global:org.hibernate.metamodel.source.annotations.xml:org.hibernate.metamodel.source.annotations.xml.filter:org.hibernate.metamodel.source.annotations.xml.mocker:org.hibernate.metamodel.source.binder:org.hibernate.metamodel.source.hbm:org.hibernate.metamodel.source.internal:org.hibernate.param:org.hibernate.persister.collection:org.hibernate.persister.entity:org.hibernate.persister.internal:org.hibernate.persister.spi:org.hibernate.pretty:org.hibernate.property:org.hibernate.proxy:org.hibernate.proxy.dom4j:org.hibernate.proxy.map:org.hibernate.proxy.pojo:org.hibernate.proxy.pojo.javassist:org.hibernate.secure.internal:org.hibernate.service:org.hibernate.service.classloading.:org.hibernate.service.classloading.internal:org.hibernate.service.classloading.internal.:org.hibernate.service.classloading.spi:org.hibernate.service.classloading.spi.:org.hibernate.service.config.internal:org.hibernate.service.config.spi:org.hibernate.service.internal:org.hibernate.service.jdbc.connections.internal:org.hibernate.service.jdbc.connections.spi:org.hibernate.service.jdbc.dialect.internal:org.hibernate.service.jdbc.dialect.spi:org.hibernate.service.jmx.internal:org.hibernate.service.jmx.spi:org.hibernate.service.jndi:org.hibernate.service.jndi.internal:org.hibernate.service.jndi.spi:org.hibernate.service.jta.platform.internal:org.hibernate.service.jta.platform.spi:org.hibernate.service.spi:org.hibernate.sql:org.hibernate.sql.ordering.antlr:org.hibernate.stat:org.hibernate.stat.internal:org.hibernate.stat.spi:org.hibernate.tool.hbm2ddl:org.hibernate.tool.instrument:org.hibernate.tool.instrument.javassist:org.hibernate.transaction:org.hibernate.transform:org.hibernate.tuple:org.hibernate.tuple.component:org.hibernate.tuple.entity:org.hibernate.type:org.hibernate.type.descriptor:org.hibernate.type.descriptor.java:org.hibernate.type.descriptor.sql:org.hibernate.usertype</packages>
+ </group>
+ <group>
+ <title>Module org.hibernate.envers</title>
+ <packages>org.hibernate.envers:org.hibernate.envers.ant:org.hibernate.envers.configuration:org.hibernate.envers.configuration.metadata:org.hibernate.envers.configuration.metadata.reader:org.hibernate.envers.entities:org.hibernate.envers.entities.mapper:org.hibernate.envers.entities.mapper.id:org.hibernate.envers.entities.mapper.relation:org.hibernate.envers.entities.mapper.relation.component:org.hibernate.envers.entities.mapper.relation.lazy:org.hibernate.envers.entities.mapper.relation.lazy.initializor:org.hibernate.envers.entities.mapper.relation.lazy.proxy:org.hibernate.envers.entities.mapper.relation.query:org.hibernate.envers.event:org.hibernate.envers.exception:org.hibernate.envers.internal:org.hibernate.envers.query:org.hibernate.envers.query.criteria:org.hibernate.envers.query.impl:org.hibernate.envers.query.order:org.hibernate.envers.query.projection:org.hibernate.envers.query.property:org.hibernate.envers.reader:org.hibernate.envers.revisioninfo:org.hibernate.envers.strategy:org.hibernate.envers.synchronization:org.hibernate.envers.synchronization.work:org.hibernate.envers.tools:org.hibernate.envers.tools.graph:org.hibernate.envers.tools.query:org.hibernate.envers.tools.reflection:org.hibernate.tool:org.hibernate.tool.ant</packages>
</group>
<group>
<title>Module org.hibernate.validator</title>
View
40 build/src/main/resources/modules/org/hibernate/envers/main/module.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software 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 software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.hibernate.envers">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="org.hibernate"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.dom4j"/>
+ <module name="javax.api"/>
+ <module name="javax.persistence.api"/>
+ <module name="javax.transaction.api"/>
+ <module name="org.hibernate.commons-annotations"/>
+ <module name="org.javassist"/>
+ </dependencies>
+</module>
View
1 build/src/main/resources/modules/org/hibernate/main/module.xml
@@ -41,6 +41,7 @@
<module name="org.javassist"/>
<module name="org.jboss.as.jpa.hibernate" slot="4" optional="true"/>
<module name="org.jboss.logging"/>
+ <module name="org.hibernate.envers" services="import" optional="true"/>
<module name="org.hibernate.commons-annotations"/>
</dependencies>
</module>
View
6 jpa/core/src/main/java/org/jboss/as/jpa/processor/JPADependencyProcessor.java
@@ -64,9 +64,11 @@
private static final ModuleIdentifier JAVAEE_API_ID = ModuleIdentifier.create("javaee.api");
private static final ModuleIdentifier JBOSS_AS_JPA_ID = ModuleIdentifier.create("org.jboss.as.jpa");
private static final ModuleIdentifier JBOSS_AS_JPA_SPI_ID = ModuleIdentifier.create("org.jboss.as.jpa.spi");
+ private static final ModuleIdentifier JAVASSIST_ID = ModuleIdentifier.create("org.javassist");
private static final ModuleIdentifier HIBERNATE_3_PROVIDER = ModuleIdentifier.create("org.jboss.as.jpa.hibernate", "3");
private static final String HIBERNATE3_PROVIDER_ADAPTOR = "org.jboss.as.jpa.hibernate3.HibernatePersistenceProviderAdaptor";
+ private static final ModuleIdentifier HIBERNATE_ENVERS_ID = ModuleIdentifier.create("org.hibernate.envers");
// module dependencies for hibernate3
private static final ModuleIdentifier JBOSS_AS_NAMING_ID = ModuleIdentifier.create("org.jboss.as.naming");
private static final ModuleIdentifier JBOSS_JANDEX_ID = ModuleIdentifier.create("org.jboss.jandex");
@@ -85,7 +87,7 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
if (!JPADeploymentMarker.isJPADeployment(deploymentUnit)) {
return; // Skip if there are no persistence use in the deployment
}
- addDependency(moduleSpecification, moduleLoader, deploymentUnit, JAVAEE_API_ID, JBOSS_AS_JPA_ID, JBOSS_AS_JPA_SPI_ID);
+ addDependency(moduleSpecification, moduleLoader, deploymentUnit, JAVAEE_API_ID, JBOSS_AS_JPA_ID, JBOSS_AS_JPA_SPI_ID, JAVASSIST_ID);
addPersistenceProviderModuleDependencies(phaseContext, moduleSpecification, moduleLoader);
}
@@ -133,6 +135,8 @@ private void addPersistenceProviderModuleDependencies(DeploymentPhaseContext pha
moduleDependencies.add(Configuration.PROVIDER_MODULE_DEFAULT);
ROOT_LOGGER.debugf("added (default provider) %s dependency to %s (since %d PU(s) didn't specify %s",
Configuration.PROVIDER_MODULE_DEFAULT, deploymentUnit.getName(),defaultProviderCount, Configuration.PROVIDER_MODULE + ")");
+ // only inject default envers for default Hibernate module
+ addDependency(moduleSpecification, moduleLoader, deploymentUnit, HIBERNATE_ENVERS_ID);
}
// add persistence provider dependency
View
1 .../jboss/as/test/compat/jpa/hibernate/Hibernate3EmbeddedProviderNullDataSourceTestCase.java
@@ -170,7 +170,6 @@ private static void addHibernate3JarsToEar(EnterpriseArchive ear) {
" <dependencies>" +
" <module name=\"com.h2database.h2\" />" +
" <module name=\"org.slf4j\"/>" +
- " <module name=\"org.javassist\"/>" +
" </dependencies>" +
" </deployment>" +
"</jboss-deployment-structure>"),
View
1 .../test/java/org/jboss/as/test/compat/jpa/hibernate/Hibernate3EmbeddedProviderTestCase.java
@@ -158,7 +158,6 @@ private static void addHibernate3JarsToEar(EnterpriseArchive ear) {
" <dependencies>" +
" <module name=\"com.h2database.h2\" />" +
" <module name=\"org.slf4j\"/>" +
- " <module name=\"org.javassist\"/>" +
" </dependencies>" +
" </deployment>" +
"</jboss-deployment-structure>"),
View
1 ...g/jboss/as/test/compat/jpa/hibernate/envers/HibernateEnvers3EmbeddedProviderTestCase.java
@@ -111,7 +111,6 @@ private static void addHibernate3JarsToEar(EnterpriseArchive ear) {
" <dependencies>" +
" <module name=\"com.h2database.h2\" />" +
" <module name=\"org.slf4j\"/>" +
- " <module name=\"org.javassist\"/>" +
" </dependencies>" +
" </deployment>" +
"</jboss-deployment-structure>"),
View
1 ...jboss/as/test/compat/jpa/hibernate/persistencebootstrap/PersistenceBootstrapTestCase.java
@@ -124,7 +124,6 @@ private static void addHibernate3JarsToEar(EnterpriseArchive ear) {
" <dependencies>" +
" <module name=\"com.h2database.h2\" />" +
" <module name=\"org.slf4j\"/>" +
- " <module name=\"org.javassist\"/>" +
" </dependencies>" +
" </deployment>" +
"</jboss-deployment-structure>"),
View
2 .../src/test/java/org/jboss/as/test/integration/hibernate/Hibernate2LCacheStatsTestCase.java
@@ -59,7 +59,7 @@
public class Hibernate2LCacheStatsTestCase {
private static final String FACTORY_CLASS = "<property name=\"hibernate.cache.region.factory_class\">org.jboss.as.jpa.hibernate4.infinispan.InfinispanRegionFactory</property>";
- private static final String MODULE_DEPENDENCIES = "Dependencies: org.javassist export, org.infinispan export,org.hibernate\n";
+ private static final String MODULE_DEPENDENCIES = "Dependencies: org.javassist export, org.infinispan export,org.hibernate.envers export,org.hibernate\n";
private static final String ARCHIVE_NAME = "hibernateSecondLevelStats_test";
View
2 ...ava/org/jboss/as/test/integration/hibernate/envers/Hibernate4NativeAPIEnversTestCase.java
@@ -85,7 +85,7 @@ public static void beforeClass() throws NamingException {
EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, ARCHIVE_NAME + ".ear");
// add required jars as manifest dependencies
- ear.addAsManifestResource(new StringAsset("Dependencies: org.hibernate\n"), "MANIFEST.MF");
+ ear.addAsManifestResource(new StringAsset("Dependencies: org.hibernate.envers export,org.hibernate\n"), "MANIFEST.MF");
JavaArchive lib = ShrinkWrap.create(JavaArchive.class, "beans.jar");
lib.addClasses(SFSBHibernateEnversSessionFactory.class);
View
2 ...oss/as/test/integration/hibernate/secondlevelcache/HibernateSecondLevelCacheTestCase.java
@@ -55,7 +55,7 @@
public class HibernateSecondLevelCacheTestCase {
private static final String FACTORY_CLASS="<property name=\"hibernate.cache.region.factory_class\">org.jboss.as.jpa.hibernate4.infinispan.InfinispanRegionFactory</property>";
- private static final String MODULE_DEPENDENCIES ="Dependencies: org.infinispan,org.hibernate\n";
+ private static final String MODULE_DEPENDENCIES ="Dependencies: org.infinispan,org.hibernate.envers export,org.hibernate\n";
private static final String ARCHIVE_NAME = "hibernateSecondLevel_test";

0 comments on commit c52a48e

Please sign in to comment.