Skip to content

Commit

Permalink
Removed all deprecated API usages in TestSslServer
Browse files Browse the repository at this point in the history
  • Loading branch information
dnene committed Apr 14, 2012
1 parent 295efec commit bc98ba6
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions src/test/scala/in/hattip/testserver/TestSslServer.scala
Expand Up @@ -12,6 +12,7 @@ import com.weiglewilczek.slf4s.Logger
import org.eclipse.jetty.servlet.ServletContextHandler
import org.eclipse.jetty.servlet.ServletHolder
import in.hattip.client.Hattip._
import org.eclipse.jetty.util.ssl.SslContextFactory

@RunWith(classOf[JUnitRunner])
class TestSslServer extends SpecificationWithJUnit with BeforeExample with AfterExample {
Expand Down Expand Up @@ -40,13 +41,15 @@ class SslServlet extends ScalatraServlet with FileUploadSupport {

class SslServer {
val server = new Server()
val connector = new SslSocketConnector()
val factory = new SslContextFactory()
factory.setKeyStorePath("src/test/resources/keystore")
factory.setKeyStorePassword("keystore")
factory.setKeyManagerPassword("keystore")
factory.setTrustStore("src/test/resources/keystore")
factory.setTrustStorePassword("keystore")

val connector = new SslSocketConnector(factory)
connector.setPort(8443)
connector.setKeystore("src/test/resources/keystore")
connector.setKeyPassword("keystore")
connector.setPassword("keystore")
connector.setTruststore("src/test/resources/keystore")
connector.setTrustPassword("keystore")
server.addConnector(connector)

val context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
Expand Down

0 comments on commit bc98ba6

Please sign in to comment.