tcurdt 2003/03/05 09:12:03
Modified:
src/blocks/databases/java1.2/org/apache/cocoon/components/language/markup/xsp
AbstractEsqlConnection.java
src/blocks/databases/java1.4/org/apache/cocoon/components/language/markup/xsp
AbstractEsqlConnection.java
Added:
src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp
PervasiveEsqlQuery.java
Log:
added support for Pervasive
Revision Changes Path
1.2 +6 -0
xml-cocoon2/src/blocks/databases/java1.2/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
Index: AbstractEsqlConnection.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java1.2/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractEsqlConnection.java 26 Feb 2003 10:47:40 -0000 1.1
+++ AbstractEsqlConnection.java 5 Mar 2003 17:12:03 -0000 1.2
@@ -149,6 +149,9 @@
else if (url.startsWith("jdbc:oracle:")) {
query = new OracleEsqlQuery(this,queryString);
}
+ else if (url.startsWith("jdbc:pervasive:")) {
+ query = new PervasiveEsqlQuery(this,queryString);
+ }
else {
getLogger().warn("Cannot guess database type from jdbc url: " +
String.valueOf(url) +" - Defaulting to JDBC");
query = new JdbcEsqlQuery(this,queryString);
@@ -168,6 +171,9 @@
}
else if ("oracle".equalsIgnoreCase(type)) {
query = new OracleEsqlQuery(this,queryString);
+ }
+ else if ("pervasive".equalsIgnoreCase(type)) {
+ query = new PervasiveEsqlQuery(this,queryString);
}
else if ("jdbc".equalsIgnoreCase(type)) {
query = new JdbcEsqlQuery(this,queryString);
1.2 +6 -0
xml-cocoon2/src/blocks/databases/java1.4/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
Index: AbstractEsqlConnection.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java1.4/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractEsqlConnection.java 26 Feb 2003 10:47:40 -0000 1.1
+++ AbstractEsqlConnection.java 5 Mar 2003 17:12:03 -0000 1.2
@@ -149,6 +149,9 @@
else if (url.startsWith("jdbc:oracle:")) {
query = new OracleEsqlQuery(this,queryString);
}
+ else if (url.startsWith("jdbc:pervasive:")) {
+ query = new PervasiveEsqlQuery(this,queryString);
+ }
else {
getLogger().warn("Cannot guess database type from jdbc url: " +
String.valueOf(url) +" - Defaulting to JDBC");
query = new JdbcEsqlQuery(this,queryString);
@@ -168,6 +171,9 @@
}
else if ("oracle".equalsIgnoreCase(type)) {
query = new OracleEsqlQuery(this,queryString);
+ }
+ else if ("pervasive".equalsIgnoreCase(type)) {
+ query = new PervasiveEsqlQuery(this,queryString);
}
else if ("jdbc".equalsIgnoreCase(type)) {
query = new JdbcEsqlQuery(this,queryString);
1.1
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java
Index: PervasiveEsqlQuery.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, 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 acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" 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 name, without prior written permission of the
Apache Software Foundation.
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 (INCLU-
DING, 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 and was originally created by
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.components.language.markup.xsp;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.ResultSet;
import java.sql.CallableStatement;
/**
* Database specific EsqlQuery
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
*/
final public class PervasiveEsqlQuery extends AbstractEsqlQuery {
public PervasiveEsqlQuery(AbstractEsqlConnection connection, String query) {
super(connection, query);
}
/**
* Only newInstance may use this contructor
* @param resultSet
*/
private PervasiveEsqlQuery(final ResultSet resultSet) {
super(resultSet);
}
/**
* Create a EsqlQuery of the same type
* @param resultSet
* @return
*/
public AbstractEsqlQuery newInstance(final ResultSet resultSet) {
return(new PervasiveEsqlQuery(resultSet));
}
public PreparedStatement prepareStatement() throws SQLException {
return (
setPreparedStatement(
getConnection().prepareStatement(
getQueryString()
)
));
}
public CallableStatement prepareCall() throws SQLException {
return (
(CallableStatement) setPreparedStatement(
getConnection().prepareCall(
getQueryString()
)
)
);
}
}
