Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 EB88ED636 for ; Tue, 20 Nov 2012 21:11:21 +0000 (UTC) Received: (qmail 80830 invoked by uid 500); 20 Nov 2012 21:11:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 80773 invoked by uid 500); 20 Nov 2012 21:11:21 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 80762 invoked by uid 99); 20 Nov 2012 21:11:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 21:11:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 21:10:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 702CC2388900; Tue, 20 Nov 2012 21:10:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1411871 - /cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Date: Tue, 20 Nov 2012 21:10:18 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121120211018.702CC2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Nov 20 21:10:17 2012 New Revision: 1411871 URL: http://svn.apache.org/viewvc?rev=1411871&view=rev Log: Merged revisions 1411869 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1411869 | dkulp | 2012-11-20 16:09:12 -0500 (Tue, 20 Nov 2012) | 3 lines [CXF-4593] Configure soap version for MEX client Patch from Andrei Shakirin applied ........ Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1411871&r1=1411870&r2=1411871&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Tue Nov 20 21:10:17 2012 @@ -476,6 +476,7 @@ public class STSClient implements Config if (mexLoc != null) { try { JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean(); + proxyFac.setBindingId(soapVersion); proxyFac.setAddress(mexLoc); MetadataExchange exc = proxyFac.create(MetadataExchange.class); Metadata metadata = exc.get2004();