Skip to content
Browse files

integrate all @froh42 changes and re-establish notnoop/java-apns as m…

…ain repo
  • Loading branch information...
1 parent e155fc2 commit 8c4f673c45f2c223d526af54cbb863bb44ce43b7 @notnoop committed Feb 13, 2013
Showing with 13 additions and 21 deletions.
  1. +2 −2 CHANGELOG
  2. +5 −13 README.markdown
  3. +6 −6 pom.xml
View
4 CHANGELOG
@@ -9,9 +9,9 @@ Version 0.2.2 - Jan 20, 2013
- Do not stop QueuedApnsService on unsuccessfull attempt to submit a message
- Continuous integration builds on travis ci
- Support Proxy.Type.HTTP.
- - Do not log error messages for retries when sending a message, rather
+ - Do not log error messages for retries when sending a message, rather
log one when we can't send a message at all.
- - When there is an error (error packet or exception in parsing error packet)
+ - When there is an error (error packet or exception in parsing error packet)
close the socket instead of wating for APNS to close it.
- java-apns now is an osgi bundle
- Have ApnsService.push return sent messages
View
18 README.markdown
@@ -1,13 +1,5 @@
Build status: [![Build Status](https://travis-ci.org/java-apns/java-apns.png?branch=master)](https://travis-ci.org/java-apns/java-apns)
-This is a Fork!
----------------
-
-As notnoop is missing in action this is a maintained fork of [notnoop/java-apns](https://github.com/notnoop/java-apns). It unites changes and fixes from a number of java-apns forks.
-
-Differences up to notnoop's last version are maintained in
-[The Changelog](CHANGELOG).
-
Introduction
------------
@@ -92,14 +84,14 @@ You can use the enhanced notification format to get feetback from Apple about no
.localizedKey("GAME_PLAY_REQUEST_FORMAT")
.localizedArguments("Jenna", "Frank")
.actionKey("Play").build();
-
- EnhancedApnsNotification notification = new EnhancedApnsNotification(EnhancedApnsNotification.INCREMENT_ID() /* Next ID */,
- new Date().getTime() + 60 * 60 /* Expire in one hour */,
- token /* Device Token */,
+
+ EnhancedApnsNotification notification = new EnhancedApnsNotification(EnhancedApnsNotification.INCREMENT_ID() /* Next ID */,
+ new Date().getTime() + 60 * 60 /* Expire in one hour */,
+ token /* Device Token */,
payload);
service.push(notification);
-
+
License
----------------
View
12 pom.xml
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:git:git://github.com/froh42/java-apns.git</connection>
- <developerConnection>scm:git:git@github.com:froh42/java-apns.git</developerConnection>
- <url>http://github.com/froh42/java-apns</url>
+ <connection>scm:git:git://github.com/notnoop/java-apns.git</connection>
+ <developerConnection>scm:git:git@github.com:notnoop/java-apns.git</developerConnection>
+ <url>http://github.com/notnoop/java-apns</url>
</scm>
<properties>
@@ -136,8 +136,8 @@
<bundleSymbolicName>${project.groupId}.${project.artifactId}</bundleSymbolicName>
<bundleVersion>${project.version}</bundleVersion>
<failOnWarnings>true</failOnWarnings>
- <!-- Set the input path explicitly to ensure that it is never set to the target/generated-classes of the cobertua plugin.
- These classes contain references to cobertura classes and will mess up the generated manifest. If the default for inputPath is used, it will
+ <!-- Set the input path explicitly to ensure that it is never set to the target/generated-classes of the cobertua plugin.
+ These classes contain references to cobertura classes and will mess up the generated manifest. If the default for inputPath is used, it will
use target/generated-classes if other plugins run custom builds that include cobertura. If the path is set explicitly it will always be target/classes. -->
<inputPath>${project.build.outputDirectory}</inputPath>
</configuration>
@@ -199,7 +199,7 @@
<artifactId>org.eclipse.virgo.bundlor.maven</artifactId>
<version>1.1.1.RELEASE</version>
<scope>compile</scope>
- </dependency> -->
+ </dependency> -->
</dependencies>
<!-- Site Generation -->

0 comments on commit 8c4f673

Please sign in to comment.
Something went wrong with that request. Please try again.