From 3f5a35024e9659a622c2a7eaad2e472a583d8537 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Fri, 24 Feb 2012 14:18:50 +0100
Subject: [PATCH] Improved sample webapp, now to be run using mvn
 jetty:run-forked and working with out-of-the-box Chromium.

---
 spdy-jetty-http-webapp/pom.xml                |  13 +++---
 .../src/main/config/jetty-spdy.xml            |  39 ++++++++++++++++++
 .../src/main/resources/keystore.jks           | Bin 0 -> 2206 bytes
 .../src/main/resources/log4j.properties       |   2 +
 .../src/main/resources/truststore.jks         | Bin 0 -> 916 bytes
 .../src/main/webapp/index.jsp                 |   4 +-
 6 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 spdy-jetty-http-webapp/src/main/config/jetty-spdy.xml
 create mode 100644 spdy-jetty-http-webapp/src/main/resources/keystore.jks
 create mode 100644 spdy-jetty-http-webapp/src/main/resources/truststore.jks

diff --git a/spdy-jetty-http-webapp/pom.xml b/spdy-jetty-http-webapp/pom.xml
index aa6fbb023b2..d7b0ca97b86 100644
--- a/spdy-jetty-http-webapp/pom.xml
+++ b/spdy-jetty-http-webapp/pom.xml
@@ -20,11 +20,14 @@
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>${jetty.version}</version>
                 <configuration>
-                    <connectors>
-                        <connector implementation="org.eclipse.jetty.spdy.http.HTTPSPDYServerConnector">
-                            <port>8080</port>
-                        </connector>
-                    </connectors>
+                    <stopPort>8888</stopPort>
+                    <stopKey>quit</stopKey>
+                    <jvmArgs>
+                        -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+                        -Dlog4j.configuration=file://${basedir}/src/main/resources/log4j.properties
+                        -Xbootclasspath/p:${settings.localRepository}/org/eclipse/jetty/npn-boot/${npn.version}/npn-boot-${npn.version}.jar
+                    </jvmArgs>
+                    <jettyXml>${basedir}/src/main/config/jetty-spdy.xml</jettyXml>
                     <webAppConfig>
                         <contextPath>/</contextPath>
                     </webAppConfig>
diff --git a/spdy-jetty-http-webapp/src/main/config/jetty-spdy.xml b/spdy-jetty-http-webapp/src/main/config/jetty-spdy.xml
new file mode 100644
index 00000000000..8d4c1441928
--- /dev/null
+++ b/spdy-jetty-http-webapp/src/main/config/jetty-spdy.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="server" class="org.eclipse.jetty.server.Server">
+
+    <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+        <Set name="keyStorePath">src/main/resources/keystore.jks</Set>
+        <Set name="keyStorePassword">storepwd</Set>
+        <Set name="trustStore">src/main/resources/truststore.jks</Set>
+        <Set name="trustStorePassword">storepwd</Set>
+        <Set name="protocol">TLSv1</Set>
+        <Set name="includeProtocols">
+            <Array type="java.lang.String">
+                <Item>TLSv1</Item>
+                <Item>TLSv1.1</Item>
+                <Item>TLSv1.2</Item>
+            </Array>
+        </Set>
+    </New>
+
+    <Call name="addConnector">
+        <Arg>
+            <New class="org.eclipse.jetty.spdy.http.HTTPSPDYServerConnector">
+                <Set name="Port">8080</Set>
+            </New>
+        </Arg>
+    </Call>
+    <Call name="addConnector">
+        <Arg>
+            <New class="org.eclipse.jetty.spdy.http.HTTPSPDYServerConnector">
+                <Arg>
+                    <Ref id="sslContextFactory" />
+                </Arg>
+                <Set name="Port">8443</Set>
+            </New>
+        </Arg>
+    </Call>
+
+</Configure>
diff --git a/spdy-jetty-http-webapp/src/main/resources/keystore.jks b/spdy-jetty-http-webapp/src/main/resources/keystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..428ba54776ede2fdcdeedd879edb927c2abd9953
GIT binary patch
literal 2206
zcmcgt`9Bkm8{cNkoMUp6gmShKn!AQX*(l6Nj(i=TnQPOKYtv{*Wg>ItE=Q!pRYH8a
z$Sp#S#2lYw#aw;$y<VTc;QPb-hxhw=et2H**Ymuey_LNc0002m2k>9u4T}83H*%lp
zAKZay0sy=q1Qoo85aAQh<O70%8Xz$skQV@^g4r51sZEE(J?uz5Bb3YK(dro|jQ>;$
zD(c2EIN#D7WwYDLKUg!CotQPD@dp;5FR#bgaace(^x$6g5frD~(_b(MI^J&*A2DRp
zf5Q2onfE(zvUb9|9C`66)YFRNM6~xrz4;iVbU=P|*YT2eW<l-p+*r=g_wu%{9}$kB
zJ#&7wl!D{L%3GZkFIHJHQTEZ&$>HFJJtr+M@zt2qPm)K~rRcqcs=LM12)PX0TT%QO
zlf*xkqD3}7l)1J`5W(>=9nR0e6j<u1IV;DihSn;CAl86fJKo+!3~^WcjK9XYxB4a~
zzs<aU=w$*q0ua`$`2K9hv^j)dp+l2h?DEO0tl$ps7~VqmhR(B*DbbJs{f7cy`_P+s
z)$DVut_Ntif?arkq=)#IA3{wzi>-<79<11v3ZuXXcQpoCsqY~n`$FN+S}hcVm5Y>G
zXnD{@DYs1@{S0z(lW+?86LWKtku$$-(kh<F_?k995g!1X!TbQ*pRxYfU-@3IhSWY_
z%v72EDZrh?+Qb^?QgW-pz^1aaUFQ#*a>sh>0qRUXn=84`GRn?77M^_JY`durnN;KE
zW#OJ`h<6xcB{I))ekGpc*Ylt}0cx4|OMBDPQvx4`r`}4Ze5_ipdObGMTi3bZHd5PC
zcY0;?uBWu$PSvjJeb87nY7ghNv?%M@SoDl6IWt`bQCosfSh$#D6$ea~QhKM^ud2Ut
z+9PYJuVpoELmN-A`F$BicO{BSYg@#tS%avVfb}DxL)|NanJ)#zB!2~?#Ot%H7--9N
zU$bs0fS5G!m5M4&WK3#a|H|Tgw*?X-;H+Lu@kwA>qSR~7UC7b)7MJXTn6PG>n@8jP
zW+}F^X$$<RGCPotk)evg;9_2#Db)8wjY)2!`t$9hglCNN262#YE+UI{frw~BJT_z8
zk5DN0jSea!pfJY|`}PP5E!gjN8btecClxqvtR3(6p|SZ*DyjXC8rhj12VMn=qR4J2
zM;Ub9H2~FfJza^$%r<__Z(+785qA|l=Dsv((<qYI{FmU;x^b72V!y%$zW8Uk*5st2
zqO2@QQt|L?vUsQ0fL1!TLvW*QW^%rkV#ngu^yG!rgB0+@#nh|*DYWI!ez<Yfk{009
z=giWz^3=HM3Jo8xwifhVK)y)QSy~Bm&6<)wI1I9?km?|$R&LQax)!6sw^o~u*spk-
zLHlm-`W#xO4K+{MX5b=5XTD3Flx!$Q3~Z4ap_);1KEOI3g#Q_AX#O>c;U~4ryqRF;
z>`j!tbLMK4ZGyY643|~?%Mu#fm!l%wAKjBDmd+VYmp3S#$<kL0bV|v}Ug0|5tLV}{
zS)y?Y!P!u(MzbNUy>scD$~bxbf|z#)hShN0*AhRaPDcmqrftGlHq4^54MM$Xfy(2>
zH8QYVMzmn_oHb<o5XZLUa(oc`de=`&0~>vJ<zli~cDlmqhi~6QRPHLrtJ3kKU!ucV
z`9#w$dwz_i_t=q#V<DTliF4b~ze35)kF_M`-TYKi*=ZR18=Auf?o7P;eX5n-!Pvxm
zK|zP{_uvh!(ei)LqvC8D+XfY)xIA(gm~@u=v4%_SVJ|;y872&C;ChZ<$vw|^!fbXM
zq^NizyT#FstbB=aE@3b<Uo`HHVMTaCqh_UoP4<GSU0w3OgAu2rk3azcJkAIzk0XK#
zGAiT&0YM-zM!9zaA<PHWpxe+lg!j{t7k~&v3L>C<JWgOfILPVze+fSvgg%KBN5Fnp
zAaE$wix8}Il0XVZ!uA7pUlV{s&Jamngn<7kf^dk7uQw^+vM*8+A@RG12QF;uOCm)o
zVZ(w0eSJs>B`IN~E&{1*h&0gEM<DUiqPoc60z&UU!vA#|Dp2|FX6*k89x6~2fS>{e
zKvW<QP+o{}g@*dy+Ct?zUA!H0%t+gP7)L+NK+H=&HQ|7|RXVb=@~-gxN`j$M{N2p*
z8(h@#ZuG9*xzvYi_Yc#izTW%cPpU3?OQK9QMJc-QF!WC|)y;N_SB~D6vLyv+3ejwA
ztPTe#{4%`}GWO;HhK3c&b1)K%#peus;yT-zGm*-MuHQ1ZLO+$}+~|(O5UEdqM9oBX
z!#-PMTtoVm{)D#%4OV(sS4U}iA!~PS**eSK7FruC&ooI?8Uh+=!nviZE*ClI&QRq0
z!Y`LLDoX)lO2!$sX7f2GxNXTrqQK!$-iVt{FI1o(lPn--;Ca?zHz#z)9m15B9Uh`U
zJU{^O?+)#+%f3TE039y-Q?<!df3RWWVz5{?JmvtyZD=>vzp(!BqMX8`t#)~0nq}Wa
zr6>FRPyp;AAB&)1$5@;r$23J{K&~>TWjZf7V$wFzmGM95CXhFG1cJNVAXks}C+&2-
zbf9Qn*D8N}Afd2kpwDxns3%1uaFhAqDV8ksWiWY|quuLGZ0)SqrJ!Y8yX}@}IyC$C
zQ3rCUsn}#>F#D8%D?q~ySy4j&he%Bs{{7V%rl!ui`@KQP?NTi+_iN{cwom&9RaMRR
zB~z!hz|0HAgB9_Ijvpe-zr#jLbckJsc>vmo{+im?t8lA;N#fD4?{lb&J0V8Gocq%;
f1ihv=QIDh{M_<9V+45Z2{KE4_qW}V3B0uV%GgrOJ

literal 0
HcmV?d00001

diff --git a/spdy-jetty-http-webapp/src/main/resources/log4j.properties b/spdy-jetty-http-webapp/src/main/resources/log4j.properties
index a55f49c8e79..d15b6be4d8a 100644
--- a/spdy-jetty-http-webapp/src/main/resources/log4j.properties
+++ b/spdy-jetty-http-webapp/src/main/resources/log4j.properties
@@ -10,5 +10,7 @@ log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c] %m%n
 log4j.appender.CONSOLE.target=System.err
 
 # Level tuning
+log4j.logger.jndi=INFO
+log4j.logger.org.mortbay.jetty=INFO
 log4j.logger.org.eclipse.jetty=INFO
 log4j.logger.org.eclipse.jetty.spdy=DEBUG
diff --git a/spdy-jetty-http-webapp/src/main/resources/truststore.jks b/spdy-jetty-http-webapp/src/main/resources/truststore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..839cb8c35151c2b7c64afca24b6b72caad070a05
GIT binary patch
literal 916
zcmezO_TO6u1_mY|W(3o$xs}<el|Y`U{QtDw46G4)rUsS_49sB$P0T?CO-xn`n3))v
zm{|Ok&fhiQW#iOp^Jx3d%gD&e%3zRX$Zf#M#vIDRCd?EX4C8PJGdVjN3K<B1WY~o{
z0}^xc6&!O)@(l$H_&{P@!t9=TC5btia1m}{_VCoClFXD;LoovpkQ!!TUa!=Wl1hbu
zqWrAX<Prk~ab80s14AQoLo*{&1H&i@ej`JWfPpbofUd4-VpKv73`SN4<|amd27@L>
zE~X|%Muz1J{3AIFGbaABoD&*5saD@gH|APIn|qhRGl}gsUzm=o9G*UXZaLfkb^*)o
zjA*-gTf)`m_MQJYE&gJ}p^PHkrj!4^W|XX5a=N7A{;n#yaON&k_bHloe-^*hm?Z91
zlB><r?BU_6oGJU?wy)sUsn!0?0X%a9tpw|$W?jDXGtAq5ilLHu<cF!h3hykP)pxw!
zKd)&UW1e=4rujuL>xeD=<(C>yn{9D54u}krkl}HQ(Uscha(++qf!T9y+xaEfnXd1O
zi0)T?voO%;QH9LK;*_O3mBblqm)!31vU@hm;^%>mh5U@y3R%l0gzi`2yxH!+?kPOi
zt!Tnsz1x9B3U2~8STZp)GB6^C5HPs_Lx_=~O<3xi>MmQ;D_g$D<_pdct`+TyzWTQ=
zW5Finm(sGEe;ty^>vg$!cV)t>;H#Mev23$*WWBpyJ}Ir;RW+Htrt6{Pk&qz&-XG2@
z8@{&Lu%DX7m47Uny+-3w`=4V611q#Ub(U`xZCtSK^2LO^3(s|HW&N14dV4@A&(kX%
z*S_eUPs-bSWRp>avt;CP@7K+G&3=b&1eO-s3f`;Cf91p#$)FW&xME3L8sEBQQD<u&
zP0`l-9JA;O`=q5hKYu<y5^~^9#5t2SYuTPo)!RGYE>VCvfG>mdwqnk+GXd2ihXqpv
z;usF(WoYYmu8DZZa4%1z=+hI+*gpkUykAy5tj#grb*gH!M6TqIcifYBGVe^&T#-2O
K*=+x>r_BKeJV|!|

literal 0
HcmV?d00001

diff --git a/spdy-jetty-http-webapp/src/main/webapp/index.jsp b/spdy-jetty-http-webapp/src/main/webapp/index.jsp
index 95db4974082..f190e572abd 100644
--- a/spdy-jetty-http-webapp/src/main/webapp/index.jsp
+++ b/spdy-jetty-http-webapp/src/main/webapp/index.jsp
@@ -7,7 +7,7 @@
         function submit()
         {
             var xhr = new XMLHttpRequest();
-            xhr.open("POST", "/form.jsp", false);
+            xhr.open("POST", "${pageContext.request.contextPath}/form.jsp", false);
             xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
             xhr.send("param=1");
             window.document.getElementById("form").innerHTML = xhr.responseText;
@@ -21,7 +21,7 @@
 </div>
 <div id="image">
     <p>Below there should be an image</p>
-    <img src="${requestScope.contextPath}/logo.jpg"  alt="logo" />
+    <img src="${pageContext.request.contextPath}/logo.jpg"  alt="logo" />
 </div>
 <div>
     <jsp:include page="included.jsp" />