You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by jc...@apache.org on 2013/10/08 19:41:19 UTC
[1/2] git commit: CAMEL-6833: Atomic Number Producer Uses Wrong Cache
Name
Updated Branches:
refs/heads/master 530242283 -> c2f84f02d
CAMEL-6833: Atomic Number Producer Uses Wrong Cache Name
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/743eb4ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/743eb4ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/743eb4ad
Branch: refs/heads/master
Commit: 743eb4ad0c5a5d4f84e75caa1852ee2fb51f4b3a
Parents: 3e2dedf
Author: James Carman <ja...@carmanconsulting.com>
Authored: Mon Oct 7 21:24:23 2013 -0400
Committer: James Carman <ja...@carmanconsulting.com>
Committed: Mon Oct 7 21:40:13 2013 -0400
----------------------------------------------------------------------
.../org/apache/camel/component/hazelcast/HazelcastComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/743eb4ad/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
index 83f5043..4731bab 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
@@ -68,7 +68,7 @@ public class HazelcastComponent extends DefaultComponent {
if (remaining.startsWith(HazelcastConstants.ATOMICNUMBER_PREFIX)) {
// remaining is the name of the atomic value
- remaining = removeStartingCharacters(remaining.substring(HazelcastConstants.INSTANCE_PREFIX.length()), '/');
+ remaining = removeStartingCharacters(remaining.substring(HazelcastConstants.ATOMICNUMBER_PREFIX.length()), '/');
endpoint = new HazelcastAtomicnumberEndpoint(hazelcastInstance, uri, this, remaining);
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel
Posted by jc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2f84f02
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2f84f02
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2f84f02
Branch: refs/heads/master
Commit: c2f84f02dc457008e93c180a2ba447e386b166fc
Parents: 743eb4a 5302422
Author: James W. Carman <jc...@apache.org>
Authored: Tue Oct 8 13:39:52 2013 -0400
Committer: James W. Carman <jc...@apache.org>
Committed: Tue Oct 8 13:39:52 2013 -0400
----------------------------------------------------------------------
.../camel/processor/ShutdownDeferTest.java | 39 +++-
.../camel/processor/ShutdownNotDeferTest.java | 41 +++-
.../restlet/DefaultRestletBinding.java | 3 +
.../component/restlet/RestletSetBodyTest.java | 42 ++++
...pringPropertyPlaceholderConfigurer3Test.java | 23 ++-
.../processor/SpringShutdownDeferTest.java | 32 ---
.../processor/SpringShutdownNotDeferTest.java | 32 ---
...SpringPropertyPlaceholderConfigurer3Test.xml | 1 +
.../spring/processor/ShutdownDeferTest.xml | 45 ----
.../spring/processor/ShutdownNotDeferTest.xml | 43 ----
.../blueprint/CamelBlueprintTestSupport.java | 13 +-
.../pom.xml | 61 ++++++
.../META-INF/maven/archetype-metadata.xml | 78 +++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../resources/archetype-resources/ReadMe.txt | 29 +++
.../main/resources/archetype-resources/pom.xml | 94 +++++++++
.../src/main/java/incident/IncidentService.java | 35 ++++
.../main/java/incident/InputReportIncident.java | 96 +++++++++
.../main/java/incident/InputStatusIncident.java | 33 +++
.../java/incident/OutputReportIncident.java | 33 +++
.../java/incident/OutputStatusIncident.java | 33 +++
.../java/incident/ReportIncidentProcessor.java | 38 ++++
.../java/incident/StatusIncidentProcessor.java | 36 ++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 59 ++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 8 +-
tooling/archetypes/pom.xml | 1 +
27 files changed, 992 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
Re: [1/2] git commit: CAMEL-6833: Atomic Number Producer Uses Wrong
Cache Name
Posted by James Carman <ja...@carmanconsulting.com>.
Thank you and thanks for the tip! My git fu needs some work. :)
On Tuesday, October 8, 2013, Willem jiang wrote:
> Yeah, it's an import moment and welcome on board James.
>
> BTW, Please use the "git pull --rebase" before you push the change.
> That could keep the commit log much better :)
>
> --
> Willem Jiang
>
> Red Hat, Inc.
> Web: http://www.redhat.com
> Blog: http://willemjiang.blogspot.com (http://willemjiang.blogspot.com/)
> (English)
> http://jnn.iteye.com (http://jnn.javaeye.com/) (Chinese)
> Twitter: willemjiang
> Weibo: 姜宁willem
>
>
>
>
>
> On Wednesday, October 9, 2013 at 1:41 AM, jcarman@apache.org<javascript:;>(mailto:
> jcarman@apache.org <javascript:;>) wrote:
>
> > Updated Branches:
> > refs/heads/master 530242283 -> c2f84f02d
> >
> >
> > CAMEL-6833: Atomic Number Producer Uses Wrong Cache Name
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/743eb4ad
> > Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/743eb4ad
> > Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/743eb4ad
> >
> > Branch: refs/heads/master
> > Commit: 743eb4ad0c5a5d4f84e75caa1852ee2fb51f4b3a
> > Parents: 3e2dedf
> > Author: James Carman <james@carmanconsulting.com <javascript:;> (mailto:
> james@carmanconsulting.com <javascript:;>)>
> > Authored: Mon Oct 7 21:24:23 2013 -0400
> > Committer: James Carman <james@carmanconsulting.com <javascript:;>(mailto:
> james@carmanconsulting.com <javascript:;>)>
> > Committed: Mon Oct 7 21:40:13 2013 -0400
> >
> > ----------------------------------------------------------------------
> > .../org/apache/camel/component/hazelcast/HazelcastComponent.java | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/camel/blob/743eb4ad/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> > ----------------------------------------------------------------------
> > diff --git
> a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> > index 83f5043..4731bab 100644
> > ---
> a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> > +++
> b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> > @@ -68,7 +68,7 @@ public class HazelcastComponent extends
> DefaultComponent {
> >
> > if (remaining.startsWith(HazelcastConstants.ATOMICNUMBER_PREFIX)) {
> > // remaining is the name of the atomic value
> > - remaining =
> removeStartingCharacters(remaining.substring(HazelcastConstants.INSTANCE_PREFIX.length()),
> '/');
> > + remaining =
> removeStartingCharacters(remaining.substring(HazelcastConstants.ATOMICNUMBER_PREFIX.length()),
> '/');
> > endpoint = new HazelcastAtomicnumberEndpoint(hazelcastInstance, uri,
> this, remaining);
> > }
> >
>
>
>
>
Re: [1/2] git commit: CAMEL-6833: Atomic Number Producer Uses
Wrong Cache Name
Posted by Willem jiang <wi...@gmail.com>.
Yeah, it's an import moment and welcome on board James.
BTW, Please use the "git pull --rebase" before you push the change.
That could keep the commit log much better :)
--
Willem Jiang
Red Hat, Inc.
Web: http://www.redhat.com
Blog: http://willemjiang.blogspot.com (http://willemjiang.blogspot.com/) (English)
http://jnn.iteye.com (http://jnn.javaeye.com/) (Chinese)
Twitter: willemjiang
Weibo: 姜宁willem
On Wednesday, October 9, 2013 at 1:41 AM, jcarman@apache.org (mailto:jcarman@apache.org) wrote:
> Updated Branches:
> refs/heads/master 530242283 -> c2f84f02d
>
>
> CAMEL-6833: Atomic Number Producer Uses Wrong Cache Name
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/743eb4ad
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/743eb4ad
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/743eb4ad
>
> Branch: refs/heads/master
> Commit: 743eb4ad0c5a5d4f84e75caa1852ee2fb51f4b3a
> Parents: 3e2dedf
> Author: James Carman <james@carmanconsulting.com (mailto:james@carmanconsulting.com)>
> Authored: Mon Oct 7 21:24:23 2013 -0400
> Committer: James Carman <james@carmanconsulting.com (mailto:james@carmanconsulting.com)>
> Committed: Mon Oct 7 21:40:13 2013 -0400
>
> ----------------------------------------------------------------------
> .../org/apache/camel/component/hazelcast/HazelcastComponent.java | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/743eb4ad/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> ----------------------------------------------------------------------
> diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> index 83f5043..4731bab 100644
> --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> @@ -68,7 +68,7 @@ public class HazelcastComponent extends DefaultComponent {
>
> if (remaining.startsWith(HazelcastConstants.ATOMICNUMBER_PREFIX)) {
> // remaining is the name of the atomic value
> - remaining = removeStartingCharacters(remaining.substring(HazelcastConstants.INSTANCE_PREFIX.length()), '/');
> + remaining = removeStartingCharacters(remaining.substring(HazelcastConstants.ATOMICNUMBER_PREFIX.length()), '/');
> endpoint = new HazelcastAtomicnumberEndpoint(hazelcastInstance, uri, this, remaining);
> }
>
Re: [1/2] git commit: CAMEL-6833: Atomic Number Producer Uses Wrong
Cache Name
Posted by Christian Müller <ch...@gmail.com>.
Congrats to your first commit!
Best,
Christian
Am 08.10.2013 19:41 schrieb <jc...@apache.org>:
> Updated Branches:
> refs/heads/master 530242283 -> c2f84f02d
>
>
> CAMEL-6833: Atomic Number Producer Uses Wrong Cache Name
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/743eb4ad
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/743eb4ad
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/743eb4ad
>
> Branch: refs/heads/master
> Commit: 743eb4ad0c5a5d4f84e75caa1852ee2fb51f4b3a
> Parents: 3e2dedf
> Author: James Carman <ja...@carmanconsulting.com>
> Authored: Mon Oct 7 21:24:23 2013 -0400
> Committer: James Carman <ja...@carmanconsulting.com>
> Committed: Mon Oct 7 21:40:13 2013 -0400
>
> ----------------------------------------------------------------------
> .../org/apache/camel/component/hazelcast/HazelcastComponent.java | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/743eb4ad/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> ----------------------------------------------------------------------
> diff --git
> a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> index 83f5043..4731bab 100644
> ---
> a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> +++
> b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
> @@ -68,7 +68,7 @@ public class HazelcastComponent extends DefaultComponent
> {
>
> if (remaining.startsWith(HazelcastConstants.ATOMICNUMBER_PREFIX))
> {
> // remaining is the name of the atomic value
> - remaining =
> removeStartingCharacters(remaining.substring(HazelcastConstants.INSTANCE_PREFIX.length()),
> '/');
> + remaining =
> removeStartingCharacters(remaining.substring(HazelcastConstants.ATOMICNUMBER_PREFIX.length()),
> '/');
> endpoint = new
> HazelcastAtomicnumberEndpoint(hazelcastInstance, uri, this, remaining);
> }
>
>
>