axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ruchi...@apache.org
Subject svn commit: r397843 - in /webservices/axis2/trunk/java: etc/ modules/integration/ modules/integration/test-resources/security/ modules/samples/resources/security/ modules/security/ modules/security/interop/org/apache/axis2/security/
Date Fri, 28 Apr 2006 10:33:15 GMT
Author: ruchithf
Date: Fri Apr 28 03:33:10 2006
New Revision: 397843

URL: http://svn.apache.org/viewcvs?rev=397843&view=rev
Log:
s/security.mar/aegis.mar


Modified:
    webservices/axis2/trunk/java/etc/project.properties
    webservices/axis2/trunk/java/modules/integration/maven.xml
    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/sST1.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.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/samples/resources/security/README.txt
    webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml
    webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
    webservices/axis2/trunk/java/modules/security/maven.xml

Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Fri Apr 28 03:33:10 2006
@@ -22,9 +22,9 @@
 version_affix=RC4
 axis2_version=${version_number}-${version_affix}
 addressing_version=${version_number}
-security_version=${version_number}
+aegis_version=${version_number}
+rahas_version=SNAPSHOT
 soapmonitor_version=${version_number}
-rahas_version=${version_number}
 
 # -------------------------------------------------------------------
 #                Dependency Repositories

Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Fri Apr 28 03:33:10 2006
@@ -23,8 +23,8 @@
         <!-- copy the mars so that they are available on the test classpath -->
         <copy file="../addressing/target/addressing-${addressing_version}.mar"
               tofile="target/test-classes/modules/addressing-${addressing_version}.mar"/>
-        <copy file="../security/target/security-${security_version}.mar"
-              tofile="target/test-classes/modules/security-${security_version}.mar"/>
+        <copy file="../security/target/aegis-${aegis_version}.mar"
+              tofile="target/test-classes/modules/aegis-${aegis_version}.mar"/>
 
         <j:set var="axis2.home" value="${basedir}/target"/>
         <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
@@ -338,8 +338,8 @@
             <mkdir dir="target/test-resources/default_security_client_repo"/>
             <mkdir dir="target/test-resources/default_security_client_repo/conf"/>
             <mkdir dir="target/test-resources/default_security_client_repo/modules"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/default_security_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/default_security_client_repo/modules/aegis-${aegis_version}.mar"/>
             <copy file="../addressing/target/addressing-${addressing_version}.mar"
                   tofile="target/test-resources/default_security_client_repo/modules/addressing-${addressing_version}.mar"/>
             <copy file="../core/conf/axis2.xml"
@@ -359,8 +359,8 @@
             <!-- setup scenario 1 client repository-->
             <copy file="test-resources/security/s1.client.axis2.xml"
                   tofile="target/test-resources/scenario1_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario1_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario1_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- This is to add the PWCallback in to the classpath for the client to pick
                  the password callback class.
@@ -371,8 +371,8 @@
             <!-- setup scenario 1 service repository-->
             <copy file="test-resources/security/s1.service.axis2.xml"
                   tofile="target/test-resources/scenario1_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario1_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario1_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s1.service.xml"
@@ -396,14 +396,14 @@
             <!-- setup scenario 2 client repository-->
             <copy file="test-resources/security/s2.client.axis2.xml"
                   tofile="target/test-resources/scenario2_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario2_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario2_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario 2 service repository-->
             <copy file="test-resources/security/s2.service.axis2.xml"
                   tofile="target/test-resources/scenario2_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario2_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario2_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s2.service.xml"
@@ -427,14 +427,14 @@
             <!-- setup scenario 2a client repository-->
             <copy file="test-resources/security/s2a.client.axis2.xml"
                   tofile="target/test-resources/scenario2a_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario2a_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario2a_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario 2a service repository-->
             <copy file="test-resources/security/s2a.service.axis2.xml"
                   tofile="target/test-resources/scenario2a_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario2a_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario2a_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s2a.service.xml"
@@ -458,14 +458,14 @@
             <!-- setup scenario 3 client repository-->
             <copy file="test-resources/security/s3.client.axis2.xml"
                   tofile="target/test-resources/scenario3_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario3_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario3_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario 3 service repository-->
             <copy file="test-resources/security/s3.service.axis2.xml"
                   tofile="target/test-resources/scenario3_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario3_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario3_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s3.service.xml"
@@ -490,14 +490,14 @@
             <!-- setup scenario 4 client repository-->
             <copy file="test-resources/security/s4.client.axis2.xml"
                   tofile="target/test-resources/scenario4_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario4_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario4_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario 4 service repository-->
             <copy file="test-resources/security/s4.service.axis2.xml"
                   tofile="target/test-resources/scenario4_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario4_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario4_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s4.service.xml"
@@ -522,14 +522,14 @@
             <!-- setup scenario 5 client repository-->
             <copy file="test-resources/security/s5.client.axis2.xml"
                   tofile="target/test-resources/scenario5_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario5_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario5_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario 5 service repository-->
             <copy file="test-resources/security/s5.service.axis2.xml"
                   tofile="target/test-resources/scenario5_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario5_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario5_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s5.service.xml"
@@ -554,14 +554,14 @@
             <!-- setup scenario 6 client repository-->
             <copy file="test-resources/security/s6.client.axis2.xml"
                   tofile="target/test-resources/scenario6_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario6_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario6_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario 6 service repository-->
             <copy file="test-resources/security/s6.service.axis2.xml"
                   tofile="target/test-resources/scenario6_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario6_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario6_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s6.service.xml"
@@ -586,14 +586,14 @@
             <!-- setup scenario 7 client repository-->
             <copy file="test-resources/security/s7.client.axis2.xml"
                   tofile="target/test-resources/scenario7_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario7_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario7_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario 7 service repository-->
             <copy file="test-resources/security/s7.service.axis2.xml"
                   tofile="target/test-resources/scenario7_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenario7_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenario7_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/s7.service.xml"
@@ -634,14 +634,14 @@
             <!-- setup scenario ST1 client repository-->
             <copy file="test-resources/security/sST1.client.axis2.xml"
                   tofile="target/test-resources/scenarioST1_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenarioST1_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenarioST1_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- setup scenario ST1 service repository-->
             <copy file="test-resources/security/sST1.service.axis2.xml"
                   tofile="target/test-resources/scenarioST1_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/scenarioST1_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/scenarioST1_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/sST1.service.xml"
@@ -666,14 +666,14 @@
             <!-- MTOM Optimized Security Test client repository-->
             <copy file="test-resources/security/secMtom.client.axis2.xml"
                   tofile="target/test-resources/mtom_sec_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/mtom_sec_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/mtom_sec_client_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- MTOM Optimized Security Test service repository-->
             <copy file="test-resources/security/secMtom.service.axis2.xml"
                   tofile="target/test-resources/mtom_sec_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/mtom_sec_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/mtom_sec_service_repo/modules/aegis-${aegis_version}.mar"/>
 
             <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
             <copy file="test-resources/security/secMtom.service.xml"
@@ -698,16 +698,16 @@
             <!-- Test with addressing and MTOM client repository-->
             <copy file="test-resources/security/complete.client.axis2.xml"
                   tofile="target/test-resources/complete_client_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/complete_client_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/complete_client_repo/modules/aegis-${aegis_version}.mar"/>
             <copy file="../addressing/target/addressing-${addressing_version}.mar"
                   tofile="target/test-resources/complete_client_repo/modules/addressing-${addressing_version}.mar"/>
 
             <!-- Test with addressing and MTOMservice repository-->
             <copy file="test-resources/security/complete.service.axis2.xml"
                   tofile="target/test-resources/complete_service_repo/conf/axis2.xml"/>
-            <copy file="../security/target/security-${security_version}.mar"
-                  tofile="target/test-resources/complete_service_repo/modules/security-${security_version}.mar"/>
+            <copy file="../security/target/aegis-${aegis_version}.mar"
+                  tofile="target/test-resources/complete_service_repo/modules/aegis-${aegis_version}.mar"/>
             <copy file="../addressing/target/addressing-${addressing_version}.mar"
                   tofile="target/test-resources/complete_service_repo/modules/addressing-${addressing_version}.mar"/>
 

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -6,9 +6,6 @@
 
     <module ref="addressing"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Test with addressing and MTOM: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -9,7 +9,7 @@
     <module ref="addressing"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 1: Client's Configuration:START-->
     <parameter name="OutflowSecurity">
       <action>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 2: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 2: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 3: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 4: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 5: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 6: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 7: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
 
     <!-- ================================================= -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml
(original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml
Fri Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario ST1: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml
(original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.axis2.xml
Fri Apr 28 03:33:10 2006
@@ -5,7 +5,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -4,9 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-    <!-- Engage the security module -->
-    <!--<module ref="security"/>-->
-
     <!-- Scenario 3 with MTOM: Client's Configuration:START-->
 
     <parameter name="OutflowSecurity">

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -6,7 +6,7 @@
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- ================================================= -->
     <!-- Transport Ins -->

Modified: webservices/axis2/trunk/java/modules/samples/resources/security/README.txt
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/resources/security/README.txt?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/resources/security/README.txt (original)
+++ webservices/axis2/trunk/java/modules/samples/resources/security/README.txt Fri Apr 28
03:33:10 2006
@@ -11,20 +11,20 @@
 ------------------------------------------------------------------------------
 Please follow each of the following steps:
 
-1.) Download the security-SNAPSHOT.mar and addressing-0.95.mar from 
+1.) Download the aegis-SNAPSHOT.mar and addressing-0.95.mar from 
 	http://ws.apache.org/axis2/modules/
-2.) To engage the security (WSS4J) module add the following line to axis2.xml in axis
-	<module ref="security"/>
-3.) Copy samples/security/SecureService.aar to axis2/WEB-INF/services/ directory
+2.) To engage the aegis (WSS4J) module add the following line to axis2.xml in axis
+	<module ref="aegis"/>
+3.) Copy samples/security/SecureService.aar to axis2/WEB-INF/services/ directory
 4.) Copy all jars other than the secUtil.jar in the samples/security/lib directory to axis2/WEB-INF/lib/
-5.) Copy the downloaded security-SNAPSHOT.mar to Axis2/WEB-INF/modules/ directory
+5.) Copy the downloaded aegis-SNAPSHOT.mar to Axis2/WEB-INF/modules/ directory
 6.) Start Tomcat
 
 Run the sample
-------------------------------------------------------------------------------
-
-Copy the downloaded security-SNAPSHOT.mar and addressing-SNAPSHOT.mar to samples/security/client_repo/modules/
directory
-
+------------------------------------------------------------------------------
+
+Copy the downloaded aegis-SNAPSHOT.mar and addressing-SNAPSHOT.mar to samples/security/client_repo/modules/
directory
+
 To run the sample client run the securitySample ant task in the ant build file available
in the samples directory.
 	$ ant securitySample
 

Modified: webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml Fri Apr
28 03:33:10 2006
@@ -4,7 +4,7 @@
     <module ref="addressing"/>
 
     <!-- Engage the security module -->
-    <module ref="security"/>
+    <module ref="aegis"/>
 
     <!-- Test with addressing and MTOM: Client's Configuration:START-->
 

Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- 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 Apr 28 03:33:10 2006
@@ -59,7 +59,7 @@
         //<optimizeParts>xpathExpression</optimizeParts>
         stub._getServiceClient().getOptions().setProperty(Constants.Configuration.ENABLE_MTOM,
Constants.VALUE_TRUE);
         stub._getServiceClient().getOptions().setSoapVersionURI(soapNsURI);
-        stub._getServiceClient().engageModule(new javax.xml.namespace.QName("security"));
+        stub._getServiceClient().engageModule(new javax.xml.namespace.QName("aegis"));
 
 
         PingResponseDocument pingResDoc = stub.Ping(pingDoc);
@@ -89,7 +89,7 @@
         //<optimizeParts>xpathExpression</optimizeParts>
         stub._getServiceClient().getOptions().setProperty(Constants.Configuration.ENABLE_MTOM,
Constants.VALUE_TRUE);
         //Engage the security module
-        stub._getServiceClient().engageModule(new javax.xml.namespace.QName("security"));
+        stub._getServiceClient().engageModule(new javax.xml.namespace.QName("aegis"));
 
 
         if (outflowConfig != null) {

Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=397843&r1=397842&r2=397843&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Fri Apr 28 03:33:10 2006
@@ -74,12 +74,12 @@
 			<fileset dir="target/temp-mar/org/apache/axis2/security/trust"/>
         </delete>
 
-        <jar jarfile="target/security-${security_version}.mar" basedir="target/temp-mar/">
+        <jar jarfile="target/aegis-${aegis_version}.mar" basedir="target/temp-mar/">
             <include name="**/*"/>
         </jar>
 
-        <copy file="target/security-${security_version}.mar" tofile="target/modules/security-${security_version}.mar"/>
-        <copy file="target/security-${security_version}.mar" tofile="${maven.repo.local}/axis2/mars/security-${security_version}.mar"/>
+        <copy file="target/aegis-${aegis_version}.mar" tofile="target/modules/aegis-${aegis_version}.mar"/>
+        <copy file="target/aegis-${aegis_version}.mar" tofile="${maven.repo.local}/axis2/mars/aegis-${aegis_version}.mar"/>
 		
         <delete includeEmptyDirs="true">
             <fileset dir="target/temp-mar"/>



Mime
View raw message