Author: remy.maucherat(a)jboss.com
Date: 2012-09-26 11:10:10 -0400 (Wed, 26 Sep 2012)
New Revision: 2088
Removed:
branches/7.2.x/BUILDING.txt
branches/7.2.x/PATCHES.txt
branches/7.2.x/RELEASE-NOTES
branches/7.2.x/build.properties.default
branches/7.2.x/build.xml
branches/7.2.x/java/
branches/7.2.x/lib/
branches/7.2.x/res/
Modified:
branches/7.2.x/NOTICE
branches/7.2.x/pom.xml
Log:
Remove old code moved to Maven [will do it in trunk later].
Deleted: branches/7.2.x/BUILDING.txt
===================================================================
--- branches/7.2.x/BUILDING.txt 2012-09-26 13:54:12 UTC (rev 2087)
+++ branches/7.2.x/BUILDING.txt 2012-09-26 15:10:10 UTC (rev 2088)
@@ -1,115 +0,0 @@
-
- ============================================
- Building The JBoss Web Servlet/JSP Container
- ============================================
-
-This subproject contains the source code for JBoss Web, a container that
-implements the Servlet 2.5 and JSP 2.1 specifications from the Java
-Community Process <
http://www.jcp.org/>. In order to build a binary
-distribution version of the container from a source distribution,
-do the following:
-
-
-(0) Download and Install a Java Development Kit
-
-* If the JDK is already installed, skip to (1).
-
-* Download a Java Development Kit (JDK) release (version 1.5.x or later) from:
-
-
http://java.sun.com/j2se/
-
-* Install the JDK according to the instructions included with the release.
-
-* Set an environment variable JAVA_HOME to the pathname of the directory
- into which you installed the JDK release.
-
-
-(1) Install Apache Ant 1.6.x on your computer
-
-* If Apache Ant 1.6.x is already installed on your computer, skip to (2).
-
-* Download a binary distribution of Ant 1.6.x from:
-
-
http://ant.apache.org/bindownload.cgi
-
-* Unpack the binary distribution into a convenient location so that the
- Ant release resides in its own directory (conventionally named
- "apache-ant-[version]"). For the purposes of the remainder of this
document,
- the symbolic name "${ant.home}" is used to refer to the full pathname of
- the release directory.
-
-* Create an ANT_HOME environment variable to point the directory
- ${ant.home}.
-
-* Modify the PATH environment variable to include the directory
- ${ant.home}/bin in its list. This makes the "ant" command line script
- available, which will be used to actually perform the build.
-
-
-(2) Building JBoss Web
-
-(2.1) Checkout or obtain the source code for JBoss Web
-
-* JBoss Web SVN repository URL:
-
http://anonsvn.jboss.org/repos/jbossweb/trunk/
-
-* Download a source package from:
-
http://labs.jboss.com/jbossweb/
-
-* Checkout the source using SVN, selecting the desired version or
- branch (current development source is at
-
http://anonsvn.jboss.org/repos/jbossweb/trunk/), or
- unpack the source package. The location where the source has been
- placed will be referred as ${jboss-web.source}.
-
-(2.2) Building
-
-* Go to that directory, and do:
-
- cd ${jboss-web.source}
- ant download
- ant
-
-* NOTE: Users accessing the Internet through a proxy must use a properties
- file to indicate to Ant the proxy configuration. Read below.
-
-* WARNING: Running this command will download binaries to the /usr/share/java
- directory. Make sure this is appropriate to do on your computer. On Windows,
- this usually corresponds to the "C:\usr\share\java" directory, unless Cygwin
- is used. Read below to customize the directory used to download the binaries.
-
-* The build can be controlled by creating a ${jboss-web.source}/build.properties
- file, and adding the following content to it:
-
- # ----- Proxy setup -----
- # Uncomment if using a proxy server
- #proxy.host=proxy.domain
- #proxy.port=8080
- #proxy.use=on
-
- # ----- Default Base Path for Dependent Packages -----
- # Replace this path with the directory path where dependencies binaries
- # should be downloaded
- base.path=/usr/share/java
-
-
-(3) Updating sources
-
-It is recommended that you regularly update the downloaded JBoss Web sources
-using your SVN client.
-
-(4) Rebuilds
-
-For a quick rebuild of only modified code you can use:
-
- cd ${jboss-web.source}
- ant
-
-(5) Building EL parser with JavaCC 4.1+:
-
- Download JavaCC 4.1+
- export JAVACC_HOME=/somepath/javacc-4.1
- export PATH=$JAVACC_HOME/bin:$PATH
- cd ${jboss-web.source}/java/org/apache/el/parser
- jjtree ELParser.jjt
- javacc ELParser.jj
Modified: branches/7.2.x/NOTICE
===================================================================
--- branches/7.2.x/NOTICE 2012-09-26 13:54:12 UTC (rev 2087)
+++ branches/7.2.x/NOTICE 2012-09-26 15:10:10 UTC (rev 2088)
@@ -1,8 +1,8 @@
JBoss Web
-Copyright 2006-2010 Red Hat Middleware, LLC. All rights reserved.
+Copyright 2006-2012 Red Hat Middleware, LLC. All rights reserved.
Apache Tomcat
-Copyright 1999-2010 The Apache Software Foundation
+Copyright 1999-2012 The Apache Software Foundation
Servlet API 3.0
Copyright 1997-2009 Sun Microsystems, Inc
Deleted: branches/7.2.x/PATCHES.txt
===================================================================
--- branches/7.2.x/PATCHES.txt 2012-09-26 13:54:12 UTC (rev 2087)
+++ branches/7.2.x/PATCHES.txt 2012-09-26 15:10:10 UTC (rev 2088)
@@ -1,88 +0,0 @@
-Dropped Tomcat patches
-SVN URL:
http://svn.apache.org/viewvc?rev=XXXXXX&view=rev
-
-701358
-Some symlink fix (too many checks needed)
-
-701355
-XML parser in webapp fix (significant refactoring, partial)
-
-709821
-Endline configuration for PrintWriter based on a server system property
-
-709018
-Async logger is not ready
-
-710179
-Invoker servlet removal
-
-711711 711714 711716 711720
-Useless session access time refactoring
-
-719602
-Dynamic change for maxThreads in the bare bones thread pool, which goes against its
simplicity goal
-(an executor should be used instead)
-
-720728
-Multiple pollers, which adds the complexity of needing a map to track to which poller a
connection belongs
-(needed in IO event mode). There are 3 pollers already, which should be able to handle a
lot of traffic.
-
-various
-All changesets introducing generics, which have small value (new code or refactorings
should use generics,
-however)
-
-724886
-Executor modifications, very specialized work that breaks the Executor design (a single
task can be submitted
-to the real executor more than once) to supposedly work better with the NIO connector.
-
-various
-New JDBC pool module
-
-733748
-SSL session tracking (may not be practical at all)
-
-733768 733769 733775
-Generics in Servlet API (not accepted yet)
-
-733771
-Deprecate some wrapper methods in Servlet API (not accepted yet)
-
-751502
-Per context validation (incomplete, and looks a bit useless anyway)
-
-752651, 752936
-XmlBase configuration
-
-757223
-AJP hack to pass remote port (the protocol does not do it, well, too bad)
-
-763654
-Specific hack to address some error condition in HTTP method
-
-765727 (reverted)
-ETag should normally be different if the content encoding changes; content-encoding is
used because
-transfer-encoding does not work with IE, and is not normally appropriate for transparent
compression
-
-770809
-Fix 47080: NPE in RealmBase.findSecurityConstraints when uri is null (normally useless, a
redirection should always occur)
-
-770876
-Windows 64 bit stuff ... Zzzzz
-
-781036
-Some configBase creation flag
-
-781779 and all followups
-Useless syncing
-
-782000 782005 782007 782010 782013 782032
-Changes to APR init
-
-784083
-Useless alias feature, redundant with overlays
-
-890139
-EL coercion patch
-
-920449
-Generating broken pages using included error pages
Deleted: branches/7.2.x/RELEASE-NOTES
===================================================================
--- branches/7.2.x/RELEASE-NOTES 2012-09-26 13:54:12 UTC (rev 2087)
+++ branches/7.2.x/RELEASE-NOTES 2012-09-26 15:10:10 UTC (rev 2088)
@@ -1,72 +0,0 @@
-
-
- JBoss Web @VERSION@
- Release Notes
-
-
-===================
-Dependency Changes:
-===================
-JBoss Web 3.0 is designed to run on JSE 6.0 and later, and requires
-configuration to run on JSE 6.0.
-
-In addition, JBoss Web 3.0 uses the Eclipse JDT Java compiler for compiling
-JSP pages. This means you no longer need to have the complete
-Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
-(JRE) is sufficient. The Eclipse JDT Java compiler is bundled with the
-binary Tomcat distributions. Tomcat can also be configured to use the
-compiler from the JDK to compile JSPs, or any other Java compiler supported
-by Apache Ant.
-
-
-=======================
-JNI Based Applications:
-=======================
-Applications that require native libraries must ensure that the libraries have
-been loaded prior to use. Typically, this is done with a call like:
-
- static {
- System.loadLibrary("path-to-library-file");
- }
-
-in some class. However, the application must also ensure that the library is
-not loaded more than once. If the above code were placed in a class inside
-the web application (i.e. under /WEB-INF/classes or /WEB-INF/lib), and the
-application were reloaded, the loadLibrary() call would be attempted a second
-time.
-
-To avoid this problem, place classes that load native libraries outside of the
-web application, and ensure that the loadLibrary() call is executed only once
-during the lifetime of a particular JVM.
-
-
-=============================
-Enabling SSI and CGI Support:
-=============================
-SSI, CGI will only will run in privileged web applications. See the Context
-attributes documentation for more details.
-
-
-============================
-Symlinking static resources:
-============================
-By default, Unix symlinks will not work when used in a web application to link
-resources located outside the web application root directory.
-
-This behavior is optional, and the "allowLinking" flag may be used to disable
-the check.
-
-
-================================
-Viewing the JBoss Web Change Log:
-================================
-See changelog.html in this directory.
-
-
-====================
-When all else fails:
-====================
-See the Wiki:
-http://labs.jboss.com/wiki/Jbossweb
-Tomcat FAQ for related common questions:
-http://tomcat.apache.org/faq/
Deleted: branches/7.2.x/build.properties.default
===================================================================
--- branches/7.2.x/build.properties.default 2012-09-26 13:54:12 UTC (rev 2087)
+++ branches/7.2.x/build.properties.default 2012-09-26 15:10:10 UTC (rev 2088)
@@ -1,48 +0,0 @@
-# -----------------------------------------------------------------------------
-# build.properties.sample
-#
-# This is an example "build.properties" file, used to customize building
-# JBoss Web for your local environment. It defines the location of all external
-# modules that JBoss Web depends on. Copy this file to "build.properties"
-# in the top-level source directory, and customize it as needed.
-#
-# $Id: build.properties.default 526202 2007-04-06 15:44:38Z remm $
-# -----------------------------------------------------------------------------
-
-# ----- Version Control Flags -----
-version.major=7
-version.minor=7
-version.build=0
-version.patch=0
-version.tag=SNAPSHOT
-
-# ----- Default Base Path for Dependent Packages -----
-# Please note this path must be absolute, not relative,
-# as it is referenced with different working directory
-# contexts by the various build scripts.
-base.path=/usr/share/java
-#base.path=C:/path/to/the/repository
-#base.path=/usr/local
-
-compile.source=1.7
-compile.target=1.7
-compile.debug=true
-
-base-commons.loc=http://archive.apache.org/dist/commons
-base-tomcat.loc=http://archive.apache.org/dist/tomcat
-base-sf.loc=http://downloads.sourceforge.net
-
-# ----- Eclipse JDT, version 3.2 or later -----
-jdt.home=${base.path}/plugins
-jdt.lib=${jdt.home}
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.7.0.v_B61.jar
-jdt.loc=http://download.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/org.eclipse.jdt-3.7.zip
-
-jdt-src.home=${base.path}/eclipse/plugins
-jdt-src.lib=${jdt.home}
-jdt-src.loc=http://download.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-sourceBuild-srcIncluded-3.7.zip
-
-# ----- Dojo Toolkit (for test webapp) -----
-dojo-js.home=${base.path}/dojo-release-1.4.3
-dojo-js.loc=http://download.dojotoolkit.org/release-1.4.3/dojo-release-1.4.3.tar.gz
-dojo-js.jar=${dojo-js.home}/dojo/dojo.js
Deleted: branches/7.2.x/build.xml
===================================================================
--- branches/7.2.x/build.xml 2012-09-26 13:54:12 UTC (rev 2087)
+++ branches/7.2.x/build.xml 2012-09-26 15:10:10 UTC (rev 2088)
@@ -1,545 +0,0 @@
-<?xml version="1.0"?>
-<project name="JBoss Web" default="deploy"
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="2010" />
- <property name="version.major" value="7" />
- <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.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.7"/>
-
- <property name="jasper-jdt.home"
value="${base.path}/jbossweb-deps/jdt" />
- <property name="jasper-jdt.jar"
value="${jasper-jdt.home}/jasper-jdt.jar"/>
-
- <property name="jasper-jdt-src.home"
value="${base.path}/jbossweb-deps/jdt-src" />
- <property name="jasper-jdt-src.jar"
value="${jasper-jdt-src.home}/jasper-jdt-src.jar"/>
-
- <!-- Classpath -->
- <path id="tomcat.classpath">
- <fileset dir="${basedir}/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${jasper-jdt.jar}"/>
- </path>
-
- <!-- Just build Tomcat -->
- <target name="build-prepare">
-
- <available classname="junit.framework.TestCase"
property="junit.present" />
-
- <mkdir dir="${tomcat.classes}"/>
-
- <mkdir dir="${tomcat.build}"/>
- <mkdir dir="${tomcat.build}/webapps"/>
-
- <mkdir dir="${tomcat.jars}"/>
-
- </target>
-
- <target name="compile">
-
- <!-- 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>
-
- </target>
-
- <target name="build-only" depends="build-prepare,compile" />
-
- <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"
- filtering="true" encoding="ISO-8859-1" />
-
- <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"
- 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"
- 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"
- 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"
- 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>
-
- <!-- 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"
- 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"
- 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"
- 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>
-
- <!-- 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"
- 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"
- 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"
- 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"
- 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>
-
- </target>
-
- <target name="deploy" depends="build-only,build-docs">
-
- <!-- 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 file="${jasper-jdt.jar}" todir="${tomcat.jars}" />
- <copy file="${jasper-jdt-src.jar}" todir="${tomcat.jars}" />
-
- <!-- Create a source jar of the jbossweb/servlet classes -->
- <jar destfile="${tomcat.jars}/jbossweb-src.jar"
index="true">
- <fileset dir="${basedir}/java">
- <include name="org/**" />
- <exclude name="org/jboss/logging/**" />
- <exclude name="javax/servlet/**" />
- <exclude name="javax/el/**" />
- </fileset>
- </jar>
-
- </target>
-
- <target name="clean-depend"
- description="Clean depend src components">
- <delete dir="${jasper-jdt.home}"/>
- <delete dir="${jasper-jdt-src.home}"/>
- </target>
-
- <target name="clean">
- <delete dir="${tomcat.classes}" />
- <delete dir="${tomcat.build}" />
- <delete dir="${tomcat.jars}" />
- <delete dir="${jbossweb.site}" />
- </target>
-
- <!-- 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}"
- proxyuser="${proxy.user}"
proxypassword="${proxy.password}" />
- <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="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="downloadfile" unless="exist"
depends="setproxy,testexist">
- <!-- Download extract the file -->
- <mkdir dir="${destdir}" />
- <get src="${sourcefile}" dest="${destfile}" />
- </target>
-
- <target name="download"
- description="Builds and download dependent components">
-
- <mkdir dir="${base.path}" />
-
- <!-- 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="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 sources bundle -->
- <antcall target="downloadzip">
- <param name="sourcefile" value="${jdt-src.loc}"/>
- <param name="destdir" value="${jasper-jdt-src.home}"/>
- </antcall>
- <mkdir dir="${jasper-jdt-src.home}"/>
- <antcall target="build-jasper-jdt-src">
- <param name="basedir" value="${jasper-jdt-src.home}" />
- </antcall>
-
- </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="build-jasper-jdt-src">
- <jar destfile="${jasper-jdt-src.jar}" index="true">
- <fileset
dir="${jasper-jdt-src.home}/src/plugins/org.eclipse.jdt.core/model">
- <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"
- 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>
-
- <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="https://repository.jboss.org/nexus/service/local/staging/depl...
- <property name="maven.repository.id"
value="jboss-releases-repository"/>
-
- <!-- Linux/Unix execs -->
- <exec dir="." executable="/bin/sh"
os="Linux">
- <arg value="-c" />
- <arg value="mvn deploy:deploy-file
-Dfile=${tomcat.jars}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb
-Dversion=${version} -Dclassifier=sources"/>
- </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>
-
- <!-- Windows exec -->
- <exec dir="." executable="cmd" os="Windows
NT">
- <arg value="/c" />
- <arg value="mvn deploy:deploy-file
-Dfile=${tomcat.jars}/jbossweb-src.jar -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jbossweb
-Dversion=${version} -Dclassifier=sources"/>
- </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>
-
- </target>
-
- <target name="maven-jdt" 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="https://repository.jboss.org/nexus/service/local/staging/depl...
- <property name="maven.repository.id"
value="jboss-releases-repository"/>
-
- <!-- Linux/Unix execs -->
- <exec dir="." executable="/bin/sh"
os="Linux">
- <arg value="-c" />
- <arg value="mvn deploy:deploy-file
-Dfile=${tomcat.jars}/jasper-jdt-src.jar -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id} -DgroupId=org.jboss.web -DartifactId=jasper-jdt
-Dversion=${version} -Dclassifier=sources"/>
- </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>
-
- <!-- 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>
-
- </target>
-
-</project>
Modified: branches/7.2.x/pom.xml
===================================================================
(Binary files differ)