Skip to content

Commit

Permalink
Housekeeping: update links and drop old RelayRides references.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jchambers
jchambers committed May 9, 2020
1 parent b99f8c5 commit ec415b9
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion benchmark/script/generate-certs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
openssl req -extensions v3_ca -new -x509 -days 36500 -nodes -subj "/CN=PushyTestRoot" -newkey rsa:2048 -sha512 -out ca.pem -keyout ca.key

# Generate a certificate/key for the server
openssl req -new -keyout server_key.pem -nodes -newkey rsa:2048 -subj "/CN=com.relayrides.pushy" | \
openssl req -new -keyout server_key.pem -nodes -newkey rsa:2048 -subj "/CN=com.eatthepath.pushy" | \
openssl x509 -req -CAkey ca.key -CA ca.pem -days 36500 -set_serial $RANDOM -sha512 -out server_certs.pem

# Clean up intermediate files
Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/com/eatthepath/pushy/apns/ApnsClientBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class ApnsClientBenchmark {
private static final String SERVER_CERTIFICATES_FILENAME = "/server_certs.pem";
private static final String SERVER_KEY_FILENAME = "/server_key.pem";

private static final String TOPIC = "com.relayrides.pushy";
private static final String TOPIC = "com.eatthepath.pushy";
private static final String TEAM_ID = "benchmark.team";
private static final String KEY_ID = "benchmark.key";
private static final int TOKEN_LENGTH = 32;
Expand Down
2 changes: 1 addition & 1 deletion dropwizard-metrics-listener/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dropwizard Metrics listener for Pushy

This module is an implementation of Pushy's [`ApnsClientMetricsListener`](http://relayrides.github.io/pushy/apidocs/0.13/com/relayrides/pushy/apns/ApnsClientMetricsListener.html) interface that uses the [Dropwizard Metrics library](http://metrics.dropwizard.io/) to gather and report metrics. If you use [Maven](http://maven.apache.org/), you can add the listener to your project by adding the following dependency declaration to your POM:
This module is an implementation of Pushy's [`ApnsClientMetricsListener`](https://pushy-apns.org/apidocs/0.13/com/eatthepath/pushy/apns/ApnsClientMetricsListener.html) interface that uses the [Dropwizard Metrics library](http://metrics.dropwizard.io/) to gather and report metrics. If you use [Maven](http://maven.apache.org/), you can add the listener to your project by adding the following dependency declaration to your POM:

```xml
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions dropwizard-metrics-listener/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<overview>${basedir}/src/main/java/overview.html</overview>
<show>public</show>
<links>
<link>http://relayrides.github.io/pushy/apidocs/0.12/</link>
<link>http://metrics.dropwizard.io/3.1.0/apidocs/</link>
<link>https://pushy-apns.org/apidocs/0.14/</link>
<link>https://metrics.dropwizard.io/3.1.0/apidocs/</link>
</links>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion dropwizard-metrics-listener/src/main/java/overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<body>
<p>This library provides a metrics listener for
<a href="http://relayrides.github.io/pushy/" target="_top">Pushy</a> (a Java library for sending APNs push)
<a href="https://pushy-apns.org/" target="_top">Pushy</a> (a Java library for sending APNs push)
notifications that gathers and reports metrics using the
<a href="http://metrics.dropwizard.io/3.1.0/">Dropwizard Metrics library</a>.</p>

Expand Down
2 changes: 1 addition & 1 deletion micrometer-metrics-listener/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Micrometer Metrics listener for Pushy

This module is an implementation of Pushy's [`ApnsClientMetricsListener`](http://relayrides.github.io/pushy/apidocs/0.13/com/relayrides/pushy/apns/ApnsClientMetricsListener.html) interface that uses the [Micrometer application monitoring library](http://micrometer.io/) to gather and report metrics. If you use [Maven](http://maven.apache.org/), you can add the listener to your project by adding the following dependency declaration to your POM:
This module is an implementation of Pushy's [`ApnsClientMetricsListener`](https://pushy-apns.org/apidocs/0.13/com/eatthepath/pushy/apns/ApnsClientMetricsListener.html) interface that uses the [Micrometer application monitoring library](http://micrometer.io/) to gather and report metrics. If you use [Maven](http://maven.apache.org/), you can add the listener to your project by adding the following dependency declaration to your POM:

```xml
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion micrometer-metrics-listener/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<overview>${basedir}/src/main/java/overview.html</overview>
<show>public</show>
<links>
<link>http://relayrides.github.io/pushy/apidocs/0.12/</link>
<link>https://pushy-apns.org/apidocs/0.12/</link>
</links>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion micrometer-metrics-listener/src/main/java/overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</head>

<body>
<p>This library provides a metrics listener for <a href="http://relayrides.github.io/pushy/" target="_top">Pushy</a> (a Java library for sending APNs push) notifications that gathers metrics using the <a href="http://micrometer.io/">Micrometer application monitoring library</a>.</p>
<p>This library provides a metrics listener for <a href="https://pushy-apns.org/" target="_top">Pushy</a> (a Java library for sending APNs push) notifications that gathers metrics using the <a href="http://micrometer.io/">Micrometer application monitoring library</a>.</p>

<p>It is available under the <a href="http://opensource.org/licenses/MIT">MIT License</a>.</p>
</body>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<name>Pushy parent</name>
<description>A Java library for sending push notifications</description>
<inceptionYear>2013</inceptionYear>
<url>https://relayrides.github.io/pushy/</url>
<url>https://pushy-apns.org/</url>

<licenses>
<license>
Expand All @@ -43,11 +43,11 @@
</licenses>

<scm>
<connection>scm:git:https://github.com/relayrides/pushy.git</connection>
<developerConnection>scm:git:[email protected]:relayrides/pushy.git</developerConnection>
<url>https://github.com/relayrides/pushy</url>
<tag>HEAD</tag>
</scm>
<connection>scm:git:https://github.com/jchambers/pushy.git</connection>
<developerConnection>scm:git:[email protected]:jchambers/pushy.git</developerConnection>
<url>https://github.com/jchambers/pushy</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
Expand Down
6 changes: 3 additions & 3 deletions pushy/script/apns-extensions.cnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ keyUsage = critical, digitalSignature, keyEncipherment
extendedKeyUsage = clientAuth, serverAuth

[ apns_topics ]
aps_topics.0 = UTF8String:com.relayrides.pushy
aps_topics.0 = UTF8String:com.eatthepath.pushy
aps_topics.1 = SEQWRAP,UTF8String:app
aps_topics.2 = UTF8String:com.relayrides.pushy.voip
aps_topics.2 = UTF8String:com.eatthepath.pushy.voip
aps_topics.3 = SEQWRAP,UTF8String:voip
aps_topics.4 = UTF8String:com.relayrides.pushy.complication
aps_topics.4 = UTF8String:com.eatthepath.pushy.complication
aps_topics.5 = SEQWRAP,UTF8String:complication
8 changes: 4 additions & 4 deletions pushy/script/generate-certs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
openssl req -config openssl-custom.cnf -extensions v3_ca -new -x509 -days 36500 -nodes -subj "/CN=PushyTestRoot" -newkey rsa:2048 -sha512 -out ca.pem -keyout ca.key

# Generate a certificate/key for the server
openssl req -new -keyout server-key.pem -nodes -newkey rsa:2048 -subj "/CN=com.relayrides.pushy" | \
openssl req -new -keyout server-key.pem -nodes -newkey rsa:2048 -subj "/CN=com.eatthepath.pushy" | \
openssl x509 -extfile ./apns-extensions.cnf -extensions apns_server_extensions -req -CAkey ca.key -CA ca.pem -days 36500 -set_serial $RANDOM -sha512 -out server-certs.pem

# Generate certificates/keys for clients and sign them with the intermediate certificate
openssl req -new -keyout single-topic-client.key -nodes -newkey rsa:2048 -subj "/CN=Apple Push Services: com.relayrides.pushy/UID=com.relayrides.pushy" | \
openssl req -new -keyout single-topic-client.key -nodes -newkey rsa:2048 -subj "/CN=Apple Push Services: com.eatthepath.pushy/UID=com.eatthepath.pushy" | \
openssl x509 -extfile ./apns-extensions.cnf -extensions apns_single_topic_client_extensions -req -CAkey ca.key -CA ca.pem -days 36500 -set_serial $RANDOM -sha512 -out single-topic-client.pem

openssl req -new -keyout multi-topic-client.key -nodes -newkey rsa:2048 -subj "/CN=Apple Push Services: com.relayrides.pushy/UID=com.relayrides.pushy" | \
openssl req -new -keyout multi-topic-client.key -nodes -newkey rsa:2048 -subj "/CN=Apple Push Services: com.eatthepath.pushy/UID=com.eatthepath.pushy" | \
openssl x509 -extfile ./apns-extensions.cnf -extensions apns_multi_topic_client_extensions -req -CAkey ca.key -CA ca.pem -days 36500 -set_serial $RANDOM -sha512 -out multi-topic-client.pem

# For simplicity, squish everything down into PKCS#12 keystores
Expand All @@ -27,7 +27,7 @@ for i in `seq 1 4`;
do
# Couldn't find a way to get multiple keys into a PKCS#12 file using OpenSSL directly, so we'll take the long way
# around and construct a multi-key-pair keystore with keytool, then export to PKCS#12.
keytool -genkeypair -storepass pushy-test -keypass pushy-test -dname "CN=com.relayrides.pushy.{$i}" -keystore multiple-keys.jks -alias "pair${i}"
keytool -genkeypair -storepass pushy-test -keypass pushy-test -dname "CN=com.eatthepath.pushy.{$i}" -keystore multiple-keys.jks -alias "pair${i}"
done

keytool -importkeystore -srckeystore multiple-keys.jks -destkeystore multiple-keys.p12 -srcstoretype JKS -deststoretype PKCS12 -srcstorepass pushy-test -deststorepass pushy-test
Expand Down
2 changes: 1 addition & 1 deletion pushy/src/main/java/com/eatthepath/pushy/apns/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* <p>The {@link com.eatthepath.pushy.apns.ApnsPushNotification} interface represents a single APNs push notification
* sent to a single device. A simple concrete implementation of the {@code ApnsPushNotification} interface
* ({@link com.eatthepath.pushy.apns.util.SimpleApnsPushNotification}) and tools for constructing push notification
* payloads can be found in the {@code com.relayrides.pushy.apns.util} package.</p>
* payloads can be found in the {@code com.eatthepath.pushy.apns.util} package.</p>
*
* @author <a href="https://github.com/jchambers">Jon Chambers</a>
*/
Expand Down
2 changes: 1 addition & 1 deletion pushy/src/main/java/com/eatthepath/pushy/apns/proxy/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* {@link com.eatthepath.pushy.apns.ApnsClientBuilder#setProxyHandlerFactory(ProxyHandlerFactory)} method. Proxy handler
* factory implementations are provided for HTTP, SOCKS4, and SOCKS5 proxies.</p>
*
* @author <a href="mailto:jon@relayrides.com">Jon Chambers</a>
* @author <a href="https://github.com/jchambers">Jon Chambers</a>
*/
package com.eatthepath.pushy.apns.proxy;

4 changes: 2 additions & 2 deletions pushy/src/main/java/overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</head>

<body>
<p><a href="https://relayrides.github.io/pushy/" target="_top">Pushy</a> is a Java library for sending
<a href="https://developer.apple.com/documentation/usernotifications" target="_top">APNs</a>(iOS and OS X) push
<p><a href="https://pushy-apns.org/" target="_top">Pushy</a> is a Java library for sending
<a href="https://developer.apple.com/documentation/usernotifications" target="_top">APNs</a> (iOS and OS X) push
notifications.</p>

<p>Pushy sends push notifications using Apple's HTTP/2-based APNs protocol. Most users will interact with
Expand Down
4 changes: 2 additions & 2 deletions pushy/src/test/java/com/eatthepath/pushy/apns/ApnsClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ void testSendNotificationWithExpiredAuthenticationToken() throws Exception {

metricsListener.waitForNonZeroAcceptedNotifications();

// See https://github.com/relayrides/pushy/issues/448
// See https://github.com/jchambers/pushy/issues/448
assertEquals(1, metricsListener.getSentNotifications().size(),
"Re-sent notifications with expired tokens must not be double-counted.");

Expand Down Expand Up @@ -438,7 +438,7 @@ void testSendManyNotificationsWithListeners(final boolean useTokenAuthentication
}
}

// See https://github.com/relayrides/pushy/issues/256
// See https://github.com/jchambers/pushy/issues/256
@ParameterizedTest
@ValueSource(booleans = { true, false })
void testRepeatedlySendSameNotification(final boolean useTokenAuthentication) throws Exception {
Expand Down

0 comments on commit ec415b9

Please sign in to comment.