User: jules_gosnell
Date: 01/09/15 06:14:59
Modified: jetty/src/build Tag: Branch_2_4 build.bat build.sh build.xml
Added: jetty/src/build Tag: Branch_2_4 mkrelease
Log:
JBoss-2.4.1_Jetty-3.1.RC9-1
Revision Changes Path
No revision
No revision
1.2.2.1 +6 -6 contrib/jetty/src/build/Attic/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/build/Attic/build.bat,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build.bat 2001/06/11 21:13:59 1.2
+++ build.bat 2001/09/15 13:14:59 1.2.2.1
@@ -1,19 +1,19 @@
@echo off
-REM $Id: build.bat,v 1.2 2001/06/11 21:13:59 starksm Exp $
+REM $Id: build.bat,v 1.2.2.1 2001/09/15 13:14:59 jules_gosnell Exp $
if not exist "%JBOSS_HOME%\bin\run.jar" (
echo $JBOSS_HOME/bin/run.jar does not exist
echo set JBOSS_HOME to your JBoss dist directory
exit 1
)
-if not exist "%JETTY_HOME%\lib\com.mortbay.jetty.jar" (
- echo %JETTY_HOME%/lib/com.mortbay.jetty.jar does not exist
+if not exist "%JETTY_HOME%\lib\org.mortbay.jetty.jar" (
+ echo %JETTY_HOME%/lib/org.mortbay.jetty.jar does not exist
echo set JETTY_HOME to your Jetty3 directory
exit 1
)
-if not exist "%JETTY_EXTRA%/jmx/lib/com.mortbay.jetty.jmx.jar" (
- echo %JETTY_EXTRA%/jmx/lib/com.mortbay.jetty.jmx.jar does not exist
+if not exist "%JETTY_EXTRA%/jmx/lib/org.mortbay.jetty.jmx.jar" (
+ echo %JETTY_EXTRA%/jmx/lib/org.mortbay.jetty.jmx.jar does not exist
echo set JETTY_EXTRA to your Jetty3Extra directory
exit 1
)
@@ -25,7 +25,7 @@
SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\crimson.jar
SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\jboss-jaas.jar
SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\ext\jbosssx.jar
-SET CLASSPATH=%CLASSPATH%;%JETTY_EXTRA%\jmx\lib\com.mortbay.jetty.jmx.jar
+SET CLASSPATH=%CLASSPATH%;%JETTY_EXTRA%\jmx\lib\org.mortbay.jetty.jmx.jar
SET OPTS= -Djetty.home="%JETTY_HOME%" -Djboss.home="%JBOSS_HOME%"
-Djetty.extra="%JETTY_EXTRA%"
java %OPTS% org.apache.tools.ant.Main %*
1.4.2.1 +8 -8 contrib/jetty/src/build/Attic/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/build/Attic/build.sh,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- build.sh 2001/06/10 21:34:22 1.4
+++ build.sh 2001/09/15 13:14:59 1.4.2.1
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: build.sh,v 1.4 2001/06/10 21:34:22 jules_gosnell Exp $
+# $Id: build.sh,v 1.4.2.1 2001/09/15 13:14:59 jules_gosnell Exp $
if [ ! -f "$JBOSS_HOME/bin/run.jar" ]
then
@@ -8,17 +8,17 @@
exit 1
fi
-if [ ! -f "$JETTY_HOME/lib/com.mortbay.jetty.jar" ]
+if [ ! -f "$JETTY_HOME/lib/org.mortbay.jetty.jar" ]
then
- echo $JETTY_HOME/lib/com.mortbay.jetty.jar does not exist
+ echo $JETTY_HOME/lib/org.mortbay.jetty.jar does not exist
echo set JETTY_HOME to your Jetty3 directory
exit 1
fi
-if [ ! -f "$JETTY_EXTRA/jmx/lib/com.mortbay.jetty.jmx.jar" ]
+if [ ! -f "$JETTY_JMX/lib/org.mortbay.jetty.jmx.jar" ]
then
- echo $JETTY_EXTRA/jmx/lib/com.mortbay.jetty.jmx.jar does not exist
- echo set JETTY_EXTRA to your Jetty3Extra directory
+ echo $JETTY_JMX/lib/org.mortbay.jetty.jmx.jar does not exist
+ echo set JETTY_JMX to your Jetty3Extra/jmx directory
exit 1
fi
@@ -30,12 +30,12 @@
CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/jaxp.jar
CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/jboss-jaas.jar
CLASSPATH=$CLASSPATH:$JBOSS_HOME/lib/ext/jbosssx.jar
-CLASSPATH=$CLASSPATH:$JETTY_EXTRA/jmx/lib/com.mortbay.jetty.jmx.jar
+CLASSPATH=$CLASSPATH:$JETTY_JMX/lib/org.mortbay.jetty.jmx.jar
exec java\
-Djboss.home="$JBOSS_HOME"\
-Djetty.home="$JETTY_HOME"\
- -Djetty.extra="$JETTY_EXTRA"\
+ -Djetty.jmx="$JETTY_JMX"\
-classpath "$CLASSPATH"\
org.apache.tools.ant.Main\
$*
1.6.2.1 +29 -13 contrib/jetty/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/build/build.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- build.xml 2001/06/10 21:32:57 1.6
+++ build.xml 2001/09/15 13:14:59 1.6.2.1
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: build.xml,v 1.6 2001/06/10 21:32:57 jules_gosnell Exp $ -->
+<!-- $Id: build.xml,v 1.6.2.1 2001/09/15 13:14:59 jules_gosnell Exp $ -->
<!-- ======================================================================= -->
@@ -16,11 +16,11 @@
<property name="src.dir" value="${basedir}/src/main"/>
<property name="lib.dir" value="${basedir}/../tomcat/lib"/>
<property name="src.resources" value="${basedir}/../tomcat/src/resources"/>
- <property name="etc.dir" value="${basedir}/src/etc"/>
+ <property name="etc.dir" value="${basedir}/etc"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="classpath"
value="${lib.dir}/xml.jar;${jboss.home}/lib/jmxri.jar;${jboss.home}/lib/ext/jboss.jar;${jboss.home}/lib/ext/ejb.jar;${build.classes.dir};${jetty.home}/lib/javax.servlet.jar;${jetty.home}/lib/org.apache.jasper.jar;${jetty.home}/lib/com.sun.net.ssl.jar;${jetty.home}/lib/com.mortbay.jetty.jar"/>
+ <property name="classpath"
value="${lib.dir}/xml.jar;${jboss.home}/lib/jmxri.jar;${jboss.home}/lib/jboss-jaas.jar;${jboss.home}/lib/ext/log4j.jar;${jboss.home}/lib/ext/jboss.jar;${jboss.home}/lib/ext/ejb.jar;${build.classes.dir};${jetty.home}/lib/javax.servlet.jar;${jetty.home}/lib/org.apache.jasper.jar;${jetty.home}/lib/com.sun.net.ssl.jar;${jetty.home}/lib/org.mortbay.jetty.jar;${jetty.jmx}/lib/org.mortbay.jetty.jmx.jar"/>
<property name="jar.file" value="${name}.jar"/>
<property name="test.client" value="tomcat-test"/>
@@ -29,6 +29,7 @@
<echo message="jboss.home=${jboss.home}" />
<echo message="jetty.home=${jetty.home}" />
+ <echo message="jetty.jmx=${jetty.jmx}" />
<echo message="classpath=${classpath}" />
</target>
@@ -38,7 +39,9 @@
<!-- =================================================================== -->
<target name="prepare" depends="init">
<mkdir dir="${build.dir}"/>
+<!--
<copy file="${src.resources}/jboss-web.dtd"
tofile="${build.classes.dir}/jboss-web.dtd"/>
+ -->
</target>
@@ -72,12 +75,14 @@
<!-- Installs the jar archive to jboss (and javac for JSPs) -->
<!-- =================================================================== -->
<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}"
+ />
+ <copy
+ file="${lib.dir}/javac.jar"
+ tofile="${jboss.home}/lib/ext/javac.jar"
/>
- <copyfile src="${lib.dir}/javac.jar"
- dest="${jboss.home}/lib/ext/javac.jar"
- />
</target>
@@ -85,7 +90,7 @@
<!-- Cleans up generated stuff -->
<!-- =================================================================== -->
<target name="clean" depends="init">
- <deltree dir="${build.dir}"/>
+ <delete dir="${build.dir}"/>
<delete file="${jar.file}"/>
<delete file="${test.client}.ear"/>
</target>
@@ -140,10 +145,13 @@
<echo message="copying JBoss from ${jboss.home} to ${dist.dir}/jboss" />
<copy todir="${dist.dir}/jboss"><fileset dir="${jboss.home}"/></copy>
+ <echo message="touching dummy file in ${dist.dir}/jboss/db/jbossmq/" />
+ <touch file="${dist.dir}/jboss/db/jbossmq/dummy"/>
<echo message="copying Jetty from ${jetty.home} to ${dist.dir}/jetty" />
<copy todir="${dist.dir}/jetty"><fileset dir="${jetty.home}"/></copy>
- <echo message="copying Jetty Extra from ${jetty.extra} to ${dist.dir}/extra" />
- <copy todir="${dist.dir}/extra"><fileset dir="${jetty.extra}"/></copy>
+ <chmod file="${dist.dir}/jetty/cgi-bin/env.sh" perm="+x"/>
+ <echo message="copying Jetty JMX from ${jetty.jmx} to ${dist.dir}/jetty-jmx" />
+ <copy todir="${dist.dir}/jetty-jmx"><fileset dir="${jetty.jmx}"/></copy>
<property name="cfg.src" value="${jboss.home}/conf/default"/>
<property name="cfg.tgt" value="${dist.dir}/jboss/conf/jetty"/>
@@ -166,8 +174,12 @@
<echo message="adding ${basedir}/etc/jetty.xml to ${cfg.tgt}" />
<copy todir="${cfg.tgt}" file="${basedir}/etc/jetty.xml"/>
- <echo message="adding ${basedir}/jetty.properties to ${cfg.tgt}" />
+ <echo message="adding ${basedir}/src/jetty.properties to ${cfg.tgt}" />
<copy todir="${cfg.tgt}" file="${basedir}/etc/jetty.properties"/>
+ <echo message="installing README file" />
+ <copy todir="${dist.dir}" file="${basedir}/etc/README"/>
+ <echo message="installing VERSION file" />
+ <copy todir="${dist.dir}" file="${basedir}/etc/VERSION"/>
<echo>
Adding Jetty MLET to jboss.conf
@@ -179,7 +191,7 @@
<ARG TYPE="java.lang.String" VALUE="Jetty">
</MLET>
<MLET CODE = "org.jboss.util.ClassPathExtension" ARCHIVE="jboss.jar"
CODEBASE="../../lib/ext/">
- <ARG TYPE="java.lang.String" VALUE="../../../extra/jmx/lib/">
+ <ARG TYPE="java.lang.String" VALUE="../../../jetty-jmx/lib/">
<ARG TYPE="java.lang.String" VALUE="JettyJMX">
</MLET>
</echo>
@@ -204,7 +216,11 @@
>
<replacevalue>
<mbean code="org.jboss.jetty.JettyService"
name="DefaultDomain:service=Jetty">
+ <attribute name="JettyHome">../../jetty</attribute>
<attribute
name="Configuration">file:../conf/jetty/jetty.xml</attribute>
+ <attribute
name="WebDefault">../../jetty/etc/webdefault.xml</attribute>
+ <attribute name="UnpackWars">true</attribute>
+ <attribute name="PublishMBeans">true</attribute>
</mbean>
</server>
No revision
No revision
1.1.2.1 +27 -0 contrib/jetty/src/build/Attic/mkrelease
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development