Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C346AD45D for ; Tue, 14 May 2013 17:10:17 +0000 (UTC) Received: (qmail 28064 invoked by uid 500); 14 May 2013 17:10:17 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 28036 invoked by uid 500); 14 May 2013 17:10:17 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 28023 invoked by uid 99); 14 May 2013 17:10:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 17:10:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 17:10:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C6C9C23888E4; Tue, 14 May 2013 17:09:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1482468 - in /logging/log4j/log4j2/trunk/core/src/test: java/org/apache/logging/log4j/core/appender/db/jpa/ resources/META-INF/ resources/org/apache/logging/log4j/core/appender/db/jpa/ Date: Tue, 14 May 2013 17:09:51 -0000 To: commits@logging.apache.org From: nickwilliams@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130514170951.C6C9C23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nickwilliams Date: Tue May 14 17:09:51 2013 New Revision: 1482468 URL: http://svn.apache.org/r1482468 Log: Renaming a test class so that its name is less ambiguous. Added: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java - copied, changed from r1481842, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java Removed: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java?rev=1482468&r1=1482467&r2=1482468&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java Tue May 14 17:09:51 2013 @@ -106,7 +106,7 @@ public class JPAAppenderTest { @Test public void testNoPersistenceUnitName() { - final JPAAppender appender = JPAAppender.createAppender("name", null, null, null, TestEntity.class.getName(), + final JPAAppender appender = JPAAppender.createAppender("name", null, null, null, TestBaseEntity.class.getName(), null); assertNull("The appender should be null.", appender); @@ -145,7 +145,7 @@ public class JPAAppenderTest { } @Test - @Ignore("until Hibernate implements support for @Convert, @Converter") + @Ignore("Until Hibernate fixes https://hibernate.atlassian.net/browse/HHH-8111") public void testBaseJpaEntityAppender() throws SQLException { try { this.setUp("log4j2-jpa-base.xml"); @@ -208,7 +208,7 @@ public class JPAAppenderTest { } @Test - @Ignore("until Hibernate implements support for @Convert, @Converter") + @Ignore("Until Hibernate fixes https://hibernate.atlassian.net/browse/HHH-8111") public void testBasicJpaEntityAppender() throws SQLException { try { this.setUp("log4j2-jpa-basic.xml"); @@ -271,7 +271,7 @@ public class JPAAppenderTest { } @SuppressWarnings("unused") - public static class BadConstructorEntity1 extends TestEntity { + public static class BadConstructorEntity1 extends TestBaseEntity { private static final long serialVersionUID = 1L; public BadConstructorEntity1(final LogEvent wrappedEvent) { @@ -280,7 +280,7 @@ public class JPAAppenderTest { } @SuppressWarnings("unused") - public static class BadConstructorEntity2 extends TestEntity { + public static class BadConstructorEntity2 extends TestBaseEntity { private static final long serialVersionUID = 1L; public BadConstructorEntity2() { Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java (from r1481842, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java) URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java&r1=1481842&r2=1482468&rev=1482468&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java Tue May 14 17:09:51 2013 @@ -16,14 +16,8 @@ */ package org.apache.logging.log4j.core.appender.db.jpa; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.appender.db.jpa.converter.MessageAttributeConverter; -import org.apache.logging.log4j.core.appender.db.jpa.converter.ThrowableAttributeConverter; -import org.apache.logging.log4j.message.Message; - +import java.util.Date; +import java.util.Map; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Convert; @@ -37,22 +31,28 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import java.util.Date; -import java.util.Map; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.ThreadContext; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.appender.db.jpa.converter.MessageAttributeConverter; +import org.apache.logging.log4j.core.appender.db.jpa.converter.ThrowableAttributeConverter; +import org.apache.logging.log4j.message.Message; @Entity @Table(name = "jpaBaseLogEntry") @SuppressWarnings("unused") -public class TestEntity extends AbstractLogEventWrapperEntity { +public class TestBaseEntity extends AbstractLogEventWrapperEntity { private static final long serialVersionUID = 1L; private long id = 0L; - public TestEntity() { + public TestBaseEntity() { super(); } - public TestEntity(final LogEvent wrappedEvent) { + public TestBaseEntity(final LogEvent wrappedEvent) { super(wrappedEvent); } Modified: logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml?rev=1482468&r1=1482467&r2=1482468&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml (original) +++ logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml Tue May 14 17:09:51 2013 @@ -24,8 +24,9 @@ org.hibernate.jpa.HibernatePersistenceProvider - org.apache.logging.log4j.core.appender.db.jpa.TestEntity - + org.apache.logging.log4j.core.appender.db.jpa.TestBaseEntity + false Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml?rev=1482468&r1=1482467&r2=1482468&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml (original) +++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml Tue May 14 17:09:51 2013 @@ -22,7 +22,7 @@ + entityClassName="org.apache.logging.log4j.core.appender.db.jpa.TestBaseEntity" />