Author: kkolinko
Date: Thu Mar 29 22:22:50 2012
New Revision: 1307146
URL: http://svn.apache.org/viewvc?rev=1307146&view=rev
Log:
Re: r1306716
- Fix wrong download location of npn-boot.jar
- Fix broken build.xml, as noted by Checkstyle.
I think whether we should use npn-boot.jar has to be discussed separately. I am
just fixing a broken build.
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=1307146&r1=1307145&r2=1307146&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Mar 29 22:22:50 2012
@@ -131,11 +131,11 @@ jdt.jar=${jdt.home}/ecj-${jdt.version}.j
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
-# ---- NPN support
+# ---- 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://repo2.maven.org/maven2/org/mortbay/jetty/npn/npn-api/${npn.version}/npn-boot-${npn.version}.jar
+npn.loc=http://repo2.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/${npn.version}/npn-boot-${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=1307146&r1=1307145&r2=1307146&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Mar 29 22:22:50 2012
@@ -324,11 +324,11 @@
<include name="org/apache/catalina/ant/jmx/*" />
<include name="org/apache/catalina/util/Base64.*" />
</patternset>
-
+
<patternset id="files.tomcat-jni">
- <include name="org/apache/tomcat/jni/**" />
+ <include name="org/apache/tomcat/jni/**" />
</patternset>
-
+
<patternset id="files.tomcat-coyote">
<include name="org/apache/coyote/**" />
<include name="org/apache/jk/**" />
@@ -337,12 +337,12 @@
<exclude name="org/apache/tomcat/util/file/**" />
<exclude name="org/apache/tomcat/util/res/**" />
<exclude name="org/apache/tomcat/util/scan/**" />
- <exclude name="org/apache/coyote/spdy/**" />
+ <exclude name="org/apache/coyote/spdy/**" />
</patternset>
<patternset id="files.tomcat-spdy">
- <include name="org/apache/coyote/spdy/**" />
- <include name="org/apache/tomcat/spdy/**" />
+ <include name="org/apache/coyote/spdy/**" />
+ <include name="org/apache/tomcat/spdy/**" />
</patternset>
<patternset id="files.jasper">
@@ -2350,7 +2350,7 @@ Apache Tomcat ${version} native binaries
<param name="destfile" value="${npn.jar}"/>
<param name="destdir" value="${npn.home}"/>
</antcall>
-
+
</target>
<target name="download-test-compile"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
