User: stark
Date: 01/02/20 14:20:40
Modified: tomcat/src/build build.bat build.sh build.xml
Log:
Update build.bat to check for JBOSS_HOME and TOMCAT_HOME
Update build.bat and build.sh to work with ant 1.2
Update build.xml to avoid deprecated task warnings
Revision Changes Path
1.2 +13 -3 contrib/tomcat/src/build/build.bat
Index: build.bat
===================================================================
RCS file: /products/cvs/ejboss/contrib/tomcat/src/build/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 2000/12/07 15:40:14 1.1
+++ build.bat 2001/02/20 22:20:40 1.2
@@ -1,11 +1,21 @@
@echo off
REM convenience bat file to build with
+if not exist %TOMCAT_HOME%\lib\webserver.jar (
+ echo %TOMCAT_HOME%\lib\webserver.jar does not exist
+ echo set TOMCAT_HOME to the tomcat dist directory
+ exit
+)
+if not exist %JBOSS_HOME%\bin\run.jar (
+ echo %JBOSS_HOME%\bin\run.jar does not exist
+ echo set JBOSS_HOME to the jboss dist directory
+ exit
+)
+
set CLASSPATH=..\..\lib\ant.jar
-set CLASSPATH=%CLASSPATH%;..\..\lib\xml.jar
set CLASSPATH=%CLASSPATH%;..\..\build\classes
set CLASSPATH=%CLASSPATH%;..\..\lib\javac.jar
-
-set JBOSS_HOME=h:\projects\jboss\dist
+set CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\parser.jar
+set CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\jaxp.jar
java -Dtomcat.home=%TOMCAT_HOME% -Djboss.home=%JBOSS_HOME% -classpath "%CLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
1.3 +20 -15 contrib/tomcat/src/build/build.sh
Index: build.sh
===================================================================
RCS file: /products/cvs/ejboss/contrib/tomcat/src/build/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 2000/11/02 18:02:44 1.2
+++ build.sh 2001/02/20 22:20:40 1.3
@@ -1,17 +1,22 @@
-#! /bin/sh
-# $Id: build.sh,v 1.2 2000/11/02 18:02:44 salborini Exp $
+#!/bin/sh
+if [ ! -f "${JBOSS_HOME}/bin/run.jar" ]
+then
+ echo $JBOSS_HOME/bin/run.jar does not exist
+ echo set JBOSS_HOME to the jboss dist directory
+ exit 1
+fi
+if [ ! -f "$TOMCAT_HOME/lib/webserver.jar" ]
+then
+ echo $TOMCAT_HOME/lib/webserver.jar does not exist
+ echo set TOMCAT_HOME to the tomcat dist directory
+ exit 1
+fi
-ABORT=0
-if [ "X${JBOSS_HOME}" = "X" ] ; then echo "JBOSS_HOME is not set. You need jboss
2.0PR3+" ; ABORT=1 ; fi
-if [ "X${TOMCAT_HOME}" = "X" ] ; then echo "TOMCAT_HOME is not set. You need tomcat
3.2b4+" ; ABORT=1 ; fi
-if [ $ABORT = 1 ] ; then echo "Aborting..." ; exit ; fi
+CLASSPATH=../../lib/ant.jar
+CLASSPATH=$CLASSPATH:../../build/classes
+CLASSPATH=$CLASSPATH:../../lib/javac.jar
+CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/parser.jar
+CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/jaxp.jar
-TARGET_CLASSPATH=../../lib/ant.jar:\
-../../lib/xml.jar:\
-../../build/classes:\
-../../lib/javac.jar
-
-java -classpath $TARGET_CLASSPATH \
- -Dtomcat.home=$TOMCAT_HOME \
- -Djboss.home=$JBOSS_HOME \
- org.apache.tools.ant.Main $*
+java -Dtomcat.home="$TOMCAT_HOME" -Djboss.home="$JBOSS_HOME" -classpath "$CLASSP
+ATH" org.apache.tools.ant.Main $*
1.6 +17 -9 contrib/tomcat/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /products/cvs/ejboss/contrib/tomcat/src/build/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2000/12/07 15:39:12 1.5
+++ build.xml 2001/02/20 22:20:40 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: build.xml,v 1.5 2000/12/07 15:39:12 oberg Exp $ -->
+<!-- $Id: build.xml,v 1.6 2001/02/20 22:20:40 stark Exp $ -->
<!-- ======================================================================= -->
@@ -26,6 +26,10 @@
<property name="test.client" value="tomcat-test"/>
<property name="build.compiler" value="classic"/>
+
+ <echo message="jboss.home=${jboss.home}" />
+ <echo message="tomcat.home=${tomcat.home}" />
+ <echo message="classpath=${classpath}" />
</target>
@@ -34,7 +38,7 @@
<!-- =================================================================== -->
<target name="prepare" depends="init">
<mkdir dir="${build.dir}"/>
- <copyfile src="${src.resources}/jboss-web.dtd"
dest="${build.classes.dir}/jboss-web.dtd"/>
+ <copy file="${src.resources}/jboss-web.dtd"
tofile="${build.classes.dir}/jboss-web.dtd"/>
</target>
@@ -68,8 +72,8 @@
<!-- Installs the jar archive to jboss -->
<!-- =================================================================== -->
<target name="install" depends="jar">
- <copyfile src="${jar.file}"
- dest="${jboss.home}/lib/ext/${jar.file}"
+ <copy file="${jar.file}"
+ tofile="${jboss.home}/lib/ext/${jar.file}"
/>
</target>
@@ -88,15 +92,19 @@
<!-- Creates the test client ear file -->
<!-- =================================================================== -->
<target name="client" depends="compile">
- <copydir src="${src.resources}/test" dest="${build.classes.dir}"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.resources}/test" />
+ </copy>
<jar jarfile="${build.classes.dir}/${test.client}.jar"
basedir="${build.classes.dir}"
includes="org/jboss/test/tomcat/ejb/**,META-INF/ejb-jar.xml,META-INF/jboss.xml"
/>
- <copydir src="${build.classes.dir}/org/jboss/test/tomcat/servlet"
-
dest="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/servlet"/>
- <copydir src="${build.classes.dir}/org/jboss/test/tomcat/ejb/interfaces"
-
dest="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/ejb/interfaces"/>
+ <copy
todir="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/servlet" >
+ <fileset dir="${build.classes.dir}/org/jboss/test/tomcat/servlet" />
+ </copy>
+ <copy
todir="${build.classes.dir}/WEB-INF/classes/org/jboss/test/tomcat/ejb/interfaces" >
+ <fileset dir="${build.classes.dir}/org/jboss/test/tomcat/ejb/interfaces" />
+ </copy>
<jar jarfile="${build.classes.dir}/${test.client}.war"
basedir="${build.classes.dir}"
manifest="${src.resources}/web.mf"
