jon 01/10/14 22:54:57
Modified: . build.xml default.properties
src/java/org/apache/torque/util BasePeer.java
Log:
I noticed you were still copying src to intermediate directory before
compiling. This is not needed as far as I can see as the only filter item
defined (VERSION) is not used in the source code. This patch removes the
unecessary copying and makes it a little easier to work with.
Peter Donald <[EMAIL PROTECTED]>
Revision Changes Path
1.19 +2 -9 jakarta-turbine-torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 2001/09/26 00:04:23 1.18
+++ build.xml 2001/10/15 05:54:57 1.19
@@ -189,13 +189,7 @@
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dest}"/>
- <mkdir dir="${build.src}"/>
- <filter token="VERSION" value="${version}"/>
-
- <copy todir="${build.src}/org" filtering="yes">
- <fileset dir="${src.dir}/java/org"/>
- </copy>
</target>
<!-- ================================================================== -->
@@ -204,9 +198,8 @@
<target name="compile" depends="prepare"
description="==> compiles the source code">
- <javac srcdir="${build.src}"
+ <javac srcdir="${src.dir}/java"
destdir="${build.dest}"
- excludes="**/package.html"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
@@ -304,7 +297,7 @@
<mkdir dir="${docs.dest}/api"/>
<javadoc
- sourcepath="${build.src}"
+ sourcepath="${src.dir}/java"
packagenames="${package}.*"
destdir="${javadoc.destdir}"
author="true"
1.3 +0 -1 jakarta-turbine-torque/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 2001/09/27 17:47:09 1.2
+++ default.properties 2001/10/15 05:54:57 1.3
@@ -13,7 +13,6 @@
final.name = ${project}-${version}
build.dir = ./bin
-build.src = ${build.dir}/src
build.dest = ${build.dir}/classes
build.test = ${build.dir}/test
src.dir = ./src
1.12 +11 -2
jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasePeer.java 2001/10/14 19:40:39 1.11
+++ BasePeer.java 2001/10/15 05:54:57 1.12
@@ -110,7 +110,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.11 2001/10/14 19:40:39 jon Exp $
+ * @version $Id: BasePeer.java,v 1.12 2001/10/15 05:54:57 jon Exp $
*/
public abstract class BasePeer implements java.io.Serializable
{
@@ -847,7 +847,16 @@
throws Exception
{
DatabaseMap dbMap = Torque.getDatabaseMap( criteria.getDbName() );
-
+System.out.println ("tableName: " + tableName);
+System.out.println ("criteria.getDbName(): " + criteria.getDbName());
+if (dbMap == null)
+{
+System.out.println ("dbMap is null");
+}
+else
+{
+System.out.println ("dbMap is not null: " + dbMap.toString());
+}
ColumnMap[] columnMaps = dbMap.getTable( tableName ).getColumns();
boolean shouldSave = false;
for (int j=0; j<columnMaps.length; j++)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
