jvanzyl 01/12/30 07:16:22
Modified: . build.properties build.xml
src/tdk/apps/3 build.xml
Added: . default.properties
src/tdk/apps/3 project-build.xml project.properties
Log:
- some additions and modifications to get the 3.x TDK working again
in at least a minimal fashion so I can test the changes in the pipeline
as we go.
Revision Changes Path
1.28 +1 -123 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.properties 25 Dec 2001 17:26:07 -0000 1.27
+++ build.properties 30 Dec 2001 15:16:22 -0000 1.28
@@ -1,123 +1 @@
-# -------------------------------------------------------------------
-# T D K P R O P E R T I E S
-# -------------------------------------------------------------------
-
-tdk.src = ./src/tdk
-tdk.containerSrc = ./src/container
-tdk.xdocs = ./xdocs
-tdk.docs = ./docs
-tdk.target.dir = ./target
-tdk.root.dir = ${tdk.target.dir}/tdk
-tdk.share.dir = ${tdk.root.dir}/tdk
-tdk.app2.template.dir = ${tdk.share.dir}/apps/2
-tdk.app3.template.dir = ${tdk.share.dir}/apps/3
-tdk.ancillary2.dir = ${tdk.share.dir}/ancillary/2
-tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
-tdk.site = ${tdk.dist}/webapps/site
-tdk.profileDirectory = ./profile
-#tdk.defaultProfile = t2-tc3-hsqldb.profile
-tdk.defaultProfile = t2-tc4-mysql.profile
-#tdk.defaultProfile = t2-tc4-postgresql.profile
-
-tdk.build.dir = ./bin
-tdk.jar = ${tdk.build.dir}/tdk.jar
-
-# -------------------------------------------------------------------
-# T U R B I N E P R O P E R T I E S
-# -------------------------------------------------------------------
-
-tdk.turbine2.home = ../jakarta-turbine-2
-tdk.turbine3.home = ../jakarta-turbine-3
-tdk.turbine-site.home = ../jakarta-turbine-site
-tdk.turbine-site.docs = ${tdk.turbine-site.home}/docs
-
-# -------------------------------------------------------------------
-# T O R Q U E P R O P E R T I E S
-# -------------------------------------------------------------------
-
-tdk.torque.home = ../jakarta-turbine-torque
-
-# -------------------------------------------------------------------
-# F U L C R U M P R O P E R T I E S
-# -------------------------------------------------------------------
-
-tdk.fulcrum.home = ../jakarta-turbine-fulcrum
-
-# -------------------------------------------------------------------
-# F L U X P R O P E R T I E S
-# -------------------------------------------------------------------
-
-tdk.flux2.home = ../jakarta-turbine-flux-2.1
-tdk.flux3.home = ../jakarta-turbine-flux
-
-# -------------------------------------------------------------------
-# D O C U M E N T A T I O N
-# -------------------------------------------------------------------
-
-tdk.site2.home = ../jakarta-site2
-
-# -------------------------------------------------------------------
-# J A R S
-# -------------------------------------------------------------------
-# These are the JAR files required for the TDK to operate.
-# -------------------------------------------------------------------
-# All these names are completely inconsistent, I realize. We have
-# to settle on a naming standard at Jakarta and start using released
-# versions of JARs. Slowly but surely.
-# -------------------------------------------------------------------
-
-ant.jar = ${lib.repo}/ant.jar
-commons-cactus.jar = ${lib.repo}/commons-cactus-1.1.jar
-commons-collections.jar = ${lib.repo}/commons-collections.jar
-commons-email.jar = ${lib.repo}/commons-email-0.1-dev.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
-ecs.jar = ${lib.repo}/ecs-1.4.1.jar
-flux2.jar = ${lib.repo}/flux-2.1.jar
-flux3.jar = ${lib.repo}/flux-3.0-dev.jar
-fulcrum.jar = ${lib.repo}/fulcrum-1.0.jar
-httpunit.jar = ${lib.repo}/httpunit-1.2.6.jar
-jaf.jar = ${lib.repo}/activation-1.0.1.jar
-javamail.jar = ${lib.repo}/mail-1.2.jar
-jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
-jdom.jar = ${lib.repo}/jdom-b7.jar
-jndi.jar = ${lib.repo}/jndi-1.2.1.jar
-jta.jar = ${lib.repo}/jta1.0.1.jar
-junit.jar = ${lib.repo}/junit-3.7.jar
-log4j.jar = ${lib.repo}/log4j-1.1.3.jar
-oro.jar = ${lib.repo}/oro.jar
-regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
-servlet.jar = ${lib.repo}/servlet.jar
-tidy.jar = ${lib.repo}/tidy.jar
-torque.jar = ${lib.repo}/torque-3.0-dev.jar
-velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
-village.jar = ${lib.repo}/village-1.5.3-dev.jar
-xalan.jar = ${lib.repo}/xalan-2.1.0.jar
-xerces.jar = ${lib.repo}/xerces-1.4.4.jar
-xmlrpc.jar = ${lib.repo}/xmlrpc.jar
-xmlrpc-helma.jar = ${lib.repo}/xmlrpc-helma.jar
-
-# -------------------------------------------------------------------
-# J A R S F O R T D K T O O L S A N D T A S K S
-# -------------------------------------------------------------------
-
-bcel.jar = ${lib.repo}/BCEL.jar
-digester.jar = ${lib.repo}/commons-digester.jar
-oro.jar = ${lib.repo}/oro.jar
-importscrubber.jar = ${lib.repo}/importscrubber.jar
-commons-beanutils.jar = ${lib.repo}/commons-beanutils.jar
-
-# -------------------------------------------------------------------
-# A D D I T I O N A L J A R S
-# -------------------------------------------------------------------
-# These are the JARs that we include with the TDK.
-# Primarily testing and JDBC drivers.
-# -------------------------------------------------------------------
-
-hsqldb.jar = ${lib.repo}/hsqldb.jar
-httpunit.jar = ${lib.repo}/httpunit.jar
-idb.jar = ${lib.repo}/idb.jar
-jstyle.jar = ${lib.repo}/jstyle.jar
-mysql.jar = ${lib.repo}/mm.mysql-2.0.7-bin.jar
-postgresql.jar = ${lib.repo}/postgresql.jar
-sapdbc.jar = ${lib.repo}/sapdbc.jar
-jdom.jar = ${lib.repo}/jdom-b7.jar
+mysql.jar = ${lib.repo}/mm.mysql-2.0.4.jar
1.30 +1 -0 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 23 Oct 2001 15:35:07 -0000 1.29
+++ build.xml 30 Dec 2001 15:16:22 -0000 1.30
@@ -5,6 +5,7 @@
<property file="${user.home}/build.properties" />
<property file="build.properties" />
+ <property file="default.properties" />
<property file="${tdk.profileDirectory}/${tdk.defaultProfile}"/>
<!-- ================================================================== -->
1.1 jakarta-turbine-tdk/default.properties
Index: default.properties
===================================================================
# -------------------------------------------------------------------
# T D K P R O P E R T I E S
# -------------------------------------------------------------------
tdk.src = ./src/tdk
tdk.containerSrc = ./src/container
tdk.xdocs = ./xdocs
tdk.docs = ./docs
tdk.target.dir = ./target
tdk.root.dir = ${tdk.target.dir}/tdk
tdk.share.dir = ${tdk.root.dir}/tdk
tdk.app2.template.dir = ${tdk.share.dir}/apps/2
tdk.app3.template.dir = ${tdk.share.dir}/apps/3
tdk.ancillary2.dir = ${tdk.share.dir}/ancillary/2
tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
tdk.site = ${tdk.dist}/webapps/site
tdk.profileDirectory = ./profile
#tdk.defaultProfile = t2-tc3-hsqldb.profile
tdk.defaultProfile = t3-tc4-mysql.profile
#tdk.defaultProfile = t2-tc4-postgresql.profile
tdk.build.dir = ./bin
tdk.jar = ${tdk.build.dir}/tdk.jar
# -------------------------------------------------------------------
# T U R B I N E P R O P E R T I E S
# -------------------------------------------------------------------
tdk.turbine2.home = ../jakarta-turbine-2
tdk.turbine3.home = ../jakarta-turbine-3
tdk.turbine-site.home = ../jakarta-turbine-site
tdk.turbine-site.docs = ${tdk.turbine-site.home}/docs
# -------------------------------------------------------------------
# T O R Q U E P R O P E R T I E S
# -------------------------------------------------------------------
tdk.torque.home = ../jakarta-turbine-torque
# -------------------------------------------------------------------
# F U L C R U M P R O P E R T I E S
# -------------------------------------------------------------------
tdk.fulcrum.home = ../jakarta-turbine-fulcrum
# -------------------------------------------------------------------
# F L U X P R O P E R T I E S
# -------------------------------------------------------------------
tdk.flux2.home = ../jakarta-turbine-flux-2.1
tdk.flux3.home = ../jakarta-turbine-flux
# -------------------------------------------------------------------
# D O C U M E N T A T I O N
# -------------------------------------------------------------------
tdk.site2.home = ../jakarta-site2
# -------------------------------------------------------------------
# J A R S
# -------------------------------------------------------------------
# These are the JAR files required for the TDK to operate.
# -------------------------------------------------------------------
# All these names are completely inconsistent, I realize. We have
# to settle on a naming standard at Jakarta and start using released
# versions of JARs. Slowly but surely.
# -------------------------------------------------------------------
ant.jar = ${lib.repo}/ant.jar
commons-cactus.jar = ${lib.repo}/commons-cactus-1.1.jar
commons-collections.jar = ${lib.repo}/commons-collections.jar
commons-email.jar = ${lib.repo}/commons-email-0.1-dev.jar
commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
ecs.jar = ${lib.repo}/ecs-1.4.1.jar
flux2.jar = ${lib.repo}/flux-2.1.jar
flux3.jar = ${lib.repo}/flux-3.0-dev.jar
fulcrum.jar = ${lib.repo}/fulcrum-1.0.jar
httpunit.jar = ${lib.repo}/httpunit-1.2.6.jar
jaf.jar = ${lib.repo}/activation-1.0.1.jar
javamail.jar = ${lib.repo}/mail-1.2.jar
jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
jdom.jar = ${lib.repo}/jdom-b7.jar
jndi.jar = ${lib.repo}/jndi-1.2.1.jar
jta.jar = ${lib.repo}/jta1.0.1.jar
junit.jar = ${lib.repo}/junit-3.7.jar
log4j.jar = ${lib.repo}/log4j-1.1.3.jar
oro.jar = ${lib.repo}/oro.jar
regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
servlet.jar = ${lib.repo}/servlet.jar
tidy.jar = ${lib.repo}/tidy.jar
torque.jar = ${lib.repo}/torque-3.0-dev.jar
velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
village.jar = ${lib.repo}/village-1.5.3-dev.jar
xalan.jar = ${lib.repo}/xalan-2.1.0.jar
xerces.jar = ${lib.repo}/xerces-1.4.4.jar
xmlrpc.jar = ${lib.repo}/xmlrpc.jar
xmlrpc-helma.jar = ${lib.repo}/xmlrpc-helma.jar
# -------------------------------------------------------------------
# J A R S F O R T D K T O O L S A N D T A S K S
# -------------------------------------------------------------------
bcel.jar = ${lib.repo}/BCEL.jar
digester.jar = ${lib.repo}/commons-digester.jar
oro.jar = ${lib.repo}/oro.jar
importscrubber.jar = ${lib.repo}/importscrubber.jar
commons-beanutils.jar = ${lib.repo}/commons-beanutils.jar
# -------------------------------------------------------------------
# A D D I T I O N A L J A R S
# -------------------------------------------------------------------
# These are the JARs that we include with the TDK.
# Primarily testing and JDBC drivers.
# -------------------------------------------------------------------
hsqldb.jar = ${lib.repo}/hsqldb.jar
httpunit.jar = ${lib.repo}/httpunit.jar
idb.jar = ${lib.repo}/idb.jar
jstyle.jar = ${lib.repo}/jstyle.jar
mysql.jar = ${lib.repo}/mm.mysql-2.0.7-bin.jar
postgresql.jar = ${lib.repo}/postgresql.jar
sapdbc.jar = ${lib.repo}/sapdbc.jar
jdom.jar = ${lib.repo}/jdom-b7.jar
1.15 +18 -50 jakarta-turbine-tdk/src/tdk/apps/3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/3/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 27 Sep 2001 06:17:59 -0000 1.14
+++ build.xml 30 Dec 2001 15:16:22 -0000 1.15
@@ -4,13 +4,6 @@
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
-
- <!-- This value is currently set as a property because
- the top level tdk build.xml file runs the "init" target
- as part of testing and texen doesn't obey the ${basedir}
- property so we must pass in the full path to the
- build.properties for use with the contextProperties attribute.
- -->
<property name="build.properties" value="build.properties"/>
<!-- Build classpath -->
@@ -18,10 +11,6 @@
<fileset dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${tdk.home}/common/lib">
- <include name="**/servlet*.jar"/>
- </fileset>
- <pathelement path="${build.dest}"/>
</path>
<!-- ================================================================ -->
@@ -51,38 +40,15 @@
<!-- problems defining them at the top level. -->
<!-- ================================================================ -->
- <target name="init-tasks" depends="setup">
-
- <taskdef name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <taskdef name="torque-om"
- classname="org.apache.torque.task.TorqueObjectModelTask">
- <classpath refid="classpath"/>
- </taskdef>
-
- <taskdef name="torque-create-db"
- classname="org.apache.torque.task.TorqueCreateDatabase">
- <classpath refid="classpath"/>
- </taskdef>
-
- <taskdef name="sql-xml"
- classname="org.apache.torque.task.TorqueSQLTransformTask">
- <classpath refid="classpath"/>
- </taskdef>
+ <target
+ name="init-tasks"
+ depends="setup">
<taskdef name="texen"
classname="org.apache.velocity.texen.ant.TexenTask">
<classpath refid="classpath"/>
</taskdef>
- <taskdef name="format-source"
- classname="jstyle.FormatTask">
- <classpath refid="classpath"/>
- </taskdef>
-
</target>
<!-- ================================================================ -->
@@ -92,8 +58,11 @@
<!-- your sources for you and compile them. -->
<!-- ================================================================ -->
- <target name="init" description="--> generates the full application">
+ <target
+ name="init"
+ description="--> generates the full application">
+ <!--
<antcall target="create-database"/>
<antcall target="turbine-sql"/>
@@ -101,15 +70,12 @@
<antcall target="turbine-id-table-init-sql"/>
<antcall target="turbine-security-sql"/>
<antcall target="turbine-insert-sql"/>
+ -->
<antcall target="update-tr-props"/>
<antcall target="project"/>
- <!--
- <antcall target="compile-tests"/>
- -->
-
</target>
@@ -122,10 +88,13 @@
<target name="project" description="--> run when XML schema is changed">
+ <!--
<antcall target="project-sql"/>
<antcall target="project-id-table-init-sql"/>
<antcall target="project-insert-sql"/>
<antcall target="project-om"/>
+ -->
+
<antcall target="compile"/>
</target>
@@ -444,11 +413,14 @@
<target name="update-tr-props">
+ <filter token="DATABASE" value="${database}"/>
<filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
<filter token="DATABASE_URL" value="${databaseUrl}"/>
+ <filter token="DATABASE_BUILD_URL" value="${build.databaseUrl}"/>
<filter token="DATABASE_USER" value="${databaseUser}"/>
<filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
- <filter token="DATABASE_DEFAULT" value="default"/>
+ <filter token="DATABASE_HOST" value="${databaseHost}"/>
+ <filter token="DATABASE_DEFAULT" value="${tdk.project}"/>
<property name="database.descriptor"
value="${master.conf.dir}/database/${database}"/>
<property name="database.name" value="${tdk.project}"/>
@@ -457,14 +429,10 @@
<filter token="DATABASE_ADAPTOR" value="${database.adaptor}"/>
<copy
- file="${conf.dir}/TurbineResources.properties"
- tofile="${conf.dir}/tmp"
+ file="${conf.dir}/TurbineResources.template"
+ tofile="${conf.dir}/TurbineResources.properties"
+ overwrite="yes"
filtering="yes"
- />
-
- <move
- file="${conf.dir}/tmp"
- tofile="${conf.dir}/TurbineResources.properties"
/>
<copy
1.1 jakarta-turbine-tdk/src/tdk/apps/3/project-build.xml
Index: project-build.xml
===================================================================
<?xml version="1.0"?>
<project name="project-build" default="init" basedir=".">
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
<property file="project.properties"/>
<target name="init">
<!--
<copy file="${tambora-system.jar}" todir="${build.webappRoot}/WEB-INF/lib"/>
-->
</target>
</project>
1.1 jakarta-turbine-tdk/src/tdk/apps/3/project.properties
Index: project.properties
===================================================================
# These are properties that are specific to this
# Turbine project.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
