svn commit: r1458947 - /cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java

[coheigea]

Author: coheigea
Date: Wed Mar 20 16:58:11 2013
New Revision: 1458947

URL: http://svn.apache.org/r1458947
Log:
Merged revisions 1458941 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1458941 | coheigea | 2013-03-20 16:52:31 +0000 (Wed, 20 Mar 2013) | 2 lines

  Fixing failing build

........

Modified:
    
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java

Modified: 
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java?rev=1458947&r1=1458946&r2=1458947&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 Wed Mar 20 16:58:11 2013
@@ -217,10 +217,7 @@ public class JavaFirstPolicyServiceTest 
         Element messageElement = 
DOMUtils.getFirstChildWithName(operationElement, WSDL_NAMESPACE, 
                                                               
type.name().toLowerCase());
         assertNotNull(messageElement);
-<<<<<<< HEAD
         Element policyReference = 
DOMUtils.getFirstChildWithName(messageElement, policyNamespace, 
-=======
-        Element policyReference = 
DOMUtils.getFirstChildWithName(messageElement, policyNamespace,
                                                                  
"PolicyReference");
         if (policyReference != null) {
             return policyReference.getAttributeNS(null, "URI");
@@ -229,6 +226,7 @@ public class JavaFirstPolicyServiceTest 
         }
     }
 
+<<<<<<< HEAD
     private String getOperationPolicyReferenceId(Element operationElement, 
String policyNamespace) {
         Element policyReference = 
DOMUtils.getFirstChildWithName(operationElement, policyNamespace,
 >>>>>>> 4c6a8d2... Merged revisions 1458926 via  git cherry-pick from
@@ -240,4 +238,6 @@ public class JavaFirstPolicyServiceTest 
         }
     }
 >>>>>>> ba4d301... Merged revisions 1458929 via  git cherry-pick from
+=======
+>>>>>>> 8e9bd13... Fixing failing build
 }