From b85f76e6c1af0c0e9442770aeb70e73d3113aecd Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 24 Jan 2008 16:30:06 +0000
Subject: [PATCH] Added SSL support to the tutorial app Jetty plugin
 configuration and added a requirement for SSL on the "extremely secure" page.

---
 samples/tutorial/keystore                        | Bin 0 -> 1396 bytes
 samples/tutorial/pom.xml                         |  12 ++++++++++++
 samples/tutorial/readme.txt                      |   6 ++++++
 .../WEB-INF/applicationContext-security-ns.xml   |   2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 samples/tutorial/keystore
 create mode 100644 samples/tutorial/readme.txt

diff --git a/samples/tutorial/keystore b/samples/tutorial/keystore
new file mode 100644
index 0000000000000000000000000000000000000000..f5faa867d4e39d9ddfcc761a9f108a5cb396f1e1
GIT binary patch
literal 1396
zcmezO_TO6u1_mY|W&~r_tkjZ{N+3^s&7=r1pv*3VCZ=r$d~96WY>X_7T1<kBjI0bS
zO-zeki&xHhfBdLXtyf`T<?T54J0~nV)E3IQb{|o&O;%ifRIzLO<INX2y`2t~yuUbW
z-RdRTkCwhWBdb(?quASL>4787x4jQ8el~ORHru<}#wRj&B;T!Y+%&7!WWqfMyM~x2
z5|bq_+dj`a>3(p@AIqMvv&;15eg04Q+8)uyk)*oXV9oWj=|^L{PYHImaQ`?Xn(?Tv
z?0-&%8T%Elb&`CXPS=CpPoDGb!JN1m9V^8irhVGk`tR5F&3V_BZhveoeoS>5-wTD-
zy5IeMsw)@IP&@7VM0o$M54ZB1mQ0+hAz^s*_Qca49@d=wXy3s6?N!!p!zObl)36r5
zeShBumGr!}Hvc5}P+H1ijhRhBKa=6%-)B>M`#t0HOckuMZF1K%{}v9++`Mwb6vGa#
zn$yzNwQkaS5kHsmEZiujmUNb*`t61_|HABe|9oGTvtz2o)dzmAu~$~<Zf5H}q<UHQ
z-WFqpQ~43MHe8xiQy!MZ`QqpPnSUEDPu-KPwDUFZlP_9zJ+~)pp89Xu)6T_JZXqW=
zTDqQ;Umxzvu;7%ZM3UYLk=EoXG4Fm`X#1&EsFX}GSa!Q+XIAVEo7C5J!m|3?j_rK%
zXvGW09Xp*2m<pt1PAjum&5(|-cp-P~`mz^?jiWkGr-!JWbDb)3Xo}Gkf1y2x>n8PO
z)g2YOqPr=l*!d;XKfCpFUwmA*>&tPI5|6Y=CO*!!eE;|VZW4cUbJq?Iy?_}!3NPxS
zWy;oYy^?uj{>9_;*Jtfk`-Pq~%uUvwGTnV~_lw$+Vx`u8xy4`B^R19o{rQhoI>zf=
zUCM<&l8WzySk<}WzPiuUUHkurh#yb21rMuZ(Sf(-;yd@RS`@2rbCP3N;--|o$Cd`E
z%26Q+e1Bp$T+O_$&YZdI!6CQ*O6!m26+cc$b2(<^6}@ayJbNc3K}YDB8dw4oatSaY
z7Z@}#-eh8NpRwb)0WTY;R+~rLcV0$D7FGs>dP4zVDrXL5VH0K#&CAZqFVBOCaA1hA
zBSa((#6h~agav{NiZb)k72Jvvb5qOni?R(R48%ZE+`{}&so>P)(xS|gN<$$70gw!{
zFlSDFa$-(KesPI`oH(z6g@K`wiJ_UHk&$r}m}_EW4CM~I0~_ZfhZ(RGU~cSXFlg*#
zYHVa^4tZVoLu{f{Wlx^Y{wWO)nSRaQKba}vj+0tblUH%fmdgG2?<j9y^YV1sgh`9o
zik$5qP2ZxvIae$)__XV}ue)0B?%&W|^5xCxH!og#iq_7`%+FZJDCotZDtP|Vlk-#0
zy}i%6mACcN>R#!|Q<Sr2n&rB=FD}pc_S1IzrU@R|v5%sem>C%uk(~#OQf8pLq)s$(
zD%ACFHr#Ztc|-W;y%!@Tlaq~(*cpAkro3jGa_-8I)Z<laZT786ogET9V?*IRm!#~v
zHQqbbiZwce;|<!k-LleEDd4Rx{l8_-qGyst^QXT}t%;L3-@CgpspaLgmkU+2y04l9
ztz>R7TGq3C#fn#xFV)ugq+C3cG>I>ABbS9=QBsatgqeT%jm$LDybI4RZQH&U03Osw
A761SM

literal 0
HcmV?d00001

diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 762d1dd5ca..472adf1299 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -96,6 +96,18 @@
                 <version>6.1.5</version>
                 <configuration>
                     <contextPath>/tutorial</contextPath>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>8080</port>
+                            <confidentialPort>8443</confidentialPort>
+                        </connector>
+                        <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
+                            <port>8443</port>
+                            <keystore>keystore</keystore>
+                            <password>password</password>
+                            <keyPassword>password</keyPassword>
+                        </connector>
+                    </connectors>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/samples/tutorial/readme.txt b/samples/tutorial/readme.txt
new file mode 100644
index 0000000000..f14e775c8c
--- /dev/null
+++ b/samples/tutorial/readme.txt
@@ -0,0 +1,6 @@
+Run the application directly from the checked out source tree, using the command
+
+mvn jetty:run
+
+This will start jetty on port 8080, with SSL support on port 8443.
+
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
index d0f35b1d59..67e0eb4c75 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
@@ -15,7 +15,7 @@
 	<annotation-driven/>
 
     <http>
-        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR"/>
+        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR" requires-channel="https"/>
         <intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" />
 		<!-- Disable web URI authorization, as we're using <annotation-driven> and have @Secured the services layer instead
         <intercept-url pattern="/listAccounts.html" access="IS_AUTHENTICATED_REMEMBERED" />