git commit: Upgraded to newer scalatest
Updated Branches:
refs/heads/master 84fd7c988 - d7abf5440
Upgraded to newer scalatest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d7abf544
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d7abf544
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d7abf544
Branch: refs/heads/master
Commit: d7abf5440167d23f920a0fc58b5ea9f2c13d3b58
Parents: 84fd7c9
Author: Claus Ibsen davscl...@apache.org
Authored: Wed May 15 08:55:51 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed May 15 08:55:51 2013 +0200
--
components/camel-scala/pom.xml |4 ++--
parent/pom.xml |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d7abf544/components/camel-scala/pom.xml
--
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index 79d8bcb..e9d0093 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -52,9 +52,9 @@
dependency
groupIdorg.scalatest/groupId
artifactIdscalatest_2.10/artifactId
-version1.9.1/version
+version${scalatest-version}/version
scopetest/scope
-!-- TODO: remove the following exclusions as soon as the scala
version being used by scalatest_2.10 is in sync with ${scala-version} --
+!-- exclude scala compiler so we can control which version we are
using --
exclusions
exclusion
groupIdorg.scala-lang/groupId
http://git-wip-us.apache.org/repos/asf/camel/blob/d7abf544/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b57f41..23aa0a0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -322,6 +322,7 @@
saxon-version9.4.0.4/saxon-version
scala-version2.10.1/scala-version
scala-maven-plugin-version3.1.2/scala-maven-plugin-version
+scalatest-version2.0.M5b/scalatest-version
scriptengines-version1.1/scriptengines-version
serp-bundle-version1.14.1_1/serp-bundle-version
servicemix-specs-version2.2.0/servicemix-specs-version
git commit: Close the Spring context properly when done.
Updated Branches:
refs/heads/master d7abf5440 - 50e9162b4
Close the Spring context properly when done.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/50e9162b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50e9162b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50e9162b
Branch: refs/heads/master
Commit: 50e9162b4561c9ce255561da025d9ed56a93b007
Parents: d7abf54
Author: Babak Vahdat bvah...@apache.org
Authored: Wed May 15 10:24:51 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Wed May 15 10:24:51 2013 +0200
--
.../component/jms/reply/QueueReplyManager.java |2 +-
.../SpringQuartzPersistentStoreRestartAppTest.java |4 +
.../camel/spring/DefaultStreamCachingTest.java |8 +-
.../camel/spring/config/AnotherCamelProxyTest.java |9 +-
.../spring/config/CamelContextFactoryBeanTest.java | 25 ++-
.../apache/camel/spring/config/CamelProxyTest.java |8 +-
.../spring/config/CamelProxyUsingRefTest.java |9 +-
.../camel/spring/config/RouteBuilderRefTest.java |9 +-
.../config/scan/SpringComponentScanTest.java | 16 +-
...ingComponentScanWithDeprecatedPackagesTest.java | 16 +-
.../apache/camel/example/client/CamelClient.java |9 +-
.../camel/example/client/CamelFileClient.java |8 +-
.../example/spring/javaconfig/IntegrationTest.java |8 +-
.../apache/camel/example/client/CamelClient.java |8 +-
.../camel/example/client/CamelClientEndpoint.java | 12 +-
.../camel/example/client/CamelClientRemoting.java |8 +-
.../src/main/resources/camel-context.xml | 196 +++---
.../customerrelations/CustomerServicesTest.java|9 +-
.../CustomerServicesWsAddressingTest.java |9 +-
19 files changed, 215 insertions(+), 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/50e9162b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
--
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
index a17708e..c18a892 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
@@ -213,7 +213,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
answer.setTaskExecutor(endpoint.getTaskExecutor());
}
-// setup a bean name which is used ny Spring JMS as the thread name
+// setup a bean name which is used by Spring JMS as the thread name
String name = QueueReplyManager[ + answer.getDestinationName() + ];
answer.setBeanName(name);
http://git-wip-us.apache.org/repos/asf/camel/blob/50e9162b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
--
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
index 471d8c1..b080b4e 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.TestSupport;
+import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -70,6 +71,9 @@ public class SpringQuartzPersistentStoreRestartAppTest
extends TestSupport {
mock2.assertIsSatisfied();
app2.stop();
+
+// we're done so let's properly close the application contexts
+IOHelper.close(app, app2);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/50e9162b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
--
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
git commit: Close the Spring context properly when done.
Updated Branches:
refs/heads/camel-2.11.x 91eaa5ca9 - b70184017
Close the Spring context properly when done.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7018401
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7018401
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7018401
Branch: refs/heads/camel-2.11.x
Commit: b701840170167101660f3140ac684da2b16faf2b
Parents: 91eaa5c
Author: Babak Vahdat bvah...@apache.org
Authored: Wed May 15 10:24:51 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Wed May 15 10:28:48 2013 +0200
--
.../component/jms/reply/QueueReplyManager.java |2 +-
.../SpringQuartzPersistentStoreRestartAppTest.java |4 +
.../camel/spring/DefaultStreamCachingTest.java |8 +-
.../camel/spring/config/AnotherCamelProxyTest.java |9 +-
.../spring/config/CamelContextFactoryBeanTest.java | 25 ++-
.../apache/camel/spring/config/CamelProxyTest.java |8 +-
.../spring/config/CamelProxyUsingRefTest.java |9 +-
.../camel/spring/config/RouteBuilderRefTest.java |9 +-
.../config/scan/SpringComponentScanTest.java | 16 +-
...ingComponentScanWithDeprecatedPackagesTest.java | 16 +-
.../apache/camel/example/client/CamelClient.java |9 +-
.../camel/example/client/CamelFileClient.java |8 +-
.../example/spring/javaconfig/IntegrationTest.java |8 +-
.../apache/camel/example/client/CamelClient.java |8 +-
.../camel/example/client/CamelClientEndpoint.java | 12 +-
.../camel/example/client/CamelClientRemoting.java |8 +-
.../src/main/resources/camel-context.xml | 196 +++---
.../customerrelations/CustomerServicesTest.java|9 +-
.../CustomerServicesWsAddressingTest.java |9 +-
19 files changed, 215 insertions(+), 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b7018401/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
--
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
index a17708e..c18a892 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
@@ -213,7 +213,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
answer.setTaskExecutor(endpoint.getTaskExecutor());
}
-// setup a bean name which is used ny Spring JMS as the thread name
+// setup a bean name which is used by Spring JMS as the thread name
String name = QueueReplyManager[ + answer.getDestinationName() + ];
answer.setBeanName(name);
http://git-wip-us.apache.org/repos/asf/camel/blob/b7018401/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
--
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
index 471d8c1..b080b4e 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.TestSupport;
+import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -70,6 +71,9 @@ public class SpringQuartzPersistentStoreRestartAppTest
extends TestSupport {
mock2.assertIsSatisfied();
app2.stop();
+
+// we're done so let's properly close the application contexts
+IOHelper.close(app, app2);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b7018401/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
--
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
git commit: Close the Spring context properly when done.
Updated Branches:
refs/heads/camel-2.10.x e6adc77fd - e4e5aeac9
Close the Spring context properly when done.
Conflicts:
components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4e5aeac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4e5aeac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4e5aeac
Branch: refs/heads/camel-2.10.x
Commit: e4e5aeac95354c59ed2813a6c2ff1beb1d696824
Parents: e6adc77
Author: Babak Vahdat bvah...@apache.org
Authored: Wed May 15 10:24:51 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Wed May 15 11:07:42 2013 +0200
--
.../jms/reply/PersistentQueueReplyManager.java |2 +-
.../SpringQuartzPersistentStoreRestartAppTest.java |4 +
.../camel/spring/DefaultStreamCachingTest.java |8 +-
.../camel/spring/config/AnotherCamelProxyTest.java |9 +-
.../spring/config/CamelContextFactoryBeanTest.java | 25 ++-
.../apache/camel/spring/config/CamelProxyTest.java |8 +-
.../spring/config/CamelProxyUsingRefTest.java |9 +-
.../camel/spring/config/RouteBuilderRefTest.java |9 +-
.../config/scan/SpringComponentScanTest.java | 16 +-
...ingComponentScanWithDeprecatedPackagesTest.java | 16 +-
.../apache/camel/example/client/CamelClient.java |9 +-
.../camel/example/client/CamelFileClient.java |8 +-
.../example/spring/javaconfig/IntegrationTest.java |8 +-
.../apache/camel/example/client/CamelClient.java |8 +-
.../camel/example/client/CamelClientEndpoint.java | 12 +-
.../camel/example/client/CamelClientRemoting.java |8 +-
.../src/main/resources/camel-context.xml | 196 +++---
.../customerrelations/CustomerServicesTest.java|9 +-
.../CustomerServicesWsAddressingTest.java |9 +-
19 files changed, 215 insertions(+), 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e4e5aeac/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
--
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
index ddcabb4..491d782 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
@@ -213,7 +213,7 @@ public class PersistentQueueReplyManager extends
ReplyManagerSupport {
answer.setTaskExecutor(endpoint.getTaskExecutor());
}
-// setup a bean name which is used ny Spring JMS as the thread name
+// setup a bean name which is used by Spring JMS as the thread name
String name = PersistentQueueReplyManager[ +
answer.getDestinationName() + ];
answer.setBeanName(name);
http://git-wip-us.apache.org/repos/asf/camel/blob/e4e5aeac/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
--
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
index 471d8c1..b080b4e 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.TestSupport;
+import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -70,6 +71,9 @@ public class SpringQuartzPersistentStoreRestartAppTest
extends TestSupport {
mock2.assertIsSatisfied();
app2.stop();
+
+// we're done so let's properly close the application contexts
+IOHelper.close(app, app2);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e4e5aeac/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
[CONF] Apache Camel Spring Security Example
Spring Security Example
Page edited by Babak Vahdat
Changes (1)
...
{code} http://localhost:8080/camel/user is for the authenticated user whose role is ROLE_USER
http://localhost:8080/camel/admimn is for the authenticated user whose role is ROLE_ADMIN
{code}
...
Full Content
Spring Security Example
This example shows you how to leverage the Spring Security already provides authentication mechanism and authoriationPolicy which is provided in camel-spring-security module to implement a role based authorization application.
This example consumes messages from a servlet endpoint which is secured by Spring Security with http basic authentication, there are two service:
"http://localhost:8080/camel/user" is for the authenticated user whose role is ROLE_USER
"http://localhost:8080/camel/admin" is for the authenticated user whose role is ROLE_ADMIN
You will need to compile this example first:
cd $CAMEL_HOME/examples/camel-example-spring-security
mvn clean install
To run the example, you need to start up the server by typing
mvn jetty:run
To stop the server hit ctrl + c
Then you can use the script in the client directory to send the request and check the response, or use browser to access upper service with the user/password ("jim/jimspassword" with the admin and user role or "rob/robspassword" with user role).
Here is the camel route configuration:
beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:spring-security="http://www.springframework.org/schema/security"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
http://camel.apache.org/schema/spring-security http://camel.apache.org/schema/spring-security/camel-spring-security.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"
spring-security:http realm="User Restrict Realm"
spring-security:intercept-url pattern="/camel/**" access="ROLE_USER"/
spring-security:http-basic/
spring-security:remember-me/
/spring-security:http
!-- set up the user configuration here --
spring-security:authentication-manager alias="authenticationManager"
spring-security:authentication-provider user-service-ref="userDetailsService"/
/spring-security:authentication-manager
spring-security:user-service id="userDetailsService"
spring-security:user name="jim" password="jimspassword" authorities="ROLE_USER, ROLE_ADMIN"/
spring-security:user name="bob" password="bobspassword" authorities="ROLE_USER"/
/spring-security:user-service
bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased"
property name="allowIfAllAbstainDecisions" value="true"/
property name="decisionVoters"
list
bean class="org.springframework.security.access.vote.RoleVoter"/
/list
/property
/bean
!-- The Policy for checking the authentication role of ADMIN --
authorizationPolicy id="admin" access="ROLE_ADMIN"
authenticationManager="authenticationManager"
accessDecisionManager="accessDecisionManager"
xmlns="http://camel.apache.org/schema/spring-security"/
!-- The Policy for checking the authentication role of USER --
authorizationPolicy id="user" access="ROLE_USER"
xmlns="http://camel.apache.org/schema/spring-security"/
camelContext id="myCamelContext" xmlns="http://camel.apache.org/schema/spring"
!-- Catch the authorization exception and set the Access Denied message back --
onException
exceptionorg.apache.camel.CamelAuthorizationException/exception
handled
constanttrue/constant
/handled
transform
simpleAccess Denied with the Policy of ${exception.policyId} !/simple
/transform
/onException
route
from uri="servlet:///user"/
!-- wrap the route in the policy which enforces security check --
policy ref="user"
transform
simpleNormal user can access this service/simple
/transform
/policy
/route
route
from uri="servlet:///admin"/
!-- wrap the route in the policy which enforces security check --
policy ref="admin"
transform
simpleCall the admin operation OK/simple
/transform
/policy
/route
/camelContext
/beans
You can find how to configure the camel-servlet with http basic
git commit: Corrected the typo inside README.txt of this example (as well as the same typo on the Wiki).
Updated Branches: refs/heads/master 50e9162b4 - 5cd83a563 Corrected the typo inside README.txt of this example (as well as the same typo on the Wiki). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5cd83a56 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5cd83a56 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5cd83a56 Branch: refs/heads/master Commit: 5cd83a563c0e5f15b14babb87076be78474f9b5d Parents: 50e9162 Author: Babak Vahdat bvah...@apache.org Authored: Wed May 15 12:12:01 2013 +0200 Committer: Babak Vahdat bvah...@apache.org Committed: Wed May 15 12:12:01 2013 +0200 -- examples/camel-example-spring-security/README.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5cd83a56/examples/camel-example-spring-security/README.txt -- diff --git a/examples/camel-example-spring-security/README.txt b/examples/camel-example-spring-security/README.txt index fc5e650..da58ae9 100644 --- a/examples/camel-example-spring-security/README.txt +++ b/examples/camel-example-spring-security/README.txt @@ -6,7 +6,7 @@ This example shows how to leverage the Spring Security to secure the camel endpo The example consumes messages from a servlet endpoint which is secured by Spring Security with http basic authentication, there are two service: http://localhost:8080/camel/user; is for the authenticated user whose role is ROLE_USER - http://localhost:8080/camel/admim; is for the authenticated user whose role is ROLE_ADMIN + http://localhost:8080/camel/admin; is for the authenticated user whose role is ROLE_ADMIN You will need to compile this example first: mvn clean install
git commit: Corrected the typo inside README.txt of this example (as well as the same typo on the Wiki).
Updated Branches: refs/heads/camel-2.11.x b70184017 - be91a4c41 Corrected the typo inside README.txt of this example (as well as the same typo on the Wiki). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/be91a4c4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/be91a4c4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/be91a4c4 Branch: refs/heads/camel-2.11.x Commit: be91a4c41d2be00ace6eebee35b09d16a0e6f9a8 Parents: b701840 Author: Babak Vahdat bvah...@apache.org Authored: Wed May 15 12:12:01 2013 +0200 Committer: Babak Vahdat bvah...@apache.org Committed: Wed May 15 12:13:47 2013 +0200 -- examples/camel-example-spring-security/README.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/be91a4c4/examples/camel-example-spring-security/README.txt -- diff --git a/examples/camel-example-spring-security/README.txt b/examples/camel-example-spring-security/README.txt index fc5e650..da58ae9 100644 --- a/examples/camel-example-spring-security/README.txt +++ b/examples/camel-example-spring-security/README.txt @@ -6,7 +6,7 @@ This example shows how to leverage the Spring Security to secure the camel endpo The example consumes messages from a servlet endpoint which is secured by Spring Security with http basic authentication, there are two service: http://localhost:8080/camel/user; is for the authenticated user whose role is ROLE_USER - http://localhost:8080/camel/admim; is for the authenticated user whose role is ROLE_ADMIN + http://localhost:8080/camel/admin; is for the authenticated user whose role is ROLE_ADMIN You will need to compile this example first: mvn clean install
git commit: Corrected the typo inside README.txt of this example (as well as the same typo on the Wiki).
Updated Branches: refs/heads/camel-2.10.x e4e5aeac9 - 8e6ee23d3 Corrected the typo inside README.txt of this example (as well as the same typo on the Wiki). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8e6ee23d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8e6ee23d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8e6ee23d Branch: refs/heads/camel-2.10.x Commit: 8e6ee23d3adc2f2bc7613cb2472292b27ebdc403 Parents: e4e5aea Author: Babak Vahdat bvah...@apache.org Authored: Wed May 15 12:12:01 2013 +0200 Committer: Babak Vahdat bvah...@apache.org Committed: Wed May 15 12:14:55 2013 +0200 -- examples/camel-example-spring-security/README.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8e6ee23d/examples/camel-example-spring-security/README.txt -- diff --git a/examples/camel-example-spring-security/README.txt b/examples/camel-example-spring-security/README.txt index ec0a073..c708587 100644 --- a/examples/camel-example-spring-security/README.txt +++ b/examples/camel-example-spring-security/README.txt @@ -6,7 +6,7 @@ This example shows how to leverage the Spring Security to secure the camel endpo The example consumes messages from a servlet endpoint which is secured by Spring Security with http basic authentication, there are two service: http://localhost:8080/camel/user; is for the authenticated user whose role is ROLE_USER - http://localhost:8080/camel/admim; is for the authenticated user whose role is ROLE_ADMIN + http://localhost:8080/camel/admin; is for the authenticated user whose role is ROLE_ADMIN You will need to compile this example first: mvn clean install
svn commit: r862053 - in /websites/production/camel/content: cache/main.pageCache spring-security-example.html
Author: buildbot Date: Wed May 15 10:18:20 2013 New Revision: 862053 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/spring-security-example.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/spring-security-example.html == --- websites/production/camel/content/spring-security-example.html (original) +++ websites/production/camel/content/spring-security-example.html Wed May 15 10:18:20 2013 @@ -83,7 +83,7 @@ div class=code panel style=border-width: 1px;div class=codeContent panelContent pre class=code-java span class=code-quotehttp:span class=code-comment//localhost:8080/camel/user/span is span class=code-keywordfor/span the authenticated user whose role is ROLE_USER -/span span class=code-quotehttp:span class=code-comment//localhost:8080/camel/admim/span is span class=code-keywordfor/span the authenticated user whose role is ROLE_ADMIN/span +/span span class=code-quotehttp:span class=code-comment//localhost:8080/camel/admin/span is span class=code-keywordfor/span the authenticated user whose role is ROLE_ADMIN/span /pre /div/div
svn commit: r862058 - in /websites/production/camel/content: cache/main.pageCache defaulterrorhandler.html
Author: buildbot Date: Wed May 15 11:19:07 2013 New Revision: 862058 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/defaulterrorhandler.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/defaulterrorhandler.html == --- websites/production/camel/content/defaulterrorhandler.html (original) +++ websites/production/camel/content/defaulterrorhandler.html Wed May 15 11:19:07 2013 @@ -76,36 +76,39 @@ tr td valign=top width=100% div class=wiki-content maincontenth2a shape=rect name=DefaultErrorHandler-DefaultErrorHandler/aDefaultErrorHandler/h2 + pThis is the new default error handler in Camel 2.0 onwards./p -pIt has the same power as the a shape=rect href=dead-letter-channel.html title=Dead Letter ChannelDead Letter Channel/a however it does bnot/b support a emdead letter queue/em. That is the only difference between the two of them./p +pIt has the same power as the a shape=rect href=dead-letter-channel.html title=Dead Letter ChannelDead Letter Channel/a, however it does bnot/b support a emdead letter queue/em, which is the only difference between the two of them./p -pThe default error handler is configured differently that a shape=rect href=dead-letter-channel.html title=Dead Letter ChannelDead Letter Channel/a as it configured to:/p -ul class=alternate type=squarelino redeliver/lilinot handled/lilino dead letter queue (not possible)/li/ul +pThe a shape=rect href=defaulterrorhandler.html title=DefaultErrorHandlerDefaultErrorHandler/a is configured differently that a shape=rect href=dead-letter-channel.html title=Dead Letter ChannelDead Letter Channel/a as it is configured to:/p +ul class=alternate type=squarelinot redeliver/lilinot handled/lilino dead letter queue (not possible)/li/ul -pBy default any exception thrown during routing will be propagated back to the caller and the a shape=rect href=exchange.html title=ExchangeExchange/a ends immediately. However you can use the a shape=rect href=exception-clause.html title=Exception ClauseException Clause/a to catch a given exception and lower the exception by marking it as handled. If so the exception will bnot/b be sent back to the caller and the a shape=rect href=exchange.html title=ExchangeExchange/a continues to be routed./p +pBy default, any exception thrown during routing will be propagated back to the caller and the a shape=rect href=exchange.html title=ExchangeExchange/a ends immediately. However, you can use the a shape=rect href=exception-clause.html title=Exception ClauseException Clause/a to catch a given exception and lower the exception by marking it as handled. If so, the exception will bnot/b be sent back to the caller, and the a shape=rect href=exchange.html title=ExchangeExchange/a continues to be routed./p h3a shape=rect name=DefaultErrorHandler-Example/aExample/h3 -pIn this route below, any exception thrown in eg the ttvalidateOrder/tt bean will be propagated back to the caller, and its the jetty endpoint. It will return a HTTP error message back to the client./p + +pIn this route below, any exception thrown in, eg the ttvalidateOrder/tt bean, will be propagated back to the caller via the jetty endpoint. It will return an HTTP error message back to the client./p + div class=code panel style=border-width: 1px;div class=codeContent panelContent -pre class=code-java -from(span class=code-quotejetty:http:span class=code-comment//localhost/myservice/order/span).to(span class=code-quotebean:validateOrder/span).to(span class=code-quotejms:queue:order/span);/span +pre class=code-javafrom(span class=code-quotejetty:http:span class=code-comment//localhost/myservice/order/span).to(span class=code-quotebean:validateOrder/span).to(span class=code-quotejms:queue:order/span);/span /pre /div/div -pWe can add a bonException/b in case we want to catch certain exceptions and route them differently, for instance to catch a bValidationException/b and return a fixed response to the caller./p +pWe can add an bonException/b in case we want to catch certain exceptions and route them differently, for instance to catch a bValidationException/b and return a fixed response to the caller./p div class=code panel style=border-width: 1px;div class=codeContent panelContent -pre class=code-java -onException(ValidationException.class).handled(span class=code-keywordtrue/span).transform(body(constant(span class=code-quoteINVALID ORDER/span))); +pre class=code-javaonException(ValidationException.class).handled(span class=code-keywordtrue/span).transform(body(constant(span class=code-quoteINVALID ORDER/span))); from(span
git commit: Fixed the compilation failure caused through my previous commit while backporting the fix from the master branch (AbstractXmlApplicationContext implements java.io.Closeable beginning from
Updated Branches:
refs/heads/camel-2.11.x be91a4c41 - 799736421
Fixed the compilation failure caused through my previous commit while
backporting the fix from the master branch
(AbstractXmlApplicationContext implements java.io.Closeable beginning
from Spring 3.2.x)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79973642
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79973642
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79973642
Branch: refs/heads/camel-2.11.x
Commit: 799736421657e7a0e992169c78581d3272d8defb
Parents: be91a4c
Author: Babak Vahdat bvah...@apache.org
Authored: Wed May 15 13:55:01 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Wed May 15 13:55:01 2013 +0200
--
.../SpringQuartzPersistentStoreRestartAppTest.java |4 ++--
.../camel/spring/DefaultStreamCachingTest.java |3 +--
.../camel/spring/config/AnotherCamelProxyTest.java |3 +--
.../spring/config/CamelContextFactoryBeanTest.java |3 +--
.../apache/camel/spring/config/CamelProxyTest.java |3 +--
.../spring/config/CamelProxyUsingRefTest.java |3 +--
.../camel/spring/config/RouteBuilderRefTest.java |3 +--
.../config/scan/SpringComponentScanTest.java |3 +--
...ingComponentScanWithDeprecatedPackagesTest.java |3 +--
.../apache/camel/example/client/CamelClient.java |3 +--
.../camel/example/client/CamelFileClient.java |3 +--
.../example/spring/javaconfig/IntegrationTest.java |3 +--
.../apache/camel/example/client/CamelClient.java |3 +--
.../camel/example/client/CamelClientEndpoint.java |3 +--
.../camel/example/client/CamelClientRemoting.java |3 +--
.../customerrelations/CustomerServicesTest.java|8 ++--
.../CustomerServicesWsAddressingTest.java | 10 +++---
17 files changed, 29 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/79973642/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
--
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
index b080b4e..d80a448 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.TestSupport;
-import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -73,7 +72,8 @@ public class SpringQuartzPersistentStoreRestartAppTest
extends TestSupport {
app2.stop();
// we're done so let's properly close the application contexts
-IOHelper.close(app, app2);
+app.close();
+app2.close();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/79973642/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
--
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
index c017729..2facd10 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring;
import junit.framework.TestCase;
import org.apache.camel.CamelContext;
-import org.apache.camel.util.IOHelper;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,7 +30,7 @@ public class DefaultStreamCachingTest extends TestCase {
assertFalse(StreamCaching should not be enabled,
camelContext.isStreamCaching());
// we're done so let's properly close the application context
-IOHelper.close(appContext);
+appContext.close();
}
}
git commit: Fixed the compilation failure caused through my previous commit while backporting the fix from the master branch (AbstractXmlApplicationContext implements java.io.Closeable beginning from
Updated Branches:
refs/heads/camel-2.10.x 8e6ee23d3 - ce7452c7e
Fixed the compilation failure caused through my previous commit while
backporting the fix from the master branch
(AbstractXmlApplicationContext implements java.io.Closeable beginning
from Spring 3.2.x)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ce7452c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ce7452c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ce7452c7
Branch: refs/heads/camel-2.10.x
Commit: ce7452c7e76eda1d0a882e75dde45fb7a818d53f
Parents: 8e6ee23
Author: Babak Vahdat bvah...@apache.org
Authored: Wed May 15 13:55:01 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Wed May 15 13:57:19 2013 +0200
--
.../SpringQuartzPersistentStoreRestartAppTest.java |4 ++--
.../camel/spring/DefaultStreamCachingTest.java |3 +--
.../camel/spring/config/AnotherCamelProxyTest.java |3 +--
.../spring/config/CamelContextFactoryBeanTest.java |3 +--
.../apache/camel/spring/config/CamelProxyTest.java |3 +--
.../spring/config/CamelProxyUsingRefTest.java |3 +--
.../camel/spring/config/RouteBuilderRefTest.java |3 +--
.../config/scan/SpringComponentScanTest.java |3 +--
...ingComponentScanWithDeprecatedPackagesTest.java |3 +--
.../apache/camel/example/client/CamelClient.java |3 +--
.../camel/example/client/CamelFileClient.java |3 +--
.../example/spring/javaconfig/IntegrationTest.java |3 +--
.../apache/camel/example/client/CamelClient.java |3 +--
.../camel/example/client/CamelClientEndpoint.java |3 +--
.../camel/example/client/CamelClientRemoting.java |3 +--
.../customerrelations/CustomerServicesTest.java|8 ++--
.../CustomerServicesWsAddressingTest.java | 10 +++---
17 files changed, 29 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ce7452c7/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
--
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
index b080b4e..d80a448 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.TestSupport;
-import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -73,7 +72,8 @@ public class SpringQuartzPersistentStoreRestartAppTest
extends TestSupport {
app2.stop();
// we're done so let's properly close the application contexts
-IOHelper.close(app, app2);
+app.close();
+app2.close();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ce7452c7/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
--
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
index c017729..2facd10 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring;
import junit.framework.TestCase;
import org.apache.camel.CamelContext;
-import org.apache.camel.util.IOHelper;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,7 +30,7 @@ public class DefaultStreamCachingTest extends TestCase {
assertFalse(StreamCaching should not be enabled,
camelContext.isStreamCaching());
// we're done so let's properly close the application context
-IOHelper.close(appContext);
+appContext.close();
}
}
buildbot failure in ASF Buildbot on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/10187 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile sincerely, -The Buildbot
buildbot success in ASF Buildbot on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/10188 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
git commit: Fix for Spring redis v 1.0.3.RELEASE
Updated Branches:
refs/heads/master 5cd83a563 - bd69f8aa1
Fix for Spring redis v 1.0.3.RELEASE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd69f8aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd69f8aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd69f8aa
Branch: refs/heads/master
Commit: bd69f8aa1bfbcb350fb460b651326b1f429aecf4
Parents: 5cd83a5
Author: bibryam bibr...@apache.org
Authored: Wed May 15 14:22:44 2013 +0100
Committer: bibryam bibr...@apache.org
Committed: Wed May 15 14:26:06 2013 +0100
--
.../camel/component/redis/RedisConfiguration.java |1 +
.../redis/RedisConsumerIntegrationTest.java|3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bd69f8aa/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
--
diff --git
a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
index 6e9bb12..889dc71 100755
---
a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
+++
b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
@@ -126,6 +126,7 @@ public class RedisConfiguration {
managedListenerContainer = true;
listenerContainer.setConnectionFactory(getConnectionFactory());
listenerContainer.afterPropertiesSet();
+listenerContainer.start();
return listenerContainer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bd69f8aa/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
--
diff --git
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
index 73613ac..22df19a 100755
---
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
+++
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java
@@ -54,9 +54,12 @@ public class RedisConsumerIntegrationTest extends
RedisTestSupport {
return new RouteBuilder() {
public void configure() {
from(spring-redis://localhost:6379?command=SUBSCRIBEchannels=one,twolistenerContainer=#listenerContainerredisTemplate=#redisTemplate)
+.startupOrder(1)
.to(mock:result);
from(direct:start)
+.startupOrder(2)
+.delay(2000)
.to(spring-redis://localhost:6379?redisTemplate=#redisTemplate);
}
};
buildbot failure in ASF Buildbot on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/10189 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile sincerely, -The Buildbot
buildbot success in ASF Buildbot on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/10190 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
git commit: Spring 3.2.x is now the default.
Updated Branches:
refs/heads/master bd69f8aa1 - a98c0100f
Spring 3.2.x is now the default.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a98c0100
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a98c0100
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a98c0100
Branch: refs/heads/master
Commit: a98c0100f58317196db76f570a03b7587ed883f1
Parents: bd69f8a
Author: Babak Vahdat bvah...@apache.org
Authored: Wed May 15 20:36:07 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Wed May 15 20:36:07 2013 +0200
--
components/camel-test-spring/pom.xml |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a98c0100/components/camel-test-spring/pom.xml
--
diff --git a/components/camel-test-spring/pom.xml
b/components/camel-test-spring/pom.xml
index a7682fc..79babf0 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -31,7 +31,6 @@
descriptionCamel Testing Library using JUnit and Spring/description
properties
-spring-version${spring31-version}/spring-version
camel.osgi.export.pkgorg.apache.camel.test.junit4.*,org.apache.camel.test.spring.*/camel.osgi.export.pkg
/properties
git commit: Removed the usage of the IOHelper.close() utility for closing Spring ApplicationContext so that Spring 3.1.x is still supported.
Updated Branches:
refs/heads/master 3a77dc861 - d4adc1be1
Removed the usage of the IOHelper.close() utility for closing Spring
ApplicationContext so that Spring 3.1.x is still supported.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d4adc1be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d4adc1be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d4adc1be
Branch: refs/heads/master
Commit: d4adc1be1d8ddd5c99e7b516c05cd382a08990ba
Parents: 3a77dc8
Author: Babak Vahdat bvah...@apache.org
Authored: Thu May 16 02:07:42 2013 +0200
Committer: Babak Vahdat bvah...@apache.org
Committed: Thu May 16 02:07:42 2013 +0200
--
.../SpringQuartzPersistentStoreRestartAppTest.java |4 +-
.../camel/spring/DefaultStreamCachingTest.java |3 +-
.../camel/spring/config/AnotherCamelProxyTest.java |3 +-
.../spring/config/CamelContextFactoryBeanTest.java |3 +-
.../apache/camel/spring/config/CamelProxyTest.java |3 +-
.../spring/config/CamelProxyUsingRefTest.java |3 +-
.../camel/spring/config/RouteBuilderRefTest.java |3 +-
.../config/scan/SpringComponentScanTest.java |3 +-
...ingComponentScanWithDeprecatedPackagesTest.java |3 +-
.../src/main/resources/etc/MailBody.vm | 54 +++---
.../src/main/resources/etc/MailBody.vm | 54 +++---
.../apache/camel/example/client/CamelClient.java |3 +-
.../camel/example/client/CamelFileClient.java |3 +-
.../example/spring/javaconfig/IntegrationTest.java |3 +-
.../apache/camel/example/client/CamelClient.java |3 +-
.../camel/example/client/CamelClientEndpoint.java |3 +-
.../camel/example/client/CamelClientRemoting.java |3 +-
.../customerrelations/CustomerServicesTest.java|8 ++-
.../CustomerServicesWsAddressingTest.java |8 ++-
.../resources/META-INF/javamail.default.providers | 44 ++--
.../services/org/apache/camel/component/__scheme__ | 34 +-
.../services/org/apache/camel/component/__scheme__ | 34 +-
22 files changed, 138 insertions(+), 144 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d4adc1be/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
--
diff --git
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
index b080b4e..d80a448 100644
---
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
+++
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.quartz;
import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.TestSupport;
-import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -73,7 +72,8 @@ public class SpringQuartzPersistentStoreRestartAppTest
extends TestSupport {
app2.stop();
// we're done so let's properly close the application contexts
-IOHelper.close(app, app2);
+app.close();
+app2.close();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d4adc1be/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
--
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
index c017729..2facd10 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring;
import junit.framework.TestCase;
import org.apache.camel.CamelContext;
-import org.apache.camel.util.IOHelper;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,7 +30,7 @@ public class DefaultStreamCachingTest extends TestCase {
assertFalse(StreamCaching should not be enabled,
camelContext.isStreamCaching());
// we're done so let's properly
git commit: CAMEL-6363 Allow to specify the string-template delimiters with thanks to Antoine
Updated Branches:
refs/heads/master d4adc1be1 - 83b180637
CAMEL-6363 Allow to specify the string-template delimiters with thanks to
Antoine
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83b18063
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83b18063
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83b18063
Branch: refs/heads/master
Commit: 83b1806378516a74eed69f232f593d6a1dd179d7
Parents: d4adc1b
Author: Willem Jiang ningji...@apache.org
Authored: Thu May 16 09:49:14 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Thu May 16 09:49:14 2013 +0800
--
.../stringtemplate/StringTemplateEndpoint.java | 26 +-
.../StringTemplateCustomDelimiterTest.java | 63 +++
.../stringtemplate/custom-delimiter-brace.tm | 17
.../stringtemplate/custom-delimiter-dollar.tm | 17
4 files changed, 119 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/83b18063/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
--
diff --git
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
index 61f6086..a5d6837 100644
---
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
+++
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
@@ -27,11 +27,14 @@ import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.util.ExchangeHelper;
import org.stringtemplate.v4.NoIndentWriter;
import org.stringtemplate.v4.ST;
+import org.stringtemplate.v4.STGroup;
/**
- * @version
+ * @version
*/
public class StringTemplateEndpoint extends ResourceEndpoint {
+private char delimiterStart = STGroup.defaultGroup.delimiterStartChar;
+private char delimiterStop = STGroup.defaultGroup.delimiterStopChar;
public StringTemplateEndpoint() {
}
@@ -50,6 +53,22 @@ public class StringTemplateEndpoint extends ResourceEndpoint
{
return ExchangePattern.InOut;
}
+public char getDelimiterStart() {
+return delimiterStart;
+}
+
+public void setDelimiterStart(char delimiterStart) {
+this.delimiterStart = delimiterStart;
+}
+
+public char getDelimiterStop() {
+return delimiterStop;
+}
+
+public void setDelimiterStop(char delimiterStop) {
+this.delimiterStop = delimiterStop;
+}
+
@Override
protected void onExchange(Exchange exchange) throws Exception {
StringWriter buffer = new StringWriter();
@@ -57,7 +76,7 @@ public class StringTemplateEndpoint extends ResourceEndpoint {
// getResourceAsInputStream also considers the content cache
String text =
exchange.getContext().getTypeConverter().mandatoryConvertTo(String.class,
getResourceAsInputStream());
-ST template = new ST(text);
+ST template = new ST(text, delimiterStart, delimiterStop);
for (Map.EntryString, Object entry : variableMap.entrySet()) {
template.add(entry.getKey(), entry.getValue());
}
@@ -71,5 +90,4 @@ public class StringTemplateEndpoint extends ResourceEndpoint {
out.setHeader(StringTemplateConstants.STRINGTEMPLATE_RESOURCE_URI,
getResourceUri());
out.setAttachments(exchange.getIn().getAttachments());
}
-
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/83b18063/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
--
diff --git
a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
new file mode 100644
index 000..9560f95
--- /dev/null
+++
b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
@@ -0,0 +1,63 @@
+/**
+ * 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
git commit: CAMEL-6363 Allow to specify the string-template delimiters with thanks to Antoine
Updated Branches:
refs/heads/camel-2.11.x 799736421 - a2b1df78e
CAMEL-6363 Allow to specify the string-template delimiters with thanks to
Antoine
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2b1df78
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2b1df78
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2b1df78
Branch: refs/heads/camel-2.11.x
Commit: a2b1df78e7d5db653878a7e65cd916c55a26e116
Parents: 7997364
Author: Willem Jiang ningji...@apache.org
Authored: Thu May 16 09:49:14 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Thu May 16 09:51:47 2013 +0800
--
.../stringtemplate/StringTemplateEndpoint.java | 26 +-
.../StringTemplateCustomDelimiterTest.java | 63 +++
.../stringtemplate/custom-delimiter-brace.tm | 17
.../stringtemplate/custom-delimiter-dollar.tm | 17
4 files changed, 119 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a2b1df78/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
--
diff --git
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
index 61f6086..a5d6837 100644
---
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
+++
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
@@ -27,11 +27,14 @@ import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.util.ExchangeHelper;
import org.stringtemplate.v4.NoIndentWriter;
import org.stringtemplate.v4.ST;
+import org.stringtemplate.v4.STGroup;
/**
- * @version
+ * @version
*/
public class StringTemplateEndpoint extends ResourceEndpoint {
+private char delimiterStart = STGroup.defaultGroup.delimiterStartChar;
+private char delimiterStop = STGroup.defaultGroup.delimiterStopChar;
public StringTemplateEndpoint() {
}
@@ -50,6 +53,22 @@ public class StringTemplateEndpoint extends ResourceEndpoint
{
return ExchangePattern.InOut;
}
+public char getDelimiterStart() {
+return delimiterStart;
+}
+
+public void setDelimiterStart(char delimiterStart) {
+this.delimiterStart = delimiterStart;
+}
+
+public char getDelimiterStop() {
+return delimiterStop;
+}
+
+public void setDelimiterStop(char delimiterStop) {
+this.delimiterStop = delimiterStop;
+}
+
@Override
protected void onExchange(Exchange exchange) throws Exception {
StringWriter buffer = new StringWriter();
@@ -57,7 +76,7 @@ public class StringTemplateEndpoint extends ResourceEndpoint {
// getResourceAsInputStream also considers the content cache
String text =
exchange.getContext().getTypeConverter().mandatoryConvertTo(String.class,
getResourceAsInputStream());
-ST template = new ST(text);
+ST template = new ST(text, delimiterStart, delimiterStop);
for (Map.EntryString, Object entry : variableMap.entrySet()) {
template.add(entry.getKey(), entry.getValue());
}
@@ -71,5 +90,4 @@ public class StringTemplateEndpoint extends ResourceEndpoint {
out.setHeader(StringTemplateConstants.STRINGTEMPLATE_RESOURCE_URI,
getResourceUri());
out.setAttachments(exchange.getIn().getAttachments());
}
-
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2b1df78/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
--
diff --git
a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
new file mode 100644
index 000..9560f95
--- /dev/null
+++
b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
@@ -0,0 +1,63 @@
+/**
+ * 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
[CONF] Apache Camel StringTemplate
StringTemplate
Page edited by willem jiang
Comment:
CAMEL-6363
Changes (6)
...
|| Option || Default || Description || | {{contentCache}} | {{false}} | Cache for the resource content when its loaded. \\ Note : as of *Camel 2.9* cached resource content can be cleared via JMX using the endpoints {{clearContentCache}} operation. ||
| {{delimiterStart}} | {{null}} | *Since Camel 2.11.1*, configuring the variable start delimiter | | {{delimiterEnd}} | {{null}} | *Since Camel 2.11.1*, configuring the variable end delimiter |
{div}
...
h3. The Email Sample In this sample we want to use a string template to send an order confirmation email. The email template is laid out in {{StringTemplate}} as:
This example works for *camel 2.11.0*. If your camel version is less than 2.11.0, the variables should be started and ended with $.
{code}
Dear $headers.lastName$, $headers.firstName$
Dear headers.lastName, headers.firstName
Thanks for the order of $headers.item$. headers.item.
Regards Camel Riders Bookstore
$body$ body
{code}
...
Full Content
String Template
The string-template: component allows you to process a message using a String Template. This can be ideal when using Templating to generate responses for requests.
Maven users will need to add the following dependency to their pom.xml for this component:
dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-stringtemplate/artifactId
versionx.x.x/version
!-- use the same version as your Camel core version --
/dependency
URI format
string-template:templateName[?options]
Where templateName is the classpath-local URI of the template to invoke; or the complete URL of the remote template.
You can append query options to the URI in the following format, ?option=valueoption=value...
Options
Option
Default
Description
contentCache
false
Cache for the resource content when its loaded. Note : as of Camel 2.9 cached resource content can be cleared via JMX using the endpoint's clearContentCache operation.
delimiterStart
null
Since Camel 2.11.1, configuring the variable start delimiter
delimiterEnd
null
Since Camel 2.11.1, configuring the variable end delimiter
Headers
Camel will store a reference to the resource in the message header with key, org.apache.camel.stringtemplate.resource. The Resource is an org.springframework.core.io.Resource object.
Hot reloading
The string template resource is by default hot-reloadable for both file and classpath resources (expanded jar). If you set contentCache=true, Camel loads the resource only once and hot-reloading is not possible. This scenario can be used in production when the resource never changes.
StringTemplate Attributes
Camel will provide exchange information as attributes (just a java.util.Map) to the string template. The Exchange is transfered as:
key
value
exchange
The Exchange itself.
headers
The headers of the In message.
camelContext
The Camel Context.
request
The In message.
in
The In message.
body
The In message body.
out
The Out message (only for InOut message exchange pattern).
response
The Out message (only for InOut message exchange pattern).
Samples
For example you could use a string template as follows in order to formulate a response to a message:
from("activemq:My.Queue").
to("string-template:com/acme/MyResponse.tm");
The Email Sample
In this sample we want to use a string template to send an order confirmation email. The email template is laid out in StringTemplate as:
This example works for camel 2.11.0. If your camel version is less than 2.11.0, the variables should be started and ended with $.
Dear headers.lastName, headers.firstName
Thanks for the order of headers.item.
Regards Camel Riders Bookstore
body
And the java code is as follows:
private Exchange createLetter() {
Exchange exchange = context.getEndpoint("direct:a").createExchange();
Message msg = exchange.getIn();
msg.setHeader("firstName", "Claus");
msg.setHeader("lastName", "Ibsen");
msg.setHeader("item", "Camel in Action");
msg.setBody("PS: Next beer is on me, James");
return exchange;
}
@Test
public void testVelocityLetter() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Dear Ibsen, Claus! Thanks for the order of Camel in Action. Regards Camel Riders Bookstore PS: Next beer is on me, James");
template.send("direct:a",
svn commit: r862128 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache stringtemplate.html
Author: buildbot Date: Thu May 16 02:21:32 2013 New Revision: 862128 Log: Production update by buildbot for camel Modified: websites/production/camel/content/book-component-appendix.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/stringtemplate.html Modified: websites/production/camel/content/book-component-appendix.html == --- websites/production/camel/content/book-component-appendix.html (original) +++ websites/production/camel/content/book-component-appendix.html Thu May 16 02:21:32 2013 @@ -16714,7 +16714,7 @@ string-template:templateName[?options] h3a shape=rect name=BookComponentAppendix-Options/aOptions/h3 div class=confluenceTableSmalldiv class=table-wrap -table class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceTh Option /thth colspan=1 rowspan=1 class=confluenceTh Default /thth colspan=1 rowspan=1 class=confluenceTh Description /th/trtrtd colspan=1 rowspan=1 class=confluenceTd ttcontentCache/tt /tdtd colspan=1 rowspan=1 class=confluenceTd ttfalse/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Cache for the resource content when its loaded. br clear=none class=atl-forced-newline Note : as of bCamel 2.9/b cached resource content can be cleared via JMX using the endpoint's ttclearContentCache/tt operation. /td/tr/tbody/table +table class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceTh Option /thth colspan=1 rowspan=1 class=confluenceTh Default /thth colspan=1 rowspan=1 class=confluenceTh Description /th/trtrtd colspan=1 rowspan=1 class=confluenceTd ttcontentCache/tt /tdtd colspan=1 rowspan=1 class=confluenceTd ttfalse/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Cache for the resource content when its loaded. br clear=none class=atl-forced-newline Note : as of bCamel 2.9/b cached resource content can be cleared via JMX using the endpoint's ttclearContentCache/tt operation. /td/trtrtd colspan=1 rowspan=1 class=confluenceTd ttdelimiterStart/tt /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd bSince Camel 2.11.1/b, configuring the variable start delimiter /td/trtrtd colspan=1 rowspan=1 class=confluenceTd ttdelimiterEnd/tt /tdtd colspan=1 rowspan=1 class=confluenceTd ttnull/tt /tdtd colspan=1 rowspan=1 class=confluenceTd bSince Camel 2.11.1/b, configuring the variable end delimiter /td/tr/tbody/table /div /div @@ -16743,15 +16743,16 @@ from(span class=code-quoteactivemq: /div/div h3a shape=rect name=BookComponentAppendix-TheEmailSample/aThe Email Sample/h3 -pIn this sample we want to use a string template to send an order confirmation email. The email template is laid out in ttStringTemplate/tt as:/p +pIn this sample we want to use a string template to send an order confirmation email. The email template is laid out in ttStringTemplate/tt as:br clear=none +This example works for bcamel 2.11.0/b. If your camel version is less than 2.11.0, the variables should be started and ended with $./p div class=code panel style=border-width: 1px;div class=codeContent panelContent pre class=code-java -Dear $headers.lastName$, $headers.firstName$ +Dear lt;headers.lastNamegt;, lt;headers.firstNamegt; -Thanks span class=code-keywordfor/span the order of $headers.item$. +Thanks span class=code-keywordfor/span the order of lt;headers.itemgt;. Regards Camel Riders Bookstore -$body$ +lt;bodygt; /pre /div/div Modified: websites/production/camel/content/book-in-one-page.html == --- websites/production/camel/content/book-in-one-page.html (original) +++ websites/production/camel/content/book-in-one-page.html Thu May 16 02:21:32 2013 @@ -37729,7 +37729,7 @@ string-template:templateName[?options] h3a shape=rect name=BookInOnePage-Options/aOptions/h3 div class=confluenceTableSmalldiv class=table-wrap -table class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceTh Option /thth colspan=1 rowspan=1 class=confluenceTh Default /thth colspan=1 rowspan=1 class=confluenceTh Description /th/trtrtd colspan=1 rowspan=1 class=confluenceTd ttcontentCache/tt /tdtd colspan=1 rowspan=1 class=confluenceTd ttfalse/tt /tdtd colspan=1 rowspan=1 class=confluenceTd Cache for the resource content when its loaded. br clear=none class=atl-forced-newline Note : as of bCamel 2.9/b cached resource content can be cleared via JMX using the endpoint's ttclearContentCache/tt operation. /td/tr/tbody/table +table class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceTh Option /thth colspan=1 rowspan=1 class=confluenceTh Default /thth colspan=1 rowspan=1 class=confluenceTh Description /th/trtrtd colspan=1 rowspan=1 class=confluenceTd ttcontentCache/tt /tdtd colspan=1 rowspan=1 class=confluenceTd ttfalse/tt
