You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/05/22 14:10:26 UTC
svn commit: r1681087 - in /tomcat/trunk: ./ conf/
java/org/apache/coyote/spdy/ java/org/apache/tomcat/spdy/ res/checkstyle/
res/maven/ webapps/docs/
Author: markt
Date: Fri May 22 12:10:25 2015
New Revision: 1681087
URL: http://svn.apache.org/r1681087
Log:
Remove the remaining SPDY code and associated references
Removed:
tomcat/trunk/java/org/apache/coyote/spdy/
tomcat/trunk/java/org/apache/tomcat/spdy/
tomcat/trunk/res/maven/tomcat-spdy.pom
Modified:
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/TOMCAT-NEXT.txt
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/conf/catalina.properties
tomcat/trunk/res/checkstyle/org-import-control.xml
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml
Modified: tomcat/trunk/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Fri May 22 12:10:25 2015
@@ -83,7 +83,6 @@ for use by web applications (by placing
* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP)
* tomcat-jdbc.jar (Tomcat's database connection pooling solution)
* tomcat-jni.jar (Interface to the native component of the APR/native connector)
-* tomcat-spdy.jar (SPDY implementation)
* tomcat-util.jar (Various utilities)
* tomcat-websocket.jar (WebSocket 1.1 implementation)
* websocket-api.jar (WebSocket 1.1 API)
Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Fri May 22 12:10:25 2015
@@ -33,7 +33,7 @@ Notes of things to consider for the next
6. See what Java 8 language features we want to use.
- 7. Connector refactoring required for HTTP2/SPDY APIs that might be exposed in
+ 7. Connector refactoring required for HTTP/2 APIs that might be exposed in
the Servlet API.
8. Keep an eye on the other Java EE 8 EGs (no sign of any movement apart
Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri May 22 12:10:25 2015
@@ -144,12 +144,6 @@ jdt.jar=${jdt.home}/ecj-${jdt.version}.j
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-# ---- NPN support
-npn.version=8.1.2.v20120308
-npn.home=${base.path}/npn-${npn.version}
-npn.jar=${npn.home}/npn-${npn.version}.jar
-npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
-
# ----- Tomcat native library -----
tomcat-native.version=1.1.33
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri May 22 12:10:25 2015
@@ -100,7 +100,6 @@
<property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/>
<property name="tomcat-dbcp.jar" value="${tomcat.build}/lib/tomcat-dbcp.jar"/>
<property name="tomcat-jni.jar" value="${tomcat.build}/lib/tomcat-jni.jar"/>
- <property name="tomcat-spdy.jar" value="${tomcat.build}/lib/tomcat-spdy.jar"/>
<property name="tomcat-api.jar" value="${tomcat.build}/lib/tomcat-api.jar"/>
<property name="tomcat-util.jar" value="${tomcat.build}/lib/tomcat-util.jar"/>
<property name="tomcat-util-scan.jar" value="${tomcat.build}/lib/tomcat-util-scan.jar"/>
@@ -124,7 +123,6 @@
<property name="catalina-ant-src.jar" value="${tomcat.src.jars}/catalina-ant-src.jar"/>
<property name="catalina-storeconfig-src.jar" value="${tomcat.src.jars}/catalina-storeconfig-src.jar"/>
<property name="tomcat-jni-src.jar" value="${tomcat.src.jars}/tomcat-jni-src.jar"/>
- <property name="tomcat-spdy-src.jar" value="${tomcat.src.jars}/tomcat-spdy-src.jar"/>
<property name="tomcat-coyote-src.jar" value="${tomcat.src.jars}/tomcat-coyote-src.jar"/>
<property name="tomcat-dbcp-src.jar" value="${tomcat.src.jars}/tomcat-dbcp-src.jar"/>
<property name="tomcat-api-src.jar" value="${tomcat.src.jars}/tomcat-api-src.jar"/>
@@ -194,12 +192,9 @@
<defaultexcludes remove="**/.gitignore" />
<!--<defaultexcludes echo="true" />-->
- <available file="${npn.jar}" property="npn.exists" />
-
<!-- Classpaths -->
<path id="compile.classpath">
<pathelement location="${jdt.jar}"/>
- <pathelement location="${npn.jar}"/>
</path>
<path id="tomcat.classpath">
@@ -347,7 +342,6 @@
<exclude name="org/apache/tomcat/buildutil" />
<exclude name="org/apache/tomcat/dbcp" />
<exclude name="org/apache/tomcat/jni" />
- <exclude name="org/apache/tomcat/spdy" />
<exclude name="org/apache/tomcat/util" />
<exclude name="org/apache/tomcat/websocket" />
</patternset>
@@ -412,8 +406,6 @@
<patternset id="files.tomcat-coyote">
<include name="org/apache/coyote/**" />
- <!-- Included in tomcat-spdy -->
- <exclude name="org/apache/coyote/spdy/**" />
<!-- Remaining tomcat-util packages -->
<include name="org/apache/tomcat/util/bcel/**" />
<include name="org/apache/tomcat/util/collections/**" />
@@ -423,11 +415,6 @@
<include name="org/apache/tomcat/util/net/**" />
</patternset>
- <patternset id="files.tomcat-spdy">
- <include name="org/apache/coyote/spdy/**" />
- <include name="org/apache/tomcat/spdy/**" />
- </patternset>
-
<patternset id="files.jasper">
<include name="org/apache/jasper/**" />
</patternset>
@@ -661,10 +648,7 @@
<compilerarg value="-Xlint:unchecked"/>
-->
<classpath refid="compile.classpath" />
- <exclude name="org/apache/naming/factory/webservices/**" />
- <exclude name="org/apache/tomcat/spdy/NetSupportJava7*" unless="npn.exists"/>
- <exclude name="org/apache/coyote/spdy/*Nio*" unless="npn.exists"/>
- <exclude name="org/apache/coyote/spdy/SpdyNpnHandler*" unless="npn.exists"/>
+ <exclude name="org/apache/naming/factory/webservices/**" />
</javac>
<!-- Copy static resource files -->
<copy todir="${tomcat.classes}" encoding="ISO-8859-1">
@@ -796,10 +780,6 @@
filesDir="${tomcat.classes}"
filesId="files.tomcat-coyote" />
- <jarIt jarfile="${tomcat-spdy.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-spdy" />
-
<jarIt jarfile="${tomcat-jni.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-jni" />
@@ -2696,11 +2676,6 @@ skip.installer property in build.propert
notice="${tomcat.manifests}/tomcat-coyote.jar.notice"
license="${tomcat.manifests}/tomcat-coyote.license" />
- <!-- SPDY -->
- <jarIt jarfile="${tomcat-spdy-src.jar}"
- filesDir="java"
- filesId="files.tomcat-spdy" />
-
<!-- JNI -->
<jarIt jarfile="${tomcat-jni-src.jar}"
filesDir="java"
@@ -2788,15 +2763,6 @@ skip.installer property in build.propert
</target>
- <target name="download-npn"
- description="Download optional NPN" >
- <antcall target="downloadfile">
- <param name="sourcefile" value="${npn.loc}"/>
- <param name="destfile" value="${npn.jar}"/>
- <param name="destdir" value="${npn.home}"/>
- </antcall>
- </target>
-
<target name="download-test-compile"
description="Download additional components for the tests" >
Modified: tomcat/trunk/conf/catalina.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Fri May 22 12:10:25 2015
@@ -112,7 +112,7 @@ catalina.jar,catalina-ant.jar,catalina-h
catalina-tribes.jar,\
jasper.jar,jasper-el.jar,ecj-*.jar,\
tomcat-api.jar,tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,\
-tomcat-dbcp.jar,tomcat-jni.jar,tomcat-spdy.jar,tomcat-websocket.jar,\
+tomcat-dbcp.jar,tomcat-jni.jar,tomcat-websocket.jar,\
tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
tomcat-jdbc.jar,\
Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Fri May 22 12:10:25 2015
@@ -88,7 +88,6 @@
<allow pkg="org.apache.coyote"/>
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.tomcat.jni"/>
- <allow pkg="org.apache.tomcat.spdy"/>
<allow pkg="org.apache.tomcat.util"/>
</subpackage>
<subpackage name="el">
@@ -145,10 +144,6 @@
<allow pkg="org.apache.tomcat.jni"/>
</subpackage>
</subpackage>
- <subpackage name="spdy">
- <allow pkg="org.apache.tomcat.jni"/>
- <allow pkg="org.apache.tomcat.spdy"/>
- </subpackage>
<subpackage name="util">
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.tomcat.jni"/>
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Fri May 22 12:10:25 2015
@@ -323,7 +323,6 @@
<doMavenDeploy artifactId="tomcat-api"/>
<doMavenDeploy artifactId="tomcat-jni"/>
- <doMavenDeploy artifactId="tomcat-spdy"/>
<doMavenDeploy artifactId="tomcat-util"/>
<doMavenDeploy artifactId="tomcat-util-scan"/>
<doMavenDeploy artifactId="tomcat-coyote"/>
Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1681087&r1=1681086&r2=1681087&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Fri May 22 12:10:25 2015
@@ -156,7 +156,6 @@ loaders as it is initialized:</p>
<li><em>tomcat-jdbc.jar</em> — An alternative database connection pool
implementation, known as Tomcat JDBC pool. See
<a href="jdbc-pool.html">documentation</a> for more details.</li>
- <li><em>tomcat-spdy.jar</em> — SPDY implementation</li>
<li><em>tomcat-util.jar</em> — Common classes used by various components of
Apache Tomcat.</li>
<li><em>tomcat-websocket.jar</em> — WebSocket 1.1 implementation</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org