jvanzyl 01/08/01 08:53:56
Modified: . build-om.xml build.properties build.xml
Log:
Revision Changes Path
1.2 +9 -2 jakarta-turbine-fulcrum/build-om.xml
Index: build-om.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build-om.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-om.xml 2001/07/31 14:36:01 1.1
+++ build-om.xml 2001/08/01 15:53:55 1.2
@@ -1,5 +1,12 @@
<project name="Turbine SQL" default="main" basedir=".">
+ <!-- Allow any user specific values to override the defaults -->
+ <property file="${user.home}/build.properties" />
+
+ <!-- Set default values for the build -->
+ <property file="build.properties" />
+
+
<!-- ================================================================ -->
<!-- I N I T T A R G E T -->
<!-- ================================================================ -->
@@ -39,7 +46,7 @@
<torque-om
contextProperties="build.properties"
controlTemplate="${OMControlTemplate}"
- outputDirectory="${build.src}"
+ outputDirectory="${build.dir}/src"
templatePath="${templatePath}"
outputFile="report.turbine.om.generation"
targetPackage="${securityPackage}"
@@ -55,7 +62,7 @@
<torque-om
contextProperties="build.properties"
controlTemplate="${OMControlTemplate}"
- outputDirectory="${build.src}"
+ outputDirectory="${build.dir}/src"
templatePath="${templatePath}"
outputFile="report.turbine.scheduler.generation"
targetPackage="${schedulerPackage}"
1.2 +44 -4 jakarta-turbine-fulcrum/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties 2001/07/31 14:36:01 1.1
+++ build.properties 2001/08/01 15:53:55 1.2
@@ -14,6 +14,7 @@
build.dir = ./bin
src.dir = ./src
+conf.dir = ../jakarta-turbine/conf
docs.src = ./xdocs
docs.dest = ./docs
@@ -28,9 +29,46 @@
# ${user.home}/build.properties file in order
# to build Torque:
+# Core
velocity.jar = ${lib.repo}/velocity-1.2-dev.jar
log4j.jar = ${lib.repo}/log4j-1.1.jar
+xerces.jar = ${lib.repo}/xerces-1.3.0.jar
+# BSF
+bsf.jar = ${lib.repo}/bsf.jar
+
+# DB
+torque.jar = ${lib.repo}/torque-1.0.jar
+village.jar = ${lib.repo}/village-1.5.1.jar
+jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
+
+# Intake/Localization/Pull/RunData
+turbine.jar = ${lib.repo}/turbine-3.0-dev.jar
+
+# JSP
+servlet.jar = ${lib.repo}/servlet.jar
+
+# Naming
+jndi.jar = ${lib.repo}/jndi-1.2.1.jar
+
+# Scheduler
+torque.jar = ${lib.repo}/torque-1.0.jar
+
+# Security
+javamail.jar = ${lib.repo}/mail-1.2.jar
+
+# Upload
+jaf.jar = ${lib.repo}/activation-1.0.1.jar
+
+# Velocity
+# already defined
+
+# XmlRpc
+xmlrpc.jar = ${lib.repo}/xmlrpc.jar
+
+# Xslt
+xalan.jar = ${lib.repo}/xalan-2.1.0.jar
+
# -------------------------------------------------------------------
#
# T O R Q U E C O N F I G U R A T I O N
@@ -44,8 +82,8 @@
complexObjectModel=true
basePrefix=Base
-templatePath = ${basedir}/../../jakarta-turbine-torque/src/templates
-schemaDirectory=${basedir}/../../jakarta-turbine/conf/master
+templatePath = ${basedir}/../jakarta-turbine-torque/src/templates
+schemaDirectory=${basedir}/../jakarta-turbine/conf/master
SQLControlTemplate = sql/base/Control.vm
OMControlTemplate = om/Control.vm
@@ -56,6 +94,8 @@
DataDumpControlTemplate = data/dump/Control.vm
DataSQLControlTemplate = sql/load/Control.vm
securityControlTemplate = sql/security/Control.vm
+
+securityPackage=org.apache.fulcrum.security.impl.db.entity
+schedulerPackage=org.apache.fulcrum.schedule
-securityPackage=org.apache.turbine.services.security.impl.db.entity
-schedulerPackage=org.apache.turbine.services.schedule
+omStatusFile = ./bin/src/report.turbine.om.generation
1.2 +20 -6 jakarta-turbine-fulcrum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/07/31 14:36:01 1.1
+++ build.xml 2001/08/01 15:53:55 1.2
@@ -12,6 +12,17 @@
<path id="classpath">
<pathelement location="${velocity.jar}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${bsf.jar}"/>
+ <pathelement location="${torque.jar}"/>
+ <pathelement location="${servlet.jar}"/>
+ <pathelement location="${jndi.jar}"/>
+ <pathelement location="${xmlrpc.jar}"/>
+ <pathelement location="${xalan.jar}"/>
+ <pathelement location="${torque.jar}"/>
+ <pathelement location="${village.jar}"/>
+ <pathelement location="${jdbc.jar}"/>
+ <pathelement location="${javamail.jar}"/>
+ <pathelement location="${jaf.jar}"/>
</path>
<!-- ================================================================== -->
@@ -117,16 +128,19 @@
<!-- ================================================================== -->
<target name="prepare"
- depends="init,check.velocity,check.log4j,env">
+ depends="init,check.velocity,check.log4j,om,env">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dir}/classes"/>
<mkdir dir="${build.dir}/src"/>
-
- <filter token="VERSION" value="${version}"/>
-
- <copy todir="${build.dir}/src/org" filtering="yes">
+
+ <!-- We have some static files that should overwrite
+ The torque generated files so overwrite must be
+ set to 'yes'. -->
+
+ <copy todir="${build.dir}/src/org" overwrite="yes">
<fileset dir="${src.dir}/core/java/org"/>
+ <fileset dir="${src.dir}/services/java/org"/>
</copy>
</target>
@@ -143,7 +157,7 @@
optimize="${optimize}">
<classpath refid="classpath"/>
</javac>
-
+
<!-- copy database.dtd to the right place -->
<copy file="${src.dir}/dtd/database.dtd"
todir="${build.dir}/classes/org/apache/turbine/torque/engine/database/transform"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
