git commit: update the maven-release-plugin configuration to use our new Git repository
Updated Branches:
refs/heads/camel-2.11.x ace5a3adc - 13b0d4656
update the maven-release-plugin configuration to use our new Git repository
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13b0d465
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13b0d465
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13b0d465
Branch: refs/heads/camel-2.11.x
Commit: 13b0d46561c26c0bbb9b97dbc0a7d5ec6da48d9a
Parents: ace5a3a
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 11:53:35 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 11:53:35 2013 +0200
--
pom.xml | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/13b0d465/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9e436da..1f545db 100755
--- a/pom.xml
+++ b/pom.xml
@@ -123,9 +123,9 @@
/modules
scm
-
connectionscm:svn:https://svn.apache.org/repos/asf/camel/branches/camel-2.11.x/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/camel/branches/camel-2.11.x/developerConnection
-urlhttp://svn.apache.org/viewvc/camel/branches/camel-2.11.x/url
+
connectionscm:git:http://git-wip-us.apache.org/repos/asf/camel.git/connection
+
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/camel.git/developerConnection
+urlhttps://fisheye6.atlassian.com/browse/~br=camel-2.11.x/camel-git/url
/scm
build
@@ -198,9 +198,12 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-release-plugin/artifactId
- version2.4/version
+ !-- see http://jira.codehaus.org/browse/MRELEASE-812 --
+ version2.4.1/version
configuration
-tagBasehttps://svn.apache.org/repos/asf/camel/tags/tagBase
+localCheckouttrue/localCheckout
+pushChangesfalse/pushChanges
+
tagNameFormat@{project.artifactId}-@{project.version}/tagNameFormat
useReleaseProfilefalse/useReleaseProfile
preparationGoalsclean install/preparationGoals
goalsdeploy/goals
git commit: CAMEL-6480: Allow to not log message body if CamelLogDebugBodyMaxChars is set to negative value.
Updated Branches:
refs/heads/master 29d8db8fa - 05967ac7f
CAMEL-6480: Allow to not log message body if CamelLogDebugBodyMaxChars is set
to negative value.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05967ac7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05967ac7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05967ac7
Branch: refs/heads/master
Commit: 05967ac7fe3d60b20c31f3796133f6854f10686c
Parents: 29d8db8
Author: Claus Ibsen davscl...@apache.org
Authored: Sat Jun 29 13:54:41 2013 +0400
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat Jun 29 13:54:41 2013 +0400
--
.../java/org/apache/camel/processor/DefaultExchangeFormatter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/05967ac7/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
index 8f474a3..0405fde 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
@@ -345,7 +345,7 @@ public class DefaultExchangeFormatter implements
ExchangeFormatter {
}
}
-return MessageHelper.extractBodyForLogging(message, ,
isShowStreams(), isShowFiles(), -1);
+return MessageHelper.extractBodyForLogging(message, ,
isShowStreams(), isShowFiles(), getMaxChars());
}
protected String getBodyTypeAsString(Message message) {
git commit: fixed the issues reported by apache-rat-plugin
Updated Branches: refs/heads/camel-2.11.x 13b0d4656 - ed63d fixed the issues reported by apache-rat-plugin Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed63 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed63 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed63 Branch: refs/heads/camel-2.11.x Commit: ed63d241331a6047df7a9de4fa151f70f204 Parents: 13b0d46 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 12:17:06 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 12:17:06 2013 +0200 -- components/camel-ical/pom.xml | 17 + .../src/main/data/message.xml | 4 pom.xml| 1 + .../META-INF/m2e/lifecycle-mapping-metadata.xml| 17 + 4 files changed, 35 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/components/camel-ical/pom.xml -- diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml index 4f4c197..fc80201 100644 --- a/components/camel-ical/pom.xml +++ b/components/camel-ical/pom.xml @@ -1,3 +1,20 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- 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; http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/examples/camel-example-management/src/main/data/message.xml -- diff --git a/examples/camel-example-management/src/main/data/message.xml b/examples/camel-example-management/src/main/data/message.xml deleted file mode 100644 index 4b8530d..000 --- a/examples/camel-example-management/src/main/data/message.xml +++ /dev/null @@ -1,4 +0,0 @@ -?xml version=1.0 encoding=UTF-8? -person -nameClaus/name -/person \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/pom.xml -- diff --git a/pom.xml b/pom.xml index 1f545db..4398294 100755 --- a/pom.xml +++ b/pom.xml @@ -191,6 +191,7 @@ exclude**/avro/**/*.avpr/exclude exclude**/OSGI-INF/bundle.info/exclude exclude**/test_rsa*/exclude +excludeexamples/*/src/data/**/*.xml/exclude /excludes /configuration /plugin http://git-wip-us.apache.org/repos/asf/camel/blob/ed63/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml -- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml index 565f8d4..1cae827 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml @@ -1,3 +1,20 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR
[CONF] Apache Camel Release Guide
Release Guide
Page edited by Christian Mueller
Changes (3)
...
The release plugin will prompt for a release version, tag and next release version. Use a three digit release version of the form: 2.x.x and for the tag use a string of the form: camel-2.x.x. The next version string should use the two digit from: 2.x-SNAPSHOT as this can be consistent for future SNAPSHOT releases.
# Grab the latest source from SVN Git
{code}
svn co https://svn.apache.org/repos/asf/camel/trunk camel
git clone https://git-wip-us.apache.org/repos/asf/camel.git
cd camel {code}
...
Full Content
How to create and announce a Camel release.
This release guide is based on the General guide for releasing Maven-based projects at Apache, so be sure to check it out before continuing and meet all prerequisites.
Note: Make sure that you are using JDK 6.
Prerequisites
To prepare or perform a release you MUST BE at least an Apache Camel committer.
The artifacts for each and every release must be SIGNED; your public key should be added to the KEYS file
Your public key must also be cross-signed by other Apache committers (this can be done at key signing parties at ApacheCon for instance)
Make sure you have the correct maven configuration in ~/.m2/settings.xml
Use Maven 2.2.1+ (Maven 2.1.x is known to produce wrong gpg pom signatures - MGPG-14)
From Camel 2.10 onwards we will require to use Maven 3.0.2+
From Camel 2.11 onwards we will require to use Maven 3.0.4+
You may want to get familiar with the release settings in the parent apache POM.
Make sure you have installed Prince to be able to generate the Camel manual
Add your Prince installation bin directory to your PATH variable:
PATH=$PATH:/usr/local/bin/prince
Maven 2 Setup
Before you deploy anything to the maven repository using Maven 2, you should configure your /.m2/settings.xml file so that the file permissions of the deployed artifacts are group writable. If you do not do this, other developers will not able to overwrite your SNAPSHOT releases with newer versions. The settings follow the guidelines used by the Maven project. Please pay particular attention to the password encryption recommendations.
settings
...
servers
!-- Per http://maven.apache.org/developers/committer-settings.html --
!-- To publish a snapshot of some part of Maven --
server
idapache.snapshots.https/id
username !-- YOUR APACHE LDAP USERNAME -- /username
password !-- YOUR APACHE LDAP PASSWORD -- /password
/server
!-- To publish a website of some part of Maven --
server
idapache.website/id
username !-- YOUR APACHE LDAP USERNAME -- /username
filePermissions664/filePermissions
directoryPermissions775/directoryPermissions
/server
!-- To stage a release of some part of Maven --
server
idapache.releases.https/id
username !-- YOUR APACHE LDAP USERNAME -- /username
password !-- YOUR APACHE LDAP PASSWORD -- /password
/server
!-- To stage a website of some part of Maven --
server
idstagingSite/id !-- must match hard-coded repository identifier in site:stage-deploy --
username !-- YOUR APACHE LDAP USERNAME -- /username
filePermissions664/filePermissions
directoryPermissions775/directoryPermissions
/server
/servers
...
profiles
profile
idapache-release/id
properties
gpg.useagentfalse/gpg.useagent
gpg.passphrase!-- YOUR GPG PASSPHRASE --/gpg.passphrase
testfalse/test
/properties
/profile
/profiles
...
/settings
It is also essential that you configure your umask to 2 on people.apache.org for non-interactive login. You can do that by including the snipped below in your .profile.
umask 002
Creating the Camel Release
The release plugin will prompt for a release version, tag and next release version. Use a three digit release version of the form: 2.x.x and for the tag use a string of the form: camel-2.x.x. The next version string should use the two digit from: 2.x-SNAPSHOT as this can be consistent for future SNAPSHOT releases.
Grab the latest source from Git
git clone https://git-wip-us.apache.org/repos/asf/camel.git
cd camel
Verify headers with rat
mvn -e org.apache.rat:apache-rat-plugin:check
grep -e ' !?' target/rat.txt -- will show any files without licenses
Because of MRELEASE-812, you should use the following setting:
LANG='en_US.UTF-8'
Do a release dry run to check for problems
mvn release:prepare -DdryRun=true
Check that you are happy with the results. The poms for the proposed tags will be in pom.xml.tag. Check also the generated signature files:
cmueller$
git commit: fixed the CS error
Updated Branches: refs/heads/camel-2.11.x ed63d - 4f5ad25be fixed the CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4f5ad25b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f5ad25b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f5ad25b Branch: refs/heads/camel-2.11.x Commit: 4f5ad25be2292277a0741998f67d24ac08d0fff5 Parents: ed6 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 12:28:07 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 12:28:07 2013 +0200 -- .../org/apache/camel/component/validator/ValidatorComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4f5ad25b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java index 5ec52f4..622d376 100644 --- a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java @@ -18,6 +18,7 @@ package org.apache.camel.component.validator; import java.io.InputStream; import java.util.Map; +import org.w3c.dom.ls.LSResourceResolver; import org.apache.camel.Endpoint; import org.apache.camel.converter.IOConverter; @@ -28,7 +29,6 @@ import org.apache.camel.util.IOHelper; import org.apache.camel.util.ResourceHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.ls.LSResourceResolver; /** * The a href=http://camel.apache.org/validation.html;Validator Component/a
[CONF] Apache Camel Twitter Websocket Blueprint Example
Twitter Websocket Blueprint Example File attached by Claus Ibsen gaga.png (110 kB image/png) Stop watching space | Change email notification preferences View Attachments
[CONF] Apache Camel Twitter Websocket Blueprint Example
Twitter Websocket Blueprint Example Page added by Claus Ibsen Twitter Websocket Blueprint Example Available as of Camel 2.12 This example is located in the Camel distribution at examples/camel-example-twitter-websocket-blueprint. The example is demonstrating how to poll a constant feed of twitter searches and publish results in real time using web socket to a web page. This example is already configured using a testing purpose twitter account named 'cameltweet'. And therefore the example is ready to run out of the box. This account is only for testing purpose, and should not be used in your custom applications. For that you need to setup and use your own twitter account. See more details at Twitter Websocket Example about how to configure twitter to use your own account. Running this example This example requires running in Apache Karaf / ServiceMix You will need to install this example first to your local maven repository with: mvn install To install Apache Camel in Karaf you type in the shell (we use version 2.12.0): features:chooseurl camel 2.12.0 features:install camel First you need to install the following features in Karaf/ServiceMix with: features:install camel-twitter features:install camel-websocket Then you can install the Camel example: osgi:install -s mvn:org.apache.camel/camel-example-twitter-websocket-blueprint/2.12.0 Then open a browser to see live twitter updates in the web page http://localhost:9090 When the application runs, the webpage should automatic update with new tweets. Blueprint XML file The 'meat' of this example is defined in the OSGi Blueprint XML file in the src/main/resources/OSGI-INF/blueprint/camel-twitter.xml file, which would be a good idea to take a look at, to better understand this example. See also Twitter Websocket Example Twitter Websocket Examples Tutorials User Guide Stop watching space | Change email notification preferences View Online | Add Comment
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 4f5ad25be - 8c3dad5f8
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c3dad5f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c3dad5f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c3dad5f
Branch: refs/heads/camel-2.11.x
Commit: 8c3dad5f81d858a8bd0dda7f0eb249714d21401d
Parents: 4f5ad25
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 12:32:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 12:32:21 2013 +0200
--
.../java/org/apache/camel/test/blueprint/DebugBlueprintTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8c3dad5f/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
--
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
index 56a9b40..8b39378 100644
---
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
@@ -70,4 +70,4 @@ public class DebugBlueprintTest extends
CamelBlueprintTestSupport {
debugAfterMethodCalled = true;
}
}
-// END SNIPPET: example
\ No newline at end of file
+// END SNIPPET: example
[CONF] Apache Camel Twitter Websocket Example
Twitter Websocket Example
Page edited by Claus Ibsen
Changes (2)
...
This example is located in the Camel [distribution|Download] at {{examples/camel-example-twitter-websocket}}.
{tip} There is a [Twitter Websocket Blueprint Example] for OSGi Blueprint users. {tip}
The example is demonstrating how to poll a constant feed of twitter searches and publish results in real time using web socket to a web page. As usual the code in Camel is very simple. All it takes is roughly
...
h3. See also
- [Twitter Websocket Blueprint Example]
- [Twitter] - [Websocket]
...
Full Content
Twitter Websocket Example
Available as of Camel 2.10
This example is located in the Camel distribution at examples/camel-example-twitter-websocket.
There is a Twitter Websocket Blueprint Example for OSGi Blueprint users.
The example is demonstrating how to poll a constant feed of twitter searches and publish results in real time using web socket to a web page.
As usual the code in Camel is very simple. All it takes is roughly
from("twitter://search?...")
.to("websocket:camel-tweet?sendToAll=true")
This example is already configured using a testing purpose twitter account named 'cameltweet'. And therefore the example is ready to run out of the box.
This account is only for testing purpose, and should not be used in your custom applications. For that you need to setup and use your own twitter account.
How to use my own twitter accountTo use twitter, you need a twitter account which have setup an application to be used.
For twitter users, you may be familiar that twitter requires you to grant applications access to your twitter account, such as twitter for iphone etc.
The same applies for this example. You can read details about how to setup a new twitter application at the Camel Twitter documentation.
In your Twitter settings under the Apps menu, it will list your approved applications. For example I created an application named "Camel-Example"
which is now listed as approved with read-only access.
When you have created an application, you get a number of details back from twitter
which you need to use the twitter component. Enter these details in the source code at:
src/main/java/org/apache/camel/example/websocket/CamelTwitterWebSocketMain.java
You will need to compile this example first:
mvn compile
To run the example type
mvn exec:java
Then open a browser to see live twitter updates in the webpage
http://localhost:9090/index.html
To stop the example hit ctrl + c
When the application runs, the webpage should automatic update with new tweets. A screenshot below illustrates what you would see:
See also
Twitter Websocket Blueprint Example
Twitter
Websocket
Examples
Tutorials
User Guide
Stop watching space
|
Change email notification preferences
View Online
|
View Changes
|
Add Comment
[2/2] git commit: Fixed potential NPE
Fixed potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/18f8d29f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/18f8d29f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/18f8d29f
Branch: refs/heads/master
Commit: 18f8d29f985746e5b5afa7f7b26564c5be564d5c
Parents: 131d39b
Author: Claus Ibsen davscl...@apache.org
Authored: Sat Jun 29 14:48:45 2013 +0400
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat Jun 29 14:48:45 2013 +0400
--
.../java/org/apache/camel/util/EventHelper.java | 199 +++
1 file changed, 155 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/18f8d29f/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
b/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
index 12084ec..c5206af 100644
--- a/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
@@ -27,6 +27,7 @@ import org.apache.camel.Route;
import org.apache.camel.StatefulService;
import org.apache.camel.spi.EventFactory;
import org.apache.camel.spi.EventNotifier;
+import org.apache.camel.spi.ManagementStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +44,12 @@ public final class EventHelper {
}
public static void notifyCamelContextStarting(CamelContext context) {
-ListEventNotifier notifiers =
context.getManagementStrategy().getEventNotifiers();
+ManagementStrategy management = context.getManagementStrategy();
+if (management == null) {
+return;
+}
+
+ListEventNotifier notifiers = management.getEventNotifiers();
if (notifiers == null || notifiers.isEmpty()) {
return;
}
@@ -53,7 +59,7 @@ public final class EventHelper {
continue;
}
-EventFactory factory =
context.getManagementStrategy().getEventFactory();
+EventFactory factory = management.getEventFactory();
if (factory == null) {
return;
}
@@ -66,7 +72,12 @@ public final class EventHelper {
}
public static void notifyCamelContextStarted(CamelContext context) {
-ListEventNotifier notifiers =
context.getManagementStrategy().getEventNotifiers();
+ManagementStrategy management = context.getManagementStrategy();
+if (management == null) {
+return;
+}
+
+ListEventNotifier notifiers = management.getEventNotifiers();
if (notifiers == null || notifiers.isEmpty()) {
return;
}
@@ -76,7 +87,7 @@ public final class EventHelper {
continue;
}
-EventFactory factory =
context.getManagementStrategy().getEventFactory();
+EventFactory factory = management.getEventFactory();
if (factory == null) {
return;
}
@@ -89,7 +100,12 @@ public final class EventHelper {
}
public static void notifyCamelContextStartupFailed(CamelContext context,
Throwable cause) {
-ListEventNotifier notifiers =
context.getManagementStrategy().getEventNotifiers();
+ManagementStrategy management = context.getManagementStrategy();
+if (management == null) {
+return;
+}
+
+ListEventNotifier notifiers = management.getEventNotifiers();
if (notifiers == null || notifiers.isEmpty()) {
return;
}
@@ -99,7 +115,7 @@ public final class EventHelper {
continue;
}
-EventFactory factory =
context.getManagementStrategy().getEventFactory();
+EventFactory factory = management.getEventFactory();
if (factory == null) {
return;
}
@@ -112,7 +128,12 @@ public final class EventHelper {
}
public static void notifyCamelContextStopping(CamelContext context) {
-ListEventNotifier notifiers =
context.getManagementStrategy().getEventNotifiers();
+ManagementStrategy management = context.getManagementStrategy();
+if (management == null) {
+return;
+}
+
+ListEventNotifier notifiers = management.getEventNotifiers();
if (notifiers == null || notifiers.isEmpty()) {
return;
}
@@ -122,7 +143,7 @@ public final class EventHelper {
continue;
}
-EventFactory factory =
context.getManagementStrategy().getEventFactory();
+EventFactory factory = management.getEventFactory();
[1/2] git commit: Added blueprint example of our twitter example.
Updated Branches:
refs/heads/master 05967ac7f - 18f8d29f9
Added blueprint example of our twitter example.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/131d39bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/131d39bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/131d39bc
Branch: refs/heads/master
Commit: 131d39bc51051343ddeda277a433a84f21a4c825
Parents: 05967ac
Author: Claus Ibsen davscl...@apache.org
Authored: Sat Jun 29 14:06:20 2013 +0400
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat Jun 29 14:38:25 2013 +0400
--
.../README.txt | 34 ++--
.../pom.xml | 7 +-
.../OSGI-INF/blueprint/camel-twitter.xml| 8 +-
.../src/main/resources/webapp/index.html| 84 +++-
examples/pom.xml| 1 +
5 files changed, 88 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/131d39bc/examples/camel-example-twitter-websocket-blueprint/README.txt
--
diff --git a/examples/camel-example-twitter-websocket-blueprint/README.txt
b/examples/camel-example-twitter-websocket-blueprint/README.txt
index 6b6352b..4d7433b 100644
--- a/examples/camel-example-twitter-websocket-blueprint/README.txt
+++ b/examples/camel-example-twitter-websocket-blueprint/README.txt
@@ -1,5 +1,5 @@
-Twitter and Websocket Example
-=
+Twitter and Websocket Blueprint Example
+===
The example is demonstrating how to poll a constant feed of twitter searches
and publish results in real time using web socket to a web page.
@@ -13,18 +13,38 @@ For that you need to setup and use your own twitter account.
We have described this in more details at the Camel twitter documentation:
http://camel.apache.org/twitter
-You will need to compile this example first:
- mvn compile
+You will need to install this example first to your local maven repository
with:
+ mvn install
-To run the example type
- mvn exec:java
+This example requires running in Apache Karaf / ServiceMix
+
+To install Apache Camel in Karaf you type in the shell (we use version 2.12.0):
+
+ features:chooseurl camel 2.12.0
+ features:install camel
+
+First you need to install the following features in Karaf/ServiceMix with:
+
+ features:install camel-twitter
+ features:install camel-websocket
+
+Then you can install the Camel example:
+
+ osgi:install -s
mvn:org.apache.camel/camel-example-twitter-websocket-blueprint/2.12.0
Then open a browser to see live twitter updates in the web page
http://localhost:9090
-To stop the example hit ctrl + c
+To stop the example run from Karaf/ServiceMix shell:
+ stop bundle id
+
+eg if the bundle id is 99 then type:
+ stop 99
This example is documented at
+ http://camel.apache.org/twitter-websocket-blueprint-example.html
+
+There is a regular (non OSGi Blueprint) example as well documented at:
http://camel.apache.org/twitter-websocket-example.html
If you hit any problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/131d39bc/examples/camel-example-twitter-websocket-blueprint/pom.xml
--
diff --git a/examples/camel-example-twitter-websocket-blueprint/pom.xml
b/examples/camel-example-twitter-websocket-blueprint/pom.xml
index 4ce9d90..9265535 100644
--- a/examples/camel-example-twitter-websocket-blueprint/pom.xml
+++ b/examples/camel-example-twitter-websocket-blueprint/pom.xml
@@ -31,6 +31,9 @@
descriptionAn example that pushes new tweets to a web page using
web-socket/description
packagingbundle/packaging
+ !-- there is no maven dependencies needed as the Camel application has no
Java code,
+ and its all defined in the
src/main/resources/OSGI-INF/blueprint/camel-twitter.xml file --
+
build
plugins
@@ -43,9 +46,9 @@
manifestLocationtarget/META-INF/manifestLocation
instructions
Bundle-SymbolicName${project.groupId}.${project.artifactId}/Bundle-SymbolicName
+Export-Packageorg.apache.camel.example.twitter*/Export-Package
Import-Package
- org.apache.camel.component.twitter,
- org.apache.camel.component.websocket
+ *
/Import-Package
/instructions
/configuration
http://git-wip-us.apache.org/repos/asf/camel/blob/131d39bc/examples/camel-example-twitter-websocket-blueprint/src/main/resources/OSGI-INF/blueprint/camel-twitter.xml
--
diff --git
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 8c3dad5f8 - 4072e3778
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4072e377
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4072e377
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4072e377
Branch: refs/heads/camel-2.11.x
Commit: 4072e377848e785d4e305027a6dd95b5f526887a
Parents: 8c3dad5
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 13:45:39 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 13:45:39 2013 +0200
--
.../java/org/apache/camel/component/ical/ICalConverter.java | 7 +--
.../java/org/apache/camel/component/ical/ICalDataFormat.java | 2 +-
.../org/apache/camel/component/ical/ICalDataFormatTest.java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4072e377/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
--
diff --git
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
index 5a3e4d9..765b158 100644
---
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
+++
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalConverter.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -31,7 +31,10 @@ import org.apache.camel.util.IOHelper;
* ICal related converter.
*/
@Converter
-public class ICalConverter {
+public final class ICalConverter {
+
+private ICalConverter() {
+}
@Converter
public static Date toDate(DateProperty property) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4072e377/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
--
diff --git
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
index 2159b53..0448c74 100644
---
a/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
+++
b/components/camel-ical/src/main/java/org/apache/camel/component/ical/ICalDataFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
http://git-wip-us.apache.org/repos/asf/camel/blob/4072e377/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
--
diff --git
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
index 163a533..f588401 100644
---
a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
+++
b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 4072e3778 - 914089379
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91408937
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91408937
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91408937
Branch: refs/heads/camel-2.11.x
Commit: 914089379ed80efe5481ac46cdec783f4c911910
Parents: 4072e37
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 14:00:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 14:00:52 2013 +0200
--
.../main/java/org/apache/camel/builder/script/ScriptBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/91408937/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
--
diff --git
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
index 9feca5e..96adfab 100644
---
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
+++
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
@@ -345,7 +345,7 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
if (LOG.isDebugEnabled()) {
LOG.debug(Script evaluation failed: + e.getMessage(), e);
}
-if (e.getCause()!= null) {
+if (e.getCause() != null) {
throw createScriptEvaluationException(e.getCause());
} else {
throw createScriptEvaluationException(e);
git commit: fixed the CS error
Updated Branches:
refs/heads/camel-2.11.x 914089379 - cc54c81f2
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc54c81f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc54c81f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc54c81f
Branch: refs/heads/camel-2.11.x
Commit: cc54c81f2902563ad0fc03d1a209940edf40800c
Parents: 9140893
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 14:08:33 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 14:08:33 2013 +0200
--
.../java/org/apache/camel/example/client/CamelClientRemoting.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cc54c81f/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
--
diff --git
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
index e7110e5..ac7f4eb 100644
---
a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
+++
b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
@@ -45,7 +45,7 @@ public final class CamelClientRemoting {
System.out.println(... the result is: + response);
// we're done so let's properly close the application context
- context.close();
+context.close();
}
// END SNIPPET: e1
git commit: fixed the CS error
Updated Branches: refs/heads/master 18f8d29f9 - 97516739b fixed the CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97516739 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97516739 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97516739 Branch: refs/heads/master Commit: 97516739bfc1a751345f39e9c99c1e1dbcd09d3d Parents: 18f8d29 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 14:27:24 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 14:27:24 2013 +0200 -- .../cxf/wssecurity/camel/MyProcessor.java | 16 +++ .../wssecurity/camel/WSSecurityRouteTest.java | 16 +++ .../component/cxf/wssecurity/client/Client.java | 27 -- .../wssecurity/client/UTPasswordCallback.java | 26 -- .../cxf/wssecurity/server/CxfServer.java| 27 -- .../cxf/wssecurity/server/GreeterImpl.java | 29 +--- .../wssecurity/server/UTPasswordCallback.java | 26 -- 7 files changed, 93 insertions(+), 74 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/97516739/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java index c53f06d..3a4ebe5 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/MyProcessor.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.component.cxf.wssecurity.camel; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/camel/blob/97516739/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java index b7c55e7..4109032 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.component.cxf.wssecurity.camel; import org.apache.camel.CamelContext; http://git-wip-us.apache.org/repos/asf/camel/blob/97516739/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java
git commit: fixed the CS error
Updated Branches:
refs/heads/master 97516739b - 8a1c55a65
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a1c55a6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a1c55a6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a1c55a6
Branch: refs/heads/master
Commit: 8a1c55a65f4d6ceeb2c29febac6451cc3cb71441
Parents: 9751673
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 14:39:33 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 14:39:33 2013 +0200
--
.../component/geocoder/GeoCoderProducer.java| 24 ++--
.../geocoder/GeoCoderComponentAddressTest.java | 8 +++
.../geocoder/GeoCoderCurrentAddressTest.java| 8 +++
.../geocoder/GeoCoderLatLngComponentTest.java | 10
4 files changed, 25 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
--
diff --git
a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
index ab10fc5..d410c97 100644
---
a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
+++
b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
@@ -114,22 +114,22 @@ public class GeoCoderProducer extends DefaultProducer {
String resLatlng = latitudeNode.asText() + , +
longitudeNode.asText();
exchange.getIn().setHeader(GeoCoderConstants.LATLNG, resLatlng);
-JsonNode country_code = node.get(country_code);
-JsonNode country_name = node.get(country_name);
-if (country_code != null) {
-exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_SHORT,
country_code.asText());
+JsonNode countryCode = node.get(country_code);
+JsonNode countryName = node.get(country_name);
+if (countryCode != null) {
+exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_SHORT,
countryCode.asText());
}
-if (country_name != null) {
-exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_LONG,
country_name.asText());
+if (countryName != null) {
+exchange.getIn().setHeader(GeoCoderConstants.COUNTRY_LONG,
countryName.asText());
}
-JsonNode region_code = node.get(region_code);
-JsonNode region_name = node.get(region_name);
-if (region_code != null) {
-exchange.getIn().setHeader(GeoCoderConstants.REGION_CODE,
region_code.asText());
+JsonNode regionCode = node.get(region_code);
+JsonNode regionName = node.get(region_name);
+if (regionCode != null) {
+exchange.getIn().setHeader(GeoCoderConstants.REGION_CODE,
regionCode.asText());
}
-if (region_name != null) {
-exchange.getIn().setHeader(GeoCoderConstants.REGION_NAME,
region_name.asText());
+if (regionName != null) {
+exchange.getIn().setHeader(GeoCoderConstants.REGION_NAME,
regionName.asText());
}
JsonNode city = node.get(city);
http://git-wip-us.apache.org/repos/asf/camel/blob/8a1c55a6/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
--
diff --git
a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
index 37f10a8..16d8bd6 100644
---
a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
+++
b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderComponentAddressTest.java
@@ -39,10 +39,10 @@ public class GeoCoderComponentAddressTest extends
CamelTestSupport {
return new RouteBuilder() {
public void configure() {
from(direct:start)
- .to(geocoder:address:Paris, France)
- .to(log:result)
- .log(Location ${header.CamelGeocoderAddress} is at lat/lng:
${header.CamelGeocoderLatlng} in city ${header.CamelGeocoderCity})
- .to(mock:result);
+.to(geocoder:address:Paris, France)
+.to(log:result)
+.log(Location ${header.CamelGeocoderAddress} is at
lat/lng: ${header.CamelGeocoderLatlng} in city
git commit: fixed the CS error
Updated Branches:
refs/heads/master 8a1c55a65 - f28ea90ed
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f28ea90e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f28ea90e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f28ea90e
Branch: refs/heads/master
Commit: f28ea90ed3efcf05ed4cf9d09fde077e978f237a
Parents: 8a1c55a
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 15:39:06 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 15:39:06 2013 +0200
--
.../NettyServerBootstrapConfiguration.java | 220 ---
1 file changed, 94 insertions(+), 126 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f28ea90e/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
--
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
index bc71182..6ea9d9e 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
@@ -21,11 +21,8 @@ import java.util.Map;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.jboss.netty.handler.ssl.SslHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class NettyServerBootstrapConfiguration implements Cloneable {
-private static final Logger LOG =
LoggerFactory.getLogger(NettyServerBootstrapConfiguration.class);
protected String protocol;
protected String host;
@@ -290,134 +287,105 @@ public class NettyServerBootstrapConfiguration
implements Cloneable {
* {@link NettyServerBootstrapConfiguration}, which must be identical.
*/
public boolean compatible(NettyServerBootstrapConfiguration other) {
+boolean isCompatible = true;
+
if (!protocol.equals(other.protocol)) {
+isCompatible = false;
+} else if (!host.equals(other.host)) {
+isCompatible = false;
+} else if (port != other.port) {
+isCompatible = false;
+} else if (broadcast != other.broadcast) {
+isCompatible = false;
+} else if (sendBufferSize != other.sendBufferSize) {
return false;
+} else if (receiveBufferSize != other.receiveBufferSize) {
+isCompatible = false;
+} else if (receiveBufferSizePredictor !=
other.receiveBufferSizePredictor) {
+isCompatible = false;
+} else if (workerCount != other.workerCount) {
+isCompatible = false;
+} else if (keepAlive != other.keepAlive) {
+isCompatible = false;
+} else if (tcpNoDelay != other.tcpNoDelay) {
+isCompatible = false;
+} else if (reuseAddress != other.reuseAddress) {
+isCompatible = false;
+} else if (connectTimeout != other.connectTimeout) {
+isCompatible = false;
+} else if (backlog != other.backlog) {
+isCompatible = false;
+} else if (serverPipelineFactory != other.serverPipelineFactory) {
+isCompatible = false;
+} else if (nettyServerBootstrapFactory !=
other.nettyServerBootstrapFactory) {
+isCompatible = false;
+} else if (options == null other.options != null) {
+// validate all the options is identical
+isCompatible = false;
+} else if (options != null other.options == null) {
+isCompatible = false;
+} else if (options != null other.options != null options.size()
!= other.options.size()) {
+isCompatible = false;
+} else if (options != null other.options != null
!options.keySet().containsAll(other.options.keySet())) {
+isCompatible = false;
+} else if (options != null other.options != null
!options.values().containsAll(other.options.values())) {
+isCompatible = false;
+} else if (ssl != other.ssl) {
+isCompatible = false;
+} else if (sslHandler != other.sslHandler) {
+isCompatible = false;
+} else if (sslContextParameters != other.sslContextParameters) {
+isCompatible = false;
+} else if (needClientAuth != other.needClientAuth) {
+isCompatible = false;
+} else if (keyStoreFile != other.keyStoreFile) {
+isCompatible = false;
+} else if (trustStoreFile != other.trustStoreFile) {
+
git commit: fixed the CS error
Updated Branches:
refs/heads/master f28ea90ed - a477bd1be
fixed the CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a477bd1b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a477bd1b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a477bd1b
Branch: refs/heads/master
Commit: a477bd1be78779920179d448e1c64f093b11471c
Parents: f28ea90
Author: cmueller cmuel...@apache.org
Authored: Sat Jun 29 16:39:32 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sat Jun 29 16:39:32 2013 +0200
--
.../main/java/org/apache/camel/builder/script/ScriptBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a477bd1b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
--
diff --git
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
index 9feca5e..710be36 100644
---
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
+++
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
@@ -345,7 +345,7 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
if (LOG.isDebugEnabled()) {
LOG.debug(Script evaluation failed: + e.getMessage(), e);
}
-if (e.getCause()!= null) {
+if (e.getCause() != null) {
throw createScriptEvaluationException(e.getCause());
} else {
throw createScriptEvaluationException(e);
git commit: fixed the CS error
Updated Branches: refs/heads/master a477bd1be - d92b38d1f fixed the CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d92b38d1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d92b38d1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d92b38d1 Branch: refs/heads/master Commit: d92b38d1f633682958b826ac6da78a192a25eec8 Parents: a477bd1 Author: cmueller cmuel...@apache.org Authored: Sat Jun 29 16:44:22 2013 +0200 Committer: cmueller cmuel...@apache.org Committed: Sat Jun 29 16:44:22 2013 +0200 -- .../itest/security/GreeterClientCxfMessageTest.java | 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d92b38d1/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java -- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java index 8aba72d..83cdb09 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientCxfMessageTest.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.itest.security; import org.springframework.test.context.ContextConfiguration;
