This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 16e8cfbd6a3a9cb96a883270907792400790dc49 (commit) from 8d16d5325738f9816f3a191208ccf54cbeaffd3f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=16e8cfbd6a3a9cb96a8832709... http://github.com/ceki/logback/commit/16e8cfbd6a3a9cb96a883270907792400790dc... commit 16e8cfbd6a3a9cb96a883270907792400790dc49 Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Mar 23 18:47:06 2010 +0100 - tests run on oracle (host=hora) diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 477d694..b52f8f1 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -314,7 +314,6 @@ org.slf4j.test_osgi <profile> <!-- Integration tests require the host-orion profile --> <id>host-orion</id> - <dependencies> <!-- locally installed artifact --> <dependency> @@ -334,6 +333,19 @@ org.slf4j.test_osgi </profile> + <profile> + <!-- Integration tests require the host-hora profile --> + <id>host-hora</id> + <dependencies> + <!-- locally installed artifact --> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.2.0.1</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql index e670866..9ac0b79 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/oracle.sql @@ -13,11 +13,11 @@ CREATE SEQUENCE logging_event_id_seq MINVALUE 1 START WITH 1; - +CREATE SEQUENCE logging_event_id_seq MINVALUE 1 START WITH 1; CREATE TABLE logging_event ( timestmp NUMBER(20) NOT NULL, - formatted_message VARCHAR2(4000) NOT NULL, + formatted_message VARCHAR2(4000) NOT NULL, logger_name VARCHAR(254) NOT NULL, level_string VARCHAR(254) NOT NULL, thread_name VARCHAR(254), diff --git a/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml b/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml index 0f601fd..17f9a75 100644 --- a/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml +++ b/logback-classic/src/test/input/integration/db/oracle10g-with-driver.xml @@ -2,17 +2,17 @@ <configuration> - <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> - <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> - <driverClass>oracle.jdbc.OracleDriver</driverClass> - <url>jdbc:oracle:thin:@localhost:1522:xe</url> - <user>hr</user> - <password>hr</password> - </connectionSource> - </appender> - - <root> - <level value="debug" /> - <appender-ref ref="DB" /> - </root> + <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> + <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource"> + <driverClass>oracle.jdbc.OracleDriver</driverClass> + <url>jdbc:oracle:thin:@localhost:1521:xe</url> + <user>test</user> + <password>test</password> + </connectionSource> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="DB" /> + </root> </configuration> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java index 341d135..ce0d3da 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderIntegrationTest.java @@ -40,7 +40,8 @@ public class DBAppenderIntegrationTest { static String[] CONFORMING_HOST_LIST = new String[] { "Orion" }; static String[] POSTGRES_CONFORMING_HOST_LIST = new String[] { "haro" }; static String[] MYSQL_CONFORMING_HOST_LIST = new String[] { "haro" }; - + static String[] ORACLE_CONFORMING_HOST_LIST = new String[] { "haro" }; + int diff = new Random(System.nanoTime()).nextInt(10000); LoggerContext lc = new LoggerContext(); @@ -117,10 +118,9 @@ public class DBAppenderIntegrationTest { } @Test - @Ignore public void oracle10g() throws Exception { // perform test only on conforming hosts - if (!isConformingHostAndJDK16OrHigher()) { + if (!isConformingHostAndJDK16OrHigher(ORACLE_CONFORMING_HOST_LIST)) { return; } doTest("src/test/input/integration/db/oracle10g-with-driver.xml"); ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 14 ++++++++++- .../ch/qos/logback/classic/db/dialect/oracle.sql | 4 +- .../input/integration/db/oracle10g-with-driver.xml | 26 ++++++++++---------- .../classic/db/DBAppenderIntegrationTest.java | 6 ++-- 4 files changed, 31 insertions(+), 19 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.