apache · zrhoffman · Jul 9, 2021 · Jul 9, 2021
diff --git 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
@@ -455,22 +455,22 @@ 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
 
 	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.<clinit> Adding BouncyCastle provider
-	        21-Feb-2020 05:16:07.452 WARNING [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol.<init> Serving wildcard certs for multiple domains
-	        21-Feb-2020 05:16:07.459 WARNING [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol.<init> Serving wildcard certs for multiple domains
-	        21-Feb-2020 05:16:07.459 WARNING [main] com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol.<init> 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.<clinit> Adding BouncyCastle provider
+	        21-Feb-2020 05:16:07.452 WARNING [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol.<init> Serving wildcard certs for multiple domains
+	        21-Feb-2020 05:16:07.459 WARNING [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol.<init> Serving wildcard certs for multiple domains
+	        21-Feb-2020 05:16:07.459 WARNING [main] org.apache.traffic_control.traffic_router.protocol.LanguidNioProtocol.<init> 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
@@ -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
@@ -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
@@ -29,7 +29,7 @@
         <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
         <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
 
-        <Listener className="com.comcast.cdn.traffic_control.traffic_router.tomcat.TomcatLifecycleListener" />
+        <Listener className="org.apache.traffic_control.traffic_router.tomcat.TomcatLifecycleListener" />
         <!-- A "Service" is a collection of one or more "Connectors" that share
                 a single "Container" Note: A "Service" is not itself a "Container", so you
                 may not define subcomponents such as "Valves" at this level. Documentation

diff --git a/traffic_ops/traffic_ops_golang/cdn/dnssec.go b/traffic_ops/traffic_ops_golang/cdn/dnssec.go
@@ -123,7 +123,7 @@ func CreateDNSSECKeys(w http.ResponseWriter, r *http.Request) {
 
 // DefaultDSTTL is the default DS Record TTL to use, if no CDN Snapshot exists, or if no tld.ttls.DS parameter exists.
 // This MUST be the same value as Traffic Router's default. Currently:
-// traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/SignatureManager.java:476
+// traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java:476
 // `final Long dsTtl = ZoneUtils.getLong(config.get("ttls"), "DS", 60);`.
 // If Traffic Router and Traffic Ops differ, and a user is using the default, errors may occur!
 // Users are advised to set the tld.ttls.DS CRConfig.json Parameter, so the default is not used!

diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
@@ -20,7 +20,7 @@
 	<packaging>pom</packaging>
 
 	<parent>
-		<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
+		<groupId>org.apache.traffic_control.traffic_router</groupId>
 		<artifactId>traffic_router</artifactId>
 		<version>5.0.0</version>
 	</parent>
@@ -33,17 +33,17 @@
 	<dependencies>
 		<!-- RPM plugin will not package artifacts without these defined dependencies -->
 		<dependency>
-			<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
+			<groupId>org.apache.traffic_control.traffic_router</groupId>
 			<artifactId>traffic_router_connector</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
+			<groupId>org.apache.traffic_control.traffic_router</groupId>
 			<artifactId>traffic_router_shared</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
+			<groupId>org.apache.traffic_control.traffic_router</groupId>
 			<artifactId>ROOT</artifactId>
 			<version>${project.parent.version}</version>
 			<type>war</type>
@@ -193,7 +193,7 @@
 									<dependency>
 										<stripVersion>true</stripVersion>
 										<excludes>
-											<exclude>com.comcast.cdn.traffic_control.traffic_router:traffic_router_core</exclude>
+											<exclude>org.apache.traffic_control.traffic_router:traffic_router_core</exclude>
 										</excludes>
 									</dependency>
 								</mapping>
@@ -218,7 +218,7 @@
 									<dependency>
 										<stripVersion>true</stripVersion>
 										<includes>
-											<include>com.comcast.cdn.traffic_control.traffic_router:ROOT</include>
+											<include>org.apache.traffic_control.traffic_router:ROOT</include>
 										</includes>
 									</dependency>
 								</mapping>

diff --git 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">
 	<parent>
 		<artifactId>traffic_router</artifactId>
-		<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
+		<groupId>org.apache.traffic_control.traffic_router</groupId>
 		<version>5.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/.../configuration/ConfigurationListener.java → .../configuration/ConfigurationListener.java b/.../configuration/ConfigurationListener.java → .../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
@@ -17,7 +17,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
+		<groupId>org.apache.traffic_control.traffic_router</groupId>
 		<artifactId>traffic_router</artifactId>
         <version>5.0.0</version>
 	</parent>
@@ -68,7 +68,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<mainClass>com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidProtocol</mainClass>
+							<mainClass>org.apache.traffic_control.traffic_router.protocol.LanguidProtocol</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
@@ -78,7 +78,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
+			<groupId>org.apache.traffic_control.traffic_router</groupId>
 			<artifactId>traffic_router_shared</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

diff --git a/...c_router/protocol/LanguidNioProtocol.java → ...c_router/protocol/LanguidNioProtocol.java b/...c_router/protocol/LanguidNioProtocol.java → ...c_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/...raffic_router/protocol/LanguidPoller.java → ...raffic_router/protocol/LanguidPoller.java b/...raffic_router/protocol/LanguidPoller.java → ...raffic_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/...ffic_router/protocol/LanguidProtocol.java → ...ffic_router/protocol/LanguidProtocol.java b/...ffic_router/protocol/LanguidProtocol.java → ...ffic_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/...ic_router/protocol/RouterNioEndpoint.java → ...ic_router/protocol/RouterNioEndpoint.java b/...ic_router/protocol/RouterNioEndpoint.java → ...ic_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/...outer/protocol/RouterProtocolHandler.java → ...outer/protocol/RouterProtocolHandler.java b/...outer/protocol/RouterProtocolHandler.java → ...outer/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/...ter/protocol/RouterSslImplementation.java → ...ter/protocol/RouterSslImplementation.java b/...ter/protocol/RouterSslImplementation.java → ...ter/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/...raffic_router/protocol/RouterSslUtil.java → ...raffic_router/protocol/RouterSslUtil.java b/...raffic_router/protocol/RouterSslUtil.java → ...raffic_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/...uter/secure/CertificateDataConverter.java → ...uter/secure/CertificateDataConverter.java b/...uter/secure/CertificateDataConverter.java → ...uter/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/...outer/secure/CertificateDataListener.java → ...outer/secure/CertificateDataListener.java b/...outer/secure/CertificateDataListener.java → ...outer/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/...fic_router/secure/CertificateDecoder.java → ...fic_router/secure/CertificateDecoder.java b/...fic_router/secure/CertificateDecoder.java → ...fic_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/...ic_router/secure/CertificateRegistry.java → ...ic_router/secure/CertificateRegistry.java b/...ic_router/secure/CertificateRegistry.java → ...ic_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/secure/HandshakeData.java → .../traffic_router/secure/HandshakeData.java b/.../traffic_router/secure/HandshakeData.java → .../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/...rol/traffic_router/secure/KeyManager.java → ...rol/traffic_router/secure/KeyManager.java b/...rol/traffic_router/secure/KeyManager.java → ...rol/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/...ffic_router/secure/PrivateKeyDecoder.java → ...ffic_router/secure/PrivateKeyDecoder.java b/...ffic_router/secure/PrivateKeyDecoder.java → ...ffic_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/...outer/tomcat/TomcatLifecycleListener.java → ...outer/tomcat/TomcatLifecycleListener.java b/...outer/tomcat/TomcatLifecycleListener.java → ...outer/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/utils/HttpsProperties.java → ...traffic_router/utils/HttpsProperties.java b/...traffic_router/utils/HttpsProperties.java → ...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
@@ -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
@@ -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;