You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/10 11:33:26 UTC

[4/4] git commit: CAMEL-6852: Upgraded camel-apns. There is a slight API breaking in apns upgrade.

CAMEL-6852: Upgraded camel-apns. There is a slight API breaking in apns upgrade.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef4bed3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef4bed3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef4bed3f

Branch: refs/heads/master
Commit: ef4bed3f5e2a742b4939738d2200567b59594330
Parents: e8a3ace
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 10 11:31:34 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 10 11:31:34 2013 +0200

----------------------------------------------------------------------
 .../apache/camel/component/apns/factory/ApnsServiceFactory.java  | 3 ---
 .../apache/camel/component/apns/model/ConnectionStrategy.java    | 2 +-
 parent/pom.xml                                                   | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ef4bed3f/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
index 5d4db72..b7495f0 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
@@ -226,9 +226,6 @@ public class ApnsServiceFactory implements CamelContextAware {
         }
 
         switch (getConnectionStrategy()) {
-        case NON_BLOCKING:
-            builder.asNonBlocking();
-            break;
         case QUEUE:
             builder.asQueued();
             break;

http://git-wip-us.apache.org/repos/asf/camel/blob/ef4bed3f/components/camel-apns/src/main/java/org/apache/camel/component/apns/model/ConnectionStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/model/ConnectionStrategy.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/model/ConnectionStrategy.java
index fbd0394..f7607ad 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/model/ConnectionStrategy.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/model/ConnectionStrategy.java
@@ -18,6 +18,6 @@ package org.apache.camel.component.apns.model;
 
 public enum ConnectionStrategy {
 
-    SIMPLE, QUEUE, POOL, NON_BLOCKING;
+    SIMPLE, QUEUE, POOL
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ef4bed3f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b2d9e31..782b5c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -197,8 +197,8 @@
     <jasper-bundle-version>6.0.36_1</jasper-bundle-version>
     <jasypt-bundle-version>1.9.1_1</jasypt-bundle-version>
     <jasypt-version>1.9.1</jasypt-version>
-    <java-apns-bundle-version>0.1.6_3</java-apns-bundle-version>
-    <java-apns-version>0.1.6</java-apns-version>
+    <java-apns-bundle-version>0.2.3_1</java-apns-bundle-version>
+    <java-apns-version>0.2.3</java-apns-version>
     <javacrumbs-version>0.22</javacrumbs-version>
     <javassist-bundle-version>3.12.1.GA_3</javassist-bundle-version>
     <javax.el-api-version>2.2.4</javax.el-api-version>