Bug 42102: Add hsqldb dependency to build.xml, stale code in CustomSQLDBReceiver
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/companions/receivers/trunk@544828 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index ce4c9ef..2190ad0 100644
--- a/build.xml
+++ b/build.xml
@@ -36,9 +36,10 @@
<property name="m2_repo" location="${user.home}/.m2/repository"/>
<!-- Versions for dependencies -->
- <property name="log4j.version" value="1.2.15"/>
+ <property name="log4j.version" value="1.2.15-SNAPSHOT"/>
<property name="junit.version" value="4.3.1"/>
<property name="oro.version" value="2.0.8"/>
+ <property name="hsqldb.version" value="1.8.0.7"/>
<property name="component.version" value="1.0-SNAPSHOT"/>
<property name="filters.version" value="1.0-SNAPSHOT"/>
<property name="jms.version" value="1.1"/>
@@ -56,6 +57,8 @@
location="${m2_repo}/oro/oro/${oro.version}/oro-${oro.version}.jar"/>
<property name="jms.jar"
location="${m2_repo}/javax/jms/jms/${jms.version}/jms-${jms.version}.jar"/>
+ <property name="hsqldb.jar"
+ location="${m2_repo}/hsqldb/hsqldb/${hsqldb.version}/hsqldb-${hsqldb.version}.jar"/>
<!-- Java compiler settings -->
<property name="javac.source" value="1.2"/>
@@ -74,6 +77,7 @@
<path refid="compile-classpath"/>
<pathelement location="target/classes"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${hsqldb.jar}"/>
</path>
<target name="compile" depends="init" description="Compile implementation files">
diff --git a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
index a6b0365..16d9455 100644
--- a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
+++ b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
@@ -455,10 +455,12 @@
*/
public boolean parseUnrecognizedElement(Element element, Properties props) throws Exception {
if ("connectionSource".equals(element.getNodeName())) {
- OptionHandler instance =
+ Object instance =
DOMConfigurator.parseElement(element, props, ConnectionSource.class);
if (instance instanceof ConnectionSource) {
- setConnectionSource((ConnectionSource) instance);
+ ConnectionSource source = (ConnectionSource) instance;
+ source.activateOptions();
+ setConnectionSource(source);
}
return true;
}
