Rollback http client version

Author: marcosnobrega

pom.xml

@@ -158,13 +158,8 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.3</version>
+      <version>4.0-alpha4</version>
     </dependency>
-	<dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>4.3</version>    
- 	</dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>

src/main/java/org/fogbowcloud/manager/core/plugins/openstack/OpenStackNovaV2ComputePlugin.java

@@ -13,7 +13,6 @@
 import org.apache.http.HttpVersion;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPatch;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.FileEntity;
@@ -29,6 +28,7 @@
 import org.fogbowcloud.manager.core.model.Flavor;
 import org.fogbowcloud.manager.core.model.ResourcesInfo;
 import org.fogbowcloud.manager.core.plugins.ComputePlugin;
+import org.fogbowcloud.manager.core.plugins.util.HttpPatch;
 import org.fogbowcloud.manager.occi.core.Category;
 import org.fogbowcloud.manager.occi.core.ErrorType;
 import org.fogbowcloud.manager.occi.core.OCCIException;
@@ -599,7 +599,7 @@ private String doPutRequest(String endpoint, String authToken, String path) {
             HttpPut request = new HttpPut(endpoint);
             request.addHeader(OCCIHeaders.CONTENT_TYPE, "application/octet-stream");
             request.addHeader(OCCIHeaders.X_AUTH_TOKEN, authToken);                   
-            request.setEntity(new FileEntity(new File(path)));
+            request.setEntity(new FileEntity(new File(path), "application/octet-stream"));
             response = client.execute(request);
         } catch (Exception e) {
             LOGGER.error(e);

src/main/java/org/fogbowcloud/manager/core/plugins/util/HttpPatch.java

@@ -0,0 +1,30 @@
+package org.fogbowcloud.manager.core.plugins.util;
+
+import java.net.URI;
+
+import org.apache.http.client.methods.HttpPost;
+
+public class HttpPatch extends HttpPost {
+
+    public final static String METHOD_NAME = "PATCH";
+
+    public HttpPatch() {
+        super();
+    }
+
+    public HttpPatch(final URI uri) {
+        super();
+        setURI(uri);
+    }
+
+    public HttpPatch(final String uri) {
+        super();
+        setURI(URI.create(uri));
+    }
+
+    @Override
+    public String getMethod() {
+        return METHOD_NAME;
+    }
+
+}