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 = Welcome to lift-akka at {new _root_.java.util.Date} 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 @@ + + + + + LiftFilter + Lift Filter + The Filter that intercepts lift calls + net.liftweb.http.LiftFilter + + + LiftFilter + /* + + + AkkaServlet + se.scalablesolutions.akka.kernel.jersey.AkkaServlet + + + AkkaServlet + /* + + 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 @@ -

Welcome to your project!

-

+

Welcome to the Akka + Lift Sample

+

This page is served by Lift, and Lift alone. In order to demonstrate how AkkaServlet and
+ Lift can work in harmony we have supplied a sample JAX-RS service that is secured using
+ Lift's HTTP Basic Authentication.

+ +

To access the Akka service, visit this url and enter the + following access credentials:

+ +

user: someuser
+ password: 1234

+ +

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 @@ - - - - - - eu.getintheloop.example:lift-akka:1.0-SNAPSHOT - - - - - - - + + + + + + Akka with Lift Example + + + +
+ + + +
+