Author: markt
Date: Fri Jan 24 12:12:07 2014
New Revision: 1560962
URL: http://svn.apache.org/r1560962
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56044
Separate out the EL and WebSocket implementations into separate JARs for
embedded.
Added:
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-el.pom
- copied unchanged from r1560850,
tomcat/trunk/res/maven/tomcat-embed-el.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-websocket.pom
- copied unchanged from r1560850,
tomcat/trunk/res/maven/tomcat-embed-websocket.pom
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1560850
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1560962&r1=1560961&r2=1560962&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Jan 24 12:12:07 2014
@@ -126,10 +126,14 @@
<!-- Embedded JARs & source JARs -->
<property name="tomcat-embed-core.jar"
value="${tomcat.embed}/tomcat-embed-core.jar"/>
<property name="tomcat-embed-jasper.jar"
value="${tomcat.embed}/tomcat-embed-jasper.jar"/>
+ <property name="tomcat-embed-el.jar"
value="${tomcat.embed}/tomcat-embed-el.jar"/>
+ <property name="tomcat7-embed-websocket.jar"
value="${tomcat.embed}/tomcat7-embed-websocket.jar"/>
<property name="tomcat-embed-juli.jar"
value="${tomcat.embed}/tomcat-embed-logging-juli.jar"/>
<property name="tomcat-embed-core-sources.jar"
value="${tomcat.embed.sources}/tomcat-embed-core-src.jar"/>
<property name="tomcat-embed-jasper-sources.jar"
value="${tomcat.embed.sources}/tomcat-embed-jasper-src.jar"/>
+ <property name="tomcat-embed-el-sources.jar"
value="${tomcat.embed.sources}/tomcat-embed-el-src.jar"/>
+ <property name="tomcat7-embed-websocket-sources.jar"
value="${tomcat.embed.sources}/tomcat7-embed-websocket-src.jar"/>
<property name="tomcat-embed-juli-sources.jar"
value="${tomcat.embed.sources}/tomcat-embed-logging-juli-src.jar"/>
<property name="tomcat-embed-dbcp-sources.jar"
value="${tomcat.embed.sources}/tomcat-dbcp-src.jar"/>
@@ -387,10 +391,7 @@
<patternset refid="files.annotations-api" />
<patternset refid="files.bootstrap" />
<patternset refid="files.catalina" />
- <patternset refid="files.el-api" />
<patternset refid="files.servlet-api" />
- <patternset refid="files.websocket-api" />
- <patternset refid="files.tomcat7-websocket" />
<patternset refid="files.tomcat-api" />
<!-- These pattern sets conflict so include files directly
<patternset refid="files.tomcat-coyote" />
@@ -405,10 +406,19 @@
<patternset id="files.tomcat-embed-jasper" >
<patternset refid="files.jasper" />
- <patternset refid="files.jasper-el" />
<patternset refid="files.jsp-api" />
</patternset>
+ <patternset id="files.tomcat-embed-el" >
+ <patternset refid="files.el-api" />
+ <patternset refid="files.jasper-el" />
+ </patternset>
+
+ <patternset id="files.tomcat7-embed-websocket" >
+ <patternset refid="files.websocket-api" />
+ <patternset refid="files.tomcat7-websocket" />
+ </patternset>
+
<!-- Pattern sets used directly -->
<!--<patternset refid="files.tomcat-juli" />-->
@@ -1136,11 +1146,18 @@
solution will be required. -->
<jarIt jarfile="${tomcat-embed-core.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-embed-core"
- meta-inf="${tomcat.manifests}/tomcat7-websocket.jar"/>
+ filesId="files.tomcat-embed-core"/>
<jarIt jarfile="${tomcat-embed-jasper.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-embed-jasper"/>
+ filesId="files.tomcat-embed-jasper"
+ meta-inf="${tomcat.manifests}/jasper.jar"/>
+ <jarIt jarfile="${tomcat-embed-el.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-embed-el"/>
+ <jarIt jarfile="${tomcat7-embed-websocket.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat7-embed-websocket"
+ meta-inf="${tomcat.manifests}/tomcat7-websocket.jar"/>
<jarIt jarfile="${tomcat-embed-juli.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-juli"/>
@@ -1161,6 +1178,12 @@
<jarIt jarfile="${tomcat-embed-jasper-sources.jar}"
filesDir="java"
filesId="files.tomcat-embed-jasper"/>
+ <jarIt jarfile="${tomcat-embed-el-sources.jar}"
+ filesDir="java"
+ filesId="files.tomcat-embed-el"/>
+ <jarIt jarfile="${tomcat7-embed-websocket-sources.jar}"
+ filesDir="java"
+ filesId="files.tomcat7-embed-websocket"/>
<jarIt jarfile="${tomcat-embed-juli-sources.jar}"
filesDir="java"
filesId="files.tomcat-juli"/>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1560962&r1=1560961&r2=1560962&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom Fri Jan 24 12:12:07
2014
@@ -37,6 +37,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>4.3.1</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
