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

[coheigea]

Author: coheigea
Date: Wed Mar 20 16:52:31 2013
New Revision: 1458941

URL: http://svn.apache.org/r1458941
Log:
Fixing failing build

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

Modified: 
cxf/branches/2.6.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.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java?rev=1458941&r1=1458940&r2=1458941&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 Wed Mar 20 16:52:31 2013
@@ -230,10 +230,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");
@@ -242,14 +239,4 @@ public class JavaFirstPolicyServiceTest 
         }
     }
 
-    private String getOperationPolicyReferenceId(Element operationElement, 
String policyNamespace) {
-        Element policyReference = 
DOMUtils.getFirstChildWithName(operationElement, policyNamespace,
->>>>>>> 4c6a8d2... Merged revisions 1458926 via  git cherry-pick from
-                                                                 
"PolicyReference");
-        if (policyReference != null) {
-            return policyReference.getAttributeNS(null, "URI");
-        } else {
-            return null;
-        }
-    }
 }