vgritsenko 2002/10/22 21:31:04 Modified: src/java/org/apache/cocoon/transformation Tag: cocoon_2_0_3_branch SQLTransformer.java src/blocks/databases/java/org/apache/cocoon/transformation SQLTransformer.java Log: nitpicking Revision Changes Path No revision No revision 1.10.2.3 +43 -43 xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/SQLTransformer.java Index: SQLTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v retrieving revision 1.10.2.2 retrieving revision 1.10.2.3 diff -u -r1.10.2.2 -r1.10.2.3 --- SQLTransformer.java 23 Sep 2002 06:38:50 -0000 1.10.2.2 +++ SQLTransformer.java 23 Oct 2002 04:31:04 -0000 1.10.2.3 @@ -87,7 +87,6 @@ * @author <a href="mailto:sven.beauprez@;the-ecorp.com">Sven Beauprez</a> * @version CVS $Id$ */ - public class SQLTransformer extends AbstractSAXTransformer implements Composable, Disposable, Configurable { @@ -209,7 +208,7 @@ try { this.dbSelector = (ComponentSelector) manager.lookup( DataSourceComponent.ROLE + "Selector" ); } catch ( ComponentException cme ) { - this.getLogger().warn( "Could not get the DataSource Selector", cme ); + getLogger().warn( "Could not get the DataSource Selector", cme ); } } @@ -235,7 +234,8 @@ */ public void dispose() { if ( this.dbSelector != null ) { - this.manager.release( (Component) this.dbSelector ); + this.manager.release( this.dbSelector ); + this.dbSelector = null; } } @@ -246,8 +246,8 @@ super.configure( conf ); if ( conf != null ) { this.oldDriver = conf.getChild( "old-driver" ).getValueAsBoolean( false ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "old-driver is " + this.oldDriver + " for " + this ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "old-driver is " + this.oldDriver + " for " + this ); } this.connectAttempts = conf.getChild("connect-attempts").getValueAsInteger(5); @@ -267,17 +267,17 @@ this.current_state = SQLTransformer.STATE_OUTSIDE; this.showNrOfRows = parameters.getParameterAsBoolean( SQLTransformer.MAGIC_NR_OF_ROWS, false ); - if ( this.getLogger().isDebugEnabled() ) { + if ( getLogger().isDebugEnabled() ) { if ( this.parameters.getParameter( SQLTransformer.MAGIC_CONNECTION , null ) != null ) { - this.getLogger().debug( "CONNECTION: " + this.parameters.getParameter( SQLTransformer.MAGIC_CONNECTION , null ) ); + getLogger().debug( "CONNECTION: " + this.parameters.getParameter( SQLTransformer.MAGIC_CONNECTION , null ) ); } else { - this.getLogger().debug( "DBURL: " + parameters.getParameter( SQLTransformer.MAGIC_DBURL, null ) ); - this.getLogger().debug( "USERNAME: " + parameters.getParameter( SQLTransformer.MAGIC_USERNAME, null ) ); + getLogger().debug( "DBURL: " + parameters.getParameter( SQLTransformer.MAGIC_DBURL, null ) ); + getLogger().debug( "USERNAME: " + parameters.getParameter( SQLTransformer.MAGIC_USERNAME, null ) ); } - this.getLogger().debug( "DOC-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_DOC_ELEMENT, "rowset" ) ); - this.getLogger().debug( "ROW-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_ROW_ELEMENT, "row" ) ); - this.getLogger().debug( "NS-URI: " + parameters.getParameter( SQLTransformer.MAGIC_NS_URI_ELEMENT, NAMESPACE ) ); - this.getLogger().debug( "NS-PREFIX: " + parameters.getParameter( SQLTransformer.MAGIC_NS_PREFIX_ELEMENT, "" ) ); + getLogger().debug( "DOC-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_DOC_ELEMENT, "rowset" ) ); + getLogger().debug( "ROW-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_ROW_ELEMENT, "row" ) ); + getLogger().debug( "NS-URI: " + parameters.getParameter( SQLTransformer.MAGIC_NS_URI_ELEMENT, NAMESPACE ) ); + getLogger().debug( "NS-PREFIX: " + parameters.getParameter( SQLTransformer.MAGIC_NS_PREFIX_ELEMENT, "" ) ); } } @@ -286,8 +286,8 @@ */ protected void executeQuery( int index ) throws SAXException { - if ( this.getLogger().isDebugEnabled() ) { - this.getLogger().debug( "SQLTransformer executing query nr " + index ); + if ( getLogger().isDebugEnabled() ) { + getLogger().debug( "SQLTransformer executing query nr " + index ); } this.outUri = getCurrentQuery().properties.getParameter( SQLTransformer.MAGIC_NS_URI_ELEMENT, NAMESPACE ); @@ -304,8 +304,8 @@ try { query.execute(); } catch ( SQLException e ) { - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SQLTransformer:.executeQuery() query.execute failed ", e ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SQLTransformer:.executeQuery() query.execute failed ", e ); } AttributesImpl my_attr = new AttributesImpl(); this.start( query.rowset_name, my_attr ); @@ -345,7 +345,7 @@ this.end( query.rowset_name ); } } catch ( SQLException e ) { - if (this.getLogger().isDebugEnabled()) { + if (getLogger().isDebugEnabled()) { getLogger().debug( "SQLTransformer.executeQuery()", e ); } throw new SAXException( e ); @@ -426,8 +426,8 @@ final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } current_state = SQLTransformer.STATE_INSIDE_EXECUTE_QUERY_ELEMENT; @@ -445,8 +445,8 @@ final String value = this.endTextRecording(); this.getCurrentQuery().setParameter(name, value); this.current_state = SQLTransformer.STATE_INSIDE_EXECUTE_QUERY_ELEMENT; - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SETTING VALUE ELEMENT name {" + + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SETTING VALUE ELEMENT name {" + name + "} value {" + value + "}" ); } break; @@ -481,8 +481,8 @@ level = Integer.parseInt( attributes.getValue( NAMESPACE, SQLTransformer.MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE ) ); } catch ( Exception e ) { - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SQLTransformer", e ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SQLTransformer", e ); } throwIllegalStateException( "Ancestor value elements must have a " + SQLTransformer.MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE + " attribute" ); @@ -494,15 +494,15 @@ SQLTransformer.MAGIC_ANCESTOR_VALUE_NAME_ATTRIBUTE + " attribute" ); } AncestorValue av = new AncestorValue( level, name ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "ANCESTOR VALUE " + level + " " + name ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "ANCESTOR VALUE " + level + " " + name ); } final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } getCurrentQuery().addQueryPart( av ); @@ -532,14 +532,14 @@ String substitute = parameters.getParameter( name, null ); //escape single quote substitute = replaceCharWithString( substitute, '\'', "''" ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SUBSTITUTE VALUE " + substitute ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SUBSTITUTE VALUE " + substitute ); } final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } this.getCurrentQuery().addQueryPart( substitute ); @@ -563,8 +563,8 @@ final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } this.startTextRecording(); @@ -585,8 +585,8 @@ value = replaceCharWithString( value, '\'', "''" ); value = replaceCharWithString( value, '\\', "\\\\" ); this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } this.startSerializedXMLRecording(format); @@ -604,8 +604,8 @@ SQLTransformer.MAGIC_IN_PARAMETER_NR_ATTRIBUTE ); String value = attributes.getValue( NAMESPACE, SQLTransformer.MAGIC_IN_PARAMETER_VALUE_ATTRIBUTE ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "IN PARAMETER NR " + nr + "; VALUE " + value ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "IN PARAMETER NR " + nr + "; VALUE " + value ); } int position = Integer.parseInt( nr ); getCurrentQuery().setInParameter( position, value ); @@ -629,7 +629,7 @@ SQLTransformer.MAGIC_OUT_PARAMETER_NR_ATTRIBUTE ); String type = attributes.getValue( NAMESPACE, SQLTransformer.MAGIC_OUT_PARAMETER_TYPE_ATTRIBUTE ); - if (this.getLogger().isDebugEnabled()) { + if (getLogger().isDebugEnabled()) { getLogger().debug( "OUT PARAMETER NAME" + name + ";NR " + nr + "; TYPE " + type ); } int position = Integer.parseInt( nr ); @@ -732,7 +732,7 @@ public void startTransformingElement( String uri, String name, String raw, Attributes attributes ) throws ProcessingException, SAXException { - if (this.getLogger().isDebugEnabled()) { + if (getLogger().isDebugEnabled()) { getLogger().debug( "RECEIVED START ELEMENT " + name ); } @@ -761,8 +761,8 @@ public void endTransformingElement( String uri, String name, String raw ) throws ProcessingException, IOException, SAXException { - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "RECEIVED END ELEMENT " + name + "(" + uri + ")" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "RECEIVED END ELEMENT " + name + "(" + uri + ")" ); } if ( name.equals( SQLTransformer.MAGIC_EXECUTE_QUERY ) ) { 1.2 +43 -43 xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java Index: SQLTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SQLTransformer.java 18 Oct 2002 14:04:26 -0000 1.1 +++ SQLTransformer.java 23 Oct 2002 04:31:04 -0000 1.2 @@ -87,7 +87,6 @@ * @author <a href="mailto:sven.beauprez@;the-ecorp.com">Sven Beauprez</a> * @version CVS $Id$ */ - public class SQLTransformer extends AbstractSAXTransformer implements Composable, Disposable, Configurable { @@ -209,7 +208,7 @@ try { this.dbSelector = (ComponentSelector) manager.lookup( DataSourceComponent.ROLE + "Selector" ); } catch ( ComponentException cme ) { - this.getLogger().warn( "Could not get the DataSource Selector", cme ); + getLogger().warn( "Could not get the DataSource Selector", cme ); } } @@ -235,7 +234,8 @@ */ public void dispose() { if ( this.dbSelector != null ) { - this.manager.release( (Component) this.dbSelector ); + this.manager.release( this.dbSelector ); + this.dbSelector = null; } } @@ -246,8 +246,8 @@ super.configure( conf ); if ( conf != null ) { this.oldDriver = conf.getChild( "old-driver" ).getValueAsBoolean( false ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "old-driver is " + this.oldDriver + " for " + this ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "old-driver is " + this.oldDriver + " for " + this ); } this.connectAttempts = conf.getChild("connect-attempts").getValueAsInteger(5); @@ -267,17 +267,17 @@ this.current_state = SQLTransformer.STATE_OUTSIDE; this.showNrOfRows = parameters.getParameterAsBoolean( SQLTransformer.MAGIC_NR_OF_ROWS, false ); - if ( this.getLogger().isDebugEnabled() ) { + if ( getLogger().isDebugEnabled() ) { if ( this.parameters.getParameter( SQLTransformer.MAGIC_CONNECTION , null ) != null ) { - this.getLogger().debug( "CONNECTION: " + this.parameters.getParameter( SQLTransformer.MAGIC_CONNECTION , null ) ); + getLogger().debug( "CONNECTION: " + this.parameters.getParameter( SQLTransformer.MAGIC_CONNECTION , null ) ); } else { - this.getLogger().debug( "DBURL: " + parameters.getParameter( SQLTransformer.MAGIC_DBURL, null ) ); - this.getLogger().debug( "USERNAME: " + parameters.getParameter( SQLTransformer.MAGIC_USERNAME, null ) ); + getLogger().debug( "DBURL: " + parameters.getParameter( SQLTransformer.MAGIC_DBURL, null ) ); + getLogger().debug( "USERNAME: " + parameters.getParameter( SQLTransformer.MAGIC_USERNAME, null ) ); } - this.getLogger().debug( "DOC-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_DOC_ELEMENT, "rowset" ) ); - this.getLogger().debug( "ROW-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_ROW_ELEMENT, "row" ) ); - this.getLogger().debug( "NS-URI: " + parameters.getParameter( SQLTransformer.MAGIC_NS_URI_ELEMENT, NAMESPACE ) ); - this.getLogger().debug( "NS-PREFIX: " + parameters.getParameter( SQLTransformer.MAGIC_NS_PREFIX_ELEMENT, "" ) ); + getLogger().debug( "DOC-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_DOC_ELEMENT, "rowset" ) ); + getLogger().debug( "ROW-ELEMENT: " + parameters.getParameter( SQLTransformer.MAGIC_ROW_ELEMENT, "row" ) ); + getLogger().debug( "NS-URI: " + parameters.getParameter( SQLTransformer.MAGIC_NS_URI_ELEMENT, NAMESPACE ) ); + getLogger().debug( "NS-PREFIX: " + parameters.getParameter( SQLTransformer.MAGIC_NS_PREFIX_ELEMENT, "" ) ); } } @@ -286,8 +286,8 @@ */ protected void executeQuery( int index ) throws SAXException { - if ( this.getLogger().isDebugEnabled() ) { - this.getLogger().debug( "SQLTransformer executing query nr " + index ); + if ( getLogger().isDebugEnabled() ) { + getLogger().debug( "SQLTransformer executing query nr " + index ); } this.outUri = getCurrentQuery().properties.getParameter( SQLTransformer.MAGIC_NS_URI_ELEMENT, NAMESPACE ); @@ -304,8 +304,8 @@ try { query.execute(); } catch ( SQLException e ) { - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SQLTransformer:.executeQuery() query.execute failed ", e ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SQLTransformer:.executeQuery() query.execute failed ", e ); } AttributesImpl my_attr = new AttributesImpl(); this.start( query.rowset_name, my_attr ); @@ -345,7 +345,7 @@ this.end( query.rowset_name ); } } catch ( SQLException e ) { - if (this.getLogger().isDebugEnabled()) { + if (getLogger().isDebugEnabled()) { getLogger().debug( "SQLTransformer.executeQuery()", e ); } throw new SAXException( e ); @@ -426,8 +426,8 @@ final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } current_state = SQLTransformer.STATE_INSIDE_EXECUTE_QUERY_ELEMENT; @@ -445,8 +445,8 @@ final String value = this.endTextRecording(); this.getCurrentQuery().setParameter(name, value); this.current_state = SQLTransformer.STATE_INSIDE_EXECUTE_QUERY_ELEMENT; - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SETTING VALUE ELEMENT name {" + + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SETTING VALUE ELEMENT name {" + name + "} value {" + value + "}" ); } break; @@ -481,8 +481,8 @@ level = Integer.parseInt( attributes.getValue( NAMESPACE, SQLTransformer.MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE ) ); } catch ( Exception e ) { - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SQLTransformer", e ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SQLTransformer", e ); } throwIllegalStateException( "Ancestor value elements must have a " + SQLTransformer.MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE + " attribute" ); @@ -494,15 +494,15 @@ SQLTransformer.MAGIC_ANCESTOR_VALUE_NAME_ATTRIBUTE + " attribute" ); } AncestorValue av = new AncestorValue( level, name ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "ANCESTOR VALUE " + level + " " + name ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "ANCESTOR VALUE " + level + " " + name ); } final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } getCurrentQuery().addQueryPart( av ); @@ -532,14 +532,14 @@ String substitute = parameters.getParameter( name, null ); //escape single quote substitute = replaceCharWithString( substitute, '\'', "''" ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "SUBSTITUTE VALUE " + substitute ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "SUBSTITUTE VALUE " + substitute ); } final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } this.getCurrentQuery().addQueryPart( substitute ); @@ -563,8 +563,8 @@ final String value = this.endSerializedXMLRecording(); if ( value.length() > 0 ) { this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } this.startTextRecording(); @@ -585,8 +585,8 @@ value = replaceCharWithString( value, '\'', "''" ); value = replaceCharWithString( value, '\\', "\\\\" ); this.getCurrentQuery().addQueryPart( value ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "QUERY IS \"" + value + "\"" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "QUERY IS \"" + value + "\"" ); } } this.startSerializedXMLRecording(format); @@ -604,8 +604,8 @@ SQLTransformer.MAGIC_IN_PARAMETER_NR_ATTRIBUTE ); String value = attributes.getValue( NAMESPACE, SQLTransformer.MAGIC_IN_PARAMETER_VALUE_ATTRIBUTE ); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "IN PARAMETER NR " + nr + "; VALUE " + value ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "IN PARAMETER NR " + nr + "; VALUE " + value ); } int position = Integer.parseInt( nr ); getCurrentQuery().setInParameter( position, value ); @@ -629,7 +629,7 @@ SQLTransformer.MAGIC_OUT_PARAMETER_NR_ATTRIBUTE ); String type = attributes.getValue( NAMESPACE, SQLTransformer.MAGIC_OUT_PARAMETER_TYPE_ATTRIBUTE ); - if (this.getLogger().isDebugEnabled()) { + if (getLogger().isDebugEnabled()) { getLogger().debug( "OUT PARAMETER NAME" + name + ";NR " + nr + "; TYPE " + type ); } int position = Integer.parseInt( nr ); @@ -732,7 +732,7 @@ public void startTransformingElement( String uri, String name, String raw, Attributes attributes ) throws ProcessingException, SAXException { - if (this.getLogger().isDebugEnabled()) { + if (getLogger().isDebugEnabled()) { getLogger().debug( "RECEIVED START ELEMENT " + name ); } @@ -761,8 +761,8 @@ public void endTransformingElement( String uri, String name, String raw ) throws ProcessingException, IOException, SAXException { - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug( "RECEIVED END ELEMENT " + name + "(" + uri + ")" ); + if (getLogger().isDebugEnabled()) { + getLogger().debug( "RECEIVED END ELEMENT " + name + "(" + uri + ")" ); } if ( name.equals( SQLTransformer.MAGIC_EXECUTE_QUERY ) ) {
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]