You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/06/15 08:02:35 UTC
svn commit: r547538 - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/config/wrapper/
main/java/org/apache/tuscany/das/rdb/generator/impl/
main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/
main/java/org/apache/tuscany...
Author: lresende
Date: Thu Jun 14 23:02:32 2007
New Revision: 547538
URL: http://svn.apache.org/viewvc?view=rev&rev=547538
Log:
TUSCANY-1349 Removing logger factory and calling log4j factory directly without specifying any default behaviour (like default debug level), as this was causing issues during enable of the log trough log4j properties file
Removed:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java Thu Jun 14 23:02:32 2007
@@ -40,7 +40,6 @@
import org.apache.tuscany.das.rdb.config.Relationship;
import org.apache.tuscany.das.rdb.config.Table;
import org.apache.tuscany.das.rdb.config.Update;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.Property;
@@ -48,7 +47,7 @@
private static final ConfigFactory FACTORY = ConfigFactory.INSTANCE;
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(MappingWrapper.class);
+ private final Logger logger = Logger.getLogger(MappingWrapper.class);
private Config config;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java Thu Jun 14 23:02:32 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.das.rdb.config.wrapper;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
public class QualifiedColumn {
@@ -28,7 +27,7 @@
private final String columnName;
private final String schemaName;//JIRA-952
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(QualifiedColumn.class);
+ private final Logger logger = Logger.getLogger(QualifiedColumn.class);
public QualifiedColumn(String name) {
this.schemaName = "";
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java Thu Jun 14 23:02:32 2007
@@ -27,13 +27,12 @@
import org.apache.tuscany.das.rdb.impl.DeleteCommandImpl;
import org.apache.tuscany.das.rdb.impl.ParameterImpl;
import org.apache.tuscany.das.rdb.impl.SDODataTypes;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
public final class DeleteGenerator extends BaseGenerator {
public static final DeleteGenerator INSTANCE = new DeleteGenerator();
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(DeleteGenerator.class);
+ private final Logger logger = Logger.getLogger(DeleteGenerator.class);
private DeleteGenerator() {
super();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java Thu Jun 14 23:02:32 2007
@@ -33,7 +33,6 @@
import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
import org.apache.tuscany.das.rdb.impl.InsertCommandImpl;
import org.apache.tuscany.das.rdb.impl.ParameterImpl;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -42,7 +41,7 @@
public static final InsertGenerator INSTANCE = new InsertGenerator();
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(InsertGenerator.class);
+ private final Logger logger = Logger.getLogger(InsertGenerator.class);
private InsertGenerator() {
super();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java Thu Jun 14 23:02:32 2007
@@ -34,7 +34,6 @@
import org.apache.tuscany.das.rdb.impl.OptimisticWriteCommandImpl;
import org.apache.tuscany.das.rdb.impl.ParameterImpl;
import org.apache.tuscany.das.rdb.impl.UpdateCommandImpl;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataObject;
@@ -46,7 +45,7 @@
public static final UpdateGenerator INSTANCE = new UpdateGenerator();
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(UpdateGenerator.class);
+ private final Logger logger = Logger.getLogger(UpdateGenerator.class);
private UpdateGenerator() {
super();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java Thu Jun 14 23:02:32 2007
@@ -21,7 +21,6 @@
import java.util.Iterator;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -32,7 +31,7 @@
private final DataObject rootObject;
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(DataObjectMaker.class);
+ private final Logger logger = Logger.getLogger(DataObjectMaker.class);
public DataObjectMaker(DataObject root) {
this.rootObject = root;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java Thu Jun 14 23:02:32 2007
@@ -24,7 +24,6 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
@@ -34,7 +33,7 @@
* efficient if we could use LinkedHashMap from JDK 1.4
*/
public class MultiTableRegistry implements TableRegistry {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(MultiTableRegistry.class);
+ private final Logger logger = Logger.getLogger(MultiTableRegistry.class);
private Map tableNameMap;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java Thu Jun 14 23:02:32 2007
@@ -23,7 +23,6 @@
import java.util.Iterator;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
@@ -32,7 +31,7 @@
* A ResultSetProcessor is used to transform the data in a ResultSet into a set of inter-related EDataObjects.
*/
public class ResultSetProcessor {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(ResultSetProcessor.class);
+ private final Logger logger = Logger.getLogger(ResultSetProcessor.class);
private TableRegistry registry;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java Thu Jun 14 23:02:32 2007
@@ -26,14 +26,13 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
/**
*
* A ResultSetRow is used to transform a single row of a ResultSet into a set of EDataObjects.
*/
public class ResultSetRow {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(ResultSetRow.class);
+ private final Logger logger = Logger.getLogger(ResultSetRow.class);
private final ResultMetadata metadata;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java Thu Jun 14 23:02:32 2007
@@ -28,13 +28,12 @@
import org.apache.tuscany.das.rdb.config.KeyPair;
import org.apache.tuscany.das.rdb.config.Relationship;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
public class RowObjects {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(RowObjects.class);
+ private final Logger logger = Logger.getLogger(RowObjects.class);
private Map objectsByTableName;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java Thu Jun 14 23:02:32 2007
@@ -24,10 +24,9 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
public class TableData {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(TableData.class);
+ private final Logger logger = Logger.getLogger(TableData.class);
private Map columnData = new HashMap();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java Thu Jun 14 23:02:32 2007
@@ -22,7 +22,6 @@
import org.apache.log4j.Logger;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
@@ -31,7 +30,7 @@
*/
public class ApplyChangesCommandImpl extends BaseCommandImpl {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(ApplyChangesCommandImpl.class);
+ private final Logger logger = Logger.getLogger(ApplyChangesCommandImpl.class);
private ChangeSummarizer summarizer = new ChangeSummarizer();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java Thu Jun 14 23:02:32 2007
@@ -28,12 +28,11 @@
import org.apache.tuscany.das.rdb.generator.impl.DeleteGenerator;
import org.apache.tuscany.das.rdb.generator.impl.InsertGenerator;
import org.apache.tuscany.das.rdb.generator.impl.UpdateGenerator;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
public class ChangeFactory {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(ChangeFactory.class);
+ private final Logger logger = Logger.getLogger(ChangeFactory.class);
private InsertCommandImpl createCommand;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java Thu Jun 14 23:02:32 2007
@@ -21,7 +21,6 @@
import java.util.Iterator;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
@@ -32,7 +31,7 @@
protected String propagatedID;
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(ChangeOperation.class);
+ private final Logger logger = Logger.getLogger(ChangeOperation.class);
private final WriteCommandImpl writeCommand;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java Thu Jun 14 23:02:32 2007
@@ -32,7 +32,6 @@
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.config.wrapper.RelationshipWrapper;
import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
import commonj.sdo.ChangeSummary;
@@ -42,7 +41,7 @@
public class ChangeSummarizer {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(ChangeSummarizer.class);
+ private final Logger logger = Logger.getLogger(ChangeSummarizer.class);
private Changes changes = new Changes();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java Thu Jun 14 23:02:32 2007
@@ -27,11 +27,10 @@
import java.sql.Statement;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
public class ConnectionImpl {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(ConnectionImpl.class);
+ private final Logger logger = Logger.getLogger(ConnectionImpl.class);
private Connection connection;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java Thu Jun 14 23:02:32 2007
@@ -18,16 +18,12 @@
*/
package org.apache.tuscany.das.rdb.impl;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.ConfigHelper;
import org.apache.tuscany.das.rdb.config.Column;
import org.apache.tuscany.das.rdb.config.Config;
import org.apache.tuscany.das.rdb.config.KeyPair;
@@ -35,9 +31,7 @@
import org.apache.tuscany.das.rdb.config.Table;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.config.wrapper.TableWrapper;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
-import commonj.sdo.DataGraph;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -48,7 +42,7 @@
*/
public class DatabaseObject {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(DatabaseObject.class);
+ private final Logger logger = Logger.getLogger(DatabaseObject.class);
private final MappingWrapper mappingWrapper;
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java Thu Jun 14 23:02:32 2007
@@ -23,13 +23,12 @@
import org.apache.log4j.Logger;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.Type;
public class FactoryRegistry {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(FactoryRegistry.class);
+ private final Logger logger = Logger.getLogger(FactoryRegistry.class);
private Map registry = new HashMap();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java Thu Jun 14 23:02:32 2007
@@ -26,7 +26,6 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
/**
* InsertList will sort ChangeOperation objects so that parents are inserted before children
@@ -34,7 +33,7 @@
*
*/
public class InsertList {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(InsertList.class);
+ private final Logger logger = Logger.getLogger(InsertList.class);
private Map opsByTableName = new HashMap();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java Thu Jun 14 23:02:32 2007
@@ -23,12 +23,11 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.Type;
public class Parameters {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(Parameters.class);
+ private final Logger logger = Logger.getLogger(Parameters.class);
private List parameters = new ArrayList();
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java Thu Jun 14 23:02:32 2007
@@ -25,14 +25,13 @@
import org.apache.log4j.Logger;
import org.apache.tuscany.das.rdb.config.Parameter;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
import commonj.sdo.helper.TypeHelper;
public class SPCommandImpl extends ReadCommandImpl {
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(SPCommandImpl.class);
+ private final Logger logger = Logger.getLogger(SPCommandImpl.class);
public SPCommandImpl(String sqlString, MappingWrapper config, List params) {
super(sqlString, config, null);
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java Thu Jun 14 23:02:32 2007
@@ -29,7 +29,6 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
// TODO - Can use some refactoring. Much code is duplicated in "execute" methods
public class Statement {
@@ -38,7 +37,7 @@
protected ConnectionImpl jdbcConnection;
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(Statement.class);
+ private final Logger logger = Logger.getLogger(Statement.class);
private PreparedStatement preparedStatement;
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java?view=diff&rev=547538&r1=547537&r2=547538
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java Thu Jun 14 23:02:32 2007
@@ -23,7 +23,6 @@
import java.sql.SQLException;
import org.apache.log4j.Logger;
-import org.apache.tuscany.das.rdb.util.LoggerFactory;
public abstract class TestDataWithExplicitColumns extends TestData {
@@ -31,7 +30,7 @@
private int[] sqlTypes;
- private final Logger logger = LoggerFactory.INSTANCE.getLogger(TestDataWithExplicitColumns.class);
+ private final Logger logger = Logger.getLogger(TestDataWithExplicitColumns.class);
public TestDataWithExplicitColumns(Connection c, Object[][] data, String[] columns, int[] sqlTypes) {
super(c, data);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org