svn commit: r1306716 - in /tomcat/trunk: build.properties.default build.xml

[costin]

Author: costin
Date: Thu Mar 29 04:46:56 2012
New Revision: 1306716

URL: http://svn.apache.org/viewvc?rev=1306716&view=rev
Log:
Build the tomcat-jni and tomcat-spdy as separate jars, so they can be used 
independently. 

Add a dependency to an apache-license optional interface to support TLS NPN on 
Java7. 
If no objections I'll add the classes that use it.



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=1306716&r1=1306715&r2=1306716&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Mar 29 04:46:56 2012
@@ -131,6 +131,12 @@ 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.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
+
 # ----- Tomcat native library -----
 tomcat-native.version=1.1.23
 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=1306716&r1=1306715&r2=1306716&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Mar 29 04:46:56 2012
@@ -92,6 +92,8 @@
   <property name="catalina-ha.jar" 
value="${tomcat.build}/lib/catalina-ha.jar"/>
   <property name="catalina-ant.jar" 
value="${tomcat.build}/lib/catalina-ant.jar"/>
   <property name="tomcat-coyote.jar" 
value="${tomcat.build}/lib/tomcat-coyote.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"/>
 
@@ -164,6 +166,7 @@
   <!-- Classpaths -->
   <path id="compile.classpath">
     <pathelement location="${jdt.jar}"/>
+    <pathelement location="${npn.jar}"/>
   </path>
 
   <path id="tomcat.classpath">
@@ -321,16 +324,25 @@
     <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/**" />
+  </patternset>
+       
   <patternset id="files.tomcat-coyote">
     <include name="org/apache/coyote/**" />
-    <include name="org/apache/tomcat/jni/**" />
     <include name="org/apache/jk/**" />
     <include name="org/apache/tomcat/util/**" />
     <!-- Exclude the files shared between Catalina & Jasper -->
     <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/**" />    
+  </patternset>
+
+  <patternset id="files.tomcat-spdy">
+       <include name="org/apache/coyote/spdy/**" />
+       <include name="org/apache/tomcat/spdy/**" />
   </patternset>
 
   <patternset id="files.jasper">
@@ -673,6 +685,14 @@
       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" />
+
     <!-- Jasper Implementation JAR File -->
     <jarIt jarfile="${jasper.jar}"
       filesDir="${tomcat.classes}"
@@ -2324,6 +2344,13 @@ Apache Tomcat ${version} native binaries
       <param name="destfile" value="${jdt.jar}"/>
       <param name="destdir" value="${jdt.home}"/>
     </antcall>
+
+    <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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org