Author: steve.ebersole(a)jboss.com Date: 2008-10-30 12:45:35 -0400 (Thu, 30 Oct 2008) New Revision: 15453 Added: core/trunk/envers/src/test/resources/log4j.properties Modified: core/trunk/envers/pom.xml core/trunk/envers/src/test/resources/hibernate.test.cfg.xml Log: HHH-3351 : import envers as core module Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2008-10-30 12:36:16 UTC (rev 15452) +++ core/trunk/envers/pom.xml 2008-10-30 16:45:35 UTC (rev 15453) @@ -1,6 +1,7 @@ <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> @@ -94,6 +95,10 @@ <artifactId>javassist</artifactId> </exclusion> <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> <!-- OMG, YUCK YUCK YUCK --> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> @@ -129,19 +134,21 @@ <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>5.8</version> + <classifier>jdk15</classifier> <scope>test</scope> - <classifier>jdk15</classifier> </dependency> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> - </dependency> - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.0.79</version> + <scope>test</scope> </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <scope>test</scope> + </dependency> </dependencies> <dependencyManagement> @@ -189,4 +196,5 @@ <!-- for now, at least, lets aggregate them --> <jbossenvers.reports.aggregate>true</jbossenvers.reports.aggregate> </properties> + </project> Modified: core/trunk/envers/src/test/resources/hibernate.test.cfg.xml =================================================================== --- core/trunk/envers/src/test/resources/hibernate.test.cfg.xml 2008-10-30 12:36:16 UTC (rev 15452) +++ core/trunk/envers/src/test/resources/hibernate.test.cfg.xml 2008-10-30 16:45:35 UTC (rev 15453) @@ -8,11 +8,8 @@ <session-factory> <property name="hbm2ddl.auto">create-drop</property> - <!--<property name="dialect">org.hibernate.dialect.MySQLDialect</property> - <property name="connection.url">jdbc:mysql:///hibernate_tests?useUnicode=true&amp;characterEncoding=UTF-8</property> - <property name="connection.driver_class">com.mysql.jdbc.Driver</property> - <property name="connection.username">root</property> - <property name="connection.password"></property>--> + <property name="show_sql">false</property> + <property name="format_sql">true</property> <property name="dialect">org.hibernate.dialect.H2Dialect</property> <property name="connection.url">jdbc:h2:mem:envers</property> @@ -20,15 +17,6 @@ <property name="connection.username">sa</property> <property name="connection.password"></property> - <!--<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property> - <property name="connection.url">jdbc:postgresql://localhost/hibernate_tests</property> - <property name="connection.driver_class">org.postgresql.Driver</property> - <property name="connection.username">postgres</property> - <property name="connection.password"></property>--> - - <property name="show_sql">false</property> - <property name="format_sql">true</property> - <event type="post-insert"> <listener class="org.hibernate.envers.event.VersionsEventListener" /> </event> Copied: core/trunk/envers/src/test/resources/log4j.properties (from rev 15426, core/trunk/core/src/test/resources/log4j.properties) =================================================================== --- core/trunk/envers/src/test/resources/log4j.properties (rev 0) +++ core/trunk/envers/src/test/resources/log4j.properties 2008-10-30 16:45:35 UTC (rev 15453) @@ -0,0 +1,32 @@ +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as +# indicated by the @author tags or express copyright attribution +# statements applied by the authors. All third-party contributions are +# distributed under license by Red Hat Middleware LLC. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# Lesser General Public License, as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License +# for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this distribution; if not, write to: +# Free Software Foundation, Inc. +# 51 Franklin Street, Fifth Floor +# Boston, MA 02110-1301 USA +# +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.rootLogger=info, stdout + +log4j.logger.org.hibernate.test=info +log4j.logger.org.hibernate.tool.hbm2ddl=debug \ No newline at end of file