cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tcu...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp AbstractEsqlConnection.java
Date Mon, 23 Jun 2003 14:00:51 GMT
tcurdt      2003/06/23 07:00:50

  Modified:    src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp
                        AbstractEsqlConnection.java
  Log:
  added recognition of "firebird" database,
  only give a warning if the database was not recognized and use jdbc as fallback (as it was
before)
  
  Revision  Changes    Path
  1.6       +6 -12     cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
  
  Index: AbstractEsqlConnection.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractEsqlConnection.java	9 Jun 2003 10:55:47 -0000	1.5
  +++ AbstractEsqlConnection.java	23 Jun 2003 14:00:50 -0000	1.6
  @@ -185,22 +185,16 @@
                        database.indexOf("interbase") > -1 ||
                        database.indexOf("access") > -1 ||
                        database.indexOf("sap db") > -1 ||
  +                     database.indexOf("firebird") > -1 ||
                        database.indexOf("sybase sql server") > -1) {
                   query = new JdbcEsqlQuery(getConnection(),queryString);
               }
               else {
  -                getLogger().warn("Unrecognized database: \"" + String.valueOf(database)
+ "\"");
  +                getLogger().warn("Your database [" + String.valueOf(database) + "] is not
being recognized yet." +
  +                                 " Using the generic [jdbc] query as default. " +
  +                                 " Please report this to cocoon-dev or to tcurdt.at.apache.org
directly.");
   
  -                // temp start
  -                String message = "The database detection method has changed.\nIf your database
"+
  -                                 "is not being recognized (anymore) you can either fix
it in the Cocoon2EsqlConnection class, "+
  -                                 " file it to bugzilla, report it to cocoon-dev or to me
(tcurdt.at.apache.org) directly.\n" +
  -                                 " Only be sure to include the database string \"" + String.valueOf(database)
+ "\" in your post.";
  -                getLogger().error( message );
  -                throw new SQLException( message );
  -                // temp stop
  -
  -                //query = new JdbcEsqlQuery(getConnection(),queryString);
  +                query = new JdbcEsqlQuery(getConnection(),queryString);
               }
           }
           else if ("sybase".equalsIgnoreCase(type)) {
  
  
  

Mime
View raw message