Skip to content

Commit 3fbb7b7

Browse files
author
Marcus Linke
committed
Merge branch 'master' of https://github.com/dflemstr/docker-java 
2 parents 0619214 + 35ff3fb commit 3fbb7b7

File tree

100 files changed

+952
-1020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+952
-1020
lines changed

‎pom.xml‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,14 @@
5050

5151
<version.slf4j>1.6.1</version.slf4j>
5252

53-
<jersey.version>1.18</jersey.version>
53+
<jersey.version>2.11</jersey.version>
5454
<jersey-apache-client4.version>1.9</jersey-apache-client4.version>
5555

5656
<jackson-jaxrs.version>2.3.3</jackson-jaxrs.version>
5757

5858
<httpclient.version>4.2.5</httpclient.version>
5959
<commons-compress.version>1.5</commons-compress.version>
60+
<commons-codec.version>1.8</commons-codec.version>
6061
<commons-io.version>2.3</commons-io.version>
6162
<commons-lang.version>2.6</commons-lang.version>
6263
<slf4j-api.version>1.7.5</slf4j-api.version>
@@ -87,38 +88,21 @@
8788
<version>${jackson-jaxrs.version}</version>
8889
</dependency>
8990
<dependency>
90-
<groupId>com.sun.jersey</groupId>
91-
<artifactId>jersey-core</artifactId>
92-
<version>${jersey.version}</version>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.sun.jersey</groupId>
96-
<artifactId>jersey-client</artifactId>
91+
<groupId>org.glassfish.jersey.connectors</groupId>
92+
<artifactId>jersey-jetty-connector</artifactId>
9793
<version>${jersey.version}</version>
9894
</dependency>
9995

100-
<dependency>
101-
<groupId>com.sun.jersey.contribs</groupId>
102-
<artifactId>jersey-multipart</artifactId>
103-
<version>${jersey.version}</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>com.sun.jersey.contribs</groupId>
107-
<artifactId>jersey-apache-client4</artifactId>
108-
<version>${jersey-apache-client4.version}</version>
109-
</dependency>
110-
111-
<dependency>
112-
<groupId>org.apache.httpcomponents</groupId>
113-
<artifactId>httpclient</artifactId>
114-
<version>${httpclient.version}</version>
115-
</dependency>
116-
11796
<dependency>
11897
<groupId>org.apache.commons</groupId>
11998
<artifactId>commons-compress</artifactId>
12099
<version>${commons-compress.version}</version>
121100
</dependency>
101+
<dependency>
102+
<groupId>commons-codec</groupId>
103+
<artifactId>commons-codec</artifactId>
104+
<version>${commons-codec.version}</version>
105+
</dependency>
122106
<dependency>
123107
<groupId>commons-lang</groupId>
124108
<artifactId>commons-lang</artifactId>

‎src/main/java/com/github/dockerjava/api/DockerClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.github.dockerjava.api.command.UnpauseContainerCmd;
3333
import com.github.dockerjava.api.command.VersionCmd;
3434
import com.github.dockerjava.api.command.WaitContainerCmd;
35-
import com.github.dockerjava.client.model.AuthConfig;
35+
import com.github.dockerjava.api.model.AuthConfig;
3636

3737
public interface DockerClient extends Closeable {
3838

‎src/main/java/com/github/dockerjava/api/UnauthorizedException.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.github.dockerjava.api;
2+
3+
/**
4+
*
5+
*/
6+
public class UnauthorizedException extends DockerException {
7+
8+
private static final long serialVersionUID = 8257731964780578278L;
9+
10+
public UnauthorizedException(String message, Throwable cause) {
11+
super(message, 401, cause);
12+
}
13+
14+
public UnauthorizedException(String message) {
15+
this(message, null);
16+
}
17+
18+
public UnauthorizedException(Throwable cause) {
19+
this(cause.getMessage(), cause);
20+
}
21+
22+
}

‎src/main/java/com/github/dockerjava/api/command/AuthCmd.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
package com.github.dockerjava.api.command;
22

3+
import com.github.dockerjava.api.UnauthorizedException;
4+
35
/**
46
*
57
* Authenticate with the server, useful for checking authentication.
68
*
79
*/
8-
public interface AuthCmd extends DockerCmd<Void>{
10+
public interface AuthCmd extends DockerCmd<Void> {
11+
12+
@Override
13+
public Void exec() throws UnauthorizedException;
914

1015
}

‎src/main/java/com/github/dockerjava/api/command/CommitCmd.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.github.dockerjava.api.command;
22

33
import com.github.dockerjava.api.NotFoundException;
4-
import com.github.dockerjava.client.model.ExposedPorts;
5-
import com.github.dockerjava.client.model.Volumes;
6-
import com.github.dockerjava.jaxrs1.command.CommitCommand;
4+
import com.github.dockerjava.api.model.ExposedPorts;
5+
import com.github.dockerjava.api.model.Volumes;
76

87
/**
98
*
@@ -14,7 +13,7 @@ public interface CommitCmd extends DockerCmd<String>{
1413

1514
public String getContainerId();
1615

17-
public CommitCommand withContainerId(String containerId);
16+
public CommitCmd withContainerId(String containerId);
1817

1918
public String getRepository();
2019

‎src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.github.dockerjava.api.DockerException;
66
import com.github.dockerjava.api.InternalServerErrorException;
77
import com.github.dockerjava.api.NotFoundException;
8-
import com.github.dockerjava.client.model.ChangeLog;
8+
import com.github.dockerjava.api.model.ChangeLog;
99

1010
public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
1111

‎src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.github.dockerjava.api.ConflictException;
44
import com.github.dockerjava.api.NotFoundException;
5-
import com.github.dockerjava.client.model.ExposedPort;
6-
import com.github.dockerjava.client.model.Volume;
5+
import com.github.dockerjava.api.model.ExposedPort;
6+
import com.github.dockerjava.api.model.Volume;
77

88
public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
99

‎src/main/java/com/github/dockerjava/api/command/InfoCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.github.dockerjava.client.model.Info;
3+
import com.github.dockerjava.api.model.Info;
44

55
public interface InfoCmd extends DockerCmd<Info> {
66

‎src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import com.fasterxml.jackson.annotation.JsonIgnore;
99
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1010
import com.fasterxml.jackson.annotation.JsonProperty;
11-
import com.github.dockerjava.client.model.ContainerConfig;
12-
import com.github.dockerjava.client.model.LxcConf;
13-
import com.github.dockerjava.client.model.Ports;
14-
import com.github.dockerjava.client.model.Volume;
15-
import com.github.dockerjava.client.model.Volumes;
11+
import com.github.dockerjava.api.model.ContainerConfig;
12+
import com.github.dockerjava.api.model.LxcConf;
13+
import com.github.dockerjava.api.model.Ports;
14+
import com.github.dockerjava.api.model.Volume;
15+
import com.github.dockerjava.api.model.Volumes;
1616

1717
/**
1818
*

‎src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.github.dockerjava.client.model.ContainerConfig;
5+
import com.github.dockerjava.api.model.ContainerConfig;
6+
67
import org.apache.commons.lang.builder.ToStringBuilder;
78

89
/**

0 commit comments

Comments
 (0)