From 424e4214397cfbd39ecf87e9f27d007e9b4c9644 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 11 Jun 2014 18:45:45 +0200
Subject: [PATCH] Added JDK 7u60 files and configuration for NPN and ALPN.

---
 .../config/modules/protonego-impl/alpn-1.7.0_60.mod |  8 ++++++++
 .../config/modules/protonego-impl/npn-1.7.0_60.mod  |  8 ++++++++
 .../usecases/home/modules/npn/npn-1.7.0_60.mod      |  8 ++++++++
 pom.xml                                             | 13 +++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod
 create mode 100644 jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod
 create mode 100644 jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod

diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod
new file mode 100644
index 00000000000..45bbad75c9f
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod
new file mode 100644
index 00000000000..639c70e3ffd
--- /dev/null
+++ b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar
+
+[exec]
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod
new file mode 100644
index 00000000000..6f6b4250803
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod
@@ -0,0 +1,8 @@
+[name]
+npn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar
+
+[exec]
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar
diff --git a/pom.xml b/pom.xml
index 4578536f2bd..6070878b398 100644
--- a/pom.xml
+++ b/pom.xml
@@ -877,6 +877,19 @@
         <alpn.version>7.0.0.v20140317</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>7u60</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.7.0_60</value>
+        </property>
+      </activation>
+      <properties>
+        <npn.version>1.1.7.v20140316</npn.version>
+        <alpn.version>7.0.0.v20140317</alpn.version>
+      </properties>
+    </profile>
     <profile>
       <id>8u00</id>
       <activation>