Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 87696 invoked from network); 2 Sep 2009 19:02:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Sep 2009 19:02:17 -0000 Received: (qmail 97350 invoked by uid 500); 2 Sep 2009 19:02:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 97236 invoked by uid 500); 2 Sep 2009 19:02:16 -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 97180 invoked by uid 99); 2 Sep 2009 19:02:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Sep 2009 19:02:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 02 Sep 2009 19:02:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2EC1A2388909; Wed, 2 Sep 2009 19:01:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r810672 - in /cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy: AddressingOptionalPolicyTest.java HTTPClientPolicyTest.java RMPolicyWsdlTest.java Date: Wed, 02 Sep 2009 19:01:45 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090902190146.2EC1A2388909@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Sep 2 19:01:45 2009 New Revision: 810672 URL: http://svn.apache.org/viewvc?rev=810672&view=rev Log: Fix ws-policy tests for 2.1.x based policy engine Modified: cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java Modified: cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java?rev=810672&r1=810671&r2=810672&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java Wed Sep 2 19:01:45 2009 @@ -38,6 +38,7 @@ import org.apache.cxf.systest.ws.util.OutMessageRecorder; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.ws.policy.PolicyConstants; import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.ws.policy.selector.MinimalAlternativeSelector; import org.apache.cxf.ws.rm.RMUtils; @@ -58,6 +59,8 @@ protected void run() { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml"); + PolicyTestUtils.setPolicyConstants(bus, + PolicyConstants.NAMESPACE_W3_200607); BusFactory.setDefaultBus(bus); LoggingInInterceptor in = new LoggingInInterceptor(); bus.getInInterceptors().add(in); @@ -97,6 +100,8 @@ SpringBusFactory bf = new SpringBusFactory(); bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml"); Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml"); + PolicyTestUtils.setPolicyConstants(bus, + PolicyConstants.NAMESPACE_W3_200607); BusFactory.setDefaultBus(bus); InMessageRecorder in = new InMessageRecorder(); bus.getInInterceptors().add(in); Modified: cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java?rev=810672&r1=810671&r2=810672&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java Wed Sep 2 19:01:45 2009 @@ -40,6 +40,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.transport.http.HTTPConduit; +import org.apache.cxf.ws.policy.PolicyConstants; import org.apache.cxf.ws.policy.PolicyException; import org.junit.BeforeClass; import org.junit.Test; @@ -110,6 +111,9 @@ bus = bf.createBus(POLICY_ENGINE_ENABLED_CFG); BusFactory.setDefaultBus(bus); + PolicyTestUtils.setPolicyConstants(bus, + PolicyConstants.NAMESPACE_W3_200607); + LoggingInInterceptor in = new LoggingInInterceptor(); bus.getInInterceptors().add(in); bus.getInFaultInterceptors().add(in); Modified: cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java?rev=810672&r1=810671&r2=810672&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java Wed Sep 2 19:01:45 2009 @@ -39,6 +39,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.ws.policy.PolicyAssertion; +import org.apache.cxf.ws.policy.PolicyConstants; import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.ws.rm.RMConstants; import org.apache.neethi.All; @@ -122,6 +123,8 @@ public void testUsingRM() throws Exception { SpringBusFactory bf = new SpringBusFactory(); bus = bf.createBus("org/apache/cxf/systest/ws/policy/rmwsdl.xml"); + PolicyTestUtils.setPolicyConstants(bus, + PolicyConstants.NAMESPACE_W3_200607); BusFactory.setDefaultBus(bus); OutMessageRecorder outRecorder = new OutMessageRecorder(); bus.getOutInterceptors().add(outRecorder);