You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/19 03:49:37 UTC
svn commit: r586220 -
/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/transformation/SQLTransformer.java
Author: vgritsenko
Date: Thu Oct 18 18:49:36 2007
New Revision: 586220
URL: http://svn.apache.org/viewvc?rev=586220&view=rev
Log:
switching to new AbstractLogEnabled
Modified:
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/transformation/SQLTransformer.java
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/transformation/SQLTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/transformation/SQLTransformer.java?rev=586220&r1=586219&r2=586220&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/transformation/SQLTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/transformation/SQLTransformer.java Thu Oct 18 18:49:36 2007
@@ -16,8 +16,8 @@
*/
package org.apache.cocoon.transformation;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.lang.reflect.Field;
@@ -29,29 +29,30 @@
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import java.util.List;
-import java.util.ArrayList;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.excalibur.xml.sax.SAXParser;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamInterpreter;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.xml.IncludeXMLConsumer;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.excalibur.xml.sax.SAXParser;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -343,7 +344,6 @@
case SQLTransformer.STATE_INSIDE_EXECUTE_QUERY_ELEMENT:
// Create root query (if query == null), or child query
this.query = new Query(this.query);
- this.query.enableLogging(getLogger().getChildLogger("query"));
state = SQLTransformer.STATE_INSIDE_EXECUTE_QUERY_ELEMENT;
break;
@@ -1035,14 +1035,13 @@
String type = (String) outParameters.get(counter);
int index = type.lastIndexOf(".");
- String className, fieldName;
if (index == -1) {
getLogger().error("Invalid SQLType: " + type, null);
throw new SQLException("Invalid SQLType: " + type);
}
- className = type.substring(0, index);
- fieldName = type.substring(index + 1, type.length());
+ String className = type.substring(0, index);
+ String fieldName = type.substring(index + 1, type.length());
try {
Class clss = Class.forName(className);
Field fld = clss.getField(fieldName);