You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 04:39:28 UTC
[02/45] git commit: pushy 4_0 upgrade
pushy 4_0 upgrade
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d5d859b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d5d859b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d5d859b7
Branch: refs/heads/key-row-sharding
Commit: d5d859b707df3e293702bac4c3240c0ca3bf895e
Parents: fc3c42c
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 24 13:25:37 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 24 13:25:37 2014 -0600
----------------------------------------------------------------------
.../_maven.repositories | 8 -
...14c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar | Bin 160201 -> 0 bytes
...14c97c6e3ef40c88590e1b196d3ec55b-sources.jar | Bin 59744 -> 0 bytes
...63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar | Bin 67751 -> 0 bytes
...7c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated | 13 --
...63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom | 166 -------------------
...7c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated | 13 --
.../pushy-0.4-apigee.pom | 166 -------------------
stack/pom.xml | 2 +-
stack/services/pom.xml | 2 +-
.../notifications/apns/APNsAdapter.java | 32 ++--
11 files changed, 18 insertions(+), 384 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/_maven.repositories
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/_maven.repositories b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/_maven.repositories
deleted file mode 100644
index 4b4ac07..0000000
--- a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/_maven.repositories
+++ /dev/null
@@ -1,8 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Wed Aug 20 23:57:49 MDT 2014
-pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar>local-dependencies=
-pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom>=
-pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-sources.jar>=
-pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar>=
-pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom>local-dependencies=
-pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar>=
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar
deleted file mode 100644
index 969757f..0000000
Binary files a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-sources.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-sources.jar b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-sources.jar
deleted file mode 100644
index 9e167fb..0000000
Binary files a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b-sources.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar
deleted file mode 100644
index 3246a7a..0000000
Binary files a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated
deleted file mode 100644
index 592c733..0000000
--- a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated
+++ /dev/null
@@ -1,13 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Tue Jul 29 08:11:52 MDT 2014
-http\://oss.sonatype.org/content/repositories/snapshots/.lastUpdated=1406643112428
-http\://download.java.net/maven/2/.lastUpdated=1406643110976
-http\://oss.sonatype.org/content/repositories/snapshots/.error=
-http\://download.java.net/maven/2/.error=
-http\://maven.springframework.org/milestone/.lastUpdated=1406643112690
-http\://repository.codehaus.org/.lastUpdated=1406643111574
-https\://repository-hector-dev.forge.cloudbees.com/snapshot/.error=
-http\://repository.codehaus.org/.error=
-http\://maven.springframework.org/milestone/.error=
-file\:///Users/ApigeeCorporation/Dev/apigee/apigee-URAP/m2/repository/.lastUpdated=1406643112703
-https\://repository-hector-dev.forge.cloudbees.com/snapshot/.lastUpdated=1406643111364
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom
deleted file mode 100644
index 78f6a8e..0000000
--- a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom
+++ /dev/null
@@ -1,166 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.relayrides</groupId>
- <artifactId>pushy</artifactId>
- <version>0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b</version>
- <name>Pushy</name>
- <description>A Java library for sending push notifications</description>
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>7</version>
- </parent>
- <licenses>
- <license>
- <name>The MIT License (MIT)</name>
- <url>http://opensource.org/licenses/MIT</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.0.23.Final</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.6</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <argLine>-Dorg.slf4j.simpleLogger.defaultLogLevel=warn</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <overview>${basedir}/src/main/java/overview.html</overview>
- <show>public</show>
- <links>
- <link>http://netty.io/4.0/api/</link>
- </links>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <organization>
- <name>RelayRides</name>
- <url>https://relayrides.com/</url>
- </organization>
- <developers>
- <developer>
- <id>jon</id>
- <name>Jon Chambers</name>
- <email>jon@relayrides.com</email>
- <url>https://github.com/jchambers</url>
- <organization>RelayRides</organization>
- <organizationUrl>https://relayrides.com/</organizationUrl>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- </developers>
- <inceptionYear>2013</inceptionYear>
- <url>http://relayrides.github.com/pushy/</url>
- <scm>
- <connection>scm:git:https://github.com/relayrides/pushy.git</connection>
- <developerConnection>scm:git:git@github.com:relayrides/pushy.git</developerConnection>
- <url>https://github.com/relayrides/pushy</url>
- </scm>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated
deleted file mode 100644
index 1038f38..0000000
--- a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated
+++ /dev/null
@@ -1,13 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Tue Jul 29 08:11:50 MDT 2014
-http\://oss.sonatype.org/content/repositories/snapshots/.lastUpdated=1406643109745
-http\://download.java.net/maven/2/.lastUpdated=1406643106235
-http\://oss.sonatype.org/content/repositories/snapshots/.error=
-http\://download.java.net/maven/2/.error=
-http\://maven.springframework.org/milestone/.lastUpdated=1406643110610
-http\://repository.codehaus.org/.lastUpdated=1406643107580
-https\://repository-hector-dev.forge.cloudbees.com/snapshot/.error=
-http\://repository.codehaus.org/.error=
-http\://maven.springframework.org/milestone/.error=
-file\:///Users/ApigeeCorporation/Dev/apigee/apigee-URAP/m2/repository/.lastUpdated=1406643110624
-https\://repository-hector-dev.forge.cloudbees.com/snapshot/.lastUpdated=1406643107290
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee.pom b/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee.pom
deleted file mode 100644
index 39f61e3..0000000
--- a/stack/m2/repository/com/relayrides/pushy/0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b/pushy-0.4-apigee.pom
+++ /dev/null
@@ -1,166 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.relayrides</groupId>
- <artifactId>pushy</artifactId>
- <version>0.4-apigee</version>
- <name>Pushy</name>
- <description>A Java library for sending push notifications</description>
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>7</version>
- </parent>
- <licenses>
- <license>
- <name>The MIT License (MIT)</name>
- <url>http://opensource.org/licenses/MIT</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.0.21.Final</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.6</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <argLine>-Dorg.slf4j.simpleLogger.defaultLogLevel=warn</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <overview>${basedir}/src/main/java/overview.html</overview>
- <show>public</show>
- <links>
- <link>http://netty.io/4.0/api/</link>
- </links>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <organization>
- <name>RelayRides</name>
- <url>https://relayrides.com/</url>
- </organization>
- <developers>
- <developer>
- <id>jon</id>
- <name>Jon Chambers</name>
- <email>jon@relayrides.com</email>
- <url>https://github.com/jchambers</url>
- <organization>RelayRides</organization>
- <organizationUrl>https://relayrides.com/</organizationUrl>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- </developers>
- <inceptionYear>2013</inceptionYear>
- <url>http://relayrides.github.com/pushy/</url>
- <scm>
- <connection>scm:git:https://github.com/relayrides/pushy.git</connection>
- <developerConnection>scm:git:git@github.com:relayrides/pushy.git</developerConnection>
- <url>https://github.com/relayrides/pushy</url>
- </scm>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index b752b2b..2a2fcb0 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1436,7 +1436,7 @@
<groupId>com.relayrides</groupId>
<artifactId>pushy</artifactId>
<!-- The sha in the version is the git commit used in this build. Check out the pushy source, then this commit to build the library locally -->
- <version>0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b</version>
+ <version>0.4</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index e401440..0537613 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -564,7 +564,7 @@
<groupId>com.relayrides</groupId>
<artifactId>pushy</artifactId>
<!-- The sha in the version is the git commit used in this build. Check out the pushy source, then this commit to build the library locally -->
- <version>0.4-apigee-63dec68314c97c6e3ef40c88590e1b196d3ec55b</version>
+ <version>0.4</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5d859b7/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
index 01fda92..4277b8a 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
@@ -21,6 +21,7 @@ import com.google.common.cache.*;
import com.relayrides.pushy.apns.*;
import com.relayrides.pushy.apns.util.*;
+import io.netty.channel.nio.NioEventLoopGroup;
import org.apache.usergrid.persistence.entities.Notification;
import org.apache.usergrid.persistence.entities.Notifier;
import org.mortbay.util.ajax.JSON;
@@ -122,22 +123,8 @@ public class APNsAdapter implements ProviderAdapter {
public Map<String, Date> getInactiveDevices(Notifier notifier,
EntityManager em) throws Exception {
Map<String,Date> map = new HashMap<String,Date>();
- if(isMock(notifier)){
- return map;
- }
PushManager<SimpleApnsPushNotification> pushManager = getPushManager(notifier);
-
- List<ExpiredToken> tokens = null;
- try {
- tokens = pushManager.getExpiredTokens();
- }catch (FeedbackConnectionException fce){
- logger.debug("Failed to get tokens",fce);
- return map;
- }
- for(ExpiredToken token : tokens){
- String expiredToken = new String(token.getToken());
- map.put(expiredToken, token.getExpiration());
- }
+ pushManager.requestExpiredTokens();
return map;
}
@@ -179,13 +166,26 @@ public class APNsAdapter implements ProviderAdapter {
public PushManager<SimpleApnsPushNotification> load(Notifier notifier) {
try {
LinkedBlockingQueue<SimpleApnsPushNotification> queue = new LinkedBlockingQueue<SimpleApnsPushNotification>();
+ NioEventLoopGroup group = new NioEventLoopGroup();
PushManagerConfiguration config = new PushManagerConfiguration();
config.setConcurrentConnectionCount(Runtime.getRuntime().availableProcessors() * 2);
- PushManager<SimpleApnsPushNotification> pushManager = new PushManager<SimpleApnsPushNotification>(getApnsEnvironment(notifier), getSSLContext(notifier), null, null, queue, config);
+ PushManager<SimpleApnsPushNotification> pushManager = new PushManager<>(getApnsEnvironment(notifier), getSSLContext(notifier), group,null , queue, config,notifier.getName());
//only tested when a message is sent
pushManager.registerRejectedNotificationListener(new RejectedAPNsListener());
//this will get tested when start is called
pushManager.registerFailedConnectionListener(new FailedConnectionListener());
+
+ pushManager.registerExpiredTokenListener(new ExpiredTokenListener<SimpleApnsPushNotification>() {
+ @Override
+ public void handleExpiredTokens(PushManager<? extends SimpleApnsPushNotification> pushManager, Collection<ExpiredToken> expiredTokens) {
+ Map<String,Date> map = new HashMap<String,Date>();
+ for(ExpiredToken token : expiredTokens){
+ String expiredToken = new String(token.getToken());
+ map.put(expiredToken, token.getExpiration());
+ }
+ //TODO figure out way to call back and clear out em references
+ }
+ });
try {
if (!pushManager.isStarted()) { //ensure manager is started
pushManager.start();