User: starksm
Date: 01/04/17 21:30:51
Modified: tomcat/src/build build.bat build.sh
Log:
Change JBOSS_HOME to JBOSS_DIST
Change TOMCAT_HOME to TOMCAT_DIST
Update server.xml.patch to be against the shipped 3.2.1 server.xml file
Revision Changes Path
1.5 +9 -9 contrib/tomcat/src/build/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/jboss/contrib/tomcat/src/build/build.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.bat 2001/04/18 03:18:08 1.4
+++ build.bat 2001/04/18 04:30:51 1.5
@@ -1,21 +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
+if not exist %TOMCAT_DIST%\lib\webserver.jar (
+ echo %TOMCAT_DIST%\lib\webserver.jar does not exist
+ echo set TOMCAT_DIST 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
+if not exist %JBOSS_DIST%\bin\run.jar (
+ echo %JBOSS_DIST%\bin\run.jar does not exist
+ echo set JBOSS_DIST to the jboss dist directory
exit
)
set CLASSPATH=..\..\lib\ant.jar
set CLASSPATH=%CLASSPATH%;..\..\build\classes
set CLASSPATH=%CLASSPATH%;..\..\lib\javac.jar
-set CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\crimson.jar
-set CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\jaxp.jar
+set CLASSPATH=%CLASSPATH%;%JBOSS_DIST%\lib\crimson.jar
+set CLASSPATH=%CLASSPATH%;%JBOSS_DIST%\lib\jaxp.jar
-java -Dtomcat.dist=%TOMCAT_HOME% -Djboss.dist=%JBOSS_HOME% -classpath "%CLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
+java -Dtomcat.dist=%TOMCAT_DIST% -Djboss.dist=%JBOSS_DIST% -classpath "%CLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
1.7 +9 -9 contrib/tomcat/src/build/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/contrib/tomcat/src/build/build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.sh 2001/04/18 03:18:08 1.6
+++ build.sh 2001/04/18 04:30:51 1.7
@@ -1,22 +1,22 @@
#!/bin/sh
-if [ ! -f "${JBOSS_HOME}/bin/run.jar" ]
+if [ ! -f "${JBOSS_DIST}/bin/run.jar" ]
then
- echo $JBOSS_HOME/bin/run.jar does not exist
- echo set JBOSS_HOME to the jboss dist directory
+ echo $JBOSS_DIST/bin/run.jar does not exist
+ echo set JBOSS_DIST to the jboss dist directory
exit 1
fi
-if [ ! -f "$TOMCAT_HOME/lib/webserver.jar" ]
+if [ ! -f "$TOMCAT_DIST/lib/webserver.jar" ]
then
- echo $TOMCAT_HOME/lib/webserver.jar does not exist
- echo set TOMCAT_HOME to the tomcat dist directory
+ echo $TOMCAT_DIST/lib/webserver.jar does not exist
+ echo set TOMCAT_DIST to the tomcat dist directory
exit 1
fi
CLASSPATH=../../lib/ant.jar
CLASSPATH=$CLASSPATH:../../build/classes
CLASSPATH=$CLASSPATH:../../lib/javac.jar
-CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/crimson.jar
-CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/jaxp.jar
+CLASSPATH=$CLASSPATH:$JBOSS_DIST/lib/crimson.jar
+CLASSPATH=$CLASSPATH:$JBOSS_DIST/lib/jaxp.jar
-java -Dtomcat.dist="$TOMCAT_HOME" -Djboss.dist="$JBOSS_HOME" -classpath
"$CLASSPATH" org.apache.tools.ant.Main $*
+java -Dtomcat.dist="$TOMCAT_DIST" -Djboss.dist="$JBOSS_DIST" -classpath
"$CLASSPATH" org.apache.tools.ant.Main $*
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
