Author: markt
Date: Thu Jan 23 23:26:44 2014
New Revision: 1560850
URL: http://svn.apache.org/r1560850
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/trunk/res/maven/tomcat-embed-el.pom (with props)
tomcat/trunk/res/maven/tomcat-embed-websocket.pom (with props)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1560850&r1=1560849&r2=1560850&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jan 23 23:26:44 2014
@@ -139,10 +139,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="tomcat-embed-websocket.jar"
value="${tomcat.embed}/tomcat-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="tomcat-embed-websocket-sources.jar"
value="${tomcat.embed.sources}/tomcat-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"/>
@@ -415,10 +419,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.tomcat-websocket" />
<patternset refid="files.tomcat-api" />
<!-- These pattern sets conflict so include files directly
<patternset refid="files.tomcat-coyote" />
@@ -434,10 +435,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.tomcat-embed-websocket" >
+ <patternset refid="files.websocket-api" />
+ <patternset refid="files.tomcat-websocket" />
+ </patternset>
+
<!-- Pattern sets used directly -->
<!--<patternset refid="files.tomcat-juli" />-->
@@ -1179,11 +1189,18 @@
solution will be required. -->
<jarIt jarfile="${tomcat-embed-core.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-embed-core"
- meta-inf="${tomcat.manifests}/tomcat-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="${tomcat-embed-websocket.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-embed-websocket"
+ meta-inf="${tomcat.manifests}/tomcat-websocket.jar"/>
<jarIt jarfile="${tomcat-embed-juli.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-juli"/>
@@ -1204,6 +1221,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="${tomcat-embed-websocket-sources.jar}"
+ filesDir="java"
+ filesId="files.tomcat-embed-websocket"/>
<jarIt jarfile="${tomcat-embed-juli-sources.jar}"
filesDir="java"
filesId="files.tomcat-juli"/>
Added: tomcat/trunk/res/maven/tomcat-embed-el.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-el.pom?rev=1560850&view=auto
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-el.pom (added)
+++ tomcat/trunk/res/maven/tomcat-embed-el.pom Thu Jan 23 23:26:44 2014
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Core Tomcat implementation</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
Propchange: tomcat/trunk/res/maven/tomcat-embed-el.pom
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1560850&r1=1560849&r2=1560850&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Thu Jan 23 23:26:44 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>
Added: tomcat/trunk/res/maven/tomcat-embed-websocket.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-websocket.pom?rev=1560850&view=auto
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-websocket.pom (added)
+++ tomcat/trunk/res/maven/tomcat-embed-websocket.pom Thu Jan 23 23:26:44 2014
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Core Tomcat implementation</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: tomcat/trunk/res/maven/tomcat-embed-websocket.pom
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
