User: olegnitz
Date: 02/01/16 17:23:11
Modified: jetty build.xml
Log:
Jetty source files are in JBoss CVS now.
Run "merge-mortbay-cvs" target to update them from Jetty CVS.
Modified Jetty files (if such need will appear) must be explicitely listed in
build.xml
Revision Changes Path
1.22 +129 -34 contrib/jetty/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2002/01/15 16:45:55 1.21
+++ build.xml 2002/01/17 01:23:11 1.22
@@ -101,6 +101,15 @@
<pathelement path="${sun.jaas.lib}/jaas.jar"/>
</path>
+ <!-- Java Secure Socket Extension (JSSE) -->
+ <property name="sun.jsse.root" value="${project.thirdparty}/sun/jsse"/>
+ <property name="sun.jsse.lib" value="${sun.jsse.root}/lib"/>
+ <path id="sun.jsse.classpath">
+ <fileset dir="${sun.jsse.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<!-- Log4j -->
<property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
<property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
@@ -116,22 +125,17 @@
</path>
<!-- Jetty -->
- <property name="mortbay.jetty.root"
value="${project.thirdparty}/mortbay/jetty"/>
- <property name="mortbay.jetty.lib" value="${mortbay.jetty.root}/lib"/>
- <path id="mortbay.jetty.classpath">
- <fileset dir="${mortbay.jetty.lib}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <!-- Jetty3Extra -->
- <property name="mortbay.jetty3extra.root"
value="${project.thirdparty}/mortbay/jetty3extra"/>
- <property name="mortbay.jetty3extra.jmx" value="${mortbay.jetty3extra.root}"/>
- <property name="mortbay.jetty3extra.jmx.lib"
value="${mortbay.jetty3extra.jmx}/lib"/>
- <path id="mortbay.jetty3extra.classpath">
- <fileset dir="${mortbay.jetty3extra.jmx.lib}">
- <include name="**/*.jar"/>
- </fileset>
+ <property name="mortbay.jetty.cvs" value="${module.root}/mortbay-cvs"/>
+ <property name="mortbay.jetty.cvs.tag" value="JBOSS_20020116223222"/>
+ <property name="mortbay.jetty.cvs.extra.tag" value="JBOSS_20020116223222"/>
+ <property name="jetty.jar" value="org.mortbay.jetty.jar"/>
+ <property name="jetty.jmx.jar" value="org.mortbay.jetty.jmx.jar"/>
+ <property name="servlet.jar" value="javax.servlet.jar"/>
+ <property name="jasper.jar" value="org.apache.jasper.jar"/>
+
+ <!-- Java Compiler -->
+ <path id="tomcat.javac.classpath">
+ <pathelement path="${module.root}/../tomcat/lib/javac.jar"/>
</path>
<!-- The combined library classpath -->
@@ -140,10 +144,10 @@
<path refid="sun.jmx.classpath"/>
<path refid="sun.jaxp.classpath"/>
<path refid="sun.jaas.classpath"/>
+ <path refid="sun.jsse.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="mortbay.jetty.classpath"/>
- <path refid="mortbay.jetty3extra.classpath"/>
+ <path refid="tomcat.javac.classpath"/>
</path>
<!-- ======= -->
@@ -238,6 +242,73 @@
</target>
+ <!-- ====================================================================== -->
+ <!-- Merge Jetty CVS and JBoss/Jetty -->
+ <!-- Note: all modified Jetty files must be listed below in the "copy" task -->
+ <!-- ====================================================================== -->
+
+ <target name="merge-mortbay-cvs" depends="init">
+ <mkdir dir="${mortbay.jetty.cvs}"/>
+
+ <!-- Checkout from Jetty CVS (actually this is necessary on the first run only)
-->
+ <cvs command="-r checkout"
+ cvsRoot=":pserver:[EMAIL PROTECTED]:/cvsroot/jetty"
+ package="Jetty"
+ tag="${mortbay.jetty.cvs.tag}"
+ quiet="true"
+ dest="${mortbay.jetty.cvs}"/>
+ <cvs command="-r checkout"
+ cvsRoot=":pserver:[EMAIL PROTECTED]:/cvsroot/jetty"
+ package="JettyExtra"
+ tag="${mortbay.jetty.cvs.extra.tag}"
+ quiet="true"
+ dest="${mortbay.jetty.cvs}"/>
+
+ <!-- Copy modified files JBoss CVS tree -> Jetty CVS tree -->
+ <copy todir="${mortbay.jetty.cvs}/Jetty/src"
+ overwrite="yes">
+ <fileset dir="${source.java}">
+ <!-- include files that was modified in JBoss/Jetty -->
+ <include name=""/>
+ </fileset>
+ </copy>
+ <copy todir="${mortbay.jetty.cvs}/JettyExtra/jmx/src"
+ overwrite="yes">
+ <fileset dir="${source.java}">
+ <!-- include files that was modified in JBoss/Jetty -->
+ <include name=""/>
+ </fileset>
+ </copy>
+
+ <!-- Update from Jetty CVS to merge changes -->
+ <cvs command="-r update -d"
+ cvsRoot=":pserver:[EMAIL PROTECTED]:/cvsroot/jetty"
+ package="Jetty"
+ tag="${mortbay.jetty.cvs.tag}"
+ quiet="true"
+ dest="${mortbay.jetty.cvs}"/>
+ <cvs command="-r update -d"
+ cvsRoot=":pserver:[EMAIL PROTECTED]:/cvsroot/jetty"
+ package="JettyExtra"
+ tag="${mortbay.jetty.cvs.extra.tag}"
+ quiet="true"
+ dest="${mortbay.jetty.cvs}"/>
+
+ <!-- Copy all files Jetty CVS tree -> JBoss CVS tree -->
+ <copy todir="${source.java}"
+ overwrite="yes">
+ <fileset dir="${mortbay.jetty.cvs}/Jetty/src">
+ <include name="javax/servlet/**"/>
+ <include name="org/apache/jasper/**"/>
+ <include name="org/mortbay/**"/>
+ </fileset>
+ <fileset dir="${mortbay.jetty.cvs}/JettyExtra/jmx/src">
+ <include name="org/mortbay/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
@@ -304,6 +375,14 @@
<include name="${javac.includes}"/>
<exclude name="${javac.excludes}"/>
</javac>
+
+ <!-- these are for Jetty jars -->
+ <copy todir="${build.classes}">
+ <fileset dir="${source.java}">
+ <include name="**/*.properties"/>
+ <include name="**/*.dtd"/>
+ </fileset>
+ </copy>
</target>
<!-- Compile etc files (manifests and such) -->
@@ -327,7 +406,6 @@
</target>
-
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
@@ -341,6 +419,31 @@
depends="compile">
<mkdir dir="${build.lib}"/>
+ <!-- Build Jetty and JettyExtra jars -->
+
+ <jar jarfile="${build.lib}/${servlet.jar}">
+ <fileset dir="${build.classes}">
+ <include name="javax/servlet/**"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${build.lib}/${jetty.jar}"
+ manifest="${source.java}/org/mortbay/MANIFEST.MF">
+ <fileset dir="${build.classes}">
+ <include name="org/mortbay/**"/>
+ <exclude name="org/mortbay/jetty/jmx/**"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${build.lib}/${jetty.jmx.jar}">
+ <fileset dir="${build.classes}">
+ <include name="org/mortbay/jetty/jmx/**"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${build.lib}/${jasper.jar}">
+ <fileset dir="${build.classes}">
+ <include name="org/apache/jasper/**"/>
+ </fileset>
+ </jar>
+
<jar jarfile="${build.lib}/${module.name}.sar">
<!-- Jetty plugin classes -->
<fileset dir="${build.etc}">
@@ -349,27 +452,20 @@
<include name="jetty.properties"/>
</fileset>
<fileset dir="${build.classes}">
- <include name="**"/>
- <exclude name="**/ejb/**"/>
+ <include name="org/jboss/**"/>
+ <exclude name="org/jboss/**/ejb/**"/>
</fileset>
<!-- jboss-service.xml for jetty plugin -->
<fileset dir="${build.resources}/jetty-plugin">
<include name="**/*"/>
</fileset>
<!--include jars in sar-->
- <fileset dir="${mortbay.jetty.lib}">
+ <fileset dir="${build.lib}">
<!-- For some reason jasper doesn't work if servlet and jasper are in the
sar -->
- <!--include name="javax.servlet.jar"/>
- <include name="org.apache.jasper.jar"/-->
- <include name="org.mortbay.jetty.jar"/>
- </fileset>
- <fileset dir="${mortbay.jetty3extra.jmx.lib}">
- <include name="org.mortbay.ftp.jar"/>
- <include name="org.mortbay.jetty.nbio.jar"/>
- <include name="org.mortbay.jetty.jmx.jar"/>
- <include name="org.mortbay.jetty.sasl.jar"/>
- <include name="org.mortbay.tools.jar"/>
- <include name="cryptix-sasl-jetty.jar"/>
+ <!--include name="${servlet.jar}"/>
+ <include name="${jasper.jar}"/-->
+ <include name="${jetty.jar}"/>
+ <include name="${jetty.jmx.jar}"/>
</fileset>
</jar>
@@ -537,7 +633,6 @@
description="Cleans up all generated files."
depends="_buildmagic:clobber, clean">
</target>
-
<!-- ================================================================== -->
<!-- Misc. -->
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
