diff --git a/CHANGELOG.md b/CHANGELOG.md index e4c55f2940..d5901cfaf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -91,6 +91,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Disabled TLSv1.1 for Traffic Router in Ansible role by default - Updated the Traffic Monitor Ansible role to set `serve_write_timeout_ms` to `20000` by default because 10 seconds can be too short for relatively large CDNs. - Refactored the Traffic Ops - Traffic Vault integration to more easily support the development of new Traffic Vault backends +- Changed the Traffic Router package structure from com.comcast.cdn.\* to org.apache.\* - Updated Apache Tomcat from 8.5.63 to 9.0.43 - Delivery Service Requests now keep a record of the changes they make. - Changed the `goose` provider to the maintained fork [`github.com/kevinburke/goose`](https://github.com/kevinburke/goose) diff --git a/docs/source/development/debugging.rst b/docs/source/development/debugging.rst index 8e91605d08..2c92ba0f5d 100644 --- a/docs/source/development/debugging.rst +++ b/docs/source/development/debugging.rst @@ -455,10 +455,10 @@ Traffic Router tail: '/opt/tomcat/logs/catalina.2020-02-21.log' has appeared; following end of new file ==> /opt/traffic_router/var/log/traffic_router.log <== - INFO 2020-02-21T05:16:07.557 [Thread-3] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState - INFO 2020-02-21T05:16:07.557 [Thread-4] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState - INFO 2020-02-21T05:16:07.558 [Thread-5] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState - INFO 2020-02-21T05:16:07.559 [Thread-6] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState + INFO 2020-02-21T05:16:07.557 [Thread-3] org.apache.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState + INFO 2020-02-21T05:16:07.557 [Thread-4] org.apache.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState + INFO 2020-02-21T05:16:07.558 [Thread-5] org.apache.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState + INFO 2020-02-21T05:16:07.559 [Thread-6] org.apache.traffic_control.traffic_router.protocol.LanguidPoller - Waiting for state from mbean path traffic-router:name=languidState ==> /opt/tomcat/logs/catalina.log <== Listening for transport dt_socket at address: 5005 @@ -466,11 +466,11 @@ Traffic Router Watch for the line that mentions port 5005 -----------^^^^ ==> /opt/tomcat/logs/catalina.2020-02-21.log <== - 21-Feb-2020 05:16:07.359 WARNING [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol. Adding BouncyCastle provider - 21-Feb-2020 05:16:07.452 WARNING [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol. Serving wildcard certs for multiple domains - 21-Feb-2020 05:16:07.459 WARNING [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol. Serving wildcard certs for multiple domains - 21-Feb-2020 05:16:07.459 WARNING [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol. Serving wildcard certs for multiple domains - 21-Feb-2020 05:16:07.461 INFO [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol.setSslImplementationName setSslImplementation: com.comcast.cdn.traffic_control.traffic_router.protocol.RouterSslImplementation + 21-Feb-2020 05:16:07.359 WARNING [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol. Adding BouncyCastle provider + 21-Feb-2020 05:16:07.452 WARNING [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol. Serving wildcard certs for multiple domains + 21-Feb-2020 05:16:07.459 WARNING [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol. Serving wildcard certs for multiple domains + 21-Feb-2020 05:16:07.459 WARNING [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol. Serving wildcard certs for multiple domains + 21-Feb-2020 05:16:07.461 INFO [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol.setSslImplementationName setSslImplementation: org.apache.traffic_control.traffic_router.protocol.RouterSslImplementation * When you see that Tomcat is listening for debugger connections on port 5005, start debugging using the debug configuration that you created. diff --git a/docs/source/development/traffic_router.rst b/docs/source/development/traffic_router.rst index c26f8da33d..9c11f8d30d 100644 --- a/docs/source/development/traffic_router.rst +++ b/docs/source/development/traffic_router.rst @@ -136,7 +136,7 @@ To install the Traffic Router Developer environment: a. In the package explorer, expand ``traffic_router_core`` #. Expand ``src/test/java`` - #. Expand the package ``com.comcast.cdn.traffic_control.traffic_router.core`` + #. Expand the package ``org.apache.traffic_control.traffic_router.core`` #. Open and run ``TrafficRouterStart.java`` .. Note:: If an error is displayed in the Console, run ``mvn clean verify`` from the ``traffic_router`` directory diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 53d9447e8e..7689e12c8c 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -67,7 +67,7 @@ tr_java_opts: # server.xml tr_connector_default: - protocol: 'com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol' + protocol: 'org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol' maxThreads: 10000 connectionTimeout: 10000 mbeanPath: 'traffic-router:name=languidState' @@ -105,7 +105,7 @@ tr_connectors: clientAuth: false sslProtocol: 'TLS' protocols: '+TLSv1.2,+TLSv1.3' - sslImplementationName: 'com.comcast.cdn.traffic_control.traffic_router.protocol.RouterSslImplementation' + sslImplementationName: 'org.apache.traffic_control.traffic_router.protocol.RouterSslImplementation' # dns.properties tr_dns_tcp_port: 53 @@ -153,9 +153,9 @@ tr_log4j_opts: - log4j.rootLogger=WARN, A1 - - "# Set application logger levels" - - log4j.logger.com.comcast.cdn.traffic_control.traffic_router=INFO - - log4j.logger.com.comcast.cdn.traffic_control.traffic_router.core.access=INFO, ACCESS - - log4j.additivity.com.comcast.cdn.traffic_control.traffic_router.core.access=false + - log4j.logger.org.apache.traffic_control.traffic_router=INFO + - log4j.logger.org.apache.traffic_control.traffic_router.core.access=INFO, ACCESS + - log4j.additivity.org.apache.traffic_control.traffic_router.core.access=false # logging.properties tr_logging_opts: diff --git a/infrastructure/ansible/roles/traffic-router/templates/conf/server.xml.j2 b/infrastructure/ansible/roles/traffic-router/templates/conf/server.xml.j2 index 46fb9f4350..2d7864bb6a 100644 --- a/infrastructure/ansible/roles/traffic-router/templates/conf/server.xml.j2 +++ b/infrastructure/ansible/roles/traffic-router/templates/conf/server.xml.j2 @@ -29,7 +29,7 @@ - + - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_connector ${project.parent.version} - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_shared ${project.parent.version} - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router ROOT ${project.parent.version} war @@ -193,7 +193,7 @@ true - com.comcast.cdn.traffic_control.traffic_router:traffic_router_core + org.apache.traffic_control.traffic_router:traffic_router_core @@ -218,7 +218,7 @@ true - com.comcast.cdn.traffic_control.traffic_router:ROOT + org.apache.traffic_control.traffic_router:ROOT diff --git a/traffic_router/configuration/pom.xml b/traffic_router/configuration/pom.xml index 70c61d2885..1c775c7134 100644 --- a/traffic_router/configuration/pom.xml +++ b/traffic_router/configuration/pom.xml @@ -24,7 +24,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> traffic_router - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router 5.0.0 4.0.0 diff --git a/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java b/traffic_router/configuration/src/main/java/org/apache/traffic_control/traffic_router/configuration/ConfigurationListener.java similarity index 90% rename from traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java rename to traffic_router/configuration/src/main/java/org/apache/traffic_control/traffic_router/configuration/ConfigurationListener.java index 018f7d3bb0..366c410cf9 100644 --- a/traffic_router/configuration/src/main/java/com/comcast/cdn/traffic_control/traffic_router/configuration/ConfigurationListener.java +++ b/traffic_router/configuration/src/main/java/org/apache/traffic_control/traffic_router/configuration/ConfigurationListener.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.configuration; +package org.apache.traffic_control.traffic_router.configuration; public interface ConfigurationListener { void configurationChanged(); diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml index 48cc787098..0a57803ef3 100644 --- a/traffic_router/connector/pom.xml +++ b/traffic_router/connector/pom.xml @@ -17,7 +17,7 @@ 4.0.0 - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router 5.0.0 @@ -68,7 +68,7 @@ true - com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidProtocol + org.apache.traffic_control.traffic_router.protocol.LanguidProtocol @@ -78,7 +78,7 @@ - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_shared ${project.parent.version} diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidNioProtocol.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidNioProtocol.java similarity index 98% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidNioProtocol.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidNioProtocol.java index 2b7f9b91df..5aeaf90b4f 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidNioProtocol.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidNioProtocol.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.protocol; +package org.apache.traffic_control.traffic_router.protocol; import org.apache.coyote.http11.AbstractHttp11JsseProtocol; import org.apache.juli.logging.Log; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java similarity index 97% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java index 71532c0d12..9a8650d826 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.protocol; +package org.apache.traffic_control.traffic_router.protocol; import org.apache.log4j.Logger; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java similarity index 97% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java index c44407c7d0..b9d4103724 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.protocol; +package org.apache.traffic_control.traffic_router.protocol; import org.apache.coyote.http11.Http11NioProtocol; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterNioEndpoint.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java similarity index 95% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterNioEndpoint.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java index db7d776162..5a5957a951 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterNioEndpoint.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.protocol; +package org.apache.traffic_control.traffic_router.protocol; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateRegistry; -import com.comcast.cdn.traffic_control.traffic_router.secure.HandshakeData; -import com.comcast.cdn.traffic_control.traffic_router.secure.KeyManager; +import org.apache.traffic_control.traffic_router.secure.CertificateRegistry; +import org.apache.traffic_control.traffic_router.secure.HandshakeData; +import org.apache.traffic_control.traffic_router.secure.KeyManager; import org.apache.log4j.Logger; import org.apache.tomcat.jni.SSL; import org.apache.tomcat.util.net.NioChannel; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterProtocolHandler.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterProtocolHandler.java similarity index 94% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterProtocolHandler.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterProtocolHandler.java index c8c04bf093..96cd576ead 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterProtocolHandler.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterProtocolHandler.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.protocol; +package org.apache.traffic_control.traffic_router.protocol; import org.apache.coyote.ProtocolHandler; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterSslImplementation.java similarity index 95% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterSslImplementation.java index 7376cbc453..89d766ed37 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterSslImplementation.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.protocol; +package org.apache.traffic_control.traffic_router.protocol; import org.apache.tomcat.util.net.SSLHostConfigCertificate; import org.apache.tomcat.util.net.SSLSupport; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslUtil.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterSslUtil.java similarity index 93% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslUtil.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterSslUtil.java index 3c66733a2e..61c2c3a654 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslUtil.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterSslUtil.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.protocol; +package org.apache.traffic_control.traffic_router.protocol; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -70,7 +70,7 @@ public boolean isTls13RenegAuthAvailable() { @Override @SuppressWarnings({"PMD.SignatureDeclareThrowsException"}) public javax.net.ssl.KeyManager[] getKeyManagers() throws Exception { - return new javax.net.ssl.KeyManager[] { new com.comcast.cdn.traffic_control.traffic_router.secure.KeyManager() }; + return new javax.net.ssl.KeyManager[] { new org.apache.traffic_control.traffic_router.secure.KeyManager() }; } @Override diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java similarity index 97% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java index 0ab47894b2..dacd17c4b4 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataConverter.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import org.apache.log4j.Logger; import org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateCrtKey; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java similarity index 92% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java index 4bd4fd8e28..841e7be53d 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDataListener.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import org.apache.log4j.Logger; import javax.management.AttributeChangeNotification; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java similarity index 97% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java index 5f6952dfe1..22f165558f 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateDecoder.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import org.apache.log4j.Logger; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java similarity index 97% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java index 948ba733c6..942c46c8a5 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; -import com.comcast.cdn.traffic_control.traffic_router.protocol.RouterNioEndpoint; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; -import com.comcast.cdn.traffic_control.traffic_router.utils.HttpsProperties; +import org.apache.traffic_control.traffic_router.protocol.RouterNioEndpoint; +import org.apache.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.utils.HttpsProperties; import org.apache.log4j.Logger; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.BasicConstraints; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/HandshakeData.java similarity index 97% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/HandshakeData.java index f266ffef42..dd90a41740 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/HandshakeData.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/HandshakeData.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import java.security.PrivateKey; import java.security.cert.X509Certificate; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java similarity index 98% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java index 2996cb016b..18dacb2af5 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import org.apache.log4j.Logger; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/PrivateKeyDecoder.java similarity index 94% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/PrivateKeyDecoder.java index 3792d8577e..294ad37ad0 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/PrivateKeyDecoder.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/PrivateKeyDecoder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java similarity index 86% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java index b570769114..4af1c2490f 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.tomcat; +package org.apache.traffic_control.traffic_router.tomcat; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateDataListener; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificates; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; +import org.apache.traffic_control.traffic_router.secure.CertificateDataListener; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificates; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/utils/HttpsProperties.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java similarity index 96% rename from traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/utils/HttpsProperties.java rename to traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java index 259da8f597..6bfd663a17 100644 --- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/utils/HttpsProperties.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.utils; +package org.apache.traffic_control.traffic_router.utils; import org.apache.log4j.Logger; diff --git a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java index 7d92dd9181..76328a37a7 100644 --- a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java +++ b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java @@ -15,8 +15,8 @@ package protocol; -import com.comcast.cdn.traffic_control.traffic_router.protocol.RouterSslImplementation; -import com.comcast.cdn.traffic_control.traffic_router.protocol.RouterSslUtil; +import org.apache.traffic_control.traffic_router.protocol.RouterSslImplementation; +import org.apache.traffic_control.traffic_router.protocol.RouterSslUtil; import org.apache.tomcat.util.net.SSLHostConfig; import org.apache.tomcat.util.net.SSLHostConfigCertificate; import org.apache.tomcat.util.net.SSLSupport; diff --git a/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java b/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java index 696ed644e2..44f4dfa417 100644 --- a/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java +++ b/traffic_router/connector/src/test/java/secure/CertificateDataConverterTest.java @@ -15,10 +15,10 @@ package secure; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateDataConverter; -import com.comcast.cdn.traffic_control.traffic_router.secure.HandshakeData; -import com.comcast.cdn.traffic_control.traffic_router.shared.Certificate; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.secure.CertificateDataConverter; +import org.apache.traffic_control.traffic_router.secure.HandshakeData; +import org.apache.traffic_control.traffic_router.shared.Certificate; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; diff --git a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java index 809537d91d..15a1834e82 100644 --- a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java +++ b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java @@ -15,9 +15,9 @@ package secure; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateDataListener; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateRegistry; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.secure.CertificateDataListener; +import org.apache.traffic_control.traffic_router.secure.CertificateRegistry; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java b/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java index 09fd5c1d39..9059f4d0bf 100644 --- a/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java +++ b/traffic_router/connector/src/test/java/secure/CertificateRegistryTest.java @@ -15,11 +15,11 @@ package secure; -import com.comcast.cdn.traffic_control.traffic_router.protocol.RouterNioEndpoint; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateDataConverter; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateRegistry; -import com.comcast.cdn.traffic_control.traffic_router.secure.HandshakeData; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.protocol.RouterNioEndpoint; +import org.apache.traffic_control.traffic_router.secure.CertificateDataConverter; +import org.apache.traffic_control.traffic_router.secure.CertificateRegistry; +import org.apache.traffic_control.traffic_router.secure.HandshakeData; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java index 498b49aa67..6edc18ae78 100644 --- a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java +++ b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java @@ -15,9 +15,9 @@ package secure; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateRegistry; -import com.comcast.cdn.traffic_control.traffic_router.secure.HandshakeData; -import com.comcast.cdn.traffic_control.traffic_router.secure.KeyManager; +import org.apache.traffic_control.traffic_router.secure.CertificateRegistry; +import org.apache.traffic_control.traffic_router.secure.HandshakeData; +import org.apache.traffic_control.traffic_router.secure.KeyManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java index 70251d2d6c..9b65a8bee1 100644 --- a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java +++ b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java @@ -15,10 +15,10 @@ package secure; -import com.comcast.cdn.traffic_control.traffic_router.secure.CertificateDataListener; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificates; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; -import com.comcast.cdn.traffic_control.traffic_router.tomcat.TomcatLifecycleListener; +import org.apache.traffic_control.traffic_router.secure.CertificateDataListener; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificates; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; +import org.apache.traffic_control.traffic_router.tomcat.TomcatLifecycleListener; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.junit.Before; diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml index 95fa5c85d3..7b67cf3a27 100644 --- a/traffic_router/core/pom.xml +++ b/traffic_router/core/pom.xml @@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router 5.0.0 @@ -183,7 +183,7 @@ 2.19.1 -XX:-UseSplitVerifier -Djava.library.path=${java.library.path} - com.comcast.cdn.traffic_control.traffic_router.core.util.IntegrationTest,com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest + org.apache.traffic_control.traffic_router.core.util.IntegrationTest,org.apache.traffic_control.traffic_router.core.util.ExternalTest @@ -197,7 +197,7 @@ -Djava.library.path=${java.library.path} - com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest + org.apache.traffic_control.traffic_router.core.util.ExternalTest **/*Suite.java @@ -211,7 +211,7 @@ -Djava.library.path=${java.library.path} - com.comcast.cdn.traffic_control.traffic_router.core.util.IntegrationTest + org.apache.traffic_control.traffic_router.core.util.IntegrationTest **/*.java @@ -231,19 +231,19 @@ - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_geolocation ${project.parent.version} - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_config ${project.parent.version} - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_shared ${project.parent.version} @@ -374,7 +374,7 @@ - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_connector ${project.parent.version} @@ -414,7 +414,7 @@ neustar - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_neustar ${project.parent.version} diff --git a/traffic_router/core/src/main/conf/log4j.properties b/traffic_router/core/src/main/conf/log4j.properties index fb6cc552bc..0771a5b76d 100644 --- a/traffic_router/core/src/main/conf/log4j.properties +++ b/traffic_router/core/src/main/conf/log4j.properties @@ -38,7 +38,7 @@ log4j.appender.A1.threshold=ALL log4j.rootLogger=WARN, A1 # Set application logger levels -log4j.logger.com.comcast.cdn.traffic_control.traffic_router=INFO +log4j.logger.org.apache.traffic_control.traffic_router=INFO -log4j.logger.com.comcast.cdn.traffic_control.traffic_router.core.access=INFO, ACCESS -log4j.additivity.com.comcast.cdn.traffic_control.traffic_router.core.access=false +log4j.logger.org.apache.traffic_control.traffic_router.core.access=INFO, ACCESS +log4j.additivity.org.apache.traffic_control.traffic_router.core.access=false diff --git a/traffic_router/core/src/main/conf/server.xml b/traffic_router/core/src/main/conf/server.xml index c3cb55653e..9635a31af8 100644 --- a/traffic_router/core/src/main/conf/server.xml +++ b/traffic_router/core/src/main/conf/server.xml @@ -27,26 +27,26 @@ - + - - + - - + + sslImplementationName="org.apache.traffic_control.traffic_router.protocol.RouterSslImplementation"> diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/ConsistentHashController.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/ConsistentHashController.java index d9a9a4c57b..0a086243ff 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ConsistentHashController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/ConsistentHashController.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/CoverageZoneController.java similarity index 86% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/CoverageZoneController.java index 53e60bf4c6..aa1a4b7462 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/CoverageZoneController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/CoverageZoneController.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeepCoverageZoneController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/DeepCoverageZoneController.java similarity index 85% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeepCoverageZoneController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/DeepCoverageZoneController.java index 71f9fa4af6..356a39bb6a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeepCoverageZoneController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/DeepCoverageZoneController.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java similarity index 83% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java index 45108dc8f2..19a3a7cd4b 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/DeliveryServicesController.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/LocationController.java similarity index 90% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/LocationController.java index 78acfe9f4f..b96eb44b95 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/LocationController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/LocationController.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.status.model.CacheModel; -import com.comcast.cdn.traffic_control.traffic_router.core.util.DataExporter; +import org.apache.traffic_control.traffic_router.core.status.model.CacheModel; +import org.apache.traffic_control.traffic_router.core.util.DataExporter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/StatsController.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/StatsController.java index 3f36fe158e..5fc88282bf 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/StatsController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/StatsController.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.util.DataExporter; +import org.apache.traffic_control.traffic_router.core.util.DataExporter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/SteeringController.java similarity index 83% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/SteeringController.java index 60fbb67dfb..531baf8ffb 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/SteeringController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/SteeringController.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.Steering; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringRegistry; +import org.apache.traffic_control.traffic_router.core.ds.Steering; +import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/ZonesController.java similarity index 91% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/ZonesController.java index c7f56334d5..039ef1dc0b 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/api/controllers/ZonesController.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/api/controllers/ZonesController.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.api.controllers; +package org.apache.traffic_control.traffic_router.api.controllers; -import com.comcast.cdn.traffic_control.traffic_router.core.util.DataExporter; +import org.apache.traffic_control.traffic_router.core.util.DataExporter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java index 6392414157..8e95350eab 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.config; +package org.apache.traffic_control.traffic_router.core.config; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.databind.JsonNode; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java index d1a213608d..d30f84d760 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandler.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.config; +package org.apache.traffic_control.traffic_router.core.config; import java.io.IOException; import java.net.UnknownHostException; @@ -34,42 +34,42 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.LetsEncryptDnsChallengeWatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringWatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationsWatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.GeolocationDatabaseUpdater; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkNode; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkUpdater; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.DeepNetworkUpdater; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoUpdater; - -import com.comcast.cdn.traffic_control.traffic_router.core.secure.CertificatesPoller; -import com.comcast.cdn.traffic_control.traffic_router.core.secure.CertificatesPublisher; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.ds.LetsEncryptDnsChallengeWatcher; +import org.apache.traffic_control.traffic_router.core.ds.SteeringWatcher; +import org.apache.traffic_control.traffic_router.core.loc.FederationsWatcher; +import org.apache.traffic_control.traffic_router.core.loc.GeolocationDatabaseUpdater; +import org.apache.traffic_control.traffic_router.core.loc.NetworkNode; +import org.apache.traffic_control.traffic_router.core.loc.NetworkUpdater; +import org.apache.traffic_control.traffic_router.core.loc.DeepNetworkUpdater; +import org.apache.traffic_control.traffic_router.core.loc.RegionalGeoUpdater; + +import org.apache.traffic_control.traffic_router.core.secure.CertificatesPoller; +import org.apache.traffic_control.traffic_router.core.secure.CertificatesPublisher; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Location; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.TrafficRouterLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type; -import com.comcast.cdn.traffic_control.traffic_router.core.monitor.TrafficMonitorWatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.AnonymousIp; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.AnonymousIpConfigUpdater; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseUpdater; +import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.Node; +import org.apache.traffic_control.traffic_router.core.edge.TrafficRouterLocation; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type; +import org.apache.traffic_control.traffic_router.core.monitor.TrafficMonitorWatcher; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIp; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpConfigUpdater; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseUpdater; @SuppressWarnings("PMD.TooManyFields") public class ConfigHandler { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ParseException.java similarity index 91% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ParseException.java index 12e7de9e8f..893b2c1bcd 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ParseException.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ParseException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.config; +package org.apache.traffic_control.traffic_router.core.config; public class ParseException extends Exception { private static final long serialVersionUID = 1L; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/WatcherConfig.java similarity index 85% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/WatcherConfig.java index 6eb67d37f1..3ae6eba5c2 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/WatcherConfig.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/WatcherConfig.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.config; +package org.apache.traffic_control.traffic_router.core.config; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; import com.fasterxml.jackson.databind.JsonNode; public class WatcherConfig { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java index 4c195922f6..118fe492d7 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilder.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.xbill.DNS.DClass; import org.xbill.DNS.Message; import org.xbill.DNS.Rcode; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessRecord.java similarity index 91% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessRecord.java index 9c255d9f1d..cc861e08fa 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessRecord.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessRecord.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; import org.xbill.DNS.Message; import java.net.InetAddress; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSException.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSException.java index 08aaff011c..39503e40fd 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSException.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DNSException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; /** * An {@link Exception} that relates to a specified DNS RCODE. diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPair.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPair.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPair.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPair.java index 6fcb78deec..acada00733 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPair.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPair.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import org.xbill.DNS.DNSKEYRecord; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java index e670f90a8f..a1dbdff102 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; -import com.comcast.cdn.traffic_control.traffic_router.secure.BindPrivateKey; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.secure.BindPrivateKey; import com.fasterxml.jackson.databind.JsonNode; import org.apache.log4j.Logger; import org.xbill.DNS.DNSKEYRecord; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java index fdbbf12eec..73f2242b44 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServer.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.net.InetAddress; import java.util.*; @@ -36,8 +36,8 @@ import org.xbill.DNS.EDNSOption; import org.xbill.DNS.ClientSubnetOption; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; public class NameServer { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java index 96be93057d..48db476240 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMain.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.util.List; import java.util.concurrent.ExecutorService; @@ -21,7 +21,7 @@ import org.apache.log4j.Logger; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol.Protocol; +import org.apache.traffic_control.traffic_router.core.dns.protocol.Protocol; public final class NameServerMain { private static final Logger LOGGER = Logger.getLogger(NameServerMain.class); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRSIGCacheKey.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRSIGCacheKey.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRSIGCacheKey.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRSIGCacheKey.java index d266ebaddf..648fca8bf7 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRSIGCacheKey.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRSIGCacheKey.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.util.Arrays; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRSetsBuilder.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRSetsBuilder.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRSetsBuilder.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRSetsBuilder.java index 52959aabe1..4afd8b935c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRSetsBuilder.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRSetsBuilder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import org.xbill.DNS.RRset; import org.xbill.DNS.Record; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRsetKey.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRsetKey.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRsetKey.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRsetKey.java index 96db4dbdbf..2f94d52e1a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/RRsetKey.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/RRsetKey.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import org.xbill.DNS.RRset; import org.xbill.DNS.Record; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java index 1695dd821c..db71f00264 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.io.IOException; import java.security.GeneralSecurityException; @@ -33,10 +33,10 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; @@ -45,10 +45,10 @@ import org.xbill.DNS.Record; import org.xbill.DNS.RRSIGRecord; import org.xbill.DNS.TextParseException; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.ZoneManager.ZoneCacheType; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ProtectedFetcher; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.dns.ZoneManager.ZoneCacheType; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.util.ProtectedFetcher; public final class SignatureManager { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java index 9918afddc1..d874d19742 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignedZoneKey.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.util.Calendar; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneKey.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneKey.java index cfb913a691..6cf12d27ea 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneKey.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneKey.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.util.Collections; import java.util.Date; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java index 9b82493dc8..32e8725992 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.io.File; import java.io.FileWriter; @@ -46,9 +46,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; @@ -69,22 +69,22 @@ import org.xbill.DNS.Type; import org.xbill.DNS.Zone; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Resolver; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.TrafficRouterLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.request.DNSRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.DNSRouteResult; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.edge.Resolver; +import org.apache.traffic_control.traffic_router.core.edge.TrafficRouterLocation; +import org.apache.traffic_control.traffic_router.core.request.DNSRequest; +import org.apache.traffic_control.traffic_router.core.router.DNSRouteResult; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilderSpec; import com.google.common.cache.CacheLoader; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSigner.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSigner.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSigner.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSigner.java index 9d17024f3f..27e3c6024c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSigner.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSigner.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import org.xbill.DNS.DNSKEYRecord; import org.xbill.DNS.DSRecord; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java similarity index 99% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java index 743c88b4a7..8338541c37 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import org.apache.log4j.Logger; import org.xbill.DNS.DNSKEYRecord; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java similarity index 91% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java index 6501dc5d48..3fc63c5a08 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneUtils.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import org.xbill.DNS.Record; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java index 60ca20dffd..2def349518 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; +import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; +import org.apache.traffic_control.traffic_router.core.dns.NameServer; import org.apache.log4j.Logger; import org.xbill.DNS.Message; import org.xbill.DNS.Rcode; @@ -29,7 +29,7 @@ @SuppressWarnings("PMD.MoreThanOneLogger") public abstract class AbstractProtocol implements Protocol { - private static final Logger ACCESS = Logger.getLogger("com.comcast.cdn.traffic_control.traffic_router.core.access"); + private static final Logger ACCESS = Logger.getLogger("org.apache.traffic_control.traffic_router.core.access"); private static final Logger LOGGER = Logger.getLogger(AbstractProtocol.class); private static final int NUM_SECTIONS = 4; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/Protocol.java similarity index 90% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/Protocol.java index c8d2d5f68e..a9c325c289 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/Protocol.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/Protocol.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; public interface Protocol extends Runnable { /** diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/SocketHandler.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/SocketHandler.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/SocketHandler.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/SocketHandler.java index 16f01d5cd8..b2f93dc1c9 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/SocketHandler.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/SocketHandler.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; public interface SocketHandler extends Runnable { /** diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java index 7d4aac0d59..28718332ac 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java index e4db840344..3d3a6b8110 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; import java.io.IOException; import java.net.DatagramPacket; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java index dc155fa004..b9f6648494 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -42,20 +42,20 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Location; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.request.DNSRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; -import com.comcast.cdn.traffic_control.traffic_router.core.util.StringProtector; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.request.DNSRequest; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.StringProtector; @SuppressWarnings({"PMD.TooManyFields","PMD.CyclomaticComplexity", "PMD.AvoidDuplicateLiterals", "PMD.ExcessivePublicCount"}) public class DeliveryService { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java index c0253ee489..078216f3ba 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcher.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import java.util.ArrayList; import java.util.HashSet; @@ -21,8 +21,8 @@ import java.util.Set; import java.util.TreeMap; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; -import com.comcast.cdn.traffic_control.traffic_router.core.request.RequestMatcher; +import org.apache.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.request.RequestMatcher; public class DeliveryServiceMatcher implements Comparable { public enum Type { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/Dispersion.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/Dispersion.java index 108fdf851c..8b8a775960 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Dispersion.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/Dispersion.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import java.util.ArrayList; import java.util.Collections; @@ -21,10 +21,10 @@ import java.util.Random; import java.util.SortedMap; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import com.fasterxml.jackson.databind.JsonNode; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.Cache; public class Dispersion { public final static int DEFAULT_LIMIT = 1; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallenge.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallenge.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallenge.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallenge.java index f474740d20..8261ba0a89 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallenge.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallenge.java @@ -1,4 +1,4 @@ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; /* * diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java index 8525251134..957bf062ae 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java @@ -1,4 +1,4 @@ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; /* * @@ -15,10 +15,10 @@ * limitations under the License. */ -import com.comcast.cdn.traffic_control.traffic_router.core.config.ConfigHandler; -import com.comcast.cdn.traffic_control.traffic_router.core.util.AbstractResourceWatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.config.ConfigHandler; +import org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcher; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/Steering.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/Steering.java index f673dd54ad..34f519fe57 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/Steering.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringFilter.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringFilter.java index 4bbd075fda..539d333ed7 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringFilter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringFilter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringGeolocationComparator.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringGeolocationComparator.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringGeolocationComparator.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringGeolocationComparator.java index 2dbe8d1249..1b60edc8ce 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringGeolocationComparator.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringGeolocationComparator.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import java.util.Comparator; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; public class SteeringGeolocationComparator implements Comparator { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java index 41b749a940..dc17f0d12c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistry.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringResult.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringResult.java similarity index 91% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringResult.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringResult.java index 882060e83a..31d7506541 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringResult.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringResult.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.Cache; public class SteeringResult { private SteeringTarget steeringTarget; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringTarget.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringTarget.java index db1c015960..5c1bb92283 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringTarget.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringTarget.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.DefaultHashable; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import com.fasterxml.jackson.annotation.JsonProperty; public class SteeringTarget extends DefaultHashable { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java index 72c415d87f..2666311c0d 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; -import com.comcast.cdn.traffic_control.traffic_router.core.util.AbstractResourceWatcher; +import org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcher; import org.apache.log4j.Logger; public class SteeringWatcher extends AbstractResourceWatcher { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Cache.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Cache.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Cache.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Cache.java index bfadbeaa77..cea9a1c381 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Cache.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Cache.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import com.comcast.cdn.traffic_control.traffic_router.core.config.ParseException; +import org.apache.traffic_control.traffic_router.core.config.ParseException; public class Cache extends Node { private final Map deliveryServices = new HashMap(); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheLocation.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheLocation.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java index b924b0fcd5..246d35490f 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheLocation.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.util.ArrayList; import java.util.Arrays; @@ -27,7 +27,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; /** * A physical location that has caches. diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheRegister.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheRegister.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheRegister.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheRegister.java index 3e243a4369..e6de36b29d 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheRegister.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheRegister.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.util.*; import java.util.stream.Collectors; import com.fasterxml.jackson.databind.JsonNode; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; +import org.apache.traffic_control.traffic_router.core.request.Request; @SuppressWarnings("PMD.LooseCoupling") public class CacheRegister { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/InetRecord.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/InetRecord.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/InetRecord.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/InetRecord.java index 207609404e..6b6b4d4697 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/InetRecord.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/InetRecord.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import org.xbill.DNS.Type; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Location.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Location.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Location.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Location.java index 76d9fd040e..ffa38e69f5 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Location.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Location.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.util.Map; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; /** * A physical location that has caches. diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Node.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Node.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java index 0c92dabadc..6d4214a578 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Node.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.net.Inet6Address; import java.net.InetAddress; @@ -26,9 +26,9 @@ import java.util.Map; import java.util.Set; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import com.fasterxml.jackson.databind.JsonNode; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.DefaultHashable; +import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/PropertiesAndCaches.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/PropertiesAndCaches.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/PropertiesAndCaches.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/PropertiesAndCaches.java index 7823ebe39c..e1ac9897a6 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/PropertiesAndCaches.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/PropertiesAndCaches.java @@ -17,7 +17,7 @@ * under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.util.ArrayList; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Resolver.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Resolver.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java index 0547df2060..32e84dad6f 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/Resolver.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/TrafficRouterLocation.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/TrafficRouterLocation.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/TrafficRouterLocation.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/TrafficRouterLocation.java index 8535a2fa50..df6f270319 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/TrafficRouterLocation.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/TrafficRouterLocation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; import java.util.ArrayList; import java.util.HashMap; @@ -25,7 +25,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; /** * A physical location that has caches. diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/ConsistentHasher.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/ConsistentHasher.java index e3642eeb16..16ec967b95 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/ConsistentHasher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/ConsistentHasher.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hash; +package org.apache.traffic_control.traffic_router.core.hash; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.Dispersion; +import org.apache.traffic_control.traffic_router.core.ds.Dispersion; import java.util.ArrayList; import java.util.Collections; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/DefaultHashable.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/DefaultHashable.java index c0674de0db..3e08d3194c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/DefaultHashable.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/DefaultHashable.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hash; +package org.apache.traffic_control.traffic_router.core.hash; import java.util.Arrays; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/Hashable.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/Hashable.java index d60f2c47b6..fdde192ad3 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/Hashable.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/Hashable.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hash; +package org.apache.traffic_control.traffic_router.core.hash; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/MD5HashFunction.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/MD5HashFunction.java index f06742361e..c73d6ed986 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/MD5HashFunction.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/MD5HashFunction.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hash; +package org.apache.traffic_control.traffic_router.core.hash; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/NumberSearcher.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/NumberSearcher.java index 5bc731819e..198740c74c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/hash/NumberSearcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/hash/NumberSearcher.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hash; +package org.apache.traffic_control.traffic_router.core.hash; import java.util.Arrays; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java index 131a87cc85..8d2f65f46f 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.http; +package org.apache.traffic_control.traffic_router.core.http; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import javax.servlet.http.HttpServletRequest; import java.math.RoundingMode; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessRecord.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessRecord.java index e5375b65cb..cc89b1b4eb 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessRecord.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessRecord.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.http; +package org.apache.traffic_control.traffic_router.core.http; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; import javax.servlet.http.HttpServletRequest; import java.net.URL; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java index 37b9a30640..aa7dab693d 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/HttpAccessRequestHeaders.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.http; +package org.apache.traffic_control.traffic_router.core.http; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java similarity index 91% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java index 74d713ce55..30a6774956 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.http; - -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.HTTPRouteResult; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; +package org.apache.traffic_control.traffic_router.core.http; + +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.HTTPRouteResult; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.filter.OncePerRequestFilter; @@ -38,7 +38,7 @@ import java.util.Set; public class RouterFilter extends OncePerRequestFilter { - private static final Logger ACCESS = Logger.getLogger("com.comcast.cdn.traffic_control.traffic_router.core.access"); + private static final Logger ACCESS = Logger.getLogger("org.apache.traffic_control.traffic_router.core.access"); public static final String REDIRECT_QUERY_PARAM = "trred"; private static final String HEAD = "HEAD"; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java index 52f3228180..797774e97a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.FileInputStream; @@ -33,11 +33,11 @@ import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import static org.apache.commons.codec.digest.DigestUtils.md5Hex; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java similarity index 89% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java index 622c1201d1..5a57e62289 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.net.InetAddress; @@ -25,16 +25,16 @@ import com.maxmind.geoip2.model.AnonymousIpResponse; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; -import com.comcast.cdn.traffic_control.traffic_router.core.router.HTTPRouteResult; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.router.HTTPRouteResult; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; public final class AnonymousIp { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java index ede90bc4e6..9ea329e41c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java index b70846b460..3237b3db76 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java index 2d63f2d19f..9fde250ee1 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java index b05aaafc43..206469d4b7 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; public class AnonymousIpWhitelist { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/DeepNetworkUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/DeepNetworkUpdater.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/DeepNetworkUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/DeepNetworkUpdater.java index c978b6349e..834ea86f35 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/DeepNetworkUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/DeepNetworkUpdater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/Federation.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/Federation.java index 8d2c2ce092..d44496efd0 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/Federation.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/Federation.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMapping.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMapping.java index 63bd0c0830..d56c78848a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMapping.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMapping.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ComparableTreeSet; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.ComparableTreeSet; import java.util.Set; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java similarity index 86% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java index 6f8d9f3544..a13d68e97d 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ComparableTreeSet; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.ComparableTreeSet; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationRegistry.java similarity index 90% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationRegistry.java index 56c0d56cab..b63f6ea408 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistry.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationRegistry.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ComparableTreeSet; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.ComparableTreeSet; import java.util.ArrayList; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsBuilder.java similarity index 89% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsBuilder.java index 42fff4ae81..326a6c068a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilder.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsBuilder.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java index 77a7fb42ba..02029ee1a8 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.util.AbstractResourceWatcher; +import org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcher; import org.apache.log4j.Logger; public class FederationsWatcher extends AbstractResourceWatcher { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java index 29b22f4d53..c88766dfd2 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/GeolocationDatabaseUpdater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java index 1acc63eb91..d17dc0131c 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; @@ -25,9 +25,9 @@ import com.maxmind.geoip2.exception.AddressNotFoundException; import com.maxmind.geoip2.model.CityResponse; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationService; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; public class MaxmindGeolocationService implements GeolocationService { private static final Logger LOGGER = Logger.getLogger(MaxmindGeolocationService.class); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java index 138964e697..ab394c11dc 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNode.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; @@ -27,12 +27,12 @@ import java.util.Set; import java.util.TreeMap; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Location; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeException.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeException.java index 20216a0bbf..3c97575fa8 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeException.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkUpdater.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkUpdater.java index 2ae2938806..4a4db12917 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkUpdater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java similarity index 91% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java index 131e3b3258..96ef82c1c5 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java @@ -13,22 +13,22 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; - -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; -import com.comcast.cdn.traffic_control.traffic_router.core.router.HTTPRouteResult; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; +package org.apache.traffic_control.traffic_router.core.loc; + +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.router.HTTPRouteResult; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; @@ -44,10 +44,10 @@ import java.util.Set; import java.util.regex.Pattern; -import static com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.ALLOWED; -import static com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.ALTERNATE_WITHOUT_CACHE; -import static com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.ALTERNATE_WITH_CACHE; -import static com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.DENIED; +import static org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.ALLOWED; +import static org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.ALTERNATE_WITHOUT_CACHE; +import static org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.ALTERNATE_WITH_CACHE; +import static org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType.DENIED; public final class RegionalGeo { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoCoordinateRange.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoCoordinateRange.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoCoordinateRange.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoCoordinateRange.java index e348452e4b..c85749ab1a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoCoordinateRange.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoCoordinateRange.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java index 9f9d7d125b..3ab05da433 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.util.ArrayList; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoResult.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoResult.java index c9d9de5063..96d390dd47 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoResult.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; public class RegionalGeoResult { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java index f80b92e1a1..053a4eae5a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java index 4d8ce369b9..b0f23a481f 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import java.io.File; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java similarity index 89% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java index a5900e566e..00474f5bdf 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorResourceUrl.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.monitor; +package org.apache.traffic_control.traffic_router.core.monitor; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ResourceUrl; +import org.apache.traffic_control.traffic_router.core.util.ResourceUrl; class TrafficMonitorResourceUrl implements ResourceUrl { private final TrafficMonitorWatcher trafficMonitorWatcher; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java index f571376a80..42373c0fb9 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.monitor; +package org.apache.traffic_control.traffic_router.core.monitor; import java.io.File; import java.io.FileInputStream; @@ -26,15 +26,15 @@ import java.util.List; import java.util.Properties; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.config.ConfigHandler; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.util.AbstractUpdatable; -import com.comcast.cdn.traffic_control.traffic_router.core.util.PeriodicResourceUpdater; +import org.apache.traffic_control.traffic_router.core.config.ConfigHandler; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.AbstractUpdatable; +import org.apache.traffic_control.traffic_router.core.util.PeriodicResourceUpdater; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ApplicationContextEvent; import org.springframework.context.event.ContextClosedEvent; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/DNSRequest.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/DNSRequest.java index e30b809fc7..b1c331c8e6 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/DNSRequest.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/DNSRequest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.request; +package org.apache.traffic_control.traffic_router.core.request; import org.xbill.DNS.Name; import org.xbill.DNS.Zone; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/HTTPRequest.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/HTTPRequest.java index 2410be7db0..a6e433f9fd 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/HTTPRequest.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/HTTPRequest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.request; +package org.apache.traffic_control.traffic_router.core.request; import java.net.URL; import java.util.Enumeration; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/Request.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/Request.java index f6ac1c9035..c27b32a6a7 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/Request.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/Request.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.request; +package org.apache.traffic_control.traffic_router.core.request; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/RequestMatcher.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/RequestMatcher.java index d3bd57952e..882f225225 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/request/RequestMatcher.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.request; +package org.apache.traffic_control.traffic_router.core.request; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ComparableStringByLength; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type; +import org.apache.traffic_control.traffic_router.core.util.ComparableStringByLength; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/DNSRouteResult.java similarity index 85% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/DNSRouteResult.java index cb7db8f91f..3d33760681 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRouteResult.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/DNSRouteResult.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; import java.util.ArrayList; import java.util.List; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; public class DNSRouteResult implements RouteResult { private List addresses; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/HTTPRouteResult.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/HTTPRouteResult.java index b2ae848c7d..9ee128b8c0 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/HTTPRouteResult.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/HTTPRouteResult.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; import java.net.URL; import java.util.ArrayList; @@ -22,7 +22,7 @@ import java.util.Set; import java.util.StringJoiner; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; public class HTTPRouteResult implements RouteResult { final private List urls = new ArrayList(); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/LocationComparator.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/LocationComparator.java similarity index 85% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/LocationComparator.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/LocationComparator.java index 0606c052a2..db3604e3c2 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/LocationComparator.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/LocationComparator.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; import java.util.Comparator; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Location; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; /** * diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/RouteResult.java similarity index 90% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/RouteResult.java index 4a9dedf0b6..0e25f13db8 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/RouteResult.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/RouteResult.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; public interface RouteResult { public Object getResult(); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/StatTracker.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/StatTracker.java index 0aac2c9e02..b926a76aa6 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatTracker.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/StatTracker.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; import java.util.HashMap; import java.util.List; @@ -23,13 +23,13 @@ import org.xbill.DNS.SetResponse; import org.xbill.DNS.Zone; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.RouteType; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.RouteType; @SuppressWarnings("PMD.ExcessivePublicCount") public class StatTracker { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java index 86ab09b3e5..3c60cc7221 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java @@ -13,47 +13,47 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; - -import com.comcast.cdn.traffic_control.traffic_router.configuration.ConfigurationListener; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.ZoneManager; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.Steering; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringGeolocationComparator; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringRegistry; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringResult; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringTarget; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation.LocalizationMethod; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Location; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.TrafficRouterLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.ConsistentHasher; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.AnonymousIp; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationRegistry; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.MaxmindGeolocationService; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkNode; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkNodeException; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeo; -import com.comcast.cdn.traffic_control.traffic_router.core.request.DNSRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.RouteType; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationService; +package org.apache.traffic_control.traffic_router.core.router; + +import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; +import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; +import org.apache.traffic_control.traffic_router.core.dns.ZoneManager; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.Steering; +import org.apache.traffic_control.traffic_router.core.ds.SteeringGeolocationComparator; +import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; +import org.apache.traffic_control.traffic_router.core.ds.SteeringResult; +import org.apache.traffic_control.traffic_router.core.ds.SteeringTarget; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation.LocalizationMethod; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.core.edge.Node; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.edge.TrafficRouterLocation; +import org.apache.traffic_control.traffic_router.core.hash.ConsistentHasher; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIp; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; +import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; +import org.apache.traffic_control.traffic_router.core.loc.MaxmindGeolocationService; +import org.apache.traffic_control.traffic_router.core.loc.NetworkNode; +import org.apache.traffic_control.traffic_router.core.loc.NetworkNodeException; +import org.apache.traffic_control.traffic_router.core.loc.RegionalGeo; +import org.apache.traffic_control.traffic_router.core.request.DNSRequest; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.RouteType; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; import com.fasterxml.jackson.databind.JsonNode; import org.apache.log4j.Logger; import org.springframework.beans.BeansException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java similarity index 88% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java index 71e7c303df..4a56752433 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java @@ -13,26 +13,26 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; import java.io.IOException; import java.net.UnknownHostException; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringRegistry; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationRegistry; +import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; +import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; import com.fasterxml.jackson.databind.JsonNode; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.NameServer; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationService; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; public class TrafficRouterManager implements ApplicationListener { private static final Logger LOGGER = Logger.getLogger(TrafficRouterManager.class); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java index f71e937e79..f8ae18c826 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClient.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.secure; +package org.apache.traffic_control.traffic_router.core.secure; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ProtectedFetcher; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.ProtectedFetcher; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java index 50936935e8..29cb3c2cf2 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPoller.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.secure; +package org.apache.traffic_control.traffic_router.core.secure; -import com.comcast.cdn.traffic_control.traffic_router.configuration.ConfigurationListener; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java similarity index 88% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java index 97db5f0756..514fe30cd1 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesPublisher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java @@ -1,4 +1,4 @@ -package com.comcast.cdn.traffic_control.traffic_router.core.secure; +package org.apache.traffic_control.traffic_router.core.secure; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,11 +20,11 @@ */ -import com.comcast.cdn.traffic_control.traffic_router.core.config.CertificateChecker; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; +import org.apache.traffic_control.traffic_router.core.config.CertificateChecker; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesResponse.java similarity index 87% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesResponse.java index 4622cfeef0..705fd832cf 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesResponse.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesResponse.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.secure; +package org.apache.traffic_control.traffic_router.core.secure; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/status/model/CacheModel.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/status/model/CacheModel.java index eaaa59e99a..a26b4cd263 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/CacheModel.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/status/model/CacheModel.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.status.model; +package org.apache.traffic_control.traffic_router.core.status.model; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/status/model/LocationModel.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/status/model/LocationModel.java index afd5f69fc2..dd66ca9c9e 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/status/model/LocationModel.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/status/model/LocationModel.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.status.model; +package org.apache.traffic_control.traffic_router.core.status.model; import java.util.List; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java index 7e54a23bd3..07d419048b 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; -import com.comcast.cdn.traffic_control.traffic_router.core.config.WatcherConfig; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.AbstractServiceUpdater; +import org.apache.traffic_control.traffic_router.core.config.WatcherConfig; +import org.apache.traffic_control.traffic_router.core.loc.AbstractServiceUpdater; import com.fasterxml.jackson.databind.JsonNode; import org.apache.log4j.Logger; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractUpdatable.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractUpdatable.java index 1e064a8b1e..36a13bdee5 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractUpdatable.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractUpdatable.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; public abstract class AbstractUpdatable { private long lastUpdated = 0; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/CidrAddress.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/CidrAddress.java index ab904936c8..91bdc19ba7 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/CidrAddress.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/CidrAddress.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkNodeException; +import org.apache.traffic_control.traffic_router.core.loc.NetworkNodeException; import java.net.Inet4Address; import java.net.Inet6Address; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ComparableStringByLength.java similarity index 96% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ComparableStringByLength.java index 4439619998..9fd1d8de3b 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLength.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ComparableStringByLength.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; public class ComparableStringByLength implements Comparable { final private String string; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ComparableTreeSet.java similarity index 95% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ComparableTreeSet.java index 1bc223c576..a444b7419d 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableTreeSet.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ComparableTreeSet.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.util.TreeSet; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Config.java similarity index 94% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Config.java index 1cee36c37e..b751212cd4 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Config.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Config.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.io.File; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java similarity index 87% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java index be64e44605..8016518429 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DataExporter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.io.IOException; import java.io.InputStream; @@ -30,20 +30,20 @@ import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Location; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.PropertiesAndCaches; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkNode; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkNodeException; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.core.status.model.CacheModel; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.core.edge.PropertiesAndCaches; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; +import org.apache.traffic_control.traffic_router.core.loc.NetworkNode; +import org.apache.traffic_control.traffic_router.core.loc.NetworkNodeException; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.core.status.model.CacheModel; public class DataExporter { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DefaultResourceUrl.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DefaultResourceUrl.java index a103f30a99..db8f85b678 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/DefaultResourceUrl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DefaultResourceUrl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; class DefaultResourceUrl implements ResourceUrl { private final String[] urla; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/FederationExporter.java similarity index 90% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/FederationExporter.java index 61bdc26f3c..69ac54b2f5 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FederationExporter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/FederationExporter.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.Federation; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationMapping; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationRegistry; +import org.apache.traffic_control.traffic_router.core.loc.Federation; +import org.apache.traffic_control.traffic_router.core.loc.FederationMapping; +import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; import java.util.ArrayList; import java.util.HashMap; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java similarity index 99% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java index 3d4b847585..d91b3720c2 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/Fetcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/JsonUtils.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/JsonUtils.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/JsonUtils.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/JsonUtils.java index fa7feda572..1cbe94833f 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/JsonUtils.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/JsonUtils.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import com.fasterxml.jackson.databind.JsonNode; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/JsonUtilsException.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/JsonUtilsException.java similarity index 92% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/JsonUtilsException.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/JsonUtilsException.java index 15c6af5b41..903ceea898 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/JsonUtilsException.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/JsonUtilsException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; public class JsonUtilsException extends Exception { diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java similarity index 93% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java index 6218ddf568..fc1f7755da 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/LanguidState.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.net.InetAddress; import java.net.UnknownHostException; @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.log4j.Logger; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; public class LanguidState { private static final Logger LOGGER = Logger.getLogger(LanguidState.class); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java similarity index 99% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java index 0993562874..0b490c97e6 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.io.BufferedReader; import java.io.File; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ProtectedFetcher.java similarity index 98% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ProtectedFetcher.java index 65e34cc9c9..55a0fd19ba 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ProtectedFetcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ProtectedFetcher.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.io.IOException; import java.net.HttpCookie; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ResourceUrl.java similarity index 90% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ResourceUrl.java index 6669452985..dd88b4daab 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ResourceUrl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/ResourceUrl.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; public interface ResourceUrl { public String nextUrl(); diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/StringProtector.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/StringProtector.java index 351022f019..7e7a70015a 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/StringProtector.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/StringProtector.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/TrafficOpsUtils.java similarity index 97% rename from traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java rename to traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/TrafficOpsUtils.java index c4163dea72..94a2241033 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/util/TrafficOpsUtils.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/TrafficOpsUtils.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml b/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml index 55ef754d61..8b0c21fb1e 100644 --- a/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml +++ b/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml @@ -22,8 +22,8 @@ - - + + @@ -46,16 +46,16 @@ - + - + - + @@ -66,9 +66,9 @@ - + - + @@ -78,9 +78,9 @@ - + - + @@ -89,7 +89,7 @@ - + @@ -108,16 +108,16 @@ - + - + - + @@ -136,15 +136,15 @@ - + - - + + - + @@ -153,7 +153,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -169,7 +169,7 @@ - @@ -178,7 +178,7 @@ - @@ -187,7 +187,7 @@ - @@ -200,7 +200,7 @@ - + @@ -215,18 +215,18 @@ - + - + - + @@ -265,7 +265,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -356,17 +356,17 @@ /clientaccesspolicy.xml - + - + - + diff --git a/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml b/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml index ecbc51fd0a..ffc19b72a5 100644 --- a/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml +++ b/traffic_router/core/src/main/webapp/WEB-INF/status-servlet.xml @@ -21,5 +21,5 @@ - + diff --git a/traffic_router/core/src/test/conf/log4j.properties b/traffic_router/core/src/test/conf/log4j.properties index 5c0b763d4a..da8bdbe4ca 100644 --- a/traffic_router/core/src/test/conf/log4j.properties +++ b/traffic_router/core/src/test/conf/log4j.properties @@ -41,7 +41,7 @@ log4j.appender.A1.threshold=ALL log4j.rootLogger=WARN, A1 # Set application logger levels -log4j.logger.com.comcast.cdn.traffic_control.traffic_router=INFO +log4j.logger.org.apache.traffic_control.traffic_router=INFO -log4j.logger.com.comcast.cdn.traffic_control.traffic_router.core.access=INFO, ACCESS -log4j.additivity.com.comcast.cdn.traffic_control.traffic_router.core.access=false +log4j.logger.org.apache.traffic_control.traffic_router.core.access=INFO, ACCESS +log4j.additivity.org.apache.traffic_control.traffic_router.core.access=false diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/CatalinaTrafficRouter.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/CatalinaTrafficRouter.java index 9dcca02c9a..4e9ffc68a4 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/CatalinaTrafficRouter.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/CatalinaTrafficRouter.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core; +package org.apache.traffic_control.traffic_router.core; import org.apache.catalina.Wrapper; import org.apache.catalina.connector.Connector; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java similarity index 86% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java index 11953b5b10..d2d1e1000e 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TestBase.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core; +package org.apache.traffic_control.traffic_router.core; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificates; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificates; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; import org.apache.log4j.LogManager; @@ -25,10 +25,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanRegistrationException; import javax.management.MBeanServer; -import javax.management.NotCompliantMBeanException; import javax.management.ObjectName; import java.lang.management.ManagementFactory; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java index b058b78c50..c8a5aa6e23 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/TrafficRouterStart.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core; +package org.apache.traffic_control.traffic_router.core; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/config/CertificateCheckerTest.java similarity index 93% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/config/CertificateCheckerTest.java index 587e64dffc..4f6d25bb74 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateCheckerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/config/CertificateCheckerTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.config; +package org.apache.traffic_control.traffic_router.core.config; -import com.comcast.cdn.traffic_control.traffic_router.shared.Certificate; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.shared.Certificate; +import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandlerTest.java similarity index 94% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandlerTest.java index b79841ed78..daf764816b 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/config/ConfigHandlerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandlerTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.config; +package org.apache.traffic_control.traffic_router.core.config; import java.util.Arrays; import java.util.Collection; @@ -23,15 +23,15 @@ import java.util.Set; import java.util.TreeSet; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation.LocalizationMethod; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation.LocalizationMethod; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; import org.junit.Before; import org.junit.Test; @@ -48,8 +48,8 @@ import org.powermock.api.mockito.PowerMockito; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; import org.powermock.reflect.Whitebox; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java similarity index 96% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java index 27701e858d..3f63076b87 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java @@ -13,17 +13,16 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; @@ -39,7 +38,6 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.spy; import static org.powermock.api.mockito.PowerMockito.whenNew; -import static org.powermock.api.support.membermodification.MemberModifier.stub; @RunWith(PowerMockRunner.class) @PrepareForTest({Random.class, Header.class, DNSAccessEventBuilder.class, System.class, DNSAccessRecord.class}) diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSExceptionTest.java similarity index 93% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSExceptionTest.java index 83fd67a422..5e1aada645 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSExceptionTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSExceptionTest.java @@ -13,15 +13,13 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import static org.junit.Assert.assertEquals; import org.junit.Test; import org.xbill.DNS.Rcode; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSException; - public class DNSExceptionTest { @Test diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMainTest.java similarity index 92% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMainTest.java index 40d5ba6636..54e35bfedd 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerMainTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMainTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.util.ArrayList; import java.util.List; @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol.Protocol; +import org.apache.traffic_control.traffic_router.core.dns.protocol.Protocol; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java similarity index 95% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java index 730d319c93..ca3e418544 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/NameServerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java @@ -13,16 +13,14 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.Before; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerTest.java similarity index 87% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerTest.java index a82025baf6..a24a03f182 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -34,7 +34,7 @@ import java.util.Set; import java.util.Iterator; -import com.comcast.cdn.traffic_control.traffic_router.core.util.IntegrationTest; +import org.apache.traffic_control.traffic_router.core.util.IntegrationTest; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; @@ -47,14 +47,14 @@ import org.xbill.DNS.Type; import org.xbill.DNS.Zone; -import com.comcast.cdn.traffic_control.traffic_router.core.TestBase; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.TestBase; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import com.google.common.cache.CacheStats; import com.google.common.net.InetAddresses; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java similarity index 94% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java index 8b06ea59ec..36662bcc2e 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; - -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; -import com.comcast.cdn.traffic_control.traffic_router.core.util.TrafficOpsUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; +package org.apache.traffic_control.traffic_router.core.dns; + +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java similarity index 99% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java index ebe4648dec..57287b1554 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns; +package org.apache.traffic_control.traffic_router.core.dns; import java.net.InetAddress; import java.security.PrivateKey; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/keys/RRSetsBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/keys/RRSetsBuilderTest.java similarity index 90% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/keys/RRSetsBuilderTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/keys/RRSetsBuilderTest.java index 9d0a355eca..4a247e65da 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/keys/RRSetsBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/keys/RRSetsBuilderTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.keys; +package org.apache.traffic_control.traffic_router.core.dns.keys; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.RRSetsBuilder; -import com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords; +import org.apache.traffic_control.traffic_router.core.dns.RRSetsBuilder; +import org.apache.traffic_control.traffic_router.shared.ZoneTestRecords; import org.junit.Before; import org.junit.Test; import org.xbill.DNS.RRset; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java similarity index 94% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index fcb271b837..005f706335 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; +import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; +import org.apache.traffic_control.traffic_router.core.dns.NameServer; import org.apache.log4j.Logger; import org.junit.Before; import org.junit.Test; @@ -75,7 +75,7 @@ public Long answer(InvocationOnMock invocation) { when(System.currentTimeMillis()).then(currentTimeAnswer); mockStatic(Logger.class); - when(Logger.getLogger("com.comcast.cdn.traffic_control.traffic_router.core.access")).thenAnswer(invocation -> accessLogger); + when(Logger.getLogger("org.apache.traffic_control.traffic_router.core.access")).thenAnswer(invocation -> accessLogger); header = new Header(); header.setID(65535); diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java similarity index 95% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java index ade8a9e004..d91a02d75f 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/TCPTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -49,9 +49,9 @@ import org.xbill.DNS.Section; import org.xbill.DNS.Type; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.NameServer; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol.TCP.TCPSocketHandler; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessRecord; +import org.apache.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.traffic_control.traffic_router.core.dns.protocol.TCP.TCPSocketHandler; +import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; @RunWith(PowerMockRunner.class) @PrepareForTest({AbstractProtocol.class, Message.class}) diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java similarity index 95% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java index 32f516dc81..9805311d45 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/protocol/UDPTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol; +package org.apache.traffic_control.traffic_router.core.dns.protocol; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -48,9 +48,9 @@ import org.xbill.DNS.Section; import org.xbill.DNS.Type; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.NameServer; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.protocol.UDP.UDPPacketHandler; -import com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSAccessRecord; +import org.apache.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.traffic_control.traffic_router.core.dns.protocol.UDP.UDPPacketHandler; +import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; @RunWith(PowerMockRunner.class) @PrepareForTest({AbstractProtocol.class, Message.class}) diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java similarity index 93% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java index 71d589bd7f..c26223a72f 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.request.Request; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -27,8 +27,8 @@ import static org.hamcrest.Matchers.lessThan; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HOST; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.PATH; +import static org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HOST; +import static org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.PATH; import static org.mockito.Mockito.when; @PrepareForTest(DeliveryService.class) diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java similarity index 95% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java index 2306fcdd69..2702372f7e 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceTest.java @@ -13,17 +13,14 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.HashSet; -import java.util.Set; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringGeolocationComparatorTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/SteeringGeolocationComparatorTest.java similarity index 96% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringGeolocationComparatorTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/SteeringGeolocationComparatorTest.java index f769f80c41..74c9c6ac38 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringGeolocationComparatorTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/SteeringGeolocationComparatorTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java index 2cd38d26ba..50bbdf2af2 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistryTest.java @@ -13,12 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.ds; +package org.apache.traffic_control.traffic_router.core.ds; import org.junit.Test; -import java.util.Arrays; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheRegisterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/edge/CacheRegisterTest.java similarity index 85% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheRegisterTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/edge/CacheRegisterTest.java index 303ef01eff..471167fcb6 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/edge/CacheRegisterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/edge/CacheRegisterTest.java @@ -13,19 +13,19 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.edge; +package org.apache.traffic_control.traffic_router.core.edge; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.request.Request; import org.junit.Before; import org.junit.Test; import java.util.TreeSet; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HOST; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.PATH; +import static org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HOST; +import static org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.PATH; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ConsistentHashTest.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ConsistentHashTest.java index 84c8cbf7ff..0b277c7533 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ConsistentHashTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ConsistentHashTest.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/CoverageZoneTest.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/CoverageZoneTest.java index 6b6c01d50c..95b5c180e2 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/CoverageZoneTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/CoverageZoneTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/DeliveryServicesTest.java similarity index 95% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/DeliveryServicesTest.java index 54adfb9b97..a7b01d2e07 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/DeliveryServicesTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/DeliveryServicesTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import org.apache.catalina.LifecycleException; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java index 5f2fcc6c8a..a4e45099fa 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ExternalTestSuite.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.CatalinaTrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.CatalinaTrafficRouter; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import org.apache.catalina.LifecycleException; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/HttpDataServer.java similarity index 99% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/HttpDataServer.java index 94d2ea345d..7cf7d38d79 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/HttpDataServer.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/HttpDataServer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/LocationsTest.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/LocationsTest.java index 6bc7a52653..a9f48d9fe7 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/LocationsTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/LocationsTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/RouterTest.java similarity index 99% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/RouterTest.java index 9b35db1850..9b68e8dd0a 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/RouterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/RouterTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/StatsTest.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/StatsTest.java index b68b43b059..160e623781 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/StatsTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/StatsTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.catalina.LifecycleException; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/SteeringTest.java similarity index 99% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/SteeringTest.java index e365ef8102..791d7fd3be 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/SteeringTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.http.RouterFilter; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.http.RouterFilter; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ZonesTest.java similarity index 94% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ZonesTest.java index 615ad0039e..f67745bf3e 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/ZonesTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ZonesTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.external; +package org.apache.traffic_control.traffic_router.core.external; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ExternalTest; +import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.catalina.LifecycleException; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/BinarySearchTest.java similarity index 94% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/BinarySearchTest.java index e4b4e7a804..cfca9efae1 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/BinarySearchTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/BinarySearchTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hashing; +package org.apache.traffic_control.traffic_router.core.hashing; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java similarity index 91% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java index a9b0dc45fc..412bb9f6e3 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/ConsistentHasherTest.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hashing; - -import com.comcast.cdn.traffic_control.traffic_router.core.ds.Dispersion; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.ConsistentHasher; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.DefaultHashable; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.Hashable; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.MD5HashFunction; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.NumberSearcher; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; +package org.apache.traffic_control.traffic_router.core.hashing; + +import org.apache.traffic_control.traffic_router.core.ds.Dispersion; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.hash.ConsistentHasher; +import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; +import org.apache.traffic_control.traffic_router.core.hash.Hashable; +import org.apache.traffic_control.traffic_router.core.hash.MD5HashFunction; +import org.apache.traffic_control.traffic_router.core.hash.NumberSearcher; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; @@ -49,7 +49,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.mockito.MockitoAnnotations.initMocks; public class ConsistentHasherTest { @Mock diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/HashableTest.java similarity index 82% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/HashableTest.java index b1757409c8..ab36c4d7a8 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/HashableTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/HashableTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hashing; +package org.apache.traffic_control.traffic_router.core.hashing; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.DefaultHashable; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.NumberSearcher; +import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; +import org.apache.traffic_control.traffic_router.core.hash.NumberSearcher; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -26,7 +26,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertThat; -import static org.mockito.MockitoAnnotations.initMocks; public class HashableTest { @Mock diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java similarity index 88% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java index 8d83522629..7c01f1926c 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/hashing/NumberSearcherTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.hashing; +package org.apache.traffic_control.traffic_router.core.hashing; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.NumberSearcher; +import org.apache.traffic_control.traffic_router.core.hash.NumberSearcher; import org.junit.Test; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java similarity index 96% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java index 2662e9b6b2..5532ecbc7c 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.http; +package org.apache.traffic_control.traffic_router.core.http; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java index f54831d29e..c22cd72523 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseServiceTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseServiceTest.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseServiceTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseServiceTest.java index c68276094b..cd9a0171a5 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseServiceTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseServiceTest.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpTest.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpTest.java index 7fe97f7ecb..9a8d3ea84d 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpTest.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; public class AnonymousIpTest { private TrafficRouter trafficRouter; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpWhitelistTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelistTest.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpWhitelistTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelistTest.java index 2a80bdc16b..029a9a41da 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIpWhitelistTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelistTest.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/CoverageZoneTest.java similarity index 87% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/CoverageZoneTest.java index 67844401e8..982ef7b205 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/CoverageZoneTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/CoverageZoneTest.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; - -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation.LocalizationMethod; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +package org.apache.traffic_control.traffic_router.core.loc; + +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation.LocalizationMethod; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java similarity index 95% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java index f8bdebb862..038bd99c71 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilderTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; import org.junit.Test; import static org.hamcrest.CoreMatchers.not; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationRegistryTest.java similarity index 89% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationRegistryTest.java index 11f80ebe0a..70cd58c827 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationRegistryTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationRegistryTest.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; -import com.comcast.cdn.traffic_control.traffic_router.core.util.ComparableTreeSet; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; +import org.apache.traffic_control.traffic_router.core.util.ComparableTreeSet; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java similarity index 96% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java index b4d4b8ab2c..99b9cdb9f1 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/FederationsBuilderTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java similarity index 89% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java index 3ef4ccc6f7..abb1115626 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/GeoTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.core.util.IntegrationTest; +import org.apache.traffic_control.traffic_router.core.util.IntegrationTest; import org.apache.log4j.Logger; import org.junit.Before; import org.junit.BeforeClass; @@ -25,8 +25,8 @@ import org.junit.Assert; -import com.comcast.cdn.traffic_control.traffic_router.core.TestBase; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.TestBase; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java similarity index 91% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java index b307f4c2e4..f298c8864c 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeoIP2Test.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java similarity index 98% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java index 15c7ef1693..f863340990 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.model.CityResponse; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java index e4301af565..7552edbe8c 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -37,7 +37,6 @@ import org.junit.Test; import com.google.common.net.InetAddresses; -import org.junit.experimental.categories.Category; public class NetworkNodeTest { private static final Logger LOGGER = Logger.getLogger(NetworkNodeTest.class); diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java similarity index 99% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java index 2e7834752d..f6b5153ea2 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java similarity index 99% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java index fa6391cbfa..c434158001 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; +package org.apache.traffic_control.traffic_router.core.loc; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoTest.java similarity index 92% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoTest.java index cc77ce890e..efb3aaa4b8 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoTest.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.loc; - -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.HTTPRouteResult; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; +package org.apache.traffic_control.traffic_router.core.loc; + +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.loc.RegionalGeoResult.RegionalGeoResultType; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.HTTPRouteResult; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/request/RequestMatcherTest.java similarity index 92% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/request/RequestMatcherTest.java index 6fb7b1a71c..b70b07cc7f 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/request/RequestMatcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/request/RequestMatcherTest.java @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.request; +package org.apache.traffic_control.traffic_router.core.request; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HOST; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.PATH; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HEADER; +import static org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HOST; +import static org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.PATH; +import static org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type.HEADER; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.fail; @@ -25,7 +25,6 @@ import org.junit.Test; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java similarity index 91% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java index f3f0c43921..52869e0f08 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/CacheLocationComparatorTest.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; public class CacheLocationComparatorTest { diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java similarity index 90% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java index 962bbfec04..0200a58248 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/CacheRegisterBuilder.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.config.ParseException; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils; -import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.config.ParseException; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import java.net.UnknownHostException; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java similarity index 88% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java index 93e8972590..34b017180b 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java @@ -13,20 +13,20 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; - -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationRegistry; -import com.comcast.cdn.traffic_control.traffic_router.core.request.DNSRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; - -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; +package org.apache.traffic_control.traffic_router.core.router; + +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; +import org.apache.traffic_control.traffic_router.core.request.DNSRequest; +import org.apache.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; + +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; import com.fasterxml.jackson.databind.JsonNode; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java similarity index 89% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java index 1714dc8b09..c35ac236fa 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DnsNameGenerator.java similarity index 96% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DnsNameGenerator.java index becc8340de..5f445f06c2 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DnsNameGenerator.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DnsNameGenerator.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; import com.fasterxml.jackson.databind.JsonNode; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java similarity index 91% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java index de86d3d470..b8980b77ef 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringResult; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringTarget; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.SteeringResult; +import org.apache.traffic_control.traffic_router.core.ds.SteeringTarget; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import java.util.ArrayList; import java.util.Collections; @@ -28,7 +28,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java similarity index 83% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java index 704b4d1b9d..6a1382497c 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; -import com.comcast.cdn.traffic_control.traffic_router.core.util.IntegrationTest; +import org.apache.traffic_control.traffic_router.core.util.IntegrationTest; import org.apache.log4j.Logger; import org.junit.Before; import org.junit.BeforeClass; @@ -23,11 +23,11 @@ import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; -import com.comcast.cdn.traffic_control.traffic_router.core.TestBase; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.GeolocationDatabaseUpdater; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.NetworkUpdater; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.TestBase; +import org.apache.traffic_control.traffic_router.core.loc.GeolocationDatabaseUpdater; +import org.apache.traffic_control.traffic_router.core.loc.NetworkUpdater; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java similarity index 89% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java index 4ba2a0981f..8a03d16dd9 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterHTTPRoutingMissesTest.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; +package org.apache.traffic_control.traffic_router.core.router; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterTest.java similarity index 91% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterTest.java index bea123eca4..990b2a4a2b 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterTest.java @@ -13,25 +13,24 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.router; - -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Cache; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheLocation.LocalizationMethod; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.InetRecord; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.Node.IPVersions; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.DeliveryService; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.Dispersion; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringRegistry; -import com.comcast.cdn.traffic_control.traffic_router.core.hash.ConsistentHasher; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationRegistry; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.core.request.DNSRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.HTTPRequest; -import com.comcast.cdn.traffic_control.traffic_router.core.request.Request; -import com.comcast.cdn.traffic_control.traffic_router.core.router.StatTracker.Track; -import com.comcast.cdn.traffic_control.traffic_router.core.util.CidrAddress; +package org.apache.traffic_control.traffic_router.core.router; + +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.ds.Dispersion; +import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; +import org.apache.traffic_control.traffic_router.core.hash.ConsistentHasher; +import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.request.DNSRequest; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.request.Request; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; +import org.apache.traffic_control.traffic_router.core.util.CidrAddress; import org.junit.Before; import org.junit.Test; import org.xbill.DNS.Name; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClientTest.java similarity index 99% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClientTest.java index 68f277a771..1ddb5d1d56 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/CertificatesClientTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClientTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.secure; +package org.apache.traffic_control.traffic_router.core.secure; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/secure/Pkcs1Test.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/secure/Pkcs1Test.java index d6a9196600..654f35ce45 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/secure/Pkcs1Test.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/secure/Pkcs1Test.java @@ -13,19 +13,17 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.secure; +package org.apache.traffic_control.traffic_router.core.secure; -import com.comcast.cdn.traffic_control.traffic_router.secure.Pkcs1; +import org.apache.traffic_control.traffic_router.secure.Pkcs1; import org.junit.Test; import java.math.BigInteger; import java.security.interfaces.RSAPrivateKey; -import java.security.interfaces.RSAPublicKey; import java.security.spec.KeySpec; //import java.security.spec.RSAMultiPrimePrivateCrtKeySpec; //import java.security.spec.RSAPrivateKeySpec; import java.security.spec.PKCS8EncodedKeySpec; -import java.security.spec.RSAPublicKeySpec; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java similarity index 83% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java index 4b76ea2cbe..b11f62b8b0 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; - -import com.comcast.cdn.traffic_control.traffic_router.core.TestBase; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringRegistry; -import com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringWatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.edge.CacheRegister; -import com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationsWatcher; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouter; -import com.comcast.cdn.traffic_control.traffic_router.core.router.TrafficRouterManager; +package org.apache.traffic_control.traffic_router.core.util; + +import org.apache.traffic_control.traffic_router.core.TestBase; +import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; +import org.apache.traffic_control.traffic_router.core.ds.SteeringWatcher; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.loc.FederationsWatcher; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.log4j.Logger; @@ -35,19 +35,18 @@ import java.nio.file.Files; import java.nio.file.Paths; -import static com.comcast.cdn.traffic_control.traffic_router.core.ds.SteeringWatcher.DEFAULT_STEERING_DATA_URL; -import static com.comcast.cdn.traffic_control.traffic_router.core.loc.FederationsWatcher.DEFAULT_FEDERATION_DATA_URL; +import static org.apache.traffic_control.traffic_router.core.ds.SteeringWatcher.DEFAULT_STEERING_DATA_URL; +import static org.apache.traffic_control.traffic_router.core.loc.FederationsWatcher.DEFAULT_FEDERATION_DATA_URL; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertNull; @Category(IntegrationTest.class) public class AbstractResourceWatcherTest { - private static final Logger LOGGER = Logger.getLogger(com.comcast.cdn.traffic_control.traffic_router.core.util.AbstractResourceWatcherTest.class); + private static final Logger LOGGER = Logger.getLogger(org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcherTest.class); private FederationsWatcher federationsWatcher; private SteeringWatcher steeringWatcher; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java similarity index 97% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java index 0be1f6a1c5..5a1739ef7b 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/ComparableStringByLengthTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/ExternalTest.java similarity index 92% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/ExternalTest.java index ae6cdea729..d5062b42c5 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/ExternalTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/ExternalTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; public interface ExternalTest { // Just a marker interface to designate tests that exercise traffic router externally as a client will. diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/FetcherTest.java similarity index 92% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/FetcherTest.java index e894c344e5..9d757fc313 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/FetcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/FetcherTest.java @@ -13,14 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; import org.junit.Test; import org.junit.runner.RunWith; -import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; import org.powermock.modules.junit4.PowerMockRunner; import java.io.BufferedReader; diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/IntegrationTest.java similarity index 91% rename from traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java rename to traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/IntegrationTest.java index a3dcc1b943..0dae1b8020 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/util/IntegrationTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/IntegrationTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.core.util; +package org.apache.traffic_control.traffic_router.core.util; public interface IntegrationTest { // Just a marker interface to separate unit tests from integration tests diff --git a/traffic_router/geolocation/pom.xml b/traffic_router/geolocation/pom.xml index 3201bcdef1..826b4f342d 100644 --- a/traffic_router/geolocation/pom.xml +++ b/traffic_router/geolocation/pom.xml @@ -24,7 +24,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> traffic_router - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router 5.0.0 4.0.0 diff --git a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java b/traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/Geolocation.java similarity index 98% rename from traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java rename to traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/Geolocation.java index e28ba57afe..da9e306f29 100644 --- a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/Geolocation.java +++ b/traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/Geolocation.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.geolocation; +package org.apache.traffic_control.traffic_router.geolocation; import java.util.HashMap; import java.util.Map; diff --git a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java b/traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/GeolocationException.java similarity index 92% rename from traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java rename to traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/GeolocationException.java index cc22ef5c98..9913a53143 100644 --- a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationException.java +++ b/traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/GeolocationException.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.geolocation; +package org.apache.traffic_control.traffic_router.geolocation; public class GeolocationException extends Exception { diff --git a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java b/traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/GeolocationService.java similarity index 95% rename from traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java rename to traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/GeolocationService.java index 5aa3bfaa53..0951cc4c35 100644 --- a/traffic_router/geolocation/src/main/java/com/comcast/cdn/traffic_control/traffic_router/geolocation/GeolocationService.java +++ b/traffic_router/geolocation/src/main/java/org/apache/traffic_control/traffic_router/geolocation/GeolocationService.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.geolocation; +package org.apache.traffic_control.traffic_router.geolocation; import java.io.File; import java.io.IOException; diff --git a/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java b/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java index 2f639c0114..ae1bd857fb 100644 --- a/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java +++ b/traffic_router/geolocation/src/test/java/geolocation/GeolocationTest.java @@ -20,7 +20,7 @@ import org.junit.Before; import org.junit.Test; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; public class GeolocationTest { diff --git a/traffic_router/neustar/pom.xml b/traffic_router/neustar/pom.xml index f7cc525f00..0bd66091ac 100644 --- a/traffic_router/neustar/pom.xml +++ b/traffic_router/neustar/pom.xml @@ -24,7 +24,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> traffic_router - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router 5.0.0 4.0.0 @@ -40,12 +40,12 @@ under the License. 1.1.0 - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_geolocation ${project.parent.version} - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router traffic_router_config ${project.parent.version} diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java similarity index 91% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java index d9bd537895..80e252df4f 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/NeustarGeolocationService.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar; +package org.apache.traffic_control.traffic_router.neustar; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationException; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.GeolocationService; +import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; import com.quova.bff.reader.exception.AddressNotFoundException; import com.quova.bff.reader.io.GPDatabaseReader; import com.quova.bff.reader.model.GeoPointResponse; diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java similarity index 87% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java index 7c6a8fc895..31ab478eb8 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar.configuration; +package org.apache.traffic_control.traffic_router.neustar.configuration; -import com.comcast.cdn.traffic_control.traffic_router.neustar.NeustarGeolocationService; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.TarExtractor; -import com.comcast.cdn.traffic_control.traffic_router.neustar.files.FilesMover; +import org.apache.traffic_control.traffic_router.neustar.NeustarGeolocationService; +import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; +import org.apache.traffic_control.traffic_router.neustar.data.TarExtractor; +import org.apache.traffic_control.traffic_router.neustar.files.FilesMover; -import com.comcast.cdn.traffic_control.traffic_router.configuration.ConfigurationListener; +import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java similarity index 82% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java index 5638634f06..50bdf0751b 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar.configuration; +package org.apache.traffic_control.traffic_router.neustar.configuration; -import com.comcast.cdn.traffic_control.traffic_router.neustar.NeustarGeolocationService; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; +import org.apache.traffic_control.traffic_router.neustar.NeustarGeolocationService; +import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java similarity index 92% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java index e786d04d91..386a92bffb 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar.configuration; +package org.apache.traffic_control.traffic_router.neustar.configuration; -import com.comcast.cdn.traffic_control.traffic_router.configuration.ConfigurationListener; +import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java similarity index 95% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java index a597bb9941..cacee3d197 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/HttpClient.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar.data; +package org.apache.traffic_control.traffic_router.neustar.data; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java similarity index 97% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java index 8291f9fab3..cfc9007bba 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar.data; +package org.apache.traffic_control.traffic_router.neustar.data; -import com.comcast.cdn.traffic_control.traffic_router.neustar.files.FilesMover; +import org.apache.traffic_control.traffic_router.neustar.files.FilesMover; import com.quova.bff.reader.io.GPDatabaseReader; import org.apache.http.Header; import org.apache.http.HttpResponse; diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java similarity index 97% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java index 08d2669133..43700a5280 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/data/TarExtractor.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar.data; +package org.apache.traffic_control.traffic_router.neustar.data; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; diff --git a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java similarity index 97% rename from traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java rename to traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java index 3834a1c0a4..fc6a2ba511 100644 --- a/traffic_router/neustar/src/main/java/com/comcast/cdn/traffic_control/traffic_router/neustar/files/FilesMover.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.neustar.files; +package org.apache.traffic_control.traffic_router.neustar.files; import org.apache.log4j.Logger; diff --git a/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java b/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java index ea418a738e..8e68d9a037 100644 --- a/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java +++ b/traffic_router/neustar/src/test/java/configuration/PeriodicUpdateConfigurationTest.java @@ -15,7 +15,7 @@ package configuration; -import com.comcast.cdn.traffic_control.traffic_router.neustar.configuration.NeustarConfiguration; +import org.apache.traffic_control.traffic_router.neustar.configuration.NeustarConfiguration; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java b/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java index 03b8f06a8c..b7b97d475b 100644 --- a/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java +++ b/traffic_router/neustar/src/test/java/configuration/ServiceRefresherTest.java @@ -15,9 +15,9 @@ package configuration; -import com.comcast.cdn.traffic_control.traffic_router.neustar.NeustarGeolocationService; -import com.comcast.cdn.traffic_control.traffic_router.neustar.configuration.ServiceRefresher; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; +import org.apache.traffic_control.traffic_router.neustar.NeustarGeolocationService; +import org.apache.traffic_control.traffic_router.neustar.configuration.ServiceRefresher; +import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; diff --git a/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java b/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java index 6d61e3cf27..6f6ed6fb31 100644 --- a/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java +++ b/traffic_router/neustar/src/test/java/configuration/TrafficRouterConfigurationListenerTest.java @@ -15,8 +15,8 @@ package configuration; -import com.comcast.cdn.traffic_control.traffic_router.neustar.configuration.ServiceRefresher; -import com.comcast.cdn.traffic_control.traffic_router.neustar.configuration.TrafficRouterConfigurationListener; +import org.apache.traffic_control.traffic_router.neustar.configuration.ServiceRefresher; +import org.apache.traffic_control.traffic_router.neustar.configuration.TrafficRouterConfigurationListener; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; diff --git a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java index 23918840d5..dd50d229ec 100644 --- a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java +++ b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java @@ -15,10 +15,10 @@ package data; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.HttpClient; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.TarExtractor; -import com.comcast.cdn.traffic_control.traffic_router.neustar.files.FilesMover; +import org.apache.traffic_control.traffic_router.neustar.data.HttpClient; +import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; +import org.apache.traffic_control.traffic_router.neustar.data.TarExtractor; +import org.apache.traffic_control.traffic_router.neustar.files.FilesMover; import com.quova.bff.reader.io.GPDatabaseReader; import org.apache.http.HttpEntity; import org.apache.http.StatusLine; diff --git a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java index 4b0f6b5b43..cd27a3b44e 100644 --- a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java +++ b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java @@ -15,7 +15,7 @@ package data; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.TarExtractor; +import org.apache.traffic_control.traffic_router.neustar.data.TarExtractor; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.log4j.ConsoleAppender; diff --git a/traffic_router/neustar/src/test/java/files/FilesMoverTest.java b/traffic_router/neustar/src/test/java/files/FilesMoverTest.java index b2f4fbdbdb..85d2fa21b8 100644 --- a/traffic_router/neustar/src/test/java/files/FilesMoverTest.java +++ b/traffic_router/neustar/src/test/java/files/FilesMoverTest.java @@ -15,7 +15,7 @@ package files; -import com.comcast.cdn.traffic_control.traffic_router.neustar.files.FilesMover; +import org.apache.traffic_control.traffic_router.neustar.files.FilesMover; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java index 78eb1ef130..323895903a 100644 --- a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java +++ b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java @@ -15,9 +15,9 @@ package geolocation; -import com.comcast.cdn.traffic_control.traffic_router.neustar.NeustarGeolocationService; -import com.comcast.cdn.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; -import com.comcast.cdn.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.neustar.NeustarGeolocationService; +import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import com.maxmind.db.Reader; import com.quova.bff.reader.io.GPDatabaseReader; import com.quova.bff.reader.model.GeoPointResponse; diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml index 2ed6b1a082..339b6b8a7e 100644 --- a/traffic_router/pom.xml +++ b/traffic_router/pom.xml @@ -17,7 +17,7 @@ 4.0.0 traffic_router - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router 5.0.0 pom traffic_router diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml index d05307ecc4..f62951bcf7 100644 --- a/traffic_router/shared/pom.xml +++ b/traffic_router/shared/pom.xml @@ -24,7 +24,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> traffic_router - com.comcast.cdn.traffic_control.traffic_router + org.apache.traffic_control.traffic_router 5.0.0 4.0.0 diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/BindPrivateKey.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java similarity index 97% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/BindPrivateKey.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java index 76a56b6209..311684e9f7 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/BindPrivateKey.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import org.apache.log4j.Logger; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs.java similarity index 97% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs.java index f39807fa32..8ed4cbf7f2 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1.java similarity index 95% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1.java index 3893e7349a..d86220d96f 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java similarity index 92% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java index 351ad3e6a4..bb3796e7b1 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import org.apache.log4j.Logger; import org.bouncycastle.asn1.ASN1Sequence; @@ -28,8 +28,8 @@ import java.security.spec.RSAPublicKeySpec; import java.util.Base64; -import static com.comcast.cdn.traffic_control.traffic_router.secure.Pkcs1.FOOTER; -import static com.comcast.cdn.traffic_control.traffic_router.secure.Pkcs1.HEADER; +import static org.apache.traffic_control.traffic_router.secure.Pkcs1.FOOTER; +import static org.apache.traffic_control.traffic_router.secure.Pkcs1.HEADER; public class Pkcs1KeySpecDecoder { // https://tools.ietf.org/html/rfc3447#appendix-A.1.1 diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java similarity index 96% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java index 5a2f764f69..4bd6c19078 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/Pkcs8.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.secure; +package org.apache.traffic_control.traffic_router.secure; import org.apache.log4j.Logger; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/Certificate.java similarity index 96% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/Certificate.java index bc8712b741..96313c98e9 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/Certificate.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/Certificate.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.shared; +package org.apache.traffic_control.traffic_router.shared; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/CertificateData.java similarity index 97% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/CertificateData.java index f9726f36d3..97b26e37e8 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/CertificateData.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/CertificateData.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.shared; +package org.apache.traffic_control.traffic_router.shared; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java similarity index 97% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java index 99246c1d08..939bc23844 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/DeliveryServiceCertificates.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.shared; +package org.apache.traffic_control.traffic_router.shared; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java similarity index 93% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java index 9586e6c1f1..2ac64e4f7a 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/DeliveryServiceCertificatesMBean.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.shared; +package org.apache.traffic_control.traffic_router.shared; import java.util.List; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/IsEqualCollection.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/IsEqualCollection.java similarity index 96% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/IsEqualCollection.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/IsEqualCollection.java index ef4deff7c9..e9945ccb4f 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/IsEqualCollection.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/IsEqualCollection.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.shared; +package org.apache.traffic_control.traffic_router.shared; import org.hamcrest.Description; import org.hamcrest.Factory; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/SigningData.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/SigningData.java similarity index 99% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/SigningData.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/SigningData.java index 811452d87f..f02ef0dce8 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/SigningData.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/SigningData.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.shared; +package org.apache.traffic_control.traffic_router.shared; import org.xbill.DNS.Record; import org.xbill.DNS.Section; diff --git a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/ZoneTestRecords.java similarity index 96% rename from traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java rename to traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/ZoneTestRecords.java index b1628f9009..e9563cf052 100644 --- a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/ZoneTestRecords.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package com.comcast.cdn.traffic_control.traffic_router.shared; +package org.apache.traffic_control.traffic_router.shared; -import com.comcast.cdn.traffic_control.traffic_router.secure.BindPrivateKey; -import com.comcast.cdn.traffic_control.traffic_router.secure.Pkcs1KeySpecDecoder; +import org.apache.traffic_control.traffic_router.secure.BindPrivateKey; +import org.apache.traffic_control.traffic_router.secure.Pkcs1KeySpecDecoder; import org.xbill.DNS.*; import java.net.Inet6Address; diff --git a/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java b/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java index 9d149ec570..83b93d5da9 100644 --- a/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java +++ b/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java @@ -15,7 +15,7 @@ package secure; -import com.comcast.cdn.traffic_control.traffic_router.secure.BindPrivateKey; +import org.apache.traffic_control.traffic_router.secure.BindPrivateKey; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java b/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java index 6670b0aaa1..77ee4babaa 100644 --- a/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java +++ b/traffic_router/shared/src/test/java/shared/DeliveryServiceCertificatesTest.java @@ -15,8 +15,8 @@ package shared; -import com.comcast.cdn.traffic_control.traffic_router.shared.CertificateData; -import com.comcast.cdn.traffic_control.traffic_router.shared.DeliveryServiceCertificates; +import org.apache.traffic_control.traffic_router.shared.CertificateData; +import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificates; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;