Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c3bb80b0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c3bb80b0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c3bb80b0 Branch: refs/heads/3.0.x-fixes Commit: c3bb80b0c3f1ebd1a85c7826cf26a32c8c371690 Parents: 6b1987a Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Nov 11 12:16:15 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Nov 11 12:16:15 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c3bb80b0/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java ---------------------------------------------------------------------- diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java index 6e18447..9273bd7 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java @@ -127,13 +127,8 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { ConditionsBean conditions = new ConditionsBean(); conditions.setTokenPeriodMinutes(5); -<<<<<<< HEAD List<String> audiences = new ArrayList<String>(); - audiences.add("http://apache.org/one";); -======= - List<String> audiences = new ArrayList<>(); audiences.add("jms:jndi:dynamicQueues/test.jmstransport.text"); ->>>>>>> e7d7190... Fix SAML Audience Restriction problem with JMS AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean(); audienceRestrictionBean.setAudienceURIs(audiences); conditions.setAudienceRestrictions(Collections.singletonList(audienceRestrictionBean));
