brekke 01/08/18 19:56:35 Modified: src/java/org/apache/torque/adapter DBInterbase.java DBWeblogic.java Log: Removed DOS CRLF... Revision Changes Path 1.4 +173 -173 jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBInterbase.java Index: DBInterbase.java =================================================================== RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBInterbase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DBInterbase.java 2001/08/13 22:24:10 1.3 +++ DBInterbase.java 2001/08/19 02:56:35 1.4 @@ -1,173 +1,173 @@ -package org.apache.torque.adapter; - -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 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 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" and "Apache Software Foundation" and - * "Apache Turbine" 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", - * "Apache Turbine", 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 (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/>. - */ - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * This code should be used for an Interbase database pool. - * - * @author <a href="mailto:[EMAIL PROTECTED]">Frank Conradie</a> - * @version $Id: DBInterbase.java,v 1.3 2001/08/13 22:24:10 dlr Exp $ - */ -public class DBInterbase - extends DB -{ - /** - * This method is used to ignore case. - * - * @param in The string to transform to upper case. - * @return The upper case string. - */ - public String toUpperCase(String in) - { - return new StringBuffer("UPPER(").append(in).append(")").toString(); - } - - /** - * This method is used to ignore case. - * - * @param in The string whose case to ignore. - * @return The string in a case that can be ignored. - */ - public String ignoreCase(String in) - { - return new StringBuffer("UPPER(").append(in).append(")").toString(); - } - - /** - * This method is used to ignore case in an ORDER BY clause. - * Usually it is the same as ignoreCase, but some databases - * (Interbase for example) does not use the same SQL in ORDER BY - * and other clauses. - * - * @param in The string whose case to ignore. - * @return The string in a case that can be ignored. - */ - public String ignoreCaseInOrderBy(String in) - { - return in; - } - - /** - * Gets the string delimiter (usually '\''). - * - * @return The delimeter. - */ - public char getStringDelimiter() - { - return '\''; - } - - /** - * @see org.apache.torque.adapter.DB#getIDMethodType() - */ - public String getIDMethodType() - { - return NO_ID_METHOD; - } - - /** - * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj) - */ - public String getIDMethodSQL(Object obj) - { - return null; - } - - /** - * Locks the specified table. - * - * @param con The JDBC connection to use. - * @param table The name of the table to lock. - * @exception SQLException - */ - public void lockTable(Connection con, - String table) - throws SQLException - { - Statement statement = con.createStatement(); - - StringBuffer stmt = new StringBuffer(); - stmt.append( "SET TRANSACTION " ) - .append( "ISOLATION LEVEL READ COMMITTED " ) - .append( "NO RECORD_VERSION WAIT " ) - .append( "RESERVING " ) - .append( table ) - .append( " FOR PROTECTED WRITE" ); - - statement.executeQuery( stmt.toString() ); - } - - /** - * Unlocks the specified table. - * - * @param con The JDBC connection to use. - * @param table The name of the table to unlock. - * @exception SQLException - */ - public void unlockTable(Connection con, - String table) - throws SQLException - { - // Tables in Interbase are unlocked when a commit is issued. - // The user may have issued a commit but do it here to be - // sure. - con.commit(); - } -} +package org.apache.torque.adapter; + +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 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 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" and "Apache Software Foundation" and + * "Apache Turbine" 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", + * "Apache Turbine", 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 (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/>. + */ + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +/** + * This code should be used for an Interbase database pool. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Frank Conradie</a> + * @version $Id: DBInterbase.java,v 1.4 2001/08/19 02:56:35 brekke Exp $ + */ +public class DBInterbase + extends DB +{ + /** + * This method is used to ignore case. + * + * @param in The string to transform to upper case. + * @return The upper case string. + */ + public String toUpperCase(String in) + { + return new StringBuffer("UPPER(").append(in).append(")").toString(); + } + + /** + * This method is used to ignore case. + * + * @param in The string whose case to ignore. + * @return The string in a case that can be ignored. + */ + public String ignoreCase(String in) + { + return new StringBuffer("UPPER(").append(in).append(")").toString(); + } + + /** + * This method is used to ignore case in an ORDER BY clause. + * Usually it is the same as ignoreCase, but some databases + * (Interbase for example) does not use the same SQL in ORDER BY + * and other clauses. + * + * @param in The string whose case to ignore. + * @return The string in a case that can be ignored. + */ + public String ignoreCaseInOrderBy(String in) + { + return in; + } + + /** + * Gets the string delimiter (usually '\''). + * + * @return The delimeter. + */ + public char getStringDelimiter() + { + return '\''; + } + + /** + * @see org.apache.torque.adapter.DB#getIDMethodType() + */ + public String getIDMethodType() + { + return NO_ID_METHOD; + } + + /** + * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj) + */ + public String getIDMethodSQL(Object obj) + { + return null; + } + + /** + * Locks the specified table. + * + * @param con The JDBC connection to use. + * @param table The name of the table to lock. + * @exception SQLException + */ + public void lockTable(Connection con, + String table) + throws SQLException + { + Statement statement = con.createStatement(); + + StringBuffer stmt = new StringBuffer(); + stmt.append( "SET TRANSACTION " ) + .append( "ISOLATION LEVEL READ COMMITTED " ) + .append( "NO RECORD_VERSION WAIT " ) + .append( "RESERVING " ) + .append( table ) + .append( " FOR PROTECTED WRITE" ); + + statement.executeQuery( stmt.toString() ); + } + + /** + * Unlocks the specified table. + * + * @param con The JDBC connection to use. + * @param table The name of the table to unlock. + * @exception SQLException + */ + public void unlockTable(Connection con, + String table) + throws SQLException + { + // Tables in Interbase are unlocked when a commit is issued. + // The user may have issued a commit but do it here to be + // sure. + con.commit(); + } +} 1.4 +188 -188 jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBWeblogic.java Index: DBWeblogic.java =================================================================== RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBWeblogic.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DBWeblogic.java 2001/08/13 22:24:10 1.3 +++ DBWeblogic.java 2001/08/19 02:56:35 1.4 @@ -1,188 +1,188 @@ -package org.apache.torque.adapter; - -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 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 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" and "Apache Software Foundation" and - * "Apache Turbine" 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", - * "Apache Turbine", 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 (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/>. - */ - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * This code should be used for a Weblogic database pool. - * - * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a> - * @author <a href="mailto:[EMAIL PROTECTED]">Brett McLaughlin</a> - * @version $Id: DBWeblogic.java,v 1.3 2001/08/13 22:24:10 dlr Exp $ - */ -public class DBWeblogic - extends DB -{ - private String DATABASE_POOL; // = "jdbc:weblogic:pool:mla"; - - /** - * Empty constructor. - */ - protected DBWeblogic() - { - } - - /** - * Returns a JDBC <code>Connection</code> from the - * <code>DriverManager</code>. - * - * @return A JDBC <code>Connection</code> object for this - * database. - * @exception SQLException - */ - public Connection getConnection() - throws SQLException - { - return DriverManager.getConnection(DATABASE_POOL, null); - } - - /** - * Performs basic initialization. Calls Class.forName() to assure - * that the JDBC driver for this adapter can be loaded. - * - * @param url The URL of the database to connect to. - * @param username The name of the user to use when connecting. - * @param password The user's password. - * @exception Exception The JDBC driver could not be loaded or - * instantiated. - */ - public void init(String url, - String username, - String password) - throws Exception - { - DATABASE_POOL = url; - Class.forName( getJDBCDriver() ).newInstance(); - } - - /** - * This method is used to ignore case. - * - * @param in The string to transform to upper case. - * @return The upper case string. - */ - public String toUpperCase(String in) - { - return in; - } - - /** - * This method is used to ignore case. - * - * @param in The string whose case to ignore. - * @return The string in a case that can be ignored. - */ - public String ignoreCase(String in) - { - return in; - } - - /** - * Gets the string delimiter (usually '\''). - * - * @return The delimeter. - */ - public char getStringDelimiter() - { - return '\''; - } - - /** - * @see org.apache.torque.adapter.DB#getIDMethodType() - */ - public String getIDMethodType() - { - return NO_ID_METHOD; - } - - /** - * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj) - */ - public String getIDMethodSQL(Object obj) - { - return null; - } - - /** - * Locks the specified table. - * - * @param con The JDBC connection to use. - * @param table The name of the table to lock. - * @exception SQLException - */ - public void lockTable(Connection con, - String table) - throws SQLException - { - } - - /** - * Unlocks the specified table. - * - * @param con The JDBC connection to use. - * @param table The name of the table to unlock. - * @exception SQLException - */ - public void unlockTable(Connection con, - String table) - throws SQLException - { - } -} +package org.apache.torque.adapter; + +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 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 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" and "Apache Software Foundation" and + * "Apache Turbine" 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", + * "Apache Turbine", 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 (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/>. + */ + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +/** + * This code should be used for a Weblogic database pool. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Brett McLaughlin</a> + * @version $Id: DBWeblogic.java,v 1.4 2001/08/19 02:56:35 brekke Exp $ + */ +public class DBWeblogic + extends DB +{ + private String DATABASE_POOL; // = "jdbc:weblogic:pool:mla"; + + /** + * Empty constructor. + */ + protected DBWeblogic() + { + } + + /** + * Returns a JDBC <code>Connection</code> from the + * <code>DriverManager</code>. + * + * @return A JDBC <code>Connection</code> object for this + * database. + * @exception SQLException + */ + public Connection getConnection() + throws SQLException + { + return DriverManager.getConnection(DATABASE_POOL, null); + } + + /** + * Performs basic initialization. Calls Class.forName() to assure + * that the JDBC driver for this adapter can be loaded. + * + * @param url The URL of the database to connect to. + * @param username The name of the user to use when connecting. + * @param password The user's password. + * @exception Exception The JDBC driver could not be loaded or + * instantiated. + */ + public void init(String url, + String username, + String password) + throws Exception + { + DATABASE_POOL = url; + Class.forName( getJDBCDriver() ).newInstance(); + } + + /** + * This method is used to ignore case. + * + * @param in The string to transform to upper case. + * @return The upper case string. + */ + public String toUpperCase(String in) + { + return in; + } + + /** + * This method is used to ignore case. + * + * @param in The string whose case to ignore. + * @return The string in a case that can be ignored. + */ + public String ignoreCase(String in) + { + return in; + } + + /** + * Gets the string delimiter (usually '\''). + * + * @return The delimeter. + */ + public char getStringDelimiter() + { + return '\''; + } + + /** + * @see org.apache.torque.adapter.DB#getIDMethodType() + */ + public String getIDMethodType() + { + return NO_ID_METHOD; + } + + /** + * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj) + */ + public String getIDMethodSQL(Object obj) + { + return null; + } + + /** + * Locks the specified table. + * + * @param con The JDBC connection to use. + * @param table The name of the table to lock. + * @exception SQLException + */ + public void lockTable(Connection con, + String table) + throws SQLException + { + } + + /** + * Unlocks the specified table. + * + * @param con The JDBC connection to use. + * @param table The name of the table to unlock. + * @exception SQLException + */ + public void unlockTable(Connection con, + String table) + throws SQLException + { + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]