stephenh 2002/07/30 08:01:16
Modified: src/conf default.properties build-torque.xml
Log:
Pulled the various *-schema.xml/id-table-schema.xml include/exclude statements out
into default.properties so they're now driven via torque.schema.xxx.includes/excludes.
This helps with being able to just drop-in build-torque.xml into any project (e..g i
have the turbine-schema in my schema dir reference reasons but don't want it's om
generated).
Revision Changes Path
1.6 +20 -0 jakarta-turbine-torque/src/conf/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/default.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.properties 30 Jul 2002 04:45:05 -0000 1.5
+++ default.properties 30 Jul 2002 15:01:16 -0000 1.6
@@ -180,3 +180,23 @@
torque.compile.debug = ${debug}
torque.compile.deprecation = ${deprecation}
torque.compile.optimize = ${optimize}
+
+
+# -------------------------------------------------------------------
+#
+# I N C L U D E A N D E X C L U D E S E T T I N G S
+#
+# -------------------------------------------------------------------
+
+torque.schema.sql.includes = *-schema.xml
+torque.schema.sql.excludes =
+torque.schema.doc.includes = *-schema.xml
+torque.schema.doc.excludes =
+torque.schema.create-db.includes = *-schema.xml
+torque.schema.create-db.excludes =
+torque.schema.init-sql.includes = *-schema.xml
+torque.schema.init-sql.excludes = id-table-schema.xml
+torque.schema.om.includes = *-schema.xml
+torque.schema.om.excludes = id-table-schema.xml
+torque.schema.ojb.includes = *-schema.xml
+torque.schema.ojb.excludes =
1.43 +39 -33 jakarta-turbine-torque/src/conf/build-torque.xml
Index: build-torque.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build-torque.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build-torque.xml 30 Jul 2002 04:45:05 -0000 1.42
+++ build-torque.xml 30 Jul 2002 15:01:16 -0000 1.43
@@ -168,9 +168,10 @@
sqldbmap="${torque.sql.dir}/sqldb.map"
targetDatabase="${torque.database}"
useClasspath="${torque.useClasspath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.sql.includes}"
+ excludes="${torque.schema.sql.excludes}"
+ />
</torque-sql>
</target>
@@ -185,9 +186,10 @@
sqldbmap="${torque.sql.dir}/sqldb.map"
targetDatabase="${torque.database}"
templatePath="${torque.templatePath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.sql.includes}"
+ excludes="${torque.schema.sql.excludes}"
+ />
</torque-sql>
</target>
@@ -219,9 +221,10 @@
sqldbmap="${torque.sql.dir}/sqldb.map"
templatePath="${torque.templatePath}"
useClasspath="${torque.useClasspath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.doc.includes}"
+ excludes="${torque.schema.doc.excludes}"
+ />
</torque-doc>
</target>
@@ -251,9 +254,10 @@
targetDatabase="${torque.database}"
templatePath="${torque.templatePath}"
useClasspath="${torque.useClasspath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.create-db.includes}"
+ excludes="${torque.schema.create-db.excludes}"
+ />
</torque-data-model>
<echo>
@@ -372,10 +376,10 @@
targetDatabase="${torque.database}"
templatePath="${torque.templatePath}"
useClasspath="${torque.useClasspath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.init-sql.includes}"
+ excludes="${torque.schema.init-sql.excludes}"
+ />
</torque-sql>
</target>
@@ -471,10 +475,10 @@
targetDatabase="${torque.database}"
targetPackage="${torque.targetPackage}"
useClasspath="${torque.useClasspath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.om.includes}"
+ excludes="${torque.schema.om.excludes}"
+ />
</torque-data-model>
</target>
@@ -487,10 +491,10 @@
targetDatabase="${torque.database}"
targetPackage="${torque.targetPackage}"
templatePath="${torque.templatePath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.om.includes}"
+ excludes="${torque.schema.om.excludes}"
+ />
</torque-data-model>
</target>
@@ -514,8 +518,8 @@
<condition property="torque.internal.omzip.bin.extension">
<equals arg1="${torque.omzip.bin.extension}" arg2="true"/>
</condition>
- <condition property="torque.internal.omzip.delete">
- <equals arg1="${torque.omzip.delete}" arg2="true"/>
+ <condition property="torque.internal.omzip.deleteFiles">
+ <equals arg1="${torque.omzip.deleteFiles}" arg2="true"/>
</condition>
</target>
@@ -593,7 +597,7 @@
<target
name="om-zip-worker-delete"
- if="torque.internal.omzip.delete">
+ if="torque.internal.omzip.deleteFiles">
<!-- Base files that typically aren't modified. -->
<patternset id="torque.internal.omzip.pattern.base">
@@ -698,9 +702,10 @@
sqldbmap="${torque.sql.dir}/sqldb.map"
templatePath="${torque.templatePath}"
useClasspath="${torque.useClasspath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.ojb.includes}"
+ excludes="${torque.schema.ojb.excludes}"
+ />
</torque-data-model>
</target>
@@ -723,9 +728,10 @@
sqldbmap="${torque.sql.dir}/sqldb.map"
templatePath="${torque.templatePath}"
useClasspath="${torque.useClasspath}">
- <fileset dir="${torque.schema.dir}">
- <include name="*-schema.xml"/>
- </fileset>
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.ojb.includes}"
+ excludes="${torque.schema.ojb.excludes}"
+ />
</torque-data-model>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
