Author: costin
Date: Thu Mar 29 23:18:34 2012
New Revision: 1307160
URL: http://svn.apache.org/viewvc?rev=1307160&view=rev
Log:
Fix npn location, make it optional
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1307160&r1=1307159&r2=1307160&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Mar 29 23:18:34 2012
@@ -135,7 +135,7 @@ jdt.loc.2=http://download.eclipse.org/ec
npn.version=8.1.2.v20120308
npn.home=${base.path}/npn-${npn.version}
npn.jar=${npn.home}/npn-${npn.version}.jar
-npn.loc=http://repo2.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${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.23
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1307160&r1=1307159&r2=1307160&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Mar 29 23:18:34 2012
@@ -162,6 +162,8 @@
<defaultexcludes add="**/.git/**" />
<defaultexcludes remove="**/.gitignore" />
<!--<defaultexcludes echo="true" />-->
+
+ <available file="${npn.jar}" property="npn.exists" />
<!-- Classpaths -->
<path id="compile.classpath">
@@ -570,7 +572,10 @@
<compilerarg value="-Xlint:unchecked"/>
-->
<classpath refid="compile.classpath" />
- <exclude name="org/apache/naming/factory/webservices/**" />
+ <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"/>
</javac>
<!-- Copy static resource files -->
<copy todir="${tomcat.classes}" encoding="ISO-8859-1">
@@ -2345,12 +2350,15 @@ Apache Tomcat ${version} native binaries
<param name="destdir" value="${jdt.home}"/>
</antcall>
+ </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"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
