cziegeler 2003/03/10 03:45:17
Modified: lib jars.xml
src/java/org/apache/cocoon/transformation
SQLTransformer.java
Added: legal LICENSE.jakarta-commons-lang
lib/optional commons-lang-1.0.1.jar
Log:
Possible fix for bug 13344
Revision Changes Path
1.1 cocoon-2.0/legal/LICENSE.jakarta-commons-lang
Index: LICENSE.jakarta-commons-lang
===================================================================
/*
* $Header: /home/cvs/jakarta-commons/LICENSE,v 1.4 2002/04/11 13:24:02 dion Exp $
* $Revision: 1.4 $
* $Date: 2002/04/11 13:24:02 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
1.3 +7 -0 cocoon-2.0/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/cocoon-2.0/lib/jars.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jars.xml 9 Mar 2003 04:58:10 -0000 1.2
+++ jars.xml 10 Mar 2003 11:45:16 -0000 1.3
@@ -190,6 +190,13 @@
<lib>core/commons-collections-2.1.jar</lib>
<homepage>http://jakarta.apache.org/commons/collections.html</homepage>
</file>
+<file>
+ <title>Jakarta Commons Lang</title>
+ <description>The Lang Component provides a host of helper utilities for the
java.lang API.</description>
+ <used-by>SQL Transformer</used-by>
+ <lib>optional/commons-lang-1.0.1.jar</lib>
+ <homepage>http://jakarta.apache.org/commons/lang.html</homepage>
+ </file>
<file>
<title>Jakart Commons httpClient</title>
<description>Although the java.net package provides basic support for accessing
1.1 cocoon-2.0/lib/optional/commons-lang-1.0.1.jar
<<Binary file>>
1.2 +3 -2
cocoon-2.0/src/java/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQLTransformer.java 9 Mar 2003 00:03:22 -0000 1.1
+++ SQLTransformer.java 10 Mar 2003 11:45:16 -0000 1.2
@@ -63,6 +63,7 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.Tokenizer;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.commons.lang.StringUtils;
import org.apache.excalibur.xml.sax.SAXParser;
import org.apache.log.Logger;
import org.xml.sax.Attributes;
@@ -1045,7 +1046,7 @@
sb.append( query.getColumnValue( av.name ) );
}
}
- String query = sb.toString().trim();
+ String query = StringUtils.deleteWhitespace(sb.toString());
// Test, if this is an update (by comparing with select)
if ( !isstoredprocedure && !isupdate) {
if (query.length() > 6 &&
!query.substring(0,6).equalsIgnoreCase("SELECT")) {
