1 files changed, 18 insertions, 22 deletions
diff --git a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
index 127e72b857..9de7f49175 100644
--- a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
+++ b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
@@ -1,18 +1,15 @@
-/*
- * Copyright (c) 2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+//========================================================================
+//Copyright 2011-2012 Mort Bay Consulting Pty. Ltd.
+//------------------------------------------------------------------------
+//All rights reserved. This program and the accompanying materials
+//are made available under the terms of the Eclipse Public License v1.0
+//and Apache License v2.0 which accompanies this distribution.
+//The Eclipse Public License is available at
+//http://www.eclipse.org/legal/epl-v10.html
+//The Apache License v2.0 is available at
+//http://www.opensource.org/licenses/apache2.0.php
+//You may elect to redistribute this code under either of these licenses.
+//========================================================================
 
 package org.eclipse.jetty.spdy.api;
 
@@ -20,7 +17,6 @@ import java.nio.charset.Charset;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.spdy.StandardSession;
-import org.eclipse.jetty.util.Callback;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -30,7 +26,7 @@ public class ClientUsageTest
     @Test
     public void testClientRequestResponseNoBody() throws Exception
     {
-        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null);
+        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null, null);
 
         session.syn(new SynInfo(true), new StreamFrameListener.Adapter()
         {
@@ -49,7 +45,7 @@ public class ClientUsageTest
     @Test
     public void testClientRequestWithBodyResponseNoBody() throws Exception
     {
-        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null);
+        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null, null);
 
         Stream stream = session.syn(new SynInfo(false), new StreamFrameListener.Adapter()
         {
@@ -70,7 +66,7 @@ public class ClientUsageTest
     @Test
     public void testAsyncClientRequestWithBodyResponseNoBody() throws Exception
     {
-        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null);
+        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null, null);
 
         final String context = "context";
         session.syn(new SynInfo(false), new StreamFrameListener.Adapter()
@@ -84,7 +80,7 @@ public class ClientUsageTest
                 // Then issue another similar request
                 stream.getSession().syn(new SynInfo(true), this);
             }
-        }, 0, TimeUnit.MILLISECONDS, new Callback.Adapter<Stream>()
+        }, 0, TimeUnit.MILLISECONDS, new Handler.Adapter<Stream>()
         {
             @Override
             public void completed(Stream stream)
@@ -105,7 +101,7 @@ public class ClientUsageTest
     @Test
     public void testAsyncClientRequestWithBodyAndResponseWithBody() throws Exception
     {
-        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null);
+        Session session = new StandardSession(SPDY.V2, null, null, null, null, null, 1, null, null, null);
 
         session.syn(new SynInfo(false), new StreamFrameListener.Adapter()
         {
@@ -139,7 +135,7 @@ public class ClientUsageTest
                 }
 
             }
-        }, 0, TimeUnit.MILLISECONDS, new Callback.Adapter<Stream>()
+        }, 0, TimeUnit.MILLISECONDS, new Handler.Adapter<Stream>()
         {
             @Override
             public void completed(Stream stream)