tidy up of files

alexec · alexec · commit 2c6ab382369e · 2014-11-09T12:26:35.000Z
diff --git a/README.md b/README.md
@@ -15,9 +15,6 @@ Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/
 * Java 1.6
 * Maven 3.0.5
 * Docker daemon running
-* Docker private repository running (see below).
-
-You'll need to be running a local private registry, as per [these instructions](docker-auth-registry/README.md):   
 
 If you need SSL, then you'll need to put your `*.pem` file into `~/.docker/`, if you're using boot2docker, do this: 
  
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
@@ -1,4 +1,12 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class ErrorDetail {
+    @JsonProperty
+    private String message;
+
+    public String getMessage() {
+        return message;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
@@ -1,4 +1,18 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class ErrorResponse {
+    @JsonProperty
+    private ErrorDetail errorDetail;
+    @JsonProperty
+    private String error;
+
+    public ErrorDetail getErrorDetail() {
+        return errorDetail;
+    }
+
+    public String getError() {
+        return error;
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -47,15 +47,16 @@ public void beforeTest()  {
 	}
 
     private DockerClientConfig config() {
-        return config(DOCKER_JAVA);
+        return config(null);
     }
 
     protected DockerClientConfig config(String password) {
-        return DockerClientConfig.createDefaultConfigBuilder()
-                .withServerAddress("http://localhost:5001")
-                .withUsername(DOCKER_JAVA)
-                .withPassword(password)
-                .withEmail(DOCKER_JAVA + "@github.com")
+        DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
+                .withServerAddress("https://index.docker.io/v1/");
+        if (password!=null) {
+            builder = builder.withPassword(password);
+        }
+        return builder
                 .build();
     }
 
