From a0686edc9cb2d16219de5456f00bc4ca6871110e Mon Sep 17 00:00:00 2001
From: jboner <jboner@c-2f78e055.427-1-64736c11.cust.bredbandsbolaget.se>
Date: Wed, 5 Aug 2009 15:48:00 +0200
Subject: [PATCH 1/3] added web.xml to lift sample

---
 .../src/main/webapp/WEB-INF/.DS_Store         | Bin 0 -> 6148 bytes
 samples-lift/src/main/webapp/WEB-INF/web.xml  |  22 ++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 samples-lift/src/main/webapp/WEB-INF/.DS_Store
 create mode 100644 samples-lift/src/main/webapp/WEB-INF/web.xml

diff --git a/samples-lift/src/main/webapp/WEB-INF/.DS_Store b/samples-lift/src/main/webapp/WEB-INF/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8z45|!R0Z1N%F(jFgL>QrFAPJ2!M?+vV1V%$(Gz3ON
zU^D~<VF)ln+{D2Rp-0Kl5Eu=C(GY-#0H}OW0QD6Z7#JL&bOVG2Nii@oFo3%Nj0_Ac
zFio(203!nfNGnJUNGpg2X=PvpvA|}4wK6b5wK9UcAq)(R;4TS>25V<v1ltVagS9g-
zf^BACV1#IAV1(Mt2<@RTf_gL{^C8+97{Ru~TsKOOhQMeDz(Rl-!Vmz}|E>%SxcdJP
zRior+2#kinunYl47MEZbCs3t{!+W4QHvuXKVuPw;Mo^s$(F3lEVT}ML$bg~*R5_@+
b2Uo?6kTwK}57Iu`5P${HC_Nei0}uiLNUI8I

literal 0
HcmV?d00001

diff --git a/samples-lift/src/main/webapp/WEB-INF/web.xml b/samples-lift/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..f8ee2157a1
--- /dev/null
+++ b/samples-lift/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+  <filter>
+    <filter-name>LiftFilter</filter-name>
+    <display-name>Lift Filter</display-name>
+    <description>The Filter that intercepts lift calls</description>
+    <filter-class>net.liftweb.http.LiftFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>LiftFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <servlet>
+    <servlet-name>AkkaServlet</servlet-name>
+    <servlet-class>se.scalablesolutions.akka.kernel.jersey.AkkaServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>AkkaServlet</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+</web-app>

From a0e6b53d6feb0d372974bb865ae68f871f416d84 Mon Sep 17 00:00:00 2001
From: jboner <jboner@c-2f78e055.427-1-64736c11.cust.bredbandsbolaget.se>
Date: Wed, 5 Aug 2009 15:48:41 +0200
Subject: [PATCH 2/3] removed tmp file

---
 samples-lift/src/main/webapp/WEB-INF/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 samples-lift/src/main/webapp/WEB-INF/.DS_Store

diff --git a/samples-lift/src/main/webapp/WEB-INF/.DS_Store b/samples-lift/src/main/webapp/WEB-INF/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8z45|!R0Z1N%F(jFgL>QrFAPJ2!M?+vV1V%$(Gz3ON
zU^D~<VF)ln+{D2Rp-0Kl5Eu=C(GY-#0H}OW0QD6Z7#JL&bOVG2Nii@oFo3%Nj0_Ac
zFio(203!nfNGnJUNGpg2X=PvpvA|}4wK6b5wK9UcAq)(R;4TS>25V<v1ltVagS9g-
zf^BACV1#IAV1(Mt2<@RTf_gL{^C8+97{Ru~TsKOOhQMeDz(Rl-!Vmz}|E>%SxcdJP
zRior+2#kinunYl47MEZbCs3t{!+W4QHvuXKVuPw;Mo^s$(F3lEVT}ML$bg~*R5_@+
b2Uo?6kTwK}57Iu`5P${HC_Nei0}uiLNUI8I


From 7419c86270dc34c98a50b0a06fa856a3ea296ec6 Mon Sep 17 00:00:00 2001
From: Timothy Perrett <hello@timperrett.com>
Date: Wed, 5 Aug 2009 23:33:06 +0100
Subject: [PATCH 3/3] Updated Lift / Akka Sample

---
 .../main/scala/bootstrap/liftweb/Boot.scala   |  2 +-
 .../src/main/scala/snippet/HelloWorld.scala   |  2 +-
 samples-lift/src/main/webapp/index.html       | 14 ++++++++--
 .../main/webapp/templates-hidden/default.html | 28 ++++++++++---------
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala
index 5e3b9c1591..0cf98c8af4 100644
--- a/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala
+++ b/samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -23,7 +23,7 @@ class Boot {
     LiftRules.addToPackages("sample.lift")
     
     LiftRules.httpAuthProtectedResource.prepend {
-      case (ParsePath("secure-basic" :: Nil, _, _, _)) => Full(AuthRole("admin"))
+      case (ParsePath("liftcount" :: Nil, _, _, _)) => Full(AuthRole("admin"))
     }
 
     LiftRules.authentication = HttpBasicAuthentication("lift") {
diff --git a/samples-lift/src/main/scala/snippet/HelloWorld.scala b/samples-lift/src/main/scala/snippet/HelloWorld.scala
index 75c0347ecd..aed272c0b2 100644
--- a/samples-lift/src/main/scala/snippet/HelloWorld.scala
+++ b/samples-lift/src/main/scala/snippet/HelloWorld.scala
@@ -1,4 +1,4 @@
-package eu.getintheloop.example.snippet
+package sample.lift.snippet
 
 class HelloWorld {
   def howdy = <span>Welcome to lift-akka at {new _root_.java.util.Date}</span>
diff --git a/samples-lift/src/main/webapp/index.html b/samples-lift/src/main/webapp/index.html
index 41f9b1b7d8..aa25a1d91d 100644
--- a/samples-lift/src/main/webapp/index.html
+++ b/samples-lift/src/main/webapp/index.html
@@ -1,5 +1,15 @@
 <lift:surround with="default" at="content">
-		<h2>Welcome to your project!</h2>
-		<p><lift:helloWorld.howdy /></p>
+  <h2>Welcome to the Akka + Lift Sample</h2>
+  <p>This page is served by Lift, and Lift alone. In order to demonstrate how AkkaServlet and <br />
+    Lift can work in harmony we have supplied a sample JAX-RS service that is secured using <br />
+    Lift's HTTP Basic Authentication.</p>
+  
+  <p>To access the Akka service, visit <a href="/liftcount">this url</a> and enter the 
+    following access credentials:</p>
+    
+  <p>user: <strong>someuser</strong><br />
+     password: <strong>1234</strong></p>
+  
+  <p><lift:HelloWorld.howdy /></p>
 </lift:surround>
 
diff --git a/samples-lift/src/main/webapp/templates-hidden/default.html b/samples-lift/src/main/webapp/templates-hidden/default.html
index 412bcd9620..4a18c18f8a 100644
--- a/samples-lift/src/main/webapp/templates-hidden/default.html
+++ b/samples-lift/src/main/webapp/templates-hidden/default.html
@@ -1,15 +1,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/">
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<meta name="description" content="" />
-		<meta name="keywords" content="" />
-		
-		<title>eu.getintheloop.example:lift-akka:1.0-SNAPSHOT</title>
-		<script id="jquery" src="/classpath/jquery.js" type="text/javascript"></script>
-	</head>
-	<body>
-		<lift:bind name="content" />
-		<lift:Menu.builder />
-		<lift:msgs/>
-	</body>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <meta name="description" content="" />
+    <meta name="keywords" content="" />
+    <lift:CSS.blueprint />
+    <title>Akka with Lift Example</title>
+    <script id="jquery" src="/classpath/jquery.js" type="text/javascript"></script>
+  </head>
+  <body>
+    <div class="container"> 
+      <lift:bind name="content" />
+      <lift:Menu.builder />
+      <lift:msgs/>
+    </div>
+  </body>
 </html>