This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit dfc875972cc49cae680710bcab0ed3b95eee2f6e
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Thu Feb 22 11:54:14 2018 -0700
Refactored jdnssec packages
---
.../{core => jdnssec}/dns/DNSKeyPairWrapper.java | 3 ++-
.../traffic_router/{core => jdnssec}/dns/JDnsSecSigner.java | 4 +++-
.../{core => }/jdnssec/dns/keys/BindPrivateKeyFormatter.java | 2 +-
.../{core => }/jdnssec/dns/keys/Pkcs1Formatter.java | 2 +-
.../jdnssec/dns/keys/SigningTestDataGenerator.java | 9 +++++++--
.../{core => }/jdnssec/dns/keys/ZoneSignerTest.java | 6 +++---
.../traffic_router/shared/ZoneTestRecords.java | 12 +++++++++++-
7 files changed, 28 insertions(+), 10 deletions(-)
diff --git
a/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java
b/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/DNSKeyPairWrapper.java
similarity index 97%
rename from
traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java
rename to
traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/DNSKeyPairWrapper.java
index c393b88..c1c1374 100644
---
a/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/DNSKeyPairWrapper.java
+++
b/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/DNSKeyPairWrapper.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.comcast.cdn.traffic_control.traffic_router.core.dns;
+package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -23,6 +23,7 @@ import java.util.Date;
import javax.xml.bind.DatatypeConverter;
+import com.comcast.cdn.traffic_control.traffic_router.core.dns.DnsSecKeyPair;
import com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtils;
import
com.comcast.cdn.traffic_control.traffic_router.core.util.JsonUtilsException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/JDnsSecSigner.java
b/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/JDnsSecSigner.java
similarity index 92%
rename from
traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/JDnsSecSigner.java
rename to
traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/JDnsSecSigner.java
index cef5433..0cd380c 100644
---
a/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/dns/JDnsSecSigner.java
+++
b/traffic_router/jdnssec/src/main/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/JDnsSecSigner.java
@@ -13,8 +13,10 @@
* limitations under the License.
*/
-package com.comcast.cdn.traffic_control.traffic_router.core.dns;
+package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns;
+import com.comcast.cdn.traffic_control.traffic_router.core.dns.DnsSecKeyPair;
+import com.comcast.cdn.traffic_control.traffic_router.core.dns.ZoneSigner;
import com.verisignlabs.dnssec.security.DnsKeyPair;
import com.verisignlabs.dnssec.security.JCEDnsSecSigner;
import com.verisignlabs.dnssec.security.SignUtils;
diff --git
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/BindPrivateKeyFormatter.java
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/BindPrivateKeyFormatter.java
similarity index 96%
rename from
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/BindPrivateKeyFormatter.java
rename to
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/BindPrivateKeyFormatter.java
index b03a35b..82c2356 100644
---
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/BindPrivateKeyFormatter.java
+++
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/BindPrivateKeyFormatter.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.comcast.cdn.traffic_control.traffic_router.core.jdnssec.dns.keys;
+package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.keys;
import sun.security.rsa.RSAPrivateCrtKeyImpl;
diff --git
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/Pkcs1Formatter.java
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/Pkcs1Formatter.java
similarity index 96%
rename from
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/Pkcs1Formatter.java
rename to
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/Pkcs1Formatter.java
index bff5ff0..a9045de 100644
---
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/Pkcs1Formatter.java
+++
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/Pkcs1Formatter.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package com.comcast.cdn.traffic_control.traffic_router.core.jdnssec.dns.keys;
+package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.keys;
import sun.security.rsa.RSAPrivateCrtKeyImpl;
import sun.security.util.DerOutputStream;
diff --git
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/SigningTestDataGenerator.java
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/SigningTestDataGenerator.java
similarity index 96%
rename from
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/SigningTestDataGenerator.java
rename to
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/SigningTestDataGenerator.java
index 7145052..9c25669 100644
---
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/SigningTestDataGenerator.java
+++
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/SigningTestDataGenerator.java
@@ -13,13 +13,18 @@
* limitations under the License.
*/
-package com.comcast.cdn.traffic_control.traffic_router.core.jdnssec.dns.keys;
+package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.keys;
import com.verisignlabs.dnssec.security.DnsKeyPair;
import com.verisignlabs.dnssec.security.JCEDnsSecSigner;
import org.junit.Before;
import org.junit.Test;
-import org.xbill.DNS.*;
+import org.xbill.DNS.DClass;
+import org.xbill.DNS.DNSKEYRecord;
+import org.xbill.DNS.DSRecord;
+import org.xbill.DNS.Name;
+import org.xbill.DNS.Record;
+import org.xbill.DNS.Section;
import com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords;
import sun.security.rsa.RSAPrivateCrtKeyImpl;
diff --git
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/ZoneSignerTest.java
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/ZoneSignerTest.java
similarity index 97%
rename from
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/ZoneSignerTest.java
rename to
traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/ZoneSignerTest.java
index 7589f06..cd0bf53 100644
---
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/jdnssec/dns/keys/ZoneSignerTest.java
+++
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/ZoneSignerTest.java
@@ -13,12 +13,12 @@
* limitations under the License.
*/
-package com.comcast.cdn.traffic_control.traffic_router.core.jdnssec.dns.keys;
+package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.keys;
-import
com.comcast.cdn.traffic_control.traffic_router.core.dns.DNSKeyPairWrapper;
+import
com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.DNSKeyPairWrapper;
import com.comcast.cdn.traffic_control.traffic_router.core.dns.DnsSecKeyPair;
import
com.comcast.cdn.traffic_control.traffic_router.core.dns.DnsSecKeyPairImpl;
-import com.comcast.cdn.traffic_control.traffic_router.core.dns.JDnsSecSigner;
+import
com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.JDnsSecSigner;
import com.comcast.cdn.traffic_control.traffic_router.core.dns.ZoneSignerImpl;
import com.comcast.cdn.traffic_control.traffic_router.shared.IsEqualCollection;
import com.fasterxml.jackson.databind.JsonNode;
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/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java
index b1628f9..196fdac 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/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java
@@ -17,7 +17,17 @@ package
com.comcast.cdn.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.xbill.DNS.*;
+import org.xbill.DNS.AAAARecord;
+import org.xbill.DNS.ARecord;
+import org.xbill.DNS.CNAMERecord;
+import org.xbill.DNS.DClass;
+import org.xbill.DNS.DNSKEYRecord;
+import org.xbill.DNS.NSRecord;
+import org.xbill.DNS.Name;
+import org.xbill.DNS.Record;
+import org.xbill.DNS.TXTRecord;
+import org.xbill.DNS.SOARecord;
+import org.xbill.DNS.DNSSEC;
import java.net.Inet6Address;
import java.net.InetAddress;
--
To stop receiving notification emails like this one, please contact
els...@apache.org.
