You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/11/11 21:14:58 UTC
cvs commit: jakarta-slide build.properties.sample build.xml
remm 01/11/11 12:14:58
Modified: . build.properties.sample build.xml
Log:
- Update build script for Tomcat 4.1.
Revision Changes Path
1.9 +7 -4 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties.sample 2001/09/27 14:26:00 1.8
+++ build.properties.sample 2001/11/11 20:14:58 1.9
@@ -6,7 +6,7 @@
# Make any changes you need, and rename this file to
# "build.properties"
#
-# $Id: build.properties.sample,v 1.8 2001/09/27 14:26:00 cmlenz Exp $
+# $Id: build.properties.sample,v 1.9 2001/11/11 20:14:58 remm Exp $
# -------------------------------------------------------------------
@@ -72,11 +72,14 @@
struts.home=../jakarta-struts/dist
# The directory containing your binary distribution of the Java Management
-# Extensions (JMX) Reference Implementation, version 1.0 or later
-jmx.home=${base.path}/jmx
+# Extensions (JMX) Reference Implementation, version 1.0.1 or later
+jmx.home=${base.path}/jmx-ri_1.0.1/jmx
+jmx.lib=${jmx.home}/lib
+jmxri.jar=${jmx.lib}/jmxri.jar
+jmxtools.jar=${jmx.lib}/jmxtools.jar
# Catalina distribution directory
-catalina.dist=../jakarta-tomcat-4.0/dist
+catalina.dist=${base.path}/jakarta-tomcat-4.1
# hsqldb.jar -- HSQL Database Engine (http://sourceforge.net/projects/hsqldb/)
hsqldb.jar=./lib/hsqldb.jar
1.137 +47 -45 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- build.xml 2001/11/07 19:55:16 1.136
+++ build.xml 2001/11/11 20:14:58 1.137
@@ -45,8 +45,6 @@
<property name="xmlapi.jar" value="${jaxp.home}/crimson.jar"/>
<property name="xmlparser.jar" value="${jaxp.home}/crimson.jar"/>
<property name="jaxp.jar" value="${jaxp.home}/jaxp.jar"/>
- <property name="jmx.home" value="../jmx"/>
- <property name="jmx.jar" value="${jmx.home}/lib/jmxri.jar"/>
<property name="ant.home" value="../jakarta-ant/dist"/>
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
<property name="junit.jar" value="./lib/junit.jar"/>
@@ -55,6 +53,9 @@
<property name="log4j.jar" value="./lib/log4j.jar"/>
<property name="hsqldb.jar" value="./lib/hsqldb.jar"/>
<property name="hsqldb.license" value="./lib/hsqldb.license"/>
+ <property name="commons-dbcp.jar" value="./lib/commons-dbcp.jar"/>
+ <property name="commons-pool.jar" value="./lib/commons-pool.jar"/>
+ <property name="commons-modeler.jar" value="./lib/commons-modeler.jar"/>
<property name="naming.jar"
value="${catalina.dist}/common/lib/naming-common.jar"/>
<property name="resources.jar"
@@ -123,7 +124,7 @@
<pathelement location="${xmlapi.jar}"/>
<pathelement location="${jaxp.jar}"/>
<pathelement location="${jta.jar}"/>
- <pathelement location="${jmx.jar}"/>
+ <pathelement location="${jmxri.jar}"/>
</path>
<path id="manager.classpath">
@@ -141,11 +142,14 @@
<pathelement location="${jaxp.jar}"/>
<pathelement location="${jta.jar}"/>
<pathelement location="${slide.build}/classes"/>
+ <pathelement location="${commons-dbcp.jar}"/>
+ <pathelement location="${commons-pool.jar}"/>
</path>
<path id="wrappers.classpath">
<pathelement location="${jta.jar}"/>
<pathelement location="${jaxp.jar}"/>
+ <pathelement location="${jmxri.jar}"/>
<pathelement location="${xmlapi.jar}"/>
<pathelement location="${jndi.jar}"/>
<pathelement location="${slide.build}/classes"/>
@@ -154,6 +158,7 @@
<pathelement location="${resources.jar}"/>
<pathelement location="${naming.jar}"/>
<pathelement location="${catalina.jar}"/>
+ <pathelement location="${commons-modeler.jar}"/>
</path>
<path id="webdavservlet.classpath">
@@ -289,7 +294,7 @@
classpath="${jta.jar}" />
<available property="jmx.present"
classname="javax.management.MBeanServer"
- classpath="${jmx.jar}" />
+ classpath="${jmxri.jar}" />
<available property="httpclient.present"
classname="org.apache.commons.httpclient.HttpClient"
classpath="${commons-httpclient.jar}" />
@@ -351,7 +356,7 @@
<echo message="jmx.present (optional) = ${jmx.present}" />
<echo message="ant.present (optional) = ${ant.present}" />
<echo message="junit.present (optional) = ${junit.present}" />
- <echo message="catalina.present (optional) = ${catalina.present}" />
+ <echo message="tomcat41.present (optional) = ${catalina.present}" />
<echo message="xsl.present (optional) = ${xsl.present}" />
<echo message="log4j.present (optional) = ${log4j.present}" />
<echo message="jndi.present (optional) = ${jndi.present}" />
@@ -369,7 +374,7 @@
<echo message="xmlapi.jar=${xmlapi.jar}" />
<echo message="xmlparser.jar=${xmlparser.jar}" />
<echo message="jmx.home=${jmx.home}" />
- <echo message="jmx.jar=${jmx.jar}" />
+ <echo message="jmxri.jar=${jmxri.jar}" />
<echo message="junit.jar=${junit.jar}" />
<echo message="log4j.jar=${log4j.jar}" />
<echo message="jta.jar=${jta.jar}" />
@@ -1127,6 +1132,7 @@
<exclude name="**/catalina/**" unless="catalina.present" />
<exclude name="**/log4j/**" unless="log4j.present" />
<exclude name="**/jndi/**" unless="catalina.present" />
+ <exclude name="**/jmx/**" unless="jmx.present" />
</javac>
</target>
@@ -1147,6 +1153,23 @@
<!-- =================================================================== -->
+ <!-- Build JMX related components -->
+ <!-- This target requires the JMX libraries -->
+ <!-- =================================================================== -->
+ <target name="jmx-wrapper" depends="wrappers" if="jmx.present">
+
+ <copy file="src/wrappers/jmx/mbeans-descriptors.xml"
+ tofile="${slide.build}/classes/wrappers/jmx//mbeans-descriptors.xml" />
+ <jar jarfile="${slide.dist}/slide/wrappers/slide-jmxwrapper.jar"
+ basedir="${slide.build}/classes"
+ manifest="${slide.build}/classes/MANIFEST.MF">
+ <include name="wrappers/jmx/**" />
+ </jar>
+
+ </target>
+
+
+ <!-- =================================================================== -->
<!-- Build Catalina related components -->
<!-- This target requires Tomcat 4.0 -->
<!-- =================================================================== -->
@@ -1200,33 +1223,35 @@
<!-- =================================================================== -->
- <!-- Build a JMX wrapper -->
- <!-- This target requires a JMX implementation -->
- <!-- =================================================================== -->
- <target name="jmx-wrapper" depends="wrappers" if="jmx.present">
-
- </target>
-
-
- <!-- =================================================================== -->
<!-- Build Catalina-based dedicated CMS -->
<!-- This target requires Tomcat 4.0 -->
<!-- =================================================================== -->
- <target name="catalina-dist" depends="catalina-wrapper, jndi-wrapper"
+ <target name="catalina-dist" depends="catalina-wrapper, jndi-wrapper, jmx-wrapper"
if="catalina.present">
<copy todir="${slide.dist}/server">
<fileset dir="${catalina.dist}">
- <exclude name="**/webapps/**" />
- <exclude name="**/src/**" />
- <exclude name="**/logs/**" />
- <exclude name="**/work/**" />
+ <exclude name="webapps/**" />
+ <exclude name="src/**" />
+ <exclude name="logs/**" />
+ <exclude name="work/**" />
+ <exclude name="server/lib/commons-dbcp.jar" />
+ <exclude name="server/lib/commons-pool.jar" />
<exclude name="*" />
</fileset>
</copy>
+ <copy todir="${slide.dist}/server">
+ <fileset dir="${catalina.dist}">
+ <include name="webapps/*.xml" />
+ </fileset>
+ </copy>
+
<copy todir="${slide.dist}/server/common/lib">
<fileset dir="${slide.dist}/slide/lib">
+ <exclude name="commons-modeler.jar"/>
+ <exclude name="jaxp.jar"/>
+ <exclude name="crimson.jar"/>
</fileset>
</copy>
@@ -1234,6 +1259,8 @@
tofile="${slide.dist}/server/server/lib/slide-catalinawrapper.jar" />
<copy file="${slide.dist}/slide/wrappers/slide-jndiwrapper.jar"
tofile="${slide.dist}/server/server/lib/slide-jndiwrapper.jar" />
+ <copy file="${slide.dist}/slide/wrappers/slide-jmxwrapper.jar"
+ tofile="${slide.dist}/server/server/lib/slide-jmxwrapper.jar" />
<copy file="src/wrappers/catalina/server.xml"
tofile="${slide.dist}/server/conf/server.xml"
@@ -1250,26 +1277,6 @@
<mkdir dir="${slide.dist}/server/blank" />
<mkdir dir="${slide.dist}/server/slide" />
- <!-- Sepcial handling for JAXP to avoid sealing violations with Jasper -->
- <copy todir="${slide.dist}/server/common/lib">
- <fileset dir="${catalina.dist}/server/lib">
- <include name="crimson.jar" if="catalina.crimson.present" />
- <include name="jaxp.jar" if="catalina.jaxp.present" />
- </fileset>
- </copy>
- <delete failonerror="false">
- <fileset dir="${slide.dist}/server/jasper">
- <include name="crimson.jar" />
- <include name="jaxp.jar" />
- </fileset>
- </delete>
- <delete failonerror="false">
- <fileset dir="${slide.dist}/server/server/lib">
- <include name="crimson.jar" />
- <include name="jaxp.jar" />
- </fileset>
- </delete>
-
<!-- Welcome web application -->
<war warfile="${slide.dist}/server/slide/slide-welcome.war"
webxml="src/wrappers/catalina/root/WEB-INF/web.xml"
@@ -1289,11 +1296,6 @@
<zipfileset dir="${struts.home}/lib" prefix="WEB-INF/lib">
<include name="struts.jar"/>
</zipfileset>
- </war>
-
- <!-- Catalina HTML manager -->
- <war warfile="${slide.dist}/server/webapps/tomcat-manager.war"
- webxml="src/wrappers/catalina/manager.xml">
</war>
<!-- Catalina documentation -->
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>