You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2018/06/25 22:07:11 UTC
[trafficcontrol] 12/12: Update pom group_ids to match apache naming.
This is an automated email from the ASF dual-hosted git repository.
neuman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit c34f20ba17c6f865f280026e86f889fde220c43e
Author: nerdynick <ne...@gmail.com>
AuthorDate: Wed Jun 20 12:12:53 2018 -0600
Update pom group_ids to match apache naming.
---
traffic_control/clients/java/common/pom.xml | 2 +-
.../apache/trafficcontrol/{ => client}/RestApiSession.java | 4 ++--
.../{ => client}/exception/InvalidJsonException.java | 2 +-
.../trafficcontrol/{ => client}/exception/LoginException.java | 2 +-
.../{ => client}/exception/OperationException.java | 2 +-
.../{ => client}/exception/TrafficControlException.java | 2 +-
traffic_control/clients/java/pom.xml | 2 +-
traffic_control/clients/java/trafficops/pom.xml | 4 ++--
.../{ => client/trafficops}/ResponseFuture.java | 11 ++++++-----
.../trafficcontrol/{ => client/trafficops}/TOSession.java | 7 ++++---
.../trafficcontrol/{ => client/trafficops}/models/Alert.java | 2 +-
.../{ => client/trafficops}/models/Response.java | 2 +-
.../trafficcontrol/{ => client/trafficops}/TOSessionTest.java | 8 ++++----
13 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/traffic_control/clients/java/common/pom.xml b/traffic_control/clients/java/common/pom.xml
index f1f208f..4e26bc2 100644
--- a/traffic_control/clients/java/common/pom.xml
+++ b/traffic_control/clients/java/common/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.comcast.cdn.traffic_control</groupId>
+ <groupId>org.apache.trafficcontrol</groupId>
<artifactId>traffic-control-java-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/RestApiSession.java b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/RestApiSession.java
similarity index 97%
rename from traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/RestApiSession.java
rename to traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/RestApiSession.java
index 41e6133..e8f1a01 100644
--- a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/RestApiSession.java
+++ b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/RestApiSession.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol;
+package org.apache.trafficcontrol.client;
import java.io.Closeable;
import java.io.IOException;
@@ -35,7 +35,7 @@ import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
import org.apache.http.impl.nio.client.HttpAsyncClients;
import org.apache.http.message.BasicHeader;
-import org.apache.trafficcontrol.exception.OperationException;
+import org.apache.trafficcontrol.client.exception.OperationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/InvalidJsonException.java b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/InvalidJsonException.java
similarity index 95%
rename from traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/InvalidJsonException.java
rename to traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/InvalidJsonException.java
index 8ff59b4..b1a07c7 100644
--- a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/InvalidJsonException.java
+++ b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/InvalidJsonException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol.exception;
+package org.apache.trafficcontrol.client.exception;
public class InvalidJsonException extends TrafficControlException {
private static final long serialVersionUID = 1884362711438565843L;
diff --git a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/LoginException.java b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/LoginException.java
similarity index 95%
rename from traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/LoginException.java
rename to traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/LoginException.java
index 05b739e..ad172ec 100644
--- a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/LoginException.java
+++ b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/LoginException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol.exception;
+package org.apache.trafficcontrol.client.exception;
public class LoginException extends TrafficControlException {
private static final long serialVersionUID = -5021620597469977194L;
diff --git a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/OperationException.java b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/OperationException.java
similarity index 95%
rename from traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/OperationException.java
rename to traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/OperationException.java
index 08d93ef..414bae5 100644
--- a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/OperationException.java
+++ b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/OperationException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol.exception;
+package org.apache.trafficcontrol.client.exception;
public class OperationException extends TrafficControlException {
private static final long serialVersionUID = 8799467021892976240L;
diff --git a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/TrafficControlException.java b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/TrafficControlException.java
similarity index 95%
rename from traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/TrafficControlException.java
rename to traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/TrafficControlException.java
index 4daacfb..ad9142f 100644
--- a/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/exception/TrafficControlException.java
+++ b/traffic_control/clients/java/common/src/main/java/org/apache/trafficcontrol/client/exception/TrafficControlException.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol.exception;
+package org.apache.trafficcontrol.client.exception;
public class TrafficControlException extends Exception {
private static final long serialVersionUID = 914940907727369814L;
diff --git a/traffic_control/clients/java/pom.xml b/traffic_control/clients/java/pom.xml
index 18eb1af..ae9ce55 100644
--- a/traffic_control/clients/java/pom.xml
+++ b/traffic_control/clients/java/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.comcast.cdn.traffic_control</groupId>
+ <groupId>org.apache.trafficcontrol</groupId>
<artifactId>traffic-control-java-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/traffic_control/clients/java/trafficops/pom.xml b/traffic_control/clients/java/trafficops/pom.xml
index 56f350a..a04105d 100644
--- a/traffic_control/clients/java/trafficops/pom.xml
+++ b/traffic_control/clients/java/trafficops/pom.xml
@@ -21,14 +21,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.comcast.cdn.traffic_control</groupId>
+ <groupId>org.apache.trafficcontrol</groupId>
<artifactId>traffic-control-java-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>traffic-control-java-client-trafficops</artifactId>
<dependencies>
<dependency>
- <groupId>com.comcast.cdn.traffic_control</groupId>
+ <groupId>org.apache.trafficcontrol</groupId>
<artifactId>traffic-control-java-client-common</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/ResponseFuture.java b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/ResponseFuture.java
similarity index 92%
rename from traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/ResponseFuture.java
rename to traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/ResponseFuture.java
index 2e1cbfe..2e96a21 100644
--- a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/ResponseFuture.java
+++ b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/ResponseFuture.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol;
+package org.apache.trafficcontrol.client.trafficops;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -25,10 +25,11 @@ import java.util.function.BiConsumer;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.entity.StringEntity;
-import org.apache.trafficcontrol.exception.LoginException;
-import org.apache.trafficcontrol.exception.OperationException;
-import org.apache.trafficcontrol.models.Alert;
-import org.apache.trafficcontrol.models.Response;
+import org.apache.trafficcontrol.client.RestApiSession;
+import org.apache.trafficcontrol.client.exception.LoginException;
+import org.apache.trafficcontrol.client.exception.OperationException;
+import org.apache.trafficcontrol.client.trafficops.models.Alert;
+import org.apache.trafficcontrol.client.trafficops.models.Response;
import com.google.auto.value.AutoValue;
import com.google.common.base.Charsets;
diff --git a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/TOSession.java b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/TOSession.java
similarity index 95%
rename from traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/TOSession.java
rename to traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/TOSession.java
index 0bd24b7..8045172 100644
--- a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/TOSession.java
+++ b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/TOSession.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol;
+package org.apache.trafficcontrol.client.trafficops;
import java.io.Closeable;
import java.io.IOException;
@@ -27,8 +27,9 @@ import java.util.concurrent.CompletableFuture;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.message.BasicNameValuePair;
-import org.apache.trafficcontrol.exception.LoginException;
-import org.apache.trafficcontrol.models.Response;
+import org.apache.trafficcontrol.client.RestApiSession;
+import org.apache.trafficcontrol.client.exception.LoginException;
+import org.apache.trafficcontrol.client.trafficops.models.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/models/Alert.java b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/models/Alert.java
similarity index 93%
rename from traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/models/Alert.java
rename to traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/models/Alert.java
index e72d85b..5f92eb6 100644
--- a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/models/Alert.java
+++ b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/models/Alert.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol.models;
+package org.apache.trafficcontrol.client.trafficops.models;
public class Alert {
private String level;
diff --git a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/models/Response.java b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/models/Response.java
similarity index 94%
rename from traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/models/Response.java
rename to traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/models/Response.java
index 75e2ca5..0ba3e38 100644
--- a/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/models/Response.java
+++ b/traffic_control/clients/java/trafficops/src/main/java/org/apache/trafficcontrol/client/trafficops/models/Response.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol.models;
+package org.apache.trafficcontrol.client.trafficops.models;
import java.util.List;
import java.util.Map;
diff --git a/traffic_control/clients/java/trafficops/src/test/java/org/apache/trafficcontrol/TOSessionTest.java b/traffic_control/clients/java/trafficops/src/test/java/org/apache/trafficcontrol/client/trafficops/TOSessionTest.java
similarity index 92%
rename from traffic_control/clients/java/trafficops/src/test/java/org/apache/trafficcontrol/TOSessionTest.java
rename to traffic_control/clients/java/trafficops/src/test/java/org/apache/trafficcontrol/client/trafficops/TOSessionTest.java
index a1cbbcb..605a507 100644
--- a/traffic_control/clients/java/trafficops/src/test/java/org/apache/trafficcontrol/TOSessionTest.java
+++ b/traffic_control/clients/java/trafficops/src/test/java/org/apache/trafficcontrol/client/trafficops/TOSessionTest.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.apache.trafficcontrol;
+package org.apache.trafficcontrol.client.trafficops;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,9 +26,9 @@ import org.apache.http.HttpVersion;
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicStatusLine;
-import org.apache.trafficcontrol.TOSession;
-import org.apache.trafficcontrol.exception.LoginException;
-import org.apache.trafficcontrol.models.Response.CollectionResponse;
+import org.apache.trafficcontrol.client.RestApiSession;
+import org.apache.trafficcontrol.client.exception.LoginException;
+import org.apache.trafficcontrol.client.trafficops.models.Response.CollectionResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;