[JBoss-dev] CVS update: contrib/catalina/src/build build.properties
User: starksm Date: 01/12/29 01:23:54 Removed: catalina/src/build Tag: Branch_2_4 build.properties Log: This file should not be in cvs ___ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/catalina/src/build build.properties build.sh build.xml
User: starksm
Date: 01/11/12 11:29:44
Modified:catalina/src/build Tag: Branch_2_4 build.properties build.sh
build.xml
Log:
Update to use Tomcat-4.0.1
Revision ChangesPath
No revision
No revision
1.1.2.1 +2 -2 contrib/catalina/src/build/build.properties
Index: build.properties
===
RCS file: /cvsroot/jboss/contrib/catalina/src/build/build.properties,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build.properties 2001/09/14 12:45:00 1.1
+++ build.properties 2001/11/12 19:29:44 1.1.2.1
@@ -1,3 +1,3 @@
# Change this to reflect your local settings
-jboss.home=/xdev/jboss
-tomcat.home=/xdev/jboss/catalina
+jboss.dist=${basedir}/../../jboss/dist
+catalina.dist=${basedir}/jakarta-tomcat-4.0.1
1.2.2.1 +12 -4 contrib/catalina/src/build/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/contrib/catalina/src/build/build.sh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build.sh 2001/03/29 08:27:17 1.2
+++ build.sh 2001/11/12 19:29:44 1.2.2.1
@@ -2,11 +2,20 @@
ABORT=0
-if [ X${JBOSS_HOME} = X ] ; then echo JBOSS_HOME is not set. You need jboss
2.1+ ; ABORT=1 ; fi
-if [ X${TOMCAT_HOME} = X ] ; then echo TOMCAT_HOME is not set. You need tomcat
4.0-b1+ ; ABORT=1 ; fi
+if [ X${JBOSS_HOME} = X ]
+then
+ echo JBOSS_HOME is not set. You need jboss 2.4
+ ABORT=1
+fi
+
+if [ X${TOMCAT_HOME} = X ]
+then
+ echo TOMCAT_HOME is not set. You need tomcat 4.0.1+
+ ABORT=1
+fi
if [ $ABORT = 1 ] ; then echo Aborting... ; exit ; fi
-TARGET_CLASSPATH=${JBOSS_HOME}/lib/ant-1.3.jar:\
+TARGET_CLASSPATH=${JBOSS_HOME}/lib/ant.jar:\
${TOMCAT_HOME}/server/crimson.jar:\
${TOMCAT_HOME}/server/jaxp.jar:\
${JBOSS_HOME}/lib/javac.jar
@@ -15,5 +24,4 @@
-Dtomcat.home=$TOMCAT_HOME \
-Djboss.home=$JBOSS_HOME \
org.apache.tools.ant.Main $*
-
1.4.2.2 +9 -5 contrib/catalina/src/build/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/catalina/src/build/build.xml,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- build.xml 2001/10/03 07:36:25 1.4.2.1
+++ build.xml 2001/11/12 19:29:44 1.4.2.2
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=UTF-8 ?
-!-- $Id: build.xml,v 1.4.2.1 2001/10/03 07:36:25 starksm Exp $ --
+!-- $Id: build.xml,v 1.4.2.2 2001/11/12 19:29:44 starksm Exp $ --
!-- An Ant build file for the catalina-service jar and the
JBoss/Tomcat bundle. The buildfile requires a JBoss dist
@@ -9,9 +9,12 @@
project name=catalina-service default=jar basedir=../..
+!-- Allow override from local properties file --
+property file=build.properties /
+
!-- Default values for jboss.dist catalina.dist that should be overriden --
property name=jboss.dist value=${basedir}/../../jboss/dist/
-property name=catalina.dist value=${basedir}/jakarta-tomcat-4.0/
+property name=catalina.dist value=${basedir}/jakarta-tomcat-4.0.1/
property name=name value=catalina-service/
property name=lib.dir value=${basedir}/lib/
@@ -21,7 +24,7 @@
property name=build.dir value=${basedir}/build/
property name=build.classes.dir value=${build.dir}/classes/
property name=jar.file value=${name}.jar/
-property name=bundle.name value=JBoss-2.4.3_Tomcat-4.0 /
+property name=bundle.name value=JBoss-2.4.4_Tomcat-4.0.1 /
property name=bundle.dir value=bundle /
property name=bundle.root value=${bundle.dir}/${bundle.name} /
path id=base.path_24
@@ -130,10 +133,10 @@
set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%JAVA_HOME%/lib/tools.jar
.\run.bat catalina
/echo
-fixcrlf srcdir=${bundle.root}/jboss/bin cr=remove eof=remove
+fixcrlf srcdir=${bundle.root}/jboss/bin eol=lf eof=remove
includes=*.sh /
chmod dir=${bundle.root}/jboss/bin perm=ugo+rx includes=*.sh /
-fixcrlf srcdir=${bundle.root}/jboss/bin cr=add eof=remove
+fixcrlf srcdir=${bundle.root}/jboss/bin eol=crlf eof=remove
includes=*.bat /
/target
@@ -151,6 +154,7 @@
!-- === --
target name=clean
delete dir=${build.dir}/
+delete dir=${bundle.dir}/
/target
/project
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/catalina/src/build build.properties build.xml
User: rickardoberg
Date: 01/09/14 05:45:00
Modified:catalina/src/build build.xml
Added: catalina/src/build build.properties
Log:
Now works properly with Tomcat4-RC2
Revision ChangesPath
1.2 +51 -51contrib/catalina/src/build/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/contrib/catalina/src/build/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/02/22 14:51:03 1.1
+++ build.xml 2001/09/14 12:45:00 1.2
@@ -1,51 +1,51 @@
-project default=tomcatservice basedir=../
- target name=init
-tstamp/
-property name=build.compiler value=classic/
-property name=debug value=on/
-property name=optimize value=on/
-property name=deprecation value=on/
-
-property name=src.dir value=${basedir}/main/
-property name=lib.dir value=${basedir}/lib/
-property name=build.dir value=${basedir}/../build/
-property name=build.classes.dir value=${build.dir}/classes/
-property name=dist.dir value=${basedir}/../dist/
-property name=classpath value=${tomcat.home}/server/catalina.jar;
- ${tomcat.home}/server/crimson.jar;
- ${tomcat.home}/server/jaxp.jar;
- ${jboss.home}/dist/lib/ext/jboss.jar;
- ${jboss.home}/dist/lib/jmxri.jar /
- /target
-
- !-- === --
- !-- Prepares the build directory--
- !-- === --
- target name=prepare depends=init
-mkdir dir=${build.classes.dir}/
- /target
-
- !-- === --
- !-- Compiles the source directory --
- !-- === --
- target name=compile depends=prepare
-javac srcdir=${src.dir}
- destdir=${build.classes.dir}
- debug=${debug}
- classpath=${classpath}
- optimize=${optimize}/
- /target
-
- !-- === --
- !-- Creates the class package --
- !-- === --
-
- target name=tomcatservice depends=compile
-mkdir dir=${dist.dir}/
-jar jarfile=${dist.dir}/embedded.jar basedir=${build.classes.dir}/
- /target
-
-
-/project
-
-!-- End of file --
+project name=Catalina default=tomcatservice basedir=../
+ target name=init
+tstamp/
+property name=build.compiler value=classic/
+property name=debug value=on/
+property name=optimize value=on/
+property name=deprecation value=on/
+
+property name=src.dir value=${basedir}/main/
+property name=lib.dir value=${basedir}/lib/
+property name=build.dir value=${basedir}/../build/
+property name=build.classes.dir value=${build.dir}/classes/
+property name=dist.dir value=${basedir}/../dist/
+
+property file=${basedir}/build/build.properties/
+
+property name=classpath
value=${tomcat.home}/bin/bootstrap.jar;${tomcat.home}/server/lib/catalina.jar;${tomcat.home}/server/lib/crimson.jar;${tomcat.home}/server/lib/jaxp.jar;${jboss.home}/lib/ext/jboss.jar;${jboss.home}/lib/jmxri.jar;${jboss.home}/lib/ext/log4j.jar;${tomcat.home}/common/lib/servlet.jar/
+echo message=${classpath}/
+ /target
+
+ !-- === --
+ !-- Prepares the build directory--
+ !-- === --
+ target name=prepare depends=init
+mkdir dir=${build.classes.dir}/
+ /target
+
+ !-- === --
+ !-- Compiles the source directory --
+ !-- === --
+ target name=compile depends=prepare
+javac srcdir=${src.dir}
+ destdir=${build.classes.dir}
+ debug=${debug}
+ classpath=${classpath}
+ optimize=${optimize}/
+ /target
+
+ !-- === --
+ !-- Creates the class package --
+ !-- === --
+
+ target name=tomcatservice depends=compile
+mkdir dir=${dist.dir}/
+jar jarfile=${dist.dir}/embedded.jar basedir=${build.classes.dir}/
+ /target
