Repository: camel Updated Branches: refs/heads/master 9f88bcb1d -> 541a3ed8c
CAMEL-7630 Updated unit tests for it Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/541a3ed8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/541a3ed8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/541a3ed8 Branch: refs/heads/master Commit: 541a3ed8c77ec2cc8a7f1f617c5617e0ce332958 Parents: 07841d5 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Jul 24 08:43:15 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Jul 24 08:44:20 2014 +0800 ---------------------------------------------------------------------- tests/camel-blueprint-cxf-test/pom.xml | 18 ++++++++++++++++++ .../camel/test/cxf/blueprint/CxfEndpointBeans.xml | 16 +++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/541a3ed8/tests/camel-blueprint-cxf-test/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml index 93728bd..6e5f67c 100644 --- a/tests/camel-blueprint-cxf-test/pom.xml +++ b/tests/camel-blueprint-cxf-test/pom.xml @@ -39,6 +39,24 @@ </dependency> <dependency> + <groupId>org.apache.karaf.jaas</groupId> + <artifactId>org.apache.karaf.jaas.jasypt</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.jasypt</artifactId> + </exclusion> + </exclusions> + <version>${karaf-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jasypt</groupId> + <artifactId>jasypt</artifactId> + <version>${jasypt-version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/541a3ed8/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml ---------------------------------------------------------------------- diff --git a/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml b/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml index 991d187..cf17a1f 100644 --- a/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml +++ b/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml @@ -22,17 +22,20 @@ xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"; xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"; xmlns:s="http://cxf.apache.org/hello_world_soap_http"; + xmlns:enc="http://karaf.apache.org/xmlns/jasypt/v1.0.0"; xsi:schemaLocation=" http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd http://camel.apache.org/schema/blueprint/cxf http://camel.apache.org/schema/blueprint/cxf/camel-cxf.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";> + <!-- blueprint property placeholders --> <cm:property-placeholder persistent-id="my-placeholders"> <cm:default-properties> - <cm:property name="router.address" value="http://localhost:9000/routerEndpoint"; /> + <!--cm:property name="router.address" value="http://localhost:9000/routerEndpoint"; /--> + <cm:property name="router.address" value="ENC(pYMW5lQHCwmrPJvvNb5Nx0+aoaYGymveCroZarDXcNPtQwzP6F2Jj9iBNO9+xGjx)" /> <cm:property name="service.address" value="http://localhost:8000/serviceEndpoint"; /> <cm:property name="test.address" value="http://localhost:9000/testEndpoint"; /> <cm:property name="bindingId" value="http://schemas.xmlsoap.org/wsdl/soap12/"; /> @@ -42,6 +45,17 @@ <cm:property name="wsdlURL" value="wsdl/test.wsdl" /> </cm:default-properties> </cm:property-placeholder> + + <enc:property-placeholder> + <enc:encryptor class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"> + <property name="config"> + <bean class="org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig"> + <property name="algorithm" value="PBEWithMD5AndDES" /> + <property name="password" value="password1" /> + </bean> + </property> + </enc:encryptor> + </enc:property-placeholder> <cxf:cxfEndpoint id="routerEndpoint" address="{{router.address}}" serviceClass="org.apache.camel.component.cxf.HelloService"/>
