From 4197b9c2c7ec13b5d7ee137743ed7390f88a6293 Mon Sep 17 00:00:00 2001
From: Imran M Yousuf <imyousuf@smartitengineering.com>
Date: Tue, 17 Feb 2009 12:31:29 +0600
Subject: [PATCH] Change to apache http based jersey client

Signed-off-by: Imran M Yousuf <imyousuf@smartitengineering.com>
---
 WebServiceServer/pom.xml                           |    6 ++++++
 .../ws/server/BookStoreResourcesTest.java          |   17 +++++++----------
 pom.xml                                            |    4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/WebServiceServer/pom.xml b/WebServiceServer/pom.xml
index 246a261..b1051da 100644
--- a/WebServiceServer/pom.xml
+++ b/WebServiceServer/pom.xml
@@ -48,6 +48,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-apache-client</artifactId>
+            <version>${jersey.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
             <version>2.5.6</version>
diff --git a/WebServiceServer/src/test/java/com/smartitengineering/bookstore/ws/server/BookStoreResourcesTest.java b/WebServiceServer/src/test/java/com/smartitengineering/bookstore/ws/server/BookStoreResourcesTest.java
index 82fa46f..b3ad4b8 100644
--- a/WebServiceServer/src/test/java/com/smartitengineering/bookstore/ws/server/BookStoreResourcesTest.java
+++ b/WebServiceServer/src/test/java/com/smartitengineering/bookstore/ws/server/BookStoreResourcesTest.java
@@ -17,13 +17,13 @@ import com.smartitengineering.bookstore.ws.element.PublicationHouseFilterElement
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.WebResource.Builder;
+import com.sun.jersey.client.apache.ApacheHttpClient;
+import com.sun.jersey.client.apache.config.DefaultApacheHttpClientConfig;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 import java.io.File;
 import java.net.URI;
 import java.util.Collections;
 import java.util.Random;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriBuilder;
 import junit.framework.TestCase;
@@ -55,6 +55,7 @@ public class BookStoreResourcesTest
     private static final URI BASE_URI = getBaseURI();
     private GlassFish glassfish;
     private WebResource webResource;
+    private Client client;
 
     public BookStoreResourcesTest(String testName) {
         super(testName);
@@ -72,8 +73,10 @@ public class BookStoreResourcesTest
                 new File("src/test/webapp/WEB-INF/unitTestWeb.xml"),
                 Collections.singleton(new File("target/classes").toURI().toURL()));
         glassfish.deploy(war);
-        Client c = Client.create();
-        webResource = c.resource(BASE_URI);
+        DefaultApacheHttpClientConfig clientConfig = new DefaultApacheHttpClientConfig();
+        clientConfig.getState().setCredentials(null, null, -1, "modhu", "modhu");
+        client = ApacheHttpClient.create(clientConfig);
+        webResource = client.resource(BASE_URI);
     }
 
     @Override
@@ -84,12 +87,6 @@ public class BookStoreResourcesTest
     }
 
     public void testResources() {
-        try {
-            Thread.sleep(30000);
-        }
-        catch (InterruptedException ex) {
-            ex.printStackTrace();
-        }
         doTestPublicationServices();
         doTestBookServices();
     }
diff --git a/pom.xml b/pom.xml
index 16769fb..ec7e618 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         <module>ServiceImplementation</module>
     </modules>
     <properties>
-        <jersey.version>1.0.1</jersey.version>
+        <jersey.version>1.0.2</jersey.version>
         <abstract-dao-version>0.4-SNAPSHOT</abstract-dao-version>
     </properties>
-</project>
\ No newline at end of file
+</project>
-- 
1.5.6