jvanzyl 01/09/22 18:33:10
Modified: . build.properties build.xml
profile t2-tc4-hsqldb.profile
src/tdk/apps/2 build.xml
Log:
- adding deployment targets to the standard build.xml for a 2.x
project working in cvslayout mode.
deploy-war:
this will move everything into the servlet container and bundle
everything up. if you use hypersonic than you have a self-contained
bundle that is easy first step for novice users that have a servlet
container already configured.
deploy-container:
this depends on the "deploy-war" target but additionally copies
the contents of the TDK (with your app contained within) to a target
directory, less the tdk gunk, and zip/tgz up the results. this is
an even easier first step for novice users as all they have to do
is undo the bundle and start the servlet container. the configured
app using hypersonic is ready to run.
i will add some more good stuff to allow a project that is configured
to use a heavy weight db to make the self-contained deployment targets
without affecting the setup.
moving closer to the big-time build box that will assemble the sample
application for all known supported dbs so that we can make sure that
everything is working for people and remains that way.
right now i am thinking of two main ways to deploy: using hypersonic
which makes for complete self-containment and having a hook for
configuration via a web console that will take any site specific
information and run any stages that are presently used during
development of the application. as a simple start this would be
the collection and verfication of database settings: take the verified
settings and use what exists in the TDK to generate the required SQL
and insert it into the specified database (or create the database if
required). this is the end goal as this is what i would like to provide
tambora users with by the end of the weekend.
Revision Changes Path
1.20 +1 -1 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.properties 2001/09/22 18:14:58 1.19
+++ build.properties 2001/09/23 01:33:10 1.20
@@ -13,7 +13,7 @@
tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
tdk.site = ${tdk.dist}/webapps/site
tdk.profileDirectory = ./profile
-tdk.defaultProfile = t3-tc4-hsqldb.profile
+tdk.defaultProfile = t2-tc4-hsqldb.profile
# -------------------------------------------------------------------
# T U R B I N E P R O P E R T I E S
1.23 +11 -6 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2001/09/22 18:14:58 1.22
+++ build.xml 2001/09/23 01:33:10 1.23
@@ -110,9 +110,6 @@
<!-- =================================================================== -->
<target name="test">
-
- <echo message="${database}"/>
-
<antcall target="test-dist"/>
<ant dir="${tdk.home}"/>
<ant dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build" target="init">
@@ -124,12 +121,20 @@
</target>
<target name="test-cvslayout">
-
- <echo message="${database}"/>
-
<antcall target="test-dist"/>
<ant dir="${tdk.home}" target="cvslayout"/>
<ant dir="${tdk.home}/../${tdk.project}" target="init">
+ <property
+ name="build.properties"
+ value="${tdk.home}/../${tdk.project}/build.properties"
+ />
+ </ant>
+ </target>
+
+ <target name="test-deploy-container">
+ <antcall target="test-dist"/>
+ <ant dir="${tdk.home}" target="cvslayout"/>
+ <ant dir="${tdk.home}/../${tdk.project}" target="deploy-container">
<property
name="build.properties"
value="${tdk.home}/../${tdk.project}/build.properties"
1.5 +1 -0 jakarta-turbine-tdk/profile/t2-tc4-hsqldb.profile
Index: t2-tc4-hsqldb.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t2-tc4-hsqldb.profile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- t2-tc4-hsqldb.profile 2001/09/22 18:13:49 1.4
+++ t2-tc4-hsqldb.profile 2001/09/23 01:33:10 1.5
@@ -5,6 +5,7 @@
tdk.profileName = t2-tc4-hsqldb
tdk.profileDescription = Turbine 2.x / Tomcat 4.0 / HsqlDb
tdk.turbineVersion = 2
+#tdk.project = ${tdk.profileName}
tdk.project = newapp
tdk.servletContainer = tomcat4
database = hypersonic
1.20 +51 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 2001/09/22 20:11:44 1.19
+++ build.xml 2001/09/23 01:33:10 1.20
@@ -23,7 +23,14 @@
<pathelement path="${build.dest}"/>
</path>
- <target name="cvslayout-war">
+ <!-- ================================================================ -->
+ <!-- D E P L O Y M E N T T A R G E T S -->
+ <!-- ================================================================ -->
+
+ <target
+ name="assemble-webapp-in-container"
+ depends="init">
+
<echo message="${build.webappRoot}"/>
<copy todir="${build.webappRoot}">
<fileset dir=".">
@@ -32,6 +39,49 @@
<include name="templates/**"/>
</fileset>
</copy>
+ <copy todir="${build.webappRoot}/WEB-INF/conf">
+ <fileset dir="src/conf"/>
+ </copy>
+ </target>
+
+ <target
+ name="deploy-war"
+ depends="assemble-webapp-in-container">
+
+ <jar jarfile="${tdk.project}.war">
+ <fileset dir="${tdk.home}/webapps">
+ <include name="${tdk.project}/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target
+ name="deploy-container"
+ depends="assemble-webapp-in-container">
+
+ <mkdir dir="target/${tdk.project}"/>
+ <copy todir="target/${tdk.project}">
+ <fileset dir="${tdk.home}">
+ <exclude name="tdk/**"/>
+ <exclude name="build.xml"/>
+ <exclude name="build.properties"/>
+ <exclude name="GETTING_STARTED.txt"/>
+ </fileset>
+ </copy>
+
+ <tar longfile="gnu" tarfile="${tdk.project}.tar">
+ <tarfileset dir="target" mode="755">
+ <include name="**/*.sh"/>
+ </tarfileset>
+ <tarfileset dir="target">
+ <include name="**"/>
+ <exclude name="**/*.sh"/>
+ </tarfileset>
+ </tar>
+
+ <gzip zipfile="${tdk.project}.tar.gz" src="${tdk.project}.tar"/>
+ <zip zipfile="${tdk.project}.zip" basedir="target"/>
+ <delete file="${tdk.project}.tar"/>
</target>
<!-- ================================================================ -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
