--- a/bin/rwsbt Sat Oct 22 17:40:53 2011 +0200
+++ b/bin/rwsbt Sat Oct 22 19:14:30 2011 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
-KS=/Volumes/Dev/Programming/w3.org/hg/read-write-web/keys/KEYSTORE.jks
+KS=keys/KEYSTORE.jks
while [ $# -gt 0 ]
do
case $1 in
--- a/src/main/scala/netty/ReadWriteWebNetty.scala Sat Oct 22 17:40:53 2011 +0200
+++ b/src/main/scala/netty/ReadWriteWebNetty.scala Sat Oct 22 19:14:30 2011 +0200
@@ -63,16 +63,13 @@
}
// configures and launches a Netty server
- service.plan( new tmp ).run()
+ service.plan( x509v ).run()
}
- class tmp extends cycle.Plan with cycle.ThreadPool with ServerErrorResponse with tmp2
-
- trait tmp2 extends X509view[ReceivedMessage,HttpResponse] {
+ object x509v extends cycle.Plan with cycle.ThreadPool with ServerErrorResponse with X509view[ReceivedMessage,HttpResponse] {
def wc = webCache
def man = manifest[ReceivedMessage]
-
}
}
--- a/src/main/scala/netty/SslLoginTest.scala Sat Oct 22 17:40:53 2011 +0200
+++ b/src/main/scala/netty/SslLoginTest.scala Sat Oct 22 19:14:30 2011 +0200
@@ -26,8 +26,6 @@
import org.jboss.netty.handler.ssl.SslHandler
import unfiltered.request.Path
import unfiltered.response.ResponseString
-import unfiltered.netty._
-import org.w3.readwriteweb.netty.{NormalPlan, KeyAuth_Https}
/**
* A very light weight plan to test SSL login using TLS renegotiation in netty.