Move utilities classes to core package

Marcus Linke · Marcus Linke · commit abee7f659e84 · 2015-02-06T21:06:45.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.command;
 
-import static com.github.dockerjava.jaxrs.util.guava.Guava.join;
+import static com.github.dockerjava.core.util.guava.Guava.join;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java b/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.jaxrs.util;
+package com.github.dockerjava.core.util;
 
 
 import javax.ws.rs.client.ClientRequestContext;
diff --git a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.jaxrs.util;
+package com.github.dockerjava.core.util;
 
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
diff --git a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.jaxrs.util;
+package com.github.dockerjava.core.util;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.jaxrs.util;
+package com.github.dockerjava.core.util;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/src/main/java/com/github/dockerjava/core/util/guava/Guava.java b/src/main/java/com/github/dockerjava/core/util/guava/Guava.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.github.dockerjava.jaxrs.util.guava;
+package com.github.dockerjava.core.util.guava;
 
 public class Guava {
 
diff --git a/src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java b/src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.dockerjava.jaxrs.util.guava;
+package com.github.dockerjava.core.util.guava;
 
 import jersey.repackaged.com.google.common.base.Preconditions;
 
diff --git a/src/main/java/com/github/dockerjava/core/util/guava/UnicodeEscaper.java b/src/main/java/com/github/dockerjava/core/util/guava/UnicodeEscaper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.dockerjava.jaxrs.util.guava;
+package com.github.dockerjava.core.util.guava;
 
 import jersey.repackaged.com.google.common.base.Preconditions;
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -61,9 +61,9 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.util.JsonClientFilter;
-import com.github.dockerjava.jaxrs.util.ResponseStatusExceptionFilter;
-import com.github.dockerjava.jaxrs.util.SelectiveLoggingFilter;
+import com.github.dockerjava.core.util.JsonClientFilter;
+import com.github.dockerjava.core.util.ResponseStatusExceptionFilter;
+import com.github.dockerjava.core.util.SelectiveLoggingFilter;
 
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.github.dockerjava.jaxrs.util.guava.Guava.urlPathSegmentEscaper;
+import static com.github.dockerjava.core.util.guava.Guava.urlPathSegmentEscaper;
 
 import java.util.List;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.dockerjava.jaxrs.util;`
	`1`	`+package com.github.dockerjava.core.util;`
`2`	`2`
`3`	`3`
`4`	`4`	`import javax.ws.rs.client.ClientRequestContext;`