Merge "Fix the compilation error"

huangqingxin · May 6, 2016 · d47add4 · d47add4
2 parents 6ef224f + 2fc2071
commit d47add4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/aaa-authn-federation/pom.xml b/aaa-authn-federation/pom.xml
@@ -67,7 +67,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+            <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-servlet-tester</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/...uthn-federation/src/test/java/org/opendaylight/aaa/federation/FederationEndpointTest.java b/...uthn-federation/src/test/java/org/opendaylight/aaa/federation/FederationEndpointTest.java
@@ -17,14 +17,14 @@
 
 import java.util.Arrays;
 import java.util.TreeSet;
-import org.eclipse.jetty.testing.HttpTester;
-import org.eclipse.jetty.testing.ServletTester;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.mortbay.jetty.testing.HttpTester;
+import org.mortbay.jetty.testing.ServletTester;
 import org.opendaylight.aaa.ClaimBuilder;
 import org.opendaylight.aaa.api.Claim;
 import org.opendaylight.aaa.api.ClaimAuth;
@@ -78,18 +78,6 @@ public void teardown() {
         ServiceLocator.getInstance().getClaimAuthCollection().clear();
     }
 
-    @Test
-    public void testFederationUnconfiguredProxyPort() throws Exception {
-        HttpTester req = new HttpTester();
-        req.setMethod("POST");
-        req.setURI(CONTEXT + "/");
-        req.setVersion("HTTP/1.0");
-
-        HttpTester resp = new HttpTester();
-        resp.parse(server.getResponses(req.generate()));
-        assertEquals(401, resp.getStatus());
-    }
-
     @Test
     @SuppressWarnings("unchecked")
     public void testFederation() throws Exception {
@@ -115,6 +103,18 @@ public void testFederation() throws Exception {
         assertTrue(content.contains("pepsi coke"));
     }
 
+    @Test
+    public void testFederationUnconfiguredProxyPort() throws Exception {
+        HttpTester req = new HttpTester();
+        req.setMethod("POST");
+        req.setURI(CONTEXT + "/");
+        req.setVersion("HTTP/1.0");
+
+        HttpTester resp = new HttpTester();
+        resp.parse(server.getResponses(req.generate()));
+        assertEquals(401, resp.getStatus());
+    }
+
     private static void mockServiceLocator() {
         ServiceLocator.getInstance().setIdmService(mock(IdMService.class));
         ServiceLocator.getInstance().setTokenStore(mock(TokenStore.class));

diff --git a/aaa-authn-sts/pom.xml b/aaa-authn-sts/pom.xml
@@ -67,7 +67,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+            <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-servlet-tester</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/aaa-authn-sts/src/test/java/org/opendaylight/aaa/sts/TokenEndpointTest.java b/aaa-authn-sts/src/test/java/org/opendaylight/aaa/sts/TokenEndpointTest.java
@@ -16,14 +16,14 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
-import org.eclipse.jetty.testing.HttpTester;
-import org.eclipse.jetty.testing.ServletTester;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.mortbay.jetty.testing.HttpTester;
+import org.mortbay.jetty.testing.ServletTester;
 import org.opendaylight.aaa.AuthenticationBuilder;
 import org.opendaylight.aaa.ClaimBuilder;
 import org.opendaylight.aaa.api.AuthenticationService;

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -55,7 +55,7 @@
 
         <!-- Test -->
         <javax.inject.version>1</javax.inject.version>
-        <servlet.tester.version>7.0.0.M2</servlet.tester.version>
+        <servlet.tester.version>7.0.0.pre5</servlet.tester.version>
         <features.test.version>1.7.0-SNAPSHOT</features.test.version>
     </properties>
 
@@ -160,10 +160,10 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet-tester</artifactId>
-                <version>${servlet.tester.version}</version>
-                <scope>test</scope>
+              <groupId>org.mortbay.jetty</groupId>
+              <artifactId>jetty-servlet-tester</artifactId>
+              <version>${servlet.tester.version}</version>
+              <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>