You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/30 08:45:32 UTC

svn commit: r1780881 - in /axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples: policy/sample09/src/org/apache/rampart/samples/policy/sample09/ src/test/java/org/apache/rampart/samples/runner/

Author: veithen
Date: Mon Jan 30 08:45:32 2017
New Revision: 1780881

URL: http://svn.apache.org/viewvc?rev=1780881&view=rev
Log:
Add sample 9 to unit test.

Modified:
    axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/Client.java
    axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/PWCBHandler.java
    axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java

Modified: axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/Client.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/Client.java?rev=1780881&r1=1780880&r2=1780881&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/Client.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/Client.java Mon Jan 30 08:45:32 2017
@@ -20,7 +20,8 @@ import org.apache.axiom.om.OMAbstractFac
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
@@ -30,7 +31,7 @@ import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyEngine;
 import org.apache.rampart.RampartMessageData;
 
-import javax.xml.namespace.QName;
+import java.io.FileInputStream;
 
 public class Client {
 
@@ -62,7 +63,7 @@ public class Client {
     }
     
     private static Policy loadPolicy(String xmlPath) throws Exception {
-        StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
         return PolicyEngine.getPolicy(builder.getDocumentElement());
     }
     

Modified: axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/PWCBHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/PWCBHandler.java?rev=1780881&r1=1780880&r2=1780881&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/PWCBHandler.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/policy/sample09/src/org/apache/rampart/samples/policy/sample09/PWCBHandler.java Mon Jan 30 08:45:32 2017
@@ -30,7 +30,7 @@ public class PWCBHandler implements Call
             UnsupportedCallbackException {
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
-            String id = pwcb.getIdentifer();
+            String id = pwcb.getIdentifier();
             if("client".equals(id)) {
                 pwcb.setPassword("apache");
             } else if("service".equals(id)) {

Modified: axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java?rev=1780881&r1=1780880&r2=1780881&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-339/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java Mon Jan 30 08:45:32 2017
@@ -44,6 +44,7 @@ public class SampleTest extends TestCase
         suite.addTest(new SampleTest("policy", "06"));
         suite.addTest(new SampleTest("policy", "07"));
         suite.addTest(new SampleTest("policy", "08"));
+        suite.addTest(new SampleTest("policy", "09"));
         return suite;
     }
 }