Merge branch 'master' into java-7

kpelykh · kpelykh · commit e2401a7820dd · 2013-07-25T10:54:53.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -81,16 +81,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${version.logback}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${version.logback}</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -106,6 +96,20 @@
 
 
         <!-- /// Test /////////////////////////// -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${version.logback}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${version.logback}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -140,7 +144,6 @@
             <scope>test</scope>
         </dependency>
 
-
     </dependencies>
 
 
diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java b/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java
@@ -25,7 +25,7 @@ public class ContainerConfig {
     @JsonProperty("AttachStdin")  private boolean   attachStdin;
     @JsonProperty("AttachStdout") private boolean   attachStdout;
     @JsonProperty("AttachStderr") private boolean   attachStderr;
-    @JsonProperty("Env")          private Map<String, String> env;
+    @JsonProperty("Env")          private String[] env;
     @JsonProperty("Cmd")          private String[]  cmd;
     @JsonProperty("Dns")          private String[]  dns;
     @JsonProperty("Image")        private String    image;
@@ -130,11 +130,11 @@ public void setAttachStderr(boolean attachStderr) {
         this.attachStderr = attachStderr;
     }
 
-    public Map<String, String> getEnv() {
+    public String[] getEnv() {
         return env;
     }
 
-    public void setEnv(Map<String, String> env) {
+    public void setEnv(String[] env) {
         this.env = env;
     }
 
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class ContainerConfig {`
`25`	`25`	`@JsonProperty("AttachStdin") private boolean attachStdin;`
`26`	`26`	`@JsonProperty("AttachStdout") private boolean attachStdout;`
`27`	`27`	`@JsonProperty("AttachStderr") private boolean attachStderr;`
`28`		`- @JsonProperty("Env") private Map<String, String> env;`
	`28`	`+ @JsonProperty("Env") private String[] env;`
`29`	`29`	`@JsonProperty("Cmd") private String[] cmd;`
`30`	`30`	`@JsonProperty("Dns") private String[] dns;`
`31`	`31`	`@JsonProperty("Image") private String image;`
`@@ -130,11 +130,11 @@ public void setAttachStderr(boolean attachStderr) {`
`130`	`130`	`this.attachStderr = attachStderr;`
`131`	`131`	`}`
`132`	`132`
`133`		`- public Map<String, String> getEnv() {`
	`133`	`+ public String[] getEnv() {`
`134`	`134`	`return env;`
`135`	`135`	`}`
`136`	`136`
`137`		`- public void setEnv(Map<String, String> env) {`
	`137`	`+ public void setEnv(String[] env) {`
`138`	`138`	`this.env = env;`
`139`	`139`	`}`
`140`	`140`