Author: remy.maucherat(a)jboss.com
Date: 2009-03-27 11:43:53 -0400 (Fri, 27 Mar 2009)
New Revision: 973
Modified:
trunk/build.xml
trunk/dist.xml
trunk/webapps/docs/aio.xml
Log:
- Fix packaging.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-03-27 15:12:28 UTC (rev 972)
+++ trunk/build.xml 2009-03-27 15:43:53 UTC (rev 973)
@@ -13,9 +13,9 @@
<!-- Project Properties -->
<property name="name" value="JBoss Web" />
- <property name="year" value="2008" />
- <property name="version.major" value="2" />
- <property name="version.minor" value="1" />
+ <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" />
@@ -208,7 +208,6 @@
<!-- Catalina Main JAR File -->
<jar jarfile="${catalina.jar}">
<fileset dir="${tomcat.classes}">
- <include name="org/apache/*" />
<include name="org/apache/catalina/**" />
<include name="org/apache/naming/**" />
<include name="org/jboss/servlet/http/**" />
@@ -243,6 +242,7 @@
<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 -->
@@ -265,7 +265,6 @@
<!-- Jasper Implementation JAR File -->
<jar jarfile="${jasper.jar}">
<fileset dir="${tomcat.classes}">
- <include name="org/apache/*" />
<include name="org/apache/jasper/**" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
@@ -581,15 +580,12 @@
<!-- JBoss Web Main JAR File -->
<jar jarfile="${tomcat.jars}/jbossweb.jar" index="true">
<fileset dir="${tomcat.classes}">
- <include name="org/apache/*" />
<include name="org/apache/catalina/**" />
<exclude name="org/apache/catalina/startup/catalina.properties"
/>
<include name="org/apache/naming/**" />
<include name="org/apache/comet/**" />
<include name="org/apache/coyote/**" />
- <include name="org/apache/tomcat/bayeux/**" />
- <include name="org/apache/tomcat/jni/**" />
- <include name="org/apache/tomcat/util/**" />
+ <include name="org/apache/tomcat/**" />
<include name="org/apache/jasper/**" />
<include name="org/apache/cometd/bayeux/**" />
<include name="org/apache/el/**" />
Modified: trunk/dist.xml
===================================================================
--- trunk/dist.xml 2009-03-27 15:12:28 UTC (rev 972)
+++ trunk/dist.xml 2009-03-27 15:43:53 UTC (rev 973)
@@ -13,9 +13,9 @@
<!-- Project Properties -->
<property name="name" value="JBoss Web" />
- <property name="year" value="2008" />
- <property name="version.major" value="2" />
- <property name="version.minor" value="1" />
+ <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" />
@@ -170,6 +170,7 @@
<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" />
Modified: trunk/webapps/docs/aio.xml
===================================================================
--- trunk/webapps/docs/aio.xml 2009-03-27 15:12:28 UTC (rev 972)
+++ trunk/webapps/docs/aio.xml 2009-03-27 15:43:53 UTC (rev 973)
@@ -210,6 +210,8 @@
the HttpEventFiler interface.
</p>
+ </subsection>
+
<subsection name="Servlet 3.0 Async">
<p>
@@ -218,6 +220,8 @@
implemented using the event functionality, and presented to the user through the
Servlet API.
</p>
+ </subsection>
+
<!--subsection name="Tracking session and webapp lifecycle">
<p>
Show replies by date