Author: arminw Date: Fri Mar 30 16:09:56 2007 New Revision: 524316 URL: http://svn.apache.org/viewvc?view=rev&rev=524316 Log: minor changes
Modified: db/ojb/branches/OJB_1_0_RELEASE/build-torque.xml db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/testsuite-spy.properties Modified: db/ojb/branches/OJB_1_0_RELEASE/build-torque.xml URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/build-torque.xml?view=diff&rev=524316&r1=524315&r2=524316 ============================================================================== --- db/ojb/branches/OJB_1_0_RELEASE/build-torque.xml (original) +++ db/ojb/branches/OJB_1_0_RELEASE/build-torque.xml Fri Mar 30 16:09:56 2007 @@ -1,20 +1,23 @@ -<project name="Torque" default="main" basedir="."> +<?xml version="1.0" encoding="UTF-8"?> <!-- -#/* Copyright 2002-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> +<project name="Torque" default="main" basedir="."> <!-- Note - You should not have to edit this file. @@ -39,14 +42,25 @@ <property name="lib.dir" value="lib"/> <property name="torque.lib.dir" value="${lib.dir}"/> - <!-- - Build the classpath. Specifically point to each file we're including to avoid - version conflicts in the case of the torque.lib.dir being something like lib.repo. - However, we still need to pull in the user's database driver and since we don't - know which jar that will be, after we've got all of our specific, version-safe jars, - do a general inclusion of the torque.lib.dir to catch any drivers. + Build the classpath used by all torque ant tasks. + + First, defines the template/generator override directories/jars based on the + torque.override.dir build property. If this property is not set, use + the torque.lib.dir as a default to keep ant happy. + + Note: To prevent version conflicts in the default case, jars being + overridden need to end in "override.jar". + + Next, specifically point to each file we're including to avoid version + conflicts in the case of the torque.lib.dir being something like lib.repo. + However, we still need to pull in the user's database driver and since we + don't know which jar that will be, after we've got all of our specific, + version-safe jars, do a general inclusion of the torque.lib.dir to catch + any drivers. In the maven-built versions, ${torque.jar} is in the working + directory. --> + <path id="torque-classpath"> <fileset dir="${torque.lib.dir}"> <include name="**/*.jar"/> @@ -400,11 +414,9 @@ sqldbmap="${torque.sql.dir}/sqldb.map" srcDir="${torque.sql.dir}" url="${torque.database.buildUrl}" - userid="${torque.database.user}" - delimiter="${torque.delimiter}"> + userid="${torque.database.user}"> <classpath refid="torque-classpath"/> </torque-sql-exec> - </target> <!-- ================================================================ --> Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/testsuite-spy.properties URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/testsuite-spy.properties?view=diff&rev=524316&r1=524315&r2=524316 ============================================================================== --- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/testsuite-spy.properties (original) +++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/testsuite-spy.properties Fri Mar 30 16:09:56 2007 @@ -74,11 +74,11 @@ # the hsqldb jdbc driver (OJB testsuite and tutorials) realdriver=org.hsqldb.jdbcDriver - #specifies another driver to use -realdriver2= +realdriver2=oracle.jdbc.driver.OracleDriver +#realdriver2=com.sap.dbtech.jdbc.DriverSapDB #specifies a third driver to use -realdriver3= +realdriver3=org.gjt.mm.mysql.Driver ################################################################ # P6LOG SPECIFIC PROPERTIES # @@ -132,7 +132,7 @@ #list of categories to exclude: error, info, batch, debug, statement, #commit, rollback and result are valid values -excludecategories=info,debug,result,batch +excludecategories=info,debug,result,batch,resultset,prepared #allows you to use a regex engine or your own matching engine to determine --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]