You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2001/07/03 01:30:26 UTC
cvs commit: jakarta-turbine/build build-turbine-om.xml build-turbine-sql.xml build.properties torque.properties
mpoeschl 01/07/02 16:30:26
Modified: build build-turbine-om.xml build-turbine-sql.xml
build.properties
Removed: build torque.properties
Log:
build cleanup
- join build.props and torque props
- use build.props in build-turbine-sql.xml and build-turbine-om.xml
Revision Changes Path
1.4 +2 -6 jakarta-turbine/build/build-turbine-om.xml
Index: build-turbine-om.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build-turbine-om.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-turbine-om.xml 2001/06/29 21:23:52 1.3
+++ build-turbine-om.xml 2001/07/02 23:30:24 1.4
@@ -23,10 +23,6 @@
</classpath>
</taskdef>
- <property name="schemaDirectory" value="${basedir}/../conf/master"/>
- <property name="OMControlTemplate" value="om/Control.vm"/>
- <property name="templatePath" value="${basedir}/../conf/torque/templates"/>
-
</target>
<!-- ================================================================ -->
@@ -38,12 +34,12 @@
<target name="main" depends="init">
<torque-om
- contextProperties="torque.properties"
+ contextProperties="build.properties"
controlTemplate="${OMControlTemplate}"
outputDirectory="${build.src}"
templatePath="${templatePath}"
outputFile="report.turbine.om.generation"
- targetPackage="org.apache.om.security"
+ targetPackage="${targetPackage}"
xmlFile="${schemaDirectory}/turbine-schema.xml"
/>
1.11 +0 -5 jakarta-turbine/build/build-turbine-sql.xml
Index: build-turbine-sql.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build-turbine-sql.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-turbine-sql.xml 2001/06/29 21:23:53 1.10
+++ build-turbine-sql.xml 2001/07/02 23:30:24 1.11
@@ -22,12 +22,7 @@
</classpath>
</taskdef>
- <property name="schemaDirectory" value="${basedir}/../conf/master"/>
- <property name="SQLControlTemplate" value="sql/base/Control.vm"/>
- <property name="idTableControlTemplate" value="sql/id-table/Control.vm"/>
- <property name="securityControlTemplate" value="sql/security/Control.vm"/>
<property name="outputDirectory" value="${basedir}/../src/sql"/>
- <property name="templatePath" value="${basedir}/../conf/torque/templates"/>
</target>
1.5 +28 -0 jakarta-turbine/build/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties 2001/07/02 03:28:03 1.4
+++ build.properties 2001/07/02 23:30:25 1.5
@@ -22,3 +22,31 @@
deprecation = off
jdom.jar = jdom-b6.jar
omStatusFile = ../bin/src/report.turbine.om.generation
+
+
+# -------------------------------------------------------------------
+#
+# T O R Q U E C O N F I G U R A T I O N
+#
+# used to generate the om/peer classes for the Turbine-db-security
+# system
+# -------------------------------------------------------------------
+
+targetPackage=org.apache.turbine.om.security
+addSaveMethod=true
+addGetByNameMethod=true
+complexObjectModel=true
+basePrefix=Base
+
+templatePath = ../conf/torque/templates
+schemaDirectory=../conf/master
+
+SQLControlTemplate = sql/base/Control.vm
+OMControlTemplate = om/Control.vm
+IntakeControlTemplate = intake/Control.vm
+ServiceControlTemplate = service/Control.vm
+idTableControlTemplate = sql/id-table/Control.vm
+DataDTDControlTemplate = data/Control.vm
+DataDumpControlTemplate = data/dump/Control.vm
+DataSQLControlTemplate = sql/load/Control.vm
+securityControlTemplate = sql/security/Control.vm
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org