jvanzyl 01/10/23 08:35:07
Modified: . build-libs.xml build-tomcat4.properties
build-tomcat4.xml build.properties build.xml
src/tdk build.xml
src/tdk/apps/2 build.xml
src/tdk/task/org/apache/tdk/transformer transformations.xml
Added: . build-tomcat323.properties
Log:
- adding tomcat323 to the mix
- using released distributions for tomcat4 and tomcat3, stop
using versions from CVS.
- copy the servlet jar provided by the servlet
container into the ${tdk.home}/tdk/lib directory.
Each servlet container might put this in a different
place so making an explicit reference to it in
the project build files is a bad idea. So now we
will copy the servlet.jar into the WEB-INF/lib
directory for each app. A deployment target can
subsequently remove it as it won't be necessary
at run time.
this allows an application to build using only the
files in the WEB-INF/lib directory. getting rid
of external references.
Revision Changes Path
1.6 +2 -0 jakarta-turbine-tdk/build-libs.xml
Index: build-libs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-libs.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-libs.xml 2001/09/27 06:17:59 1.5
+++ build-libs.xml 2001/10/23 15:35:07 1.6
@@ -59,6 +59,8 @@
<copy file="${oro.jar}" todir="${tdk.share.dir}/lib"/>
<copy file="${digester.jar}" todir="${tdk.share.dir}/lib"/>
<copy file="${tdk.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${importscrubber.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${commons-beanutils.jar}" todir="${tdk.share.dir}/lib"/>
<copy todir="${tdk.share.dir}/lib">
<fileset dir="${lib.repo}">
1.3 +2 -2 jakarta-turbine-tdk/build-tomcat4.properties
Index: build-tomcat4.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-tomcat4.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tomcat4.properties 2001/10/23 15:30:13 1.2
+++ build-tomcat4.properties 2001/10/23 15:35:07 1.3
@@ -5,7 +5,7 @@
# other than tomcat4.
# -------------------------------------------------------------------
-tdk.tomcat.home = ../jakarta-tomcat-4.0
-tdk.tomcat.dist = ${tdk.tomcat.home}/dist
+tdk.tomcat.home = ${dist.repo}/jakarta-tomcat-4.0.1
+tdk.tomcat.dist = ${dist.repo}/jakarta-tomcat-4.0.1
tdk.tomcat.conf = ${tdk.tomcat.dist}/conf
tdk.servletJar = ${tdk.tomcat.dist}/common/lib/servlet.jar
1.6 +6 -4 jakarta-turbine-tdk/build-tomcat4.xml
Index: build-tomcat4.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-tomcat4.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-tomcat4.xml 2001/10/10 13:27:05 1.5
+++ build-tomcat4.xml 2001/10/23 15:35:07 1.6
@@ -19,12 +19,14 @@
</fileset>
</copy>
- <delete file="${tdk.root.dir}/conf/server.xml"/>
+ <copy
+ todir="${tdk.share.dir}/lib"
+ file="${tdk.servletJar}"
+ />
- <copy todir="${tdk.root.dir}/conf">
- <fileset dir="${tdk.tomcat.conf}"/>
+ <copy todir="${tdk.root.dir}" overwrite="yes">
+ <fileset dir="${tdk.containerSrc}/${tdk.servletContainer}"/>
</copy>
-
<replace file="${tdk.root.dir}/conf/server.xml">
<replacetoken><![CDATA[<!-- Tomcat Examples Context -->]]></replacetoken>
1.24 +5 -2 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.properties 2001/10/10 13:27:05 1.23
+++ build.properties 2001/10/23 15:35:07 1.24
@@ -3,6 +3,7 @@
# -------------------------------------------------------------------
tdk.src = ./src/tdk
+tdk.containerSrc = ./src/container
tdk.xdocs = ./xdocs
tdk.target.dir = ./target
tdk.root.dir = ${tdk.target.dir}/tdk
@@ -13,8 +14,8 @@
tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
tdk.site = ${tdk.dist}/webapps/site
tdk.profileDirectory = ./profile
-#tdk.defaultProfile = t2-tc4-hsqldb.profile
-tdk.defaultProfile = t2-tc4-mysql.profile
+tdk.defaultProfile = t2-tc3-hsqldb.profile
+#tdk.defaultProfile = t2-tc4-mysql.profile
tdk.build.dir = ./bin
tdk.jar = ${tdk.build.dir}/tdk.jar
@@ -99,6 +100,8 @@
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
1.29 +1 -2 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 2001/10/09 22:41:41 1.28
+++ build.xml 2001/10/23 15:35:07 1.29
@@ -185,7 +185,6 @@
<target name="prepare">
<copy todir="${tdk.build.dir}/src">
- <fileset dir="${tdk.src}/tool"/>
<fileset dir="${tdk.src}/task"/>
</copy>
</target>
@@ -194,10 +193,10 @@
<path id="classpath">
<pathelement location="${bcel.jar}"/>
<pathelement location="${commons-util.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${digester.jar}"/>
<pathelement location="${oro.jar}"/>
<pathelement location="${velocity.jar}"/>
- <pathelement location="${commons-util.jar}"/>
</path>
<target
1.1 jakarta-turbine-tdk/build-tomcat323.properties
Index: build-tomcat323.properties
===================================================================
# -------------------------------------------------------------------
# T O M C A T 3.2.3 P R O P E R T I E S
# -------------------------------------------------------------------
tdk.tomcat.home = ${dist.repo}/jakarta-tomcat-3.2.3
tdk.tomcat.dist = ${dist.repo}/jakarta-tomcat-3.2.3
tdk.tomcat.conf = ${tdk.tomcat.dist}/conf
tdk.servletJar = ${tdk.tomcat.dist}/lib/servlet.jar
1.23 +1 -0 jakarta-turbine-tdk/src/tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2001/10/09 22:41:41 1.22
+++ build.xml 2001/10/23 15:35:07 1.23
@@ -307,6 +307,7 @@
<copy
file="${ancillary.dir}/web.xml"
tofile="${tdk.home}/webapps/${tdk.project}/WEB-INF/web.xml"
+ overwrite="yes"
filtering="yes"
/>
1.31 +0 -4 jakarta-turbine-tdk/src/tdk/apps/2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.xml 2001/10/22 16:47:58 1.30
+++ build.xml 2001/10/23 15:35:07 1.31
@@ -18,10 +18,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>
<!-- ================================================================ -->
1.5 +5 -1
jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/transformer/transformations.xml
Index: transformations.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/transformer/transformations.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- transformations.xml 2001/10/22 00:55:36 1.4
+++ transformations.xml 2001/10/23 15:35:07 1.5
@@ -191,7 +191,6 @@
<result>import org.apache.fulcrum.upload</result>
</transformation>
-
<!-- Torque Separation -->
<transformation>
@@ -203,5 +202,10 @@
<target>import org.apache.turbine.util.db.pool.DBConnection</target>
<result>import org.apache.torque.pool.DBConnection</result>
</transformation>
+
+ <!-- Turbine Services -->
+
+
+ <!-- Turbine Security Service Extensions -->
</transformations>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
