git commit: [CAMEL-7435] Create a generic callback to configure the APNS service builder.
Repository: camel Updated Branches: refs/heads/master 48923c5ae -> ca3e8a0a6 [CAMEL-7435] Create a generic callback to configure the APNS service builder. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ca3e8a0a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca3e8a0a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca3e8a0a Branch: refs/heads/master Commit: ca3e8a0a62fd93f30ab2fa1bbb2190a14ce53f8e Parents: 48923c5 Author: Henryk Konsek Authored: Tue May 13 08:53:24 2014 +0200 Committer: Henryk Konsek Committed: Tue May 13 08:53:24 2014 +0200 -- .../apache/camel/component/apns/factory/ApnsServiceFactory.java | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ca3e8a0a/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 81a0257..0debdd1 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 @@ -167,6 +167,7 @@ public class ApnsServiceFactory implements CamelContextAware { public ApnsService getApnsService() { ApnsServiceBuilder builder = APNS.newService(); +builder = configureServiceBuilder(builder); configureConnectionStrategy(builder); configureReconnectionPolicy(builder); @@ -182,6 +183,10 @@ public class ApnsServiceFactory implements CamelContextAware { return apnsService; } +protected ApnsServiceBuilder configureServiceBuilder(ApnsServiceBuilder serviceBuilder) { +return serviceBuilder; +} + private void configureApnsCertificate(ApnsServiceBuilder builder) throws IOException { if (getSslContext() != null) { builder.withSSLContext(getSslContext());
[CONF] Apache Camel > Release Guide
willem jiang edited the page: Release Guide ... Close it by sending the RESULT to the mailing list. Promote the artifacts to the central repo. For this login to https://repository.apache.org using your Apache LDAP credentials. Click on "Staging Repositories". Select "org.apache.camel-xxx" in the list of repositories, where xxx represents your username and ip. Click "Release" on the tool bar above. This will promote all artifacts to the central maven repo. Enter the name and version of the artifact being released in the "Description" field and then click "Release". This will make it easier to identify it later. Perform a release in JIRA and create a new release version in JIRA There should be already a release notes page in the In Progress folder (if not create one based on the Camel x.y.z Release (template)). Edit it and change the number of fixed issues and update its parent to be the Download page. Now would be a good time to create a new release notes page for the next release based on the template mentioned before. It is useful and simpler to keep it up to date during the development cycle. Copy the newly deployed distribution to Apache website: Code Block language text cd ${CAMEL_ROOT_DIR}/etc/scripts release-distro.sh Check the console output and finish this step manually after checking the artifacts. Remove the old release by using svn rm https://dist.apache.org/repos/dist/release/camel/apache-camel/OLD_CAMEL_VERSION -m "Removed the old release" Copy the KEYS file by ssh into /www/www.apache.org/dist/camel/apache-camel/ on people.apache.org if you changed it
svn commit: r5334 - /release/camel/apache-camel/2.13.0/
Author: ningjiang Date: Tue May 13 03:56:26 2014 New Revision: 5334 Log: Removed the old release Removed: release/camel/apache-camel/2.13.0/
[CONF] Apache Camel > Camel 2.13.1 Release
willem jiang edited the page: Camel 2.13.1 Release ... For more details see the JIRA tickets Known Issues See Camel 2.13.0 Release ... View Online · Like · View Changes Stop watching space · Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Camel > Camel 2.13.1 Release
willem jiang created a page: Camel 2.13.1 Release Camel 2.12.3 release New and Noteworthy Welcome to the 2.13.1 release which is mainly a bug fix release with 140 issues resolved.. For more details see the JIRA tickets Known Issues See Camel 2.13.0 Release Important changes to consider when upgrading See Camel 2.13.0 Release Notice See Camel 2.13.0 Release Getting the Distributions Binary Distributions Description Download Link PGP Signature file of download Windows Distribution apache-camel-2.13.1.zip apache-camel-2.13.1.zip.asc Unix/Linux/Cygwin Distribution apache-camel-2.13.1.tar.gz apache-camel-2.13.1.tar.gz.asc The above URLs use redirection Icon The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using FireFox Source Distributions
svn commit: r5333 - /release/camel/apache-camel/2.13.1/
Author: ningjiang Date: Tue May 13 03:07:39 2014 New Revision: 5333 Log: Added release kit for camel-2.13.1 Added: release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip (with props) release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.asc release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.md5 release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.sha1 release/camel/apache-camel/2.13.1/apache-camel-2.13.1.pom release/camel/apache-camel/2.13.1/apache-camel-2.13.1.pom.asc release/camel/apache-camel/2.13.1/apache-camel-2.13.1.pom.md5 release/camel/apache-camel/2.13.1/apache-camel-2.13.1.pom.sha1 release/camel/apache-camel/2.13.1/apache-camel-2.13.1.tar.gz (with props) release/camel/apache-camel/2.13.1/apache-camel-2.13.1.tar.gz.asc release/camel/apache-camel/2.13.1/apache-camel-2.13.1.tar.gz.md5 release/camel/apache-camel/2.13.1/apache-camel-2.13.1.tar.gz.sha1 release/camel/apache-camel/2.13.1/apache-camel-2.13.1.zip (with props) release/camel/apache-camel/2.13.1/apache-camel-2.13.1.zip.asc release/camel/apache-camel/2.13.1/apache-camel-2.13.1.zip.md5 release/camel/apache-camel/2.13.1/apache-camel-2.13.1.zip.sha1 Added: release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip -- svn:mime-type = application/octet-stream Added: release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.asc == --- release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.asc (added) +++ release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.asc Tue May 13 03:07:39 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABAgAGBQJTaj8mAAoJEPBYilUU0N7prTYP/RLdPvVtttdeKjjbGCK2SqJP +jqWJeGtz8G4+WJt7QzSDu4Si8JwAmepFud4R2irlM7sOJZz5K34/FTN+0BLycrXc +0+tq8cN5T/b211enNueu6ko7EAn0ngcL9BPRRJ3rFYa2EqZrJAN4TZ47YyNkfV9f +1weYPG0BQHsacY6aR2SntxfxZ95NQ2dKgogIAO0ZhoqcGt16lDN7JWFL7rqFTcDX +vNod4GtCmVH5FBuYzSJtpfbG1qH0PVfK47DtMzSG2rkyzDU1qA4eghTh0WCWDRzS +NviNgJmlwgyJpdbmPG3Kg1xgY4Bw98n3bdlSy+hEwFqWGOxq588etUWoZ+pW2nFX +2Gif5/N2hG1iD7SVkeRBS3pvIw/Mj5WrxVn/A454N3wd5EL5q/alGjsvO8+hn/na +HIcYXjKM8PSKb/5mE3T9gzoYgCuIWIlHz5DgQmwQHduQ+0J5TfQlxD/TTA5x0fh7 +9NJnI/rqGA5M2G9ZxSCMaD7fSX8RcXeW5SQrmByC9fyCGWgoX1OcplxoRwB8am/k +BL0Zm3sq+mqcV3PPyJ3NtG8KyKan20qmAtafss7QhZNfe9pBzRsfg9i/dQQ8gqIz +snmwnQCoWltmfscxQXz4lQRYfHO9DXWDxwsk94TN4JHee2xJDDjf5BOvqxl7OUeX +RBL7AP2PK8qVbueAA8i1 +=YyPl +-END PGP SIGNATURE- Added: release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.md5 == --- release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.md5 (added) +++ release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.md5 Tue May 13 03:07:39 2014 @@ -0,0 +1 @@ +d1479f1378b577c0565ce4435084256e \ No newline at end of file Added: release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.sha1 == --- release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.sha1 (added) +++ release/camel/apache-camel/2.13.1/apache-camel-2.13.1-src.zip.sha1 Tue May 13 03:07:39 2014 @@ -0,0 +1 @@ +26e317e5e409f6ffbceeba8d61b289e8e0016986 \ No newline at end of file Added: release/camel/apache-camel/2.13.1/apache-camel-2.13.1.pom == --- release/camel/apache-camel/2.13.1/apache-camel-2.13.1.pom (added) +++ release/camel/apache-camel/2.13.1/apache-camel-2.13.1.pom Tue May 13 03:07:39 2014 @@ -0,0 +1,857 @@ + + +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/maven-v4_0_0.xsd";> + + 4.0.0 + + +org.apache.camel +camel-parent +2.13.1 +../parent + + + apache-camel + Camel :: Assembly + Apache Camel Assembly + pom + + +true +false +1.0.1 + + + + + + org.apache.camel + camel-core + + + org.apache.camel + camel-core-osgi + + + org.apache.camel + camel-core-xml + + + org.apache.camel + camel-ahc + + + org.apache.camel + camel-amqp + + + org.apache.camel + camel-apns + + + org.apache.camel + camel-atom + + + org.apache.camel + camel-aws + + + org.apache.camel + camel-avro + + + org.apache.camel + camel-bam + + + org.apache.camel + camel-base64 + + + org.apache.camel + camel-beanio +
svn commit: r5332 - /release/camel/apache-camel/2.13.1/
Author: ningjiang Date: Tue May 13 02:59:23 2014 New Revision: 5332 Log: Apache Camel 2.13.1 release distro placeholder. Added: release/camel/apache-camel/2.13.1/
svn commit: r908480 - in /websites/production/camel/content: cache/main.pageCache cxfrs.html
Author: buildbot Date: Fri May 9 19:18:01 2014 New Revision: 908480 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/cxfrs.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/cxfrs.html == --- websites/production/camel/content/cxfrs.html (original) +++ websites/production/camel/content/cxfrs.html Fri May 9 19:18:01 2014 @@ -108,7 +108,7 @@ Where rsEndpoint represents the spring bean's name which presents the CXFRS client or serverFor either style above, you can append options to the URI as follows: -OptionsNameDescriptionExampleRequired?default valueresourceClassesThe resource classes which you want to export as REST service. Multiple classes can be separated by comma.resourceClasses=org.apache.camel.rs.Example1, org.apache.camel.rs.Exchange2NoNoneresourceClassDeprecated: Use resourceClasses The resource class which you want to export as REST service.resourceClass =org.apache.camel.rs.Example1NoNonehttpClientAPInew to Camel 2.1 If it is true, the CxfRsProducer will use the HttpClientAPI to invoke the service If it is false, the CxfRsProducer will use the ProxyClientAPI to invoke the servicehttpClientAPI=trueNotruesynchronousNew in 2.5, this option will let CxfRsConsumer decide to use sync or async API to do the underlying work. The default value is false which means it will try to use async API by default.synchronous=trueNofalsethrowExceptionOnFailureNew in 2.6, this option tells the CxfRsProducer to inspect return codes and will generate an Exception if the return cod e is larger than 207.throwExceptionOnFailure=trueNotruemaxClientCacheSizeNew in 2.6, you can set a IN message header CamelDestinationOverrideUrl to dynamically override the target destination Web Service or REST Service defined in your routes. The implementation caches CXF clients or ClientFactoryBean in CxfProvider and CxfRsProvider. This option allows you to configure the maximum size of the cache.maxClientCacheSize=5No10setDefaultBusNew in 2.9.0. Will set the default bus when CXF endpoint create a bus by itselfsetDefaultBus=trueNofalsebusNew in 2.9.0. A default bus created by CXF Bus Factory. Use # notation to reference a bus object from the registry. The referenced object must be an instance of org.apache.cxf.Bus.bus=#busNameNoNoneclass="confluenceTd">bindingStylerowspan="1" class="confluenceTd">As of 2.11. Sets how >requests and responses will be mapped to/from Camel. Two values are >possible:SimpleConsumer => see >the href="#CXFRS-ConsumingaRESTRequest-SimpleBindingStyle">Consuming a REST >Request with the Simple Binding Style below.Default >=> the default style. For consumers this passes on a >MessageContentsList to the route, requiring low-level processing >in the route.class="confluenceTd">bindingStyle=SimpleConsumercolspan="1" rowspan="1" class="confluenceTd">Norowspan="1" class="confluenceTd">Defaultcolspan="1" rowspan="1" class="confluenceTd">providersSince Camel >2.12.2 set custom JAX-RS providers list to the CxfRs >endpoint.class="confluenceTd">providers=#MyProvidersclass="confluenceTd">Noclass="confluenceTd">Noneclass="confluenceTd">schemaLocationsrowspan="1" class="confluenceTd">Since Camel 2.12.2 >Sets the locations of the schemas which can be used to validate the incoming >XML or JAXB-driven JSON.class="confluenceTd">schemaLocations=#MySchemaLocationsrowspan="1" class="confluenceTd">Noclass="confluenceTd">Noneclass="confluenceTd">featuresclass="confluenceTd"> Since Camel 2.12.3 Set the feature list to the CxfRs endpoint.features=#MyFeaturesNoNonepropertiesSince Camel 2.12.4 Set the properties to the CxfRs endpoint.properties=#MyPropertiesNoNoneinInterceptorsSince Camel 2.12.4 Set the inInterceptors to the CxfRs endpoint.inIntercept ors=#MyInterceptorsNoNoneoutInterceptorsSince Camel 2.12.4 Set the outInterceptor to the CxfRs endpoint.outInterceptors=#MyInterceptorsNoNoneinFaultInterceptorsSince Camel 2.12.4 Set the inFaultInterceptors to the CxfRs endpoint.inFaultInterceptors=#MyInterceptorsNoNoneoutFaultIntercetprosSince Camel 2.12.4 Set the outFaultInterceptors to the CxfRs endpoint.outFaultInterceptors=#MyInterceptorsNoNonecontinuationTimeoutSince Camel 2.14.0 This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport. (Before Camel 2.14.0, CxfConsum er just set the continuation timeout to be 0, which means the continuation suspend operation never timeout.)continuationTimeout=80No3You can also configure the CXF REST e
[2/2] git commit: Fix unit test, so it runs on all platforms
Fix unit test, so it runs on all platforms Replace usage of hard-coded Unix file name separator ("/") with java.io.File.separator constant, so the test also runs on Windows platforms. Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6224f46a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6224f46a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6224f46a Branch: refs/heads/camel-2.12.x Commit: 6224f46a49695681d91dd3dd4c428a767751ff96 Parents: f737cbb Author: Gregor Zurowski Authored: Mon May 12 00:40:37 2014 -0400 Committer: Willem Jiang Committed: Mon May 12 16:08:45 2014 +0800 -- .../camel/processor/interceptor/DefaultTraceEventMessageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6224f46a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java old mode 100644 new mode 100755 index dd22be0..de1705a --- a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java @@ -76,7 +76,7 @@ public class DefaultTraceEventMessageTest extends ContextTestSupport { exchange.getIn().setBody(new File("target/test")); DefaultTraceEventMessage em = new DefaultTraceEventMessage(new Date(), null, exchange); -assertEquals("Get a wrong body string", "[Body is file based: target/test]", em.getBody()); +assertEquals("Get a wrong body string", "[Body is file based: target" + File.separator + "test]", em.getBody()); exchange.getIn().setBody(new ByteArrayInputStream("target/test".getBytes())); em = new DefaultTraceEventMessage(new Date(), null, exchange);
git commit: Fix unit test, so it runs on all platforms
Repository: camel Updated Branches: refs/heads/master e6eca45cb -> 48923c5ae Fix unit test, so it runs on all platforms Replace usage of hard-coded Unix file name separator ("/") with java.io.File.separator constant, so the test also runs on Windows platforms. Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48923c5a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48923c5a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48923c5a Branch: refs/heads/master Commit: 48923c5ae8e2a6247f44306ab272634466b4d053 Parents: e6eca45 Author: Gregor Zurowski Authored: Mon May 12 00:40:37 2014 -0400 Committer: Willem Jiang Committed: Mon May 12 16:04:44 2014 +0800 -- .../camel/processor/interceptor/DefaultTraceEventMessageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/48923c5a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java old mode 100644 new mode 100755 index dd22be0..de1705a --- a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java @@ -76,7 +76,7 @@ public class DefaultTraceEventMessageTest extends ContextTestSupport { exchange.getIn().setBody(new File("target/test")); DefaultTraceEventMessage em = new DefaultTraceEventMessage(new Date(), null, exchange); -assertEquals("Get a wrong body string", "[Body is file based: target/test]", em.getBody()); +assertEquals("Get a wrong body string", "[Body is file based: target" + File.separator + "test]", em.getBody()); exchange.getIn().setBody(new ByteArrayInputStream("target/test".getBytes())); em = new DefaultTraceEventMessage(new Date(), null, exchange);
[1/2] git commit: Fix unit test, so it runs on all platforms
Repository: camel Updated Branches: refs/heads/camel-2.12.x f737cbb1a -> 6224f46a4 refs/heads/camel-2.13.x 0ab12f7c9 -> 5eeb25e11 Fix unit test, so it runs on all platforms Replace usage of hard-coded Unix file name separator ("/") with java.io.File.separator constant, so the test also runs on Windows platforms. Signed-off-by: Gregor Zurowski Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5eeb25e1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5eeb25e1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5eeb25e1 Branch: refs/heads/camel-2.13.x Commit: 5eeb25e11aba9bf046ce2e66f11e20c7df857416 Parents: 0ab12f7 Author: Gregor Zurowski Authored: Mon May 12 00:40:37 2014 -0400 Committer: Willem Jiang Committed: Mon May 12 16:08:12 2014 +0800 -- .../camel/processor/interceptor/DefaultTraceEventMessageTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5eeb25e1/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java old mode 100644 new mode 100755 index dd22be0..de1705a --- a/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessageTest.java @@ -76,7 +76,7 @@ public class DefaultTraceEventMessageTest extends ContextTestSupport { exchange.getIn().setBody(new File("target/test")); DefaultTraceEventMessage em = new DefaultTraceEventMessage(new Date(), null, exchange); -assertEquals("Get a wrong body string", "[Body is file based: target/test]", em.getBody()); +assertEquals("Get a wrong body string", "[Body is file based: target" + File.separator + "test]", em.getBody()); exchange.getIn().setBody(new ByteArrayInputStream("target/test".getBytes())); em = new DefaultTraceEventMessage(new Date(), null, exchange);