Author: markt
Date: Tue Mar 19 20:34:48 2013
New Revision: 1458503
URL: http://svn.apache.org/r1458503
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54726
Include WebSocket META-INF files in core embedded JAR
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1458503&r1=1458502&r2=1458503&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Mar 19 20:34:48 2013
@@ -1123,9 +1123,13 @@
failonerror="false"/>
<copy file="${jdt.jar}" todir="${tomcat.embed}" />
+ <!-- Note the meta-int below will work as long as there is only one JAR
+ that needs to add entries. If there is more than one a more complex
+ solution will be required. -->
<jarIt jarfile="${tomcat-embed-core.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-embed-core"/>
+ filesId="files.tomcat-embed-core"
+ meta-inf="${tomcat.manifests}/tomcat-websocket.jar"/>
<jarIt jarfile="${tomcat-embed-jasper.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-embed-jasper"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
