You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/09/22 10:07:10 UTC

svn commit: r448858 - in /webservices/axis2/trunk/java/modules: integration/test-resources/security/ integration/test/org/apache/rahas/ kernel/conf/ kernel/src/org/apache/axis2/deployment/ rahas/src/org/apache/rahas/client/ security/interop/org/apache/...

Author: ruchithf
Date: Fri Sep 22 01:07:07 2006
New Revision: 448858

URL: http://svn.apache.org/viewvc?view=rev&rev=448858
Log:
Fixed AXIS2-944

Modified:
    webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
    webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
    webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java
    webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
    webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -78,6 +78,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -92,6 +92,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -59,6 +59,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -89,6 +89,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -67,6 +67,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -89,6 +89,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -66,6 +66,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -88,6 +88,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -77,6 +77,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -88,6 +88,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -73,6 +73,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -89,6 +89,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -72,6 +72,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -90,6 +90,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -74,6 +74,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -90,6 +90,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -75,6 +75,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -90,6 +90,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml Fri Sep 22 01:07:07 2006
@@ -76,6 +76,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml Fri Sep 22 01:07:07 2006
@@ -91,6 +91,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java Fri Sep 22 01:07:07 2006
@@ -70,6 +70,7 @@
             System.setProperty("javax.net.ssl.keyStoreType", "JKS");
             System.setProperty("javax.net.ssl.trustStore", "/home/ruchith/Desktop/interop/certs/interop2.jks");
             System.setProperty("javax.net.ssl.trustStorePassword", "password");
+            System.setProperty("javax.net.ssl.trustStoreType","JKS");
 
             options.setTo(new EndpointReference("http://127.0.0.1:" + port + "/axis2/services/SecureService"));
 //            options.setTo(new EndpointReference("http://127.0.0.1:" + 9090 + "/axis2/services/UTSAMLHoK"));

Modified: webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Fri Sep 22 01:07:07 2006
@@ -194,6 +194,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml Fri Sep 22 01:07:07 2006
@@ -146,6 +146,7 @@
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
+        <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
         <phase name="PreDispatch"/>

Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/client/STSClient.java Fri Sep 22 01:07:07 2006
@@ -18,20 +18,19 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
 import org.apache.axiom.om.util.Base64;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.util.UUIDGenerator;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.util.UUIDGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.neethi.Assertion;

Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java Fri Sep 22 01:07:07 2006
@@ -19,6 +19,7 @@
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axis2.Constants;
+import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.oasis.ping.PingPortStub;
 import org.apache.rampart.handler.WSSHandlerConstants;
@@ -58,9 +59,10 @@
         PingDocument pingDoc = PingDocument.Factory.newInstance();
         pingDoc.setPing(ping);
 
-        PingPortStub stub = new PingPortStub(ConfigurationContextFactory
-                .createConfigurationContextFromFileSystem(clientRepo,
-                        clientRepo + "/conf/axis2.xml"), url);
+        ConfigurationContext configCtx = ConfigurationContextFactory
+                        .createConfigurationContextFromFileSystem(clientRepo,
+                                clientRepo + "/conf/axis2.xml");
+        PingPortStub stub = new PingPortStub(configCtx, url);
 
         // Enable MTOM to those scenarios where they are configured using:
         // <optimizeParts>xpathExpression</optimizeParts>

Modified: webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml?view=diff&rev=448858&r1=448857&r2=448858
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml (original)
+++ webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml Fri Sep 22 01:07:07 2006
@@ -8,7 +8,7 @@
 
     <outflow>
         <handler name="SecurityOutHandler" class="org.apache.rampart.handler.WSDoAllSender">
-            <order phase="MessageOut"/>
+            <order phase="Security" phaseLast="true"/>
         </handler>
     </outflow>
     <supported-policy-namespaces namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org