[jbossweb-commits] JBossWeb SVN: r1411 - trunk.

Author: remy.maucherat(a)jboss.com Date: 2010-03-16 10:48:04 -0400 (Tue, 16 Mar 2010) New Revision: 1411 Removed: trunk/RUNNING.txt trunk/dist.xml Modified: trunk/NOTICE trunk/build.properties.default trunk/build.xml Log: - Remove some additional standalone elements. Modified: trunk/NOTICE =================================================================== --- trunk/NOTICE 2010-03-12 18:44:44 UTC (rev 1410) +++ trunk/NOTICE 2010-03-16 14:48:04 UTC (rev 1411) @@ -1,8 +1,8 @@ JBoss Web -Copyright 2006-2009 Red Hat Middleware, LLC. All rights reserved. +Copyright 2006-2010 Red Hat Middleware, LLC. All rights reserved. Apache Tomcat -Copyright 1999-2009 The Apache Software Foundation +Copyright 1999-2010 The Apache Software Foundation Servlet API 3.0 Copyright 1997-2009 Sun Microsystems, Inc Deleted: trunk/RUNNING.txt =================================================================== --- trunk/RUNNING.txt 2010-03-12 18:44:44 UTC (rev 1410) +++ trunk/RUNNING.txt 2010-03-16 14:48:04 UTC (rev 1411) @@ -1,148 +0,0 @@ - - =========================================== - Running The JBoss Web Servlet/JSP Container - =========================================== - -JBoss Web requires the Java 2 Standard Edition Runtime -Environment (JRE) version 5.0 or later. - -============================= -Running With JRE 5.0 Or Later -============================= - -(1) Download and Install the J2SE Runtime Environment (JRE) - -(1.1) Download the Java 2 Standard Edition Runtime Environment (JRE), - release version 5.0 or later, from http://java.sun.com/j2se. - -(1.2) Install the JRE according to the instructions included with the - release. -(1.3) Set an environment variable named JRE_HOME to the pathname of - the directory into which you installed the JRE, e.g. c:\jre5.0 - or /usr/local/java/jre5.0. - -NOTE: You may also use the full JDK rather than just the JRE. In this - case set your JAVA_HOME environment variable to the pathname of - the directory into which you installed the JDK, e.g. c:\j2sdk5.0 - or /usr/local/java/j2sdk5.0. - - -(2) Download and Install the JBoss Web Binary Distribution - -NOTE: As an alternative to downloading a binary distribution, you can create -your own from the JBoss Web source repository, as described in "BUILDING.txt". -If you do this, the value to use for "${catalina.home}" will be the "dist" -subdirectory of your source distribution. - -(2.1) Download a binary distribution of JBoss Web from: - - http://labs.jboss.com/jbossweb/ - -(2.2) Unpack the binary distribution into a convenient location so that the - distribution resides in its own directory (conventionally named - "jboss-web-[version]"). For the purposes of the remainder of this document, - the symbolic name "$CATALINA_HOME" is used to refer to the full - pathname of the release directory. - - -(3) Start Up JBoss Web - -(3.1) JBoss Web can be started by executing the following commands: - - $CATALINA_HOME\bin\startup.bat (Windows) - - $CATALINA_HOME/bin/startup.sh (Unix) - -(3.2) After startup, the default web applications included with JBoss Web will be - available by visiting: - - http://localhost:8080/ - -(3.3) Further information about configuring and running JBoss Web can be found in - the documentation included here, as well as on the JBoss Web web site: - - http://labs.jboss.com/jbossweb/ - - -(4) Shut Down JBoss Web - -(4.1) JBoss Web can be shut down by executing the following command: - - $CATALINA_HOME\bin\shutdown (Windows) - - $CATALINA_HOME/bin/shutdown.sh (Unix) - - -===================================================== -Advanced Configuration - Multiple JBoss Web Instances -===================================================== - -In many circumstances, it is desirable to have a single copy of a JBoss Web -binary distribution shared among multiple users on the same server. To make -this possible, you can pass a "-Dcatalina.base=$CATALINA_BASE" argument when -executing the startup command (see (2)). In this -"-Dcatalina.base=$CATALINA_BASE" argument, replace $CATALINA_BASE with the -directory that contains the files for your 'personal' JBoss Web instance. - -When you use this "-Dcatalina.base=$CATALINA_BASE" argument, JBoss Web will -calculate all relative references for files in the following directories based -on the value of $CATALINA_BASE instead of $CATALINA_HOME: - -* bin - Only setenv.sh (*nix) and setenv.bat (windows) - -* conf - Server configuration files (including server.xml) - -* logs - Log and output files - -* lib - For classes and resources that must be shared across all web - applications - -* webapps - Automatically loaded web applications - -* work - Temporary working directories for web applications - -* temp - Directory used by the JVM for temporary files (java.io.tmpdir) - -If you do not pass the "-Dcatalina.base=$CATALINA_BASE" argument to the -startup command, $CATALINA_BASE will default to the same value as $CATALINA_HOME, - which means that the same directory is used for all relative path resolutions. - - -================ -Troubleshooting -================ - -There are only really 3 things likely to go wrong during the stand-alone -JBoss Web install: - -(1) The most common hiccup is when another web server (or any process for that - matter) has laid claim to port 8080. This is the default HTTP port that - JBoss Web attempts to bind to at startup. To change this, open the file: - - $CATALINA_HOME/conf/server.xml - - and search for '8080'. Change it to a port that isn't in use, and is - greater than 1024, as ports less than or equal to 1024 require superuser - access to bind under UNIX. - - Restart JBoss Web and you're in business. Be sure that you replace the "8080" - in the URL you're using to access JBoss Web. For example, if you change the - port to 1977, you would request the URL http://localhost:1977/ in your browser. - -(2) An "out of environment space" error when running the batch files in - Windows 95, 98, or ME operating systems. - - Right-click on the STARTUP.BAT and SHUTDOWN.BAT files. Click on - "Properties", then on the "Memory" tab. For the "Initial environment" field, - enter in something like 4096. - - After you click apply, Windows will create shortcuts which you can use - to start and stop the container. - -(3) The 'localhost' machine isn't found. This could happen if you're behind a - proxy. If that's the case, make sure the proxy configuration for your - browser knows that you shouldn't be going through the proxy to access the - "localhost". - - In Netscape, this is under Edit/Preferences -> Advanced/Proxies, and in - Internet Explorer, Tools -> Internet Options -> Connections -> LAN Settings. Modified: trunk/build.properties.default =================================================================== --- trunk/build.properties.default 2010-03-12 18:44:44 UTC (rev 1410) +++ trunk/build.properties.default 2010-03-16 14:48:04 UTC (rev 1411) @@ -32,46 +32,12 @@ base-tomcat.loc=http://archive.apache.org/dist/tomcat base-sf.loc=http://downloads.sourceforge.net -# ----- Webservices ----- -jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar -wsdl4j-src.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar - # ----- Eclipse JDT, version 3.2 or later ----- jdt.home=${base.path}/eclipse/plugins jdt.lib=${jdt.home} jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.4.2.v_883_R34x.jar jdt.loc=http://download.eclipse.org/eclipse/downloads/drops/R-3.4.1-20080... -# ----- Commons DBCP, version 1.1 or later ----- -commons-dbcp.version=1.2.2 -commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src -commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz - -# ----- Commons Pool, version 1.1 or later ----- -commons-pool.home=${base.path}/commons-pool-1.5.2-src -commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.2-src.tar.gz - -# ----- NSIS, version 2.0 or later ----- -nsis.home=${base.path}/nsis-2.44 -nsis.exe=${nsis.home}/makensis.exe -nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll -nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll -nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll -nsis.loc=${base-sf.loc}/nsis/nsis-2.44.zip - -# ----- JBoss Native, version 2.0 or later ----- -jbossnative.home=${base.path}/jboss-native-2.0.6 -jbossnative.openssl=${jbossnative.home}/bin/META-INF/bin/windows/x86/openssl.exe -jbossnative.dlls=${jbossnative.home}/bin/META-INF/lib/windows/x86 -jbossnative.loc=http://www.jboss.org/downloading/?projectId=jbossweb&url=http://labs.jboss.com/file-access/default/members/jbossweb/freezone/dist/2.0.6.GA/jboss-native-2.0.6-windows-x86-ssl.zip - -# ----- Commons Daemon, version 1.0-Alpha or later ----- -commons-daemon.home=${base.path}/commons-daemon-1.0.1 -commons-daemon.lib=${commons-daemon.home} -commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar -commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz -commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz - # ----- Dojo Toolkit (for test webapp) ----- dojo-js.home=${base.path}/dojo-release-1.1.1 dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.... Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-03-12 18:44:44 UTC (rev 1410) +++ trunk/build.xml 2010-03-16 14:48:04 UTC (rev 1411) @@ -1,862 +1,528 @@ <?xml version="1.0"?> <project name="JBoss Web" default="deploy" basedir="."> + <!-- ===================== Initialize Property Values =================== --> - <!-- ===================== Initialize Property Values =================== --> + <!-- See "build.properties.sample" in the top level directory for all --> + <!-- property values you must customize for successful building!!! --> + <property file="${user.home}/build.properties"/> + <property file="build.properties"/> - <!-- See "build.properties.sample" in the top level directory for all --> - <!-- property values you must customize for successful building!!! --> - <property file="${user.home}/build.properties"/> - <property file="build.properties"/> + <property file="build.properties.default"/> - <property file="build.properties.default"/> + <!-- Project Properties --> + <property name="name" value="JBoss Web" /> + <property name="year" value="2010" /> + <property name="version.major" value="3" /> + <property name="version.minor" value="0" /> + <property name="version.build" value="0" /> + <property name="version.patch" value="0" /> + <property name="version.tag" value="SNAPSHOT" /> + <property name="version" value="${version.major}.${version.minor}.${version.build}-${version.tag}" /> + <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" /> - <!-- Project Properties --> - <property name="name" value="JBoss Web" /> - <property name="year" value="2009" /> - <property name="version.major" value="3" /> - <property name="version.minor" value="0" /> - <property name="version.build" value="0" /> - <property name="version.patch" value="0" /> - <property name="version.tag" value="SNAPSHOT" /> - <property name="version" value="${version.major}.${version.minor}.${version.build}-${version.tag}" /> - <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" /> + <property name="project" value="jboss-web" /> + <property name="final.name" value="${project}-${version}" /> + <property name="final-src.name" value="${project}-${version}-src" /> - <property name="project" value="jboss-web" /> - <property name="final.name" value="${project}-${version}" /> - <property name="final-src.name" value="${project}-${version}-src" /> + <!-- Build Defaults --> + <property name="tomcat.build" value="${basedir}/output/build"/> + <property name="tomcat.classes" value="${basedir}/output/classes"/> + <property name="tomcat.dist" value="${basedir}/output/dist"/> + <property name="tomcat.jars" value="${basedir}/output/jars"/> + <property name="jbossweb.site" value="${basedir}/output/site"/> + <property name="test.failonerror" value="true"/> + <property name="test.runner" value="junit.textui.TestRunner"/> - <!-- Build Defaults --> - <property name="tomcat.build" value="${basedir}/output/build"/> - <property name="tomcat.classes" value="${basedir}/output/classes"/> - <property name="tomcat.dist" value="${basedir}/output/dist"/> - <property name="tomcat.jars" value="${basedir}/output/jars"/> - <property name="jbossweb.site" value="${basedir}/output/site"/> - <property name="test.failonerror" value="true"/> - <property name="test.runner" value="junit.textui.TestRunner"/> + <!-- Can't be lower - jsp uses templates --> + <property name="compile.source" value="1.6"/> - <!-- Can't be lower - jsp uses templates --> - <property name="compile.source" value="1.6"/> + <property name="jasper-jdt.home" value="${base.path}/jbossweb-deps/jdt" /> + <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/> - <!-- JAR artifacts --> - <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/> - <property name="tomcat-juli.jar" value="${tomcat.build}/bin/tomcat-juli.jar"/> + <!-- Classpath --> + <path id="tomcat.classpath"> + <fileset dir="${basedir}/lib"> + <include name="*.jar"/> + </fileset> + <pathelement path="${jasper-jdt.jar}"/> + </path> - <property name="annotations-api.jar" value="${tomcat.build}/lib/annotations-api.jar"/> - <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> - <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> - <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> - <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/> - <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/> - <property name="catalina-optional.jar" value="${tomcat.build}/lib/catalina-optional.jar"/> - <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/> - <property name="tomcat-bayeux.jar" value="${tomcat.build}/lib/tomcat-bayeux.jar"/> + <!-- Just build Tomcat --> + <target name="build-prepare"> - <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/> - <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/> + <available classname="junit.framework.TestCase" property="junit.present" /> - <property name="tomcat-dbcp.home" value="${base.path}/jbossweb-deps/dbcp" /> - <property name="jasper-jdt.home" value="${base.path}/jbossweb-deps/jdt" /> - <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/> - <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/> + <mkdir dir="${tomcat.classes}"/> - <!-- Classpath --> - <path id="tomcat.classpath"> - <fileset dir="${basedir}/lib"> - <include name="*.jar"/> - </fileset> - <pathelement path="${jasper-jdt.jar}"/> - </path> + <mkdir dir="${tomcat.build}"/> + <mkdir dir="${tomcat.build}/webapps"/> - <!-- Just build Tomcat --> - <target name="build-prepare"> + <mkdir dir="${tomcat.jars}"/> - <available classname="junit.framework.TestCase" property="junit.present" /> + </target> - <mkdir dir="${tomcat.classes}"/> + <target name="compile"> - <delete dir="${tomcat.build}/temp" /> - <delete dir="${tomcat.build}/work" /> - - <mkdir dir="${tomcat.build}"/> - <mkdir dir="${tomcat.build}/bin"/> - <mkdir dir="${tomcat.build}/conf"/> - <mkdir dir="${tomcat.build}/lib"/> - <mkdir dir="${tomcat.build}/logs"/> - <mkdir dir="${tomcat.build}/temp"/> - <mkdir dir="${tomcat.build}/webapps"/> - - <mkdir dir="${tomcat.jars}"/> - - </target> - - <target name="compile"> - - <!-- Compile internal server components --> - <javac srcdir="java" destdir="${tomcat.classes}" + <!-- Compile internal server components --> + <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}" source="${compile.source}" target="${compile.target}" excludes="**/CVS/**,**/.svn/**"> -<!-- Comment this in to show unchecked warnings: <compilerarg value="-Xlint:unchecked"/> --> - <classpath refid="tomcat.classpath" /> - </javac> - <tstamp> - <format property="TODAY" pattern="MMM d yyyy" locale="en"/> - <format property="TSTAMP" pattern="hh:mm:ss"/> - </tstamp> - <!-- Copy static resource files --> - <filter token="VERSION" value="${version}"/> - <filter token="VERSION_NUMBER" value="${version.number}"/> - <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/> - <copy todir="${tomcat.classes}" filtering="true" encoding="ISO-8859-1"> - <fileset dir="java"> - <include name="**/*.properties"/> - <include name="**/*.dtd"/> - <include name="**/*.tasks"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - </fileset> - </copy> + <!-- Comment this in to show unchecked warnings: <compilerarg value="-Xlint:unchecked"/> --> + <classpath refid="tomcat.classpath" /> + </javac> + <tstamp> + <format property="TODAY" pattern="MMM d yyyy" locale="en"/> + <format property="TSTAMP" pattern="hh:mm:ss"/> + </tstamp> + <!-- Copy static resource files --> + <filter token="VERSION" value="${version}"/> + <filter token="VERSION_NUMBER" value="${version.number}"/> + <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/> + <copy todir="${tomcat.classes}" filtering="true" encoding="ISO-8859-1"> + <fileset dir="java"> + <include name="**/*.properties"/> + <include name="**/*.dtd"/> + <include name="**/*.tasks"/> + <include name="**/*.xsd"/> + <include name="**/*.xml"/> + </fileset> + </copy> - </target> + </target> - <target name="build-only" depends="build-prepare,compile,package" /> + <target name="build-only" depends="build-prepare,compile" /> - <target name="package" > + <target name="build-docs"> - <!-- Common Annotations 1.1 JAR File --> - <jar jarfile="${annotations-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/annotation/**" /> - <include name="javax/ejb/*" /> - <include name="javax/persistence/*" /> - <include name="javax/xml/ws/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Servlet 3.0 Implementation JAR File --> - <jar jarfile="${servlet-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/*" /> - <include name="javax/servlet/annotation/*" /> - <include name="javax/servlet/descriptor/*" /> - <include name="javax/servlet/http/*" /> - <include name="javax/servlet/resources/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.2 Implementation JAR File --> - <jar jarfile="${jsp-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/jsp/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.2 EL Implementation JAR File --> - <jar jarfile="${el-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/el/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Bootstrap JAR File --> - <jar jarfile="${bootstrap.jar}" - manifest="res/bootstrap.jar.manifest"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/catalina/startup/Bootstrap.class" /> - <include name="org/apache/catalina/startup/catalina.properties" /> - <include name="org/apache/catalina/startup/CatalinaProperties.class" /> - <include name="org/apache/catalina/startup/ClassLoaderFactory.class" /> - <include name="org/apache/catalina/startup/Tool.class" /> - <include name="org/apache/catalina/loader/StandardClassLoader*.class" /> - <include name="org/apache/catalina/loader/Extension.class" /> - <include name="org/apache/catalina/loader/Reloader.class" /> - <include name="org/apache/catalina/security/SecurityClassLoad.class" /> - <include name="org/apache/naming/JndiPermission.class" /> - <include name="org/apache/tomcat/util/compat/*" /> - <include name="org/jboss/logging/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Tomcat-juli JAR File --> - <jar jarfile="${tomcat-juli.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/juli/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Catalina Main JAR File --> - <jar jarfile="${catalina.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/catalina/**" /> - <include name="org/apache/naming/**" /> - <include name="org/jboss/servlet/http/**" /> - <include name="org/jboss/web/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="org/jboss/web/php/**" /> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - <!-- Modules --> - <exclude name="org/apache/catalina/ant/**" /> - <exclude name="org/apache/catalina/cluster/**" /> - <exclude name="org/apache/catalina/tribes/**" /> - <exclude name="org/apache/catalina/launcher/**" /> - <exclude name="org/apache/catalina/storeconfig/**" /> - </fileset> - </jar> - - <!-- Catalina Ant Tasks JAR File --> - <jar jarfile="${catalina-ant.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/catalina/ant/*" /> - <include name="org/apache/catalina/ant/jmx/*" /> - <include name="org/apache/catalina/util/Base64.class" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Protocol handlers - Coyote --> - <jar jarfile="${tomcat-coyote.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/coyote/**" /> - <include name="org/apache/tomcat/*" /> - <include name="org/apache/tomcat/jni/**" /> - <include name="org/apache/tomcat/util/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Bayeux --> - <jar jarfile="${tomcat-bayeux.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/cometd/**" /> - <include name="org/apache/tomcat/bayeux/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Jasper Implementation JAR File --> - <jar jarfile="${jasper.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/jasper/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Jasper EL Implementation JAR File --> - <jar jarfile="${jasper-el.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/el/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- i18n JARs --> - <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"> - <fileset dir="${tomcat.classes}"> - <include name="**/LocalStrings_es.properties" /> - </fileset> - </jar> - <jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"> - <fileset dir="${tomcat.classes}"> - <include name="**/LocalStrings_fr.properties" /> - </fileset> - </jar> - <jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"> - <fileset dir="${tomcat.classes}"> - <include name="**/LocalStrings_ja.properties" /> - </fileset> - </jar> - - <!-- JBoss Web - PHP Servlet --> - <jar jarfile="${tomcat.build}/lib/servlets-php.jar" index="true"> - <fileset dir="${tomcat.classes}"> - <include name="org/jboss/web/php/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - </target> - - <target name="build-docs"> - - <copy todir="${tomcat.build}/webapps"> - <fileset dir="webapps"> - <include name="docs/images/**"/> - <include name="docs/**/*.css"/> - <include name="docs/**/*.html"/> - <include name="docs/WEB-INF/**"/> - <include name="docs/appdev/*.txt"/> - <include name="docs/appdev/sample/**"/> - </fileset> - <fileset dir="webapps"> - <include name="docs/architecture/**"/> - <exclude name="docs/architecture/*.xml"/> - </fileset> - </copy> - <copy todir="${tomcat.build}/webapps/docs"> - <fileset dir="."> - <include name="BUILDING.txt"/> - <include name="NOTICE"/> - <include name="RUNNING.txt"/> - </fileset> - </copy> - <filter token="VERSION" value="${version}"/> - <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt" file="RELEASE-NOTES" + <copy todir="${tomcat.build}/webapps"> + <fileset dir="webapps"> + <include name="docs/images/**"/> + <include name="docs/**/*.css"/> + <include name="docs/**/*.html"/> + <include name="docs/WEB-INF/**"/> + <include name="docs/appdev/*.txt"/> + <include name="docs/appdev/sample/**"/> + </fileset> + <fileset dir="webapps"> + <include name="docs/architecture/**"/> + <exclude name="docs/architecture/*.xml"/> + </fileset> + </copy> + <copy todir="${tomcat.build}/webapps/docs"> + <fileset dir="."> + <include name="BUILDING.txt"/> + <include name="NOTICE"/> + <include name="RUNNING.txt"/> + </fileset> + </copy> + <filter token="VERSION" value="${version}"/> + <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt" file="RELEASE-NOTES" filtering="true" encoding="ISO-8859-1" /> - <copy tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml" + <copy tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml" file="webapps/docs/appdev/build.xml.txt"/> - - <mkdir dir="${tomcat.build}/webapps/docs/funcspec" /> - - <!-- XSL processing --> - <xslt basedir="webapps/docs" + + <mkdir dir="${tomcat.build}/webapps/docs/funcspec" /> + + <!-- XSL processing --> + <xslt basedir="webapps/docs" destdir="${tomcat.build}/webapps/docs" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="build.xml project.xml" includes="*.xml"> - <param name="relative-path" expression="."/> - </xslt> - <xslt basedir="webapps/docs/appdev" + <param name="relative-path" expression="."/> + </xslt> + <xslt basedir="webapps/docs/appdev" destdir="${tomcat.build}/webapps/docs/appdev" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression=".."/> - </xslt> - <xslt basedir="webapps/docs/funcspecs" + <param name="relative-path" expression=".."/> + </xslt> + <xslt basedir="webapps/docs/funcspecs" destdir="${tomcat.build}/webapps/docs/funcspecs" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression=".."/> - </xslt> - <xslt basedir="webapps/docs/config" + <param name="relative-path" expression=".."/> + </xslt> + <xslt basedir="webapps/docs/config" destdir="${tomcat.build}/webapps/docs/config" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression=".."/> - </xslt> - <xslt basedir="webapps/docs/architecture" + <param name="relative-path" expression=".."/> + </xslt> + <xslt basedir="webapps/docs/architecture" destdir="${tomcat.build}/webapps/docs/architecture" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression=".."/> - </xslt> - - <!-- Print friendly version --> - <mkdir dir="${tomcat.build}/webapps/docs/printer" /> - <copy todir="${tomcat.build}/webapps/docs/printer"> - <fileset dir="."> - <include name="BUILDING.txt"/> - <include name="NOTICE"/> - <include name="RUNNING.txt"/> - </fileset> - </copy> - <mkdir dir="${tomcat.build}/webapps/docs/appdev/printer" /> - <copy todir="${tomcat.build}/webapps/docs/appdev/printer"> - <fileset dir="webapps"> - <include name="docs/appdev/*.txt"/> - </fileset> - </copy> - <mkdir dir="${tomcat.build}/webapps/docs/funcspecs/printer" /> - <mkdir dir="${tomcat.build}/webapps/docs/architecture/printer"/> - <mkdir dir="${tomcat.build}/webapps/docs/config/printer"/> + <param name="relative-path" expression=".."/> + </xslt> - <xslt basedir="webapps/docs" + <!-- Print friendly version --> + <mkdir dir="${tomcat.build}/webapps/docs/printer" /> + <copy todir="${tomcat.build}/webapps/docs/printer"> + <fileset dir="."> + <include name="BUILDING.txt"/> + <include name="NOTICE"/> + <include name="RUNNING.txt"/> + </fileset> + </copy> + <mkdir dir="${tomcat.build}/webapps/docs/appdev/printer" /> + <copy todir="${tomcat.build}/webapps/docs/appdev/printer"> + <fileset dir="webapps"> + <include name="docs/appdev/*.txt"/> + </fileset> + </copy> + <mkdir dir="${tomcat.build}/webapps/docs/funcspecs/printer" /> + <mkdir dir="${tomcat.build}/webapps/docs/architecture/printer"/> + <mkdir dir="${tomcat.build}/webapps/docs/config/printer"/> + + <xslt basedir="webapps/docs" destdir="${tomcat.build}/webapps/docs/printer" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="build.xml project.xml" includes="*.xml"> - <param name="relative-path" expression="./.."/> - <param name="project-menu" expression="nomenu"/> - </xslt> - <xslt basedir="webapps/docs/appdev" + <param name="relative-path" expression="./.."/> + <param name="project-menu" expression="nomenu"/> + </xslt> + <xslt basedir="webapps/docs/appdev" destdir="${tomcat.build}/webapps/docs/appdev/printer" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - </xslt> - <xslt basedir="webapps/docs/funcspecs" + <param name="relative-path" expression="../.."/> + <param name="project-menu" expression="nomenu"/> + </xslt> + <xslt basedir="webapps/docs/funcspecs" destdir="${tomcat.build}/webapps/docs/funcspecs/printer" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - </xslt> - <xslt basedir="webapps/docs/config" + <param name="relative-path" expression="../.."/> + <param name="project-menu" expression="nomenu"/> + </xslt> + <xslt basedir="webapps/docs/config" destdir="${tomcat.build}/webapps/docs/config/printer" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - </xslt> - <xslt basedir="webapps/docs/architecture" + <param name="relative-path" expression="../.."/> + <param name="project-menu" expression="nomenu"/> + </xslt> + <xslt basedir="webapps/docs/architecture" destdir="${tomcat.build}/webapps/docs/architecture/printer" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - </xslt> + <param name="relative-path" expression="../.."/> + <param name="project-menu" expression="nomenu"/> + </xslt> - <!-- Website version --> - <mkdir dir="${jbossweb.site}" /> - <copy todir="${jbossweb.site}"> - <fileset dir="webapps/docs"> - <include name="images/**"/> - <include name="**/*.html"/> - <include name="appdev/*.txt"/> - <include name="appdev/sample/**"/> - </fileset> - <fileset dir="webapps/docs"> - <include name="architecture/**"/> - <exclude name="architecture/*.xml"/> - </fileset> - </copy> - <copy todir="${jbossweb.site}"> - <fileset dir="."> - <include name="BUILDING.txt"/> - <include name="NOTICE"/> - <include name="RUNNING.txt"/> - </fileset> - </copy> - <mkdir dir="${jbossweb.site}/appdev" /> - <copy todir="${jbossweb.site}/appdev"> - <fileset dir="webapps"> - <include name="docs/appdev/*.txt"/> - </fileset> - </copy> - <mkdir dir="${jbossweb.site}/funcspecs" /> - <mkdir dir="${jbossweb.site}/architecture"/> - <mkdir dir="${jbossweb.site}/config"/> + <!-- Website version --> + <mkdir dir="${jbossweb.site}" /> + <copy todir="${jbossweb.site}"> + <fileset dir="webapps/docs"> + <include name="images/**"/> + <include name="**/*.html"/> + <include name="appdev/*.txt"/> + <include name="appdev/sample/**"/> + </fileset> + <fileset dir="webapps/docs"> + <include name="architecture/**"/> + <exclude name="architecture/*.xml"/> + </fileset> + </copy> + <copy todir="${jbossweb.site}"> + <fileset dir="."> + <include name="BUILDING.txt"/> + <include name="NOTICE"/> + <include name="RUNNING.txt"/> + </fileset> + </copy> + <mkdir dir="${jbossweb.site}/appdev" /> + <copy todir="${jbossweb.site}/appdev"> + <fileset dir="webapps"> + <include name="docs/appdev/*.txt"/> + </fileset> + </copy> + <mkdir dir="${jbossweb.site}/funcspecs" /> + <mkdir dir="${jbossweb.site}/architecture"/> + <mkdir dir="${jbossweb.site}/config"/> - <xslt basedir="webapps/docs" + <xslt basedir="webapps/docs" destdir="${jbossweb.site}" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="build.xml project.xml" includes="*.xml"> - <param name="relative-path" expression="."/> - <param name="project-menu" expression="nomenu"/> - <param name="bodyonly" expression="true"/> - <param name="usehead" expression="true"/> - </xslt> - <xslt basedir="webapps/docs/appdev" + <param name="relative-path" expression="."/> + <param name="project-menu" expression="nomenu"/> + <param name="bodyonly" expression="true"/> + <param name="usehead" expression="true"/> + </xslt> + <xslt basedir="webapps/docs/appdev" destdir="${jbossweb.site}/appdev" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression=".."/> - <param name="project-menu" expression="nomenu"/> - <param name="bodyonly" expression="true"/> - <param name="usehead" expression="true"/> - </xslt> - <xslt basedir="webapps/docs/funcspecs" + <param name="relative-path" expression=".."/> + <param name="project-menu" expression="nomenu"/> + <param name="bodyonly" expression="true"/> + <param name="usehead" expression="true"/> + </xslt> + <xslt basedir="webapps/docs/funcspecs" destdir="${jbossweb.site}/funcspecs" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - <param name="bodyonly" expression="true"/> - <param name="usehead" expression="true"/> - </xslt> - <xslt basedir="webapps/docs/config" + <param name="relative-path" expression="../.."/> + <param name="project-menu" expression="nomenu"/> + <param name="bodyonly" expression="true"/> + <param name="usehead" expression="true"/> + </xslt> + <xslt basedir="webapps/docs/config" destdir="${jbossweb.site}/config" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression=".."/> - <param name="project-menu" expression="nomenu"/> - <param name="bodyonly" expression="true"/> - <param name="usehead" expression="true"/> - </xslt> - <xslt basedir="webapps/docs/architecture" + <param name="relative-path" expression=".."/> + <param name="project-menu" expression="nomenu"/> + <param name="bodyonly" expression="true"/> + <param name="usehead" expression="true"/> + </xslt> + <xslt basedir="webapps/docs/architecture" destdir="${jbossweb.site}/architecture" extension=".html" style="webapps/docs/tomcat-docs.xsl" excludes="project.xml" includes="*.xml"> - <param name="relative-path" expression=".."/> - <param name="project-menu" expression="nomenu"/> - <param name="bodyonly" expression="true"/> - <param name="usehead" expression="true"/> - </xslt> + <param name="relative-path" expression=".."/> + <param name="project-menu" expression="nomenu"/> + <param name="bodyonly" expression="true"/> + <param name="usehead" expression="true"/> + </xslt> - </target> + </target> - <target name="deploy" depends="build-only,build-docs"> + <target name="deploy" depends="build-only,build-docs"> - <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" /> - <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" /> + <!-- JBoss Web Main JAR File --> + <jar jarfile="${tomcat.jars}/jbossweb.jar" index="true"> + <fileset dir="${tomcat.classes}"> + <!-- Temp EE class --> + <include name="org/apache/catalina/**" /> + <include name="org/apache/catalina/ha/backend/**" /> + <include name="org/apache/naming/**" /> + <include name="org/apache/comet/**" /> + <include name="org/apache/coyote/**" /> + <include name="org/apache/tomcat/**" /> + <include name="org/apache/jasper/**" /> + <include name="org/apache/cometd/bayeux/**" /> + <include name="org/apache/el/**" /> + <include name="org/jboss/servlet/**" /> + <include name="org/jboss/web/**" /> + <!-- Javadoc and i18n exclusions --> + <exclude name="**/package.html" /> + </fileset> + </jar> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> - <exclude name="**/*.launch"/> - </fileset> - </copy> - <chmod perm="ug+x" dir="${tomcat.build}/bin" includes="*.sh"/> + <copy file="${jasper-jdt.jar}" todir="${tomcat.jars}" /> - <!-- Copy static resource files --> - <copy todir="${tomcat.build}/conf"> - <fileset dir="conf"> - <include name="**/*.policy"/> - <include name="**/*.xml"/> - <include name="**/*.properties"/> - </fileset> - </copy> + <!-- Create a source jar of the jbossweb/servlet classes --> + <zip destfile="${tomcat.jars}/jbossweb-src.zip"> + <fileset dir="${basedir}/java"> + <include name="org/**" /> + <exclude name="org/jboss/logging/**" /> + <exclude name="javax/servlet/**" /> + <exclude name="javax/el/**" /> + </fileset> + </zip> - <!-- Copy other regular webapps --> - <copy todir="${tomcat.build}/webapps"> - <fileset dir="webapps"> - <include name="ROOT/**"/> - <include name="manager/**"/> - <include name="host-manager/**"/> - </fileset> - </copy> + </target> - <filter token="VERSION" value="${version}"/> - <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt" file="RELEASE-NOTES" - filtering="true" encoding="ISO-8859-1" /> - - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" /> - <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" /> - - <!-- JBoss Web Main JAR File --> - <jar jarfile="${tomcat.jars}/jbossweb.jar" index="true"> - <fileset dir="${tomcat.classes}"> - <!-- Temp EE class --> - <include name="org/apache/catalina/**" /> - <include name="org/apache/catalina/ha/backend/**" /> - <include name="org/apache/naming/**" /> - <include name="org/apache/comet/**" /> - <include name="org/apache/coyote/**" /> - <include name="org/apache/tomcat/**" /> - <include name="org/apache/jasper/**" /> - <include name="org/apache/cometd/bayeux/**" /> - <include name="org/apache/el/**" /> - <include name="org/jboss/servlet/**" /> - <include name="org/jboss/web/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - </fileset> - </jar> - - <!-- Servlet 3.0 Implementation JAR File --> - <jar jarfile="${tomcat.jars}/servlet-api.jar"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/*" /> - <include name="javax/servlet/annotation/*" /> - <include name="javax/servlet/descriptor/*" /> - <include name="javax/servlet/http/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.2 Implementation JAR File --> - <jar jarfile="${tomcat.jars}/jsp-api.jar"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/jsp/*" /> - <include name="javax/servlet/jsp/el/*" /> - <include name="javax/servlet/jsp/tagext/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- EL Implementation JAR File --> - <jar jarfile="${tomcat.jars}/el-api.jar"> - <fileset dir="${tomcat.classes}"> - <include name="javax/el/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <copy file="${jasper-jdt.jar}" todir="${tomcat.jars}" /> - - <!-- Create a source jar of the jbossweb/servlet classes --> - <zip destfile="${tomcat.jars}/jbossweb-src.zip"> - <fileset dir="${basedir}/java"> - <include name="org/**" /> - <exclude name="org/jboss/logging/**" /> - <include name="javax/servlet/**" /> - <include name="javax/el/**" /> - </fileset> - </zip> - - </target> - - <target name="clean-depend" + <target name="clean-depend" description="Clean depend src components"> - <delete dir="${tomcat-dbcp.home}"/> - <delete dir="${jasper-jdt.home}"/> - </target> - - <target name="clean"> - <delete dir="${tomcat.classes}" /> - <delete dir="${tomcat.build}" /> - <delete dir="${tomcat.jars}" /> - <delete dir="${jbossweb.site}" /> - </target> + <delete dir="${jasper-jdt.home}"/> + </target> - <!-- Download and dependency building --> - <target name="proxyflags"> - <!-- check proxy parameters. --> - <condition property="useproxy"> - <equals arg1="${proxy.use}" arg2="on" /> - </condition> - </target> + <target name="clean"> + <delete dir="${tomcat.classes}" /> + <delete dir="${tomcat.build}" /> + <delete dir="${tomcat.jars}" /> + <delete dir="${jbossweb.site}" /> + </target> - <target name="setproxy" depends="proxyflags" if="useproxy"> - <taskdef name="setproxy" + <!-- Download and dependency building --> + <target name="proxyflags"> + <!-- check proxy parameters. --> + <condition property="useproxy"> + <equals arg1="${proxy.use}" arg2="on" /> + </condition> + </target> + + <target name="setproxy" depends="proxyflags" if="useproxy"> + <taskdef name="setproxy" classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" /> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" + <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> + <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> + </target> - <target name="testexist"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> + <target name="testexist"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> + </target> - <target name="downloadgz" unless="exist" depends="setproxy,testexist"> - <!-- Download and extract the package --> - <get src="${sourcefile}" dest="${base.path}/file.tar.gz" /> - <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/> - <untar src="${base.path}/file.tar" dest="${base.path}"/> - <delete file="${base.path}/file.tar"/> - <delete file="${base.path}/file.tar.gz"/> - </target> + <target name="downloadgz" unless="exist" depends="setproxy,testexist"> + <!-- Download and extract the package --> + <get src="${sourcefile}" dest="${base.path}/file.tar.gz" /> + <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/> + <untar src="${base.path}/file.tar" dest="${base.path}"/> + <delete file="${base.path}/file.tar"/> + <delete file="${base.path}/file.tar.gz"/> + </target> - <target name="downloadzip" unless="exist" depends="setproxy,testexist"> - <!-- Download and extract the package --> - <get src="${sourcefile}" dest="${base.path}/file.zip" /> - <mkdir dir="${destdir}" /> - <unzip src="${base.path}/file.zip" dest="${destdir}"/> - <delete file="${base.path}/file.zip"/> - </target> + <target name="downloadzip" unless="exist" depends="setproxy,testexist"> + <!-- Download and extract the package --> + <get src="${sourcefile}" dest="${base.path}/file.zip" /> + <mkdir dir="${destdir}" /> + <unzip src="${base.path}/file.zip" dest="${destdir}"/> + <delete file="${base.path}/file.zip"/> + </target> - <target name="downloadfile" unless="exist" depends="setproxy,testexist"> - <!-- Download extract the file --> - <mkdir dir="${destdir}" /> - <get src="${sourcefile}" dest="${destfile}" /> - </target> + <target name="downloadfile" unless="exist" depends="setproxy,testexist"> + <!-- Download extract the file --> + <mkdir dir="${destdir}" /> + <get src="${sourcefile}" dest="${destfile}" /> + </target> - <target name="download" + <target name="download" description="Builds and download dependent components"> - <mkdir dir="${base.path}" /> + <mkdir dir="${base.path}" /> - <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-daemon.loc}"/> - <param name="destfile" value="${commons-daemon.jar}"/> - </antcall> - - <!-- Build Tomcat DBCP bundle --> - <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-pool-src.loc}"/> - <param name="destfile" value="${tomcat-dbcp.jar}" /> - </antcall> - <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-dbcp-src.loc}"/> - <param name="destfile" value="${tomcat-dbcp.jar}" /> - </antcall> - <mkdir dir="${tomcat-dbcp.home}"/> - <antcall target="build-tomcat-dbcp"> - <param name="basedir" value="${tomcat-dbcp.home}" /> - <param name="destfile" value="${tomcat-dbcp.jar}" /> - </antcall> - - <!-- Download json libraries + <!-- Download json libraries <antcall target="downloadfile"> <param name="sourcefile" value="${json-lib.loc}"/> <param name="destfile" value="${json-lib.jar}"/> <param name="destdir" value="${json-lib.home}"/> </antcall> --> - <!-- Build Jasper JDT bundle --> - <antcall target="downloadzip"> - <param name="sourcefile" value="${jdt.loc}"/> - <param name="destfile" value="${jdt.jar}"/> - <param name="destdir" value="${base.path}"/> - </antcall> - <mkdir dir="${jasper-jdt.home}"/> - <antcall target="build-jasper-jdt"> - <param name="basedir" value="${jasper-jdt.home}" /> - </antcall> + <!-- Build Jasper JDT bundle --> + <antcall target="downloadzip"> + <param name="sourcefile" value="${jdt.loc}"/> + <param name="destfile" value="${jdt.jar}"/> + <param name="destdir" value="${base.path}"/> + </antcall> + <mkdir dir="${jasper-jdt.home}"/> + <antcall target="build-jasper-jdt"> + <param name="basedir" value="${jasper-jdt.home}" /> + </antcall> - <antcall target="downloadzip"> - <param name="sourcefile" value="${jbossnative.loc}"/> - <param name="destfile" value="${jbossnative.openssl}"/> - <param name="destdir" value="${jbossnative.home}"/> - </antcall> + </target> - <antcall target="downloadzip"> - <param name="sourcefile" value="${nsis.loc}"/> - <param name="destfile" value="${nsis.exe}"/> - <param name="destdir" value="${nsis.home}/.."/> - </antcall> + <target name="build-jasper-jdt"> + <unjar src="${jdt.jar}" dest="${jasper-jdt.home}" /> + <jar destfile="${jasper-jdt.jar}" index="true"> + <fileset dir="${jasper-jdt.home}"> + <include name="org/eclipse/jdt/core/compiler/**"/> + <include name="org/eclipse/jdt/internal/compiler/**"/> + <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/> + </fileset> + </jar> + </target> - </target> + <target name="tests"> + <antcall target="downloadgz"> + <param name="sourcefile" value="${dojo-js.loc}"/> + <param name="destfile" value="${dojo-js.jar}"/> + </antcall> - <target name="build-tomcat-dbcp" unless="exist" depends="testexist"> - <copy todir="${tomcat-dbcp.home}"> - <!-- - <fileset dir="${commons-collections.home}" > - <include name="**/collections/CursorableLinkedList.java" /> - <include name="**/collections/KeyValue.java" /> - <include name="**/collections/LRUMap.java" /> - <include name="**/collections/SequencedHashMap.java" /> - </fileset> - --> - <fileset dir="${commons-pool.home}"> - <include name="**/*.java" /> - <exclude name="**/test/**" /> - </fileset> - <fileset dir="${commons-dbcp.home}"> - <include name="**/*.java" /> - <exclude name="**/test/**" /> - </fileset> - </copy> - <!-- - <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"> - <replacefilter token="return UnmodifiableList.decorate(l);" - value="return l;" /> - <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;" - value=" " /> - </replace> - --> - <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" > - <replacefilter token="org.apache.commons" - value="org.apache.tomcat.dbcp" /> - </replace> - <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl" > - <replacefilter token="enum" - value="enumeration" /> - </replace> - - <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" /> - <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp"> - <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" /> - </move> - <mkdir dir="${tomcat-dbcp.home}/classes"/> - <javac destdir="${tomcat-dbcp.home}/classes" - sourcepath="${tomcat-dbcp.home}/src/java" - srcdir="${tomcat-dbcp.home}/src/java" - debug="${compile.debug}" - optimize="${compile.optimize}" - deprecation="${compile.deprecation}" - source="1.5" - target="1.5" - excludes="**/CVS/**,**/.svn/**"> - <include name="**" /> - </javac> - <jar jarfile="${tomcat-dbcp.jar}" - index="true"> - <fileset dir="${tomcat-dbcp.home}/classes"> - <include name="**/*.class" /> - <include name="**/*.properties" /> - </fileset> - </jar> - </target> - - <target name="build-jasper-jdt"> - <unjar src="${jdt.jar}" dest="${jasper-jdt.home}" /> - <jar destfile="${jasper-jdt.jar}" index="true"> - <fileset dir="${jasper-jdt.home}"> - <include name="org/eclipse/jdt/core/compiler/**"/> - <include name="org/eclipse/jdt/internal/compiler/**"/> - <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/> - </fileset> - </jar> - </target> - - <target name="tests"> - <antcall target="downloadgz"> - <param name="sourcefile" value="${dojo-js.loc}"/> - <param name="destfile" value="${dojo-js.jar}"/> - </antcall> - - <mkdir dir="${tomcat.build}/webapps/cometd"/> - <mkdir dir="${tomcat.build}/webapps/cometd/WEB-INF/classes"/> - <copy todir="${tomcat.build}/webapps/cometd"> - <fileset dir="${basedir}/test/webapps/cometd"> - </fileset> - <fileset dir="${dojo-js.home}"> - <include name="dojo/**"/> - <include name="dojox/**"/> - </fileset> - </copy> - <javac srcdir="${basedir}/test/java" destdir="${tomcat.build}/webapps/cometd/WEB-INF/classes" + <mkdir dir="${tomcat.build}/webapps/cometd"/> + <mkdir dir="${tomcat.build}/webapps/cometd/WEB-INF/classes"/> + <copy todir="${tomcat.build}/webapps/cometd"> + <fileset dir="${basedir}/test/webapps/cometd"> + </fileset> + <fileset dir="${dojo-js.home}"> + <include name="dojo/**"/> + <include name="dojox/**"/> + </fileset> + </copy> + <javac srcdir="${basedir}/test/java" destdir="${tomcat.build}/webapps/cometd/WEB-INF/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" optimize="${compile.optimize}" classpath="${tomcat.classes}"> - <include name="org/jboss/web/comet/**" /> - <include name="org/apache/cometd/**" /> - </javac> - </target> - + <include name="org/jboss/web/comet/**" /> + <include name="org/apache/cometd/**" /> + </javac> + </target> + + <target name="maven" description="Upload to Maven repository; if this looks like a hack, it's because it's one"> + + <filter token="VERSION" value="${version}"/> + <copy todir="${tomcat.jars}" filtering="true"> + <fileset dir="res"> + <include name="*-pom.xml"/> + </fileset> + </copy> + + <!-- Maven repository configuration --> + <property name="maven.repository.url" value="file:///somepath"/> + <property name="maven.repository.id" value="repository.jboss.org"/> + <!--<property name="maven.repository.url" value="dav:https://snapshots.jboss.org/maven2"/> + <property name="maven.repository.id" value="snapshots.jboss.org"/>--> + + <!-- Linux/Unix execs --> + <exec dir="." executable="/bin/sh" os="Linux"> + <arg value="-c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + </exec> + <exec dir="." executable="/bin/sh" os="Linux"> + <arg value="-c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + </exec> + <exec dir="." executable="/bin/sh" os="Linux"> + <arg value="-c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> + </exec> + + <!-- Windows exec --> + <exec dir="." executable="cmd" os="Windows NT"> + <arg value="/c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + </exec> + <exec dir="." executable="cmd" os="Windows NT"> + <arg value="/c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> + </exec> + <exec dir="." executable="cmd" os="Windows NT"> + <arg value="/c" /> + <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> + </exec> + + </target> + </project> Deleted: trunk/dist.xml =================================================================== --- trunk/dist.xml 2010-03-12 18:44:44 UTC (rev 1410) +++ trunk/dist.xml 2010-03-16 14:48:04 UTC (rev 1411) @@ -1,556 +0,0 @@ -<?xml version="1.0"?> -<project name="JBoss Web" default="release" basedir="."> - - - <!-- ===================== Initialize Property Values =================== --> - - <!-- See "build.properties.sample" in the top level directory for all --> - <!-- property values you must customize for successful building!!! --> - <property file="${user.home}/build.properties"/> - <property file="build.properties"/> - - <property file="build.properties.default"/> - - <!-- Project Properties --> - <property name="name" value="JBoss Web" /> - <property name="year" value="2009" /> - <property name="version.major" value="3" /> - <property name="version.minor" value="0" /> - <property name="version.build" value="0" /> - <property name="version.patch" value="0" /> - <property name="version.tag" value="SNAPSHOT" /> - <property name="version" value="${version.major}.${version.minor}.${version.build}-${version.tag}" /> - <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" /> - - <property name="project" value="jboss-web" /> - <property name="final.name" value="${project}-${version}" /> - <property name="final-src.name" value="${project}-${version}-src" /> - - <!-- Build Defaults --> - <property name="tomcat.build" value="${basedir}/output/build"/> - <property name="tomcat.classes" value="${basedir}/output/classes"/> - <property name="tomcat.dist" value="${basedir}/output/dist"/> - <property name="tomcat.deployer" value="${basedir}/output/deployer"/> - <property name="tomcat.extras" value="${basedir}/output/extras"/> - <property name="tomcat.release" value="${basedir}/output/release"/> - <property name="tomcat.jars" value="${basedir}/output/jars"/> - <property name="test.failonerror" value="true"/> - <property name="test.runner" value="junit.textui.TestRunner"/> - - <!-- constant to declare a file binary for md5sum --> - <property name="md5sum.binary-prefix" value=" *" /> - - <!-- Can't be lower - jsp uses templates --> - <property name="compile.source" value="1.5"/> - - <!-- JAR artifacts --> - <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/> - - <property name="annotations-api.jar" value="${tomcat.build}/lib/annotations-api.jar"/> - <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> - <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> - <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> - <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/> - <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/> - <property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/> - <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/> - - <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/> - <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/> - - <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" /> - <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" /> - <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/> - <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/> - - <!-- ====================== COMBO: Clean All Directories ================ --> - <target name="clean" - description="Clean all components"> - - <delete dir="${tomcat.deployer}"/> - <delete dir="${tomcat.dist}" failonerror="false"/> - - </target> - - - <!-- ====================== DIST: Create Directories ==================== --> - <target name="dist-prepare"> - <mkdir dir="${tomcat.dist}"/> - <mkdir dir="${tomcat.dist}/bin"/> - <mkdir dir="${tomcat.dist}/conf"/> - <mkdir dir="${tomcat.dist}/lib"/> - <mkdir dir="${tomcat.dist}/logs"/> - <mkdir dir="${tomcat.dist}/temp"/> - <mkdir dir="${tomcat.dist}/webapps"/> - <mkdir dir="${tomcat.dist}/work"/> - <mkdir dir="${tomcat.release}/v${version}/bin" /> - <mkdir dir="${tomcat.release}/v${version}/src" /> - <mkdir dir="${tomcat.jars}" /> - </target> - - - <!-- ====================== DIST: Copy Static Files ===================== --> - <target name="dist-static" depends="dist-prepare"> - - <!-- Copy the top-level documentation files --> - <filter token="VERSION" value="${version}"/> - <copy todir="${tomcat.dist}" filtering="true"> - <fileset dir="."> - <include name="INSTALLING.txt"/> - <include name="LICENSE"/> - <include name="NOTICE"/> - <include name="RELEASE-NOTES"/> - <include name="RUNNING.txt"/> - </fileset> - </copy> - - <!-- Copy the contents of each "build" directory --> - <copy todir="${tomcat.dist}/bin"> - <fileset dir="${tomcat.build}/bin"> - </fileset> - </copy> - <copy todir="${tomcat.dist}/lib"> - <fileset dir="${tomcat.build}/lib" /> - </copy> - <copy todir="${tomcat.dist}/conf"> - <fileset dir="${tomcat.build}/conf"> - </fileset> - </copy> - - <copy todir="${tomcat.dist}/webapps"> - <fileset dir="${tomcat.build}/webapps"> - <exclude name="**/balancer/WEB-INF/classes/**" /> - <exclude name="**/ROOT/WEB-INF/classes/**" /> - <exclude name="**/WEB-INF/src/**" /> - </fileset> - </copy> - - <touch file="${tomcat.dist}/temp/safeToDelete.tmp" /> - - <!-- Correct permissions and line endings on "bin" scripts --> - <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf" encoding="ISO-8859-1" fixlast="false"/> - <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf" encoding="ISO-8859-1" fixlast="false"/> - <chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/> - - </target> - - <target name="dist-javadoc" depends="dist-source" description="Create the Tomcat javadoc" > - <javadoc packagenames="org.apache.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/api" - author="true" version="true" - windowtitle="JBoss Web API Documentation" - doctitle="JBoss Web API" - bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved." - additionalparam="-breakiterator" - maxmemory="256m" > - </javadoc> - </target> - - <target name="dist-deployer" description="Create the Tomcat deployer binary" > - - <!-- Servlet and JSP --> - <copy todir="${tomcat.deployer}/lib"> - <fileset dir="${tomcat.build}/lib"> - <include name="catalina-ant.jar"/> - <include name="el-api.jar"/> - <include name="jsp-api.jar"/> - <include name="jasper.jar"/> - <include name="jasper-el.jar"/> - <include name="servlet-api.jar"/> - </fileset> - <fileset dir="${tomcat.build}/bin"> - <include name="tomcat-juli.jar"/> - </fileset> - </copy> - - <!-- Digester and dependencies --> - <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/catalina/startup/DigesterFactory.class" /> - <include name="org/apache/catalina/util/SchemaResolver.class" /> - <include name="org/apache/catalina/util/StringManager.class" /> - <include name="org/apache/tomcat/*" /> - <include name="org/apache/tomcat/util/*" /> - <include name="org/apache/tomcat/util/digester/*" /> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- Main build script --> - <copy todir="${tomcat.deployer}"> - <fileset dir="${basedir}/res/deployer" /> - </copy> - - <!-- Copy deployer documentation --> - <copy todir="${tomcat.deployer}"> - <fileset dir="${tomcat.build}/webapps/docs"> - <include name="images/jbossorg_logo.gif" /> - <include name="images/jboss_logo.gif" /> - </fileset> - </copy> - <copy tofile="${tomcat.deployer}/docs/manual.html" - file="${tomcat.build}/webapps/docs/printer/deployer-howto.html" - failonerror="false"/> - - </target> - - <!-- ====================== DIST: Create Sources ======================== --> - <target name="dist-source"> - - <mkdir dir="${tomcat.dist}/src"/> - - <!-- Tomcat source --> - <copy todir="${tomcat.dist}/src"> - <fileset dir="${basedir}"> - <exclude name=".*/**"/> - <exclude name="output/**"/> - <exclude name="build.properties"/> - </fileset> - </copy> - - </target> - - - <!-- ================= DIST: Create Windows Installer =================== --> - <target name="installer" - description="Create Windows 32-bit installer" unless="skip.installer"> - - <echo message="Builds a Windows installer based on Nullsoft Installer"/> - <copy todir="${tomcat.dist}"> - <fileset dir="res" /> - </copy> - <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" /> - <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" /> - <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" /> - <copy todir="${tomcat.dist}/bin"> - <fileset dir="res/procrun/" includes="jboss*.exe"/> - </copy> - <copy todir="${tomcat.dist}/bin"> - <fileset dir="${jbossnative.dlls}" includes="*.dll"/> - </copy> - <copy todir="${tomcat.dist}/bin" file="${jbossnative.openssl}" /> - - <filter token="VERSION" value="${version}"/> - <filter token="VERSION_NUMBER" value="${version.number}"/> - - <copy file="res/jboss-web.nsi" tofile="${tomcat.dist}/jboss-web.nsi" filtering="true" overwrite="true"/> - <exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows"> - <arg value="/DNSISDIR=${nsis.home}" /> - <arg value="jboss-web.nsi" /> - </exec> - <exec dir="${tomcat.dist}" executable="wine" osfamily="unix"> - <arg value="${nsis.exe}" /> - <arg value="/DNSISDIR=${nsis.home}" /> - <arg value="jboss-web.nsi" /> - </exec> - - <move file="${tomcat.dist}/jboss-web-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" /> - - <checksum file="${tomcat.release}/v${version}/bin/${final.name}.exe" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" - message="${md5sum.binary-prefix}${final.name}.exe${line.separator}" append="true" /> - </target> - - - <!-- ==================== RELEASE: Create Release ======================= --> - <target name="release" depends="clean,dist-static,installer,package-zip,package-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz" - description="Create a JBoss Web packaged distribution"> - - <filter token="VERSION" value="${version}"/> - <copy file="KEYS" - todir="${tomcat.release}/v${version}"/> - <copy file="RELEASE-NOTES" - todir="${tomcat.release}/v${version}" - filtering="true"/> - - <!-- - <copy file="res/welcome.main.html" - tofile="${tomcat.release}/v${version}/README.html" - filtering="true"/> - <copy file="res/welcome.bin.html" - tofile="${tomcat.release}/v${version}/bin/README.html" - filtering="true"/> - - <mkdir dir="${tomcat.release}/v${version}/bin/extras" /> - <copy todir="${tomcat.release}/v${version}/bin/extras"> - <fileset dir="${tomcat.extras}"> - <include name="*.*"/> - </fileset> - </copy> - --> - - </target> - - <target name="maven" description="Upload to Maven repository; if this looks like a hack, it's because it's one"> - - <filter token="VERSION" value="${version}"/> - <copy todir="${tomcat.jars}" filtering="true"> - <fileset dir="res"> - <include name="*-pom.xml"/> - </fileset> - </copy> - - <!-- Maven repository configuration --> - <property name="maven.repository.url" value="file:///somepath"/> - <property name="maven.repository.id" value="repository.jboss.org"/> - <!--<property name="maven.repository.url" value="dav:https://snapshots.jboss.org/maven2"/> - <property name="maven.repository.id" value="snapshots.jboss.org"/>--> - - <!-- Linux/Unix execs --> - <!-- - <exec dir="." executable="/bin/sh" os="Linux"> - <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - --> - <exec dir="." executable="/bin/sh" os="Linux"> - <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="/bin/sh" os="Linux"> - <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <!-- - <exec dir="." executable="/bin/sh" os="Linux"> - <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="/bin/sh" os="Linux"> - <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - --> - <exec dir="." executable="/bin/sh" os="Linux"> - <arg value="-c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> - </exec> - - <!-- Windows exec --> - <!-- - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/el-api.jar -DpomFile=${tomcat.jars}/el-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - --> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jasper-jdt.jar -DpomFile=${tomcat.jars}/jasper-jdt-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb.jar -DpomFile=${tomcat.jars}/jbossweb-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <!-- - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jsp-api.jar -DpomFile=${tomcat.jars}/jsp-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/servlet-api.jar -DpomFile=${tomcat.jars}/servlet-api-pom.xml -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id}"/> - </exec> - --> - <exec dir="." executable="cmd" os="Windows NT"> - <arg value="/c" /> - <arg value="mvn deploy:deploy-file -Dfile=${tomcat.jars}/jbossweb-src.zip -Durl=${maven.repository.url} -Dpackaging=jar -DrepositoryId=${maven.repository.id} -DgroupId=jboss.web -DartifactId=jbossweb -Dversion=${version} -Dclassifier=sources"/> - </exec> - - </target> - - <!-- Packages the core zip distro --> - <target name="package-zip"> - <copy todir="${tomcat.dist}/bin"> - <fileset dir="res/procrun/" includes="jboss*.exe"/> - </copy> - <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip"> - <zipfileset dir="${tomcat.dist}" prefix="${final.name}"> - <include name="bin/**"/> - <include name="conf/**"/> - <include name="logs/**"/> - <include name="lib/**"/> - <include name="webapps/**"/> - <include name="work/**"/> - <include name="temp/**"/> - <include name="LICENSE"/> - <include name="NOTICE"/> - <include name="README.txt"/> - <include name="RELEASE-NOTES"/> - <include name="RUNNING.txt"/> - <include name="BENCHMARKS.txt"/> - <!-- If we choose not to have service binaries by default - the exclude.service.binaries must be defined - in build.properties or in this file - --> - <exclude name="bin/*.exe" if="exclude.service.binaries"/> - <exclude name="bin/service.bat" if="exclude.service.binaries"/> - </zipfileset> - </zip> - - <checksum file="${tomcat.release}/v${version}/bin/${final.name}.zip" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5" - message="${md5sum.binary-prefix}${final.name}.zip${line.separator}" append="true" /> - </target> - - <!-- Packages the deployer distribution in zip format --> - <target name="package-deployer-zip"> - <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip"> - <zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer" includes="**" /> - <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="LICENSE" /> - <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="NOTICE" /> - <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="README.txt" /> - <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="RELEASE-NOTES" /> - </zip> - - <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip.md5" - message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}" append="true" /> - </target> - - <!-- Packages the core tar.gz distro --> - <target name="package-tgz"> - <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf" encoding="ISO-8859-1" fixlast="false"/> - <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" encoding="ISO-8859-1" fixlast="false"/> - <tar longfile="gnu" compression="gzip" - tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz"> - <tarfileset dir="${tomcat.dist}" mode="755" prefix="${final.name}"> - <include name="bin/catalina.sh" /> - <include name="bin/digest.sh" /> - <include name="bin/jasper.sh" /> - <include name="bin/jspc.sh" /> - <include name="bin/setclasspath.sh" /> - <include name="bin/startup.sh" /> - <include name="bin/shutdown.sh" /> - <include name="bin/tool-wrapper.sh" /> - <include name="bin/tool-wrapper-using-launcher.sh" /> - <include name="bin/shutdown-using-launcher.sh" /> - <include name="bin/startup-using-launcher.sh" /> - </tarfileset> - <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}"> - <include name="conf/**" /> - </tarfileset> - <tarfileset dir="${tomcat.dist}" prefix="${final.name}"> - <include name="bin/**" /> - <include name="lib/**" /> - <include name="logs/**" /> - <include name="temp/**" /> - <include name="webapps/**" /> - <include name="work/**" /> - <include name="LICENSE" /> - <include name="NOTICE" /> - <include name="README.txt" /> - <include name="RELEASE-NOTES" /> - <include name="RUNNING.txt" /> - <include name="BENCHMARKS.txt" /> - <exclude name="bin/catalina.sh" /> - <exclude name="bin/digest.sh" /> - <exclude name="bin/jasper.sh" /> - <exclude name="bin/jspc.sh" /> - <exclude name="bin/setclasspath.sh" /> - <exclude name="bin/startup.sh" /> - <exclude name="bin/shutdown.sh" /> - <exclude name="bin/tool-wrapper.sh" /> - <exclude name="bin/tool-wrapper-using-launcher.sh" /> - <exclude name="bin/shutdown-using-launcher.sh" /> - <exclude name="bin/startup-using-launcher.sh" /> - <exclude name="conf/**" /> - <exclude name="src/**" /> - <exclude name="bin/*.dll"/> - <exclude name="bin/*.exe"/> - <exclude name="bin/service.bat"/> - <!-- Do we need windows .bat files as part of .tgz? - If not apply the following rule - <exclude name="bin/*.bat"/> - --> - </tarfileset> - </tar> - - <checksum file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz.md5" - message="${md5sum.binary-prefix}${final.name}.tar.gz${line.separator}" append="true" /> - </target> - - <!-- Packages the deployer Tomcat distro in tar.gz format --> - <target name="package-deployer-tgz"> - <fixcrlf srcdir="${tomcat.dist}" - includes="*.txt,LICENSE,NOTICE" eol="lf" encoding="ISO-8859-1" fixlast="false"/> - <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf" encoding="ISO-8859-1" fixlast="false"/> - - <tar longfile="gnu" compression="gzip" - tarfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz"> - <tarfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"> - <include name="LICENSE" /> - <include name="NOTICE" /> - <include name="README.txt" /> - <include name="RELEASE-NOTES" /> - </tarfileset> - <tarfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer"> - <include name="**" /> - </tarfileset> - </tar> - - <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz.md5" - message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}" append="true" /> - </target> - - <!-- Packages the documentation distro in tar.gz format --> - <target name="package-docs-tgz"> - - <!-- Package gocs --> - <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf" encoding="ISO-8859-1" fixlast="false"/> - - <tar longfile="gnu" compression="gzip" - tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz"> - <tarfileset dir="${tomcat.dist}" prefix="jboss-web-doc"> - <include name="LICENSE" /> - <include name="NOTICE" /> - <include name="README.txt" /> - <include name="RUNNING.txt" /> - </tarfileset> - <tarfileset dir="${tomcat.dist}/webapps/docs" prefix="jboss-web-doc"> - <include name="**" /> - </tarfileset> - </tar> - - <checksum file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz.md5" - message="${md5sum.binary-prefix}${final.name}-fulldocs.tar.gz${line.separator}" append="true" /> - </target> - - <!-- Packages the source code distribution in zip format --> - <target name="package-src-zip"> - <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip"> - <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" /> - </zip> - - <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.zip" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/src/${final-src.name}.zip.md5" - message="${md5sum.binary-prefix}${final-src.name}.zip${line.separator}" append="true" /> - </target> - - <!-- Packages the source code distribution in tar.gz format --> - <target name="package-src-tgz"> - <fixcrlf srcdir="${tomcat.dist}/src" - excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia" eol="lf" - encoding="ISO-8859-1" fixlast="false"/> - <tar longfile="gnu" compression="gzip" - tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz"> - <tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" /> - </tar> - <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz" - forceOverwrite="yes" fileext=".md5" /> - <echo file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz.md5" - message="${md5sum.binary-prefix}${final-src.name}.tar.gz${line.separator}" append="true" /> - </target> - -</project>