Return-Path: 
 <commits-return-35806-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
X-Original-To: apmail-camel-commits-archive@www.apache.org
Delivered-To: apmail-camel-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 11FD311FA7
	for <apmail-camel-commits-archive@www.apache.org>;
 Thu, 24 Jul 2014 00:47:46 +0000 (UTC)
Received: (qmail 16765 invoked by uid 500); 24 Jul 2014 00:47:45 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 16615 invoked by uid 500); 24 Jul 2014 00:47:45 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 16604 invoked by uid 99); 24 Jul 2014 00:47:45 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jul 2014 00:47:45 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 752129B23BD; Thu, 24 Jul 2014 00:47:45 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ningjiang@apache.org
To: commits@camel.apache.org
Date: Thu, 24 Jul 2014 00:47:46 -0000
Message-Id: <0899ecce900148b5bdb2f763e755286f@git.apache.org>
In-Reply-To: <eba45c107ee54788b0075b35eaf10a70@git.apache.org>
References: <eba45c107ee54788b0075b35eaf10a70@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/4] git commit: CAMEL-7630 Updated unit tests for it

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/3b17bd3c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b17bd3c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b17bd3c

Branch: refs/heads/camel-2.13.x
Commit: 3b17bd3c99cca213db01319be832c8e78ef0783c
Parents: 36e35bf
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Thu Jul 24 08:43:15 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Thu Jul 24 08:46:40 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/3b17bd3c/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 170c92e..2c07b76 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/3b17bd3c/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"/>