Author: carnold
Date: Wed Jun 6 05:55:25 2007
New Revision: 544828
URL: http://svn.apache.org/viewvc?view=rev&rev=544828
Log:
Bug 42102: Add hsqldb dependency to build.xml, stale code in CustomSQLDBReceiver
Modified:
logging/log4j/companions/receivers/trunk/build.xml
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
Modified: logging/log4j/companions/receivers/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/build.xml?view=diff&rev=544828&r1=544827&r2=544828
==============================================================================
--- logging/log4j/companions/receivers/trunk/build.xml (original)
+++ logging/log4j/companions/receivers/trunk/build.xml Wed Jun 6 05:55:25 2007
@@ -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">
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java?view=diff&rev=544828&r1=544827&r2=544828
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
Wed Jun 6 05:55:25 2007
@@ -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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
