You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/06/27 07:44:01 UTC

git commit: Polished the ws-security unit test of camel-cxf

Updated Branches:
  refs/heads/master a18e7e98b -> 5bb1b4d3e


Polished the ws-security unit test of camel-cxf


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5bb1b4d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5bb1b4d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5bb1b4d3

Branch: refs/heads/master
Commit: 5bb1b4d3ec8ee144d470ecea10ce7025b6a5b995
Parents: a18e7e9
Author: Willem Jiang <ni...@apache.org>
Authored: Thu Jun 27 13:18:13 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Thu Jun 27 13:18:13 2013 +0800

----------------------------------------------------------------------
 .../cxf/wssecurity/camel/camel-context.xml      | 22 ++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5bb1b4d3/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
index 1398243..c8eb963 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
@@ -47,7 +47,7 @@
                 </cxf:properties>
 
                 <cxf:inInterceptors>
-                        <ref bean="wss4jInInterceptor" />
+                        <ref bean="wss4jInInterceptor-server" />
                 </cxf:inInterceptors>
                 
    </cxf:cxfEndpoint>
@@ -58,6 +58,9 @@
                  <cxf:properties>
                         <entry key="dataFormat" value="CXF_MESSAGE" />
                 </cxf:properties>
+                 <cxf:inInterceptors>
+                        <ref bean="wss4jInInterceptor-client" />
+                </cxf:inInterceptors>
                
    </cxf:cxfEndpoint>
 
@@ -75,7 +78,7 @@
   <bean id="noErrorHandler" class="org.apache.camel.builder.NoErrorHandlerBuilder"/>
   <bean id="myProcessor" class="org.apache.camel.component.cxf.wssecurity.camel.MyProcessor"/>
   
- <bean id="wss4jInInterceptor" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+ <bean id="wss4jInInterceptor-server" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
       <constructor-arg>
            <map>
                 <entry key="action" value="Signature" />
@@ -89,5 +92,20 @@
            </map>
         </constructor-arg>
   </bean>
+  
+  <bean id="wss4jInInterceptor-client" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+      <constructor-arg>
+           <map>
+                <entry key="action" value="Signature" />
+                <!--  entry key="passwordCallbackClass" value="org.apache.camel.component.cxf.wssecurity.server.UTPasswordCallback" />
+                <entry key="passwordType" value="PasswordDigest" /-->
+                <!--  entry key="decryptionPropFile" value="wssecurity/etc/Server_Decrypt.properties" />
+                <entry key="encryptionKeyIdentifier" value="IssuerSerial" /-->
+                
+                <entry key="signaturePropFile" value="wssecurity/etc/Client_Encrypt.properties"/>
+                <entry key="signatureKeyIdentifier" value="DirectReference"/>
+           </map>
+        </constructor-arg>
+  </bean>
 
 </beans>