Author: ruchithf
Date: Sun Mar 17 15:23:27 2013
New Revision: 1457462
URL: http://svn.apache.org/r1457462
Log:
Removed the deprecated basic configuration
Removed:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/config/
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/security/
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/resources/ping/
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/axis2/
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/
axis/axis2/java/rampart/trunk/modules/rampart-samples/basic/
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/handler/config/
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java?rev=1457462&r1=1457461&r2=1457462&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
Sun Mar 17 15:23:27 2013
@@ -30,7 +30,6 @@ import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rampart.RampartMessageData;
import org.apache.rampart.policy.RampartPolicyData;
-import org.apache.rampart.util.HandlerParameterDecoder;
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.model.Binding;
import org.apache.ws.secpolicy.model.SupportingToken;
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1457462&r1=1457461&r2=1457462&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sun Mar
17 15:23:27 2013
@@ -147,248 +147,6 @@
<outputDirectory>target/test-resources/rahas_service_repo_5</outputDirectory>
</configuration>
</execution>
- <execution>
- <id>create-scenario1-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s1.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario1_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario1-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s1.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario1_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario2-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s2.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario2_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario2-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s2.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario2_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario2a-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s2a.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario2a_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario2a-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s2a.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario2a_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario3-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s3.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario3_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario3-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s3.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario3_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario4-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s4.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario4_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario4-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s4.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario4_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario5-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s5.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario5_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario5-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s5.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario5_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario6-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s6.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario6_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario6-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s6.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario6_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario7-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s7.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario7_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenario7-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/s7.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenario7_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenarioST1-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/sST1.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenarioST1_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-scenarioST1-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/sST1.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/scenarioST1_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-mtom-sec-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/secMtom.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/mtom_sec_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-mtom-sec-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>rampart</modules>
-
<axis2xml>src/test/resources/security/secMtom.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/mtom_sec_service_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-complete-client-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>addressing,rampart</modules>
-
<axis2xml>src/test/resources/security/complete.client.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/complete_client_repo</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>create-complete-service-repo</id>
- <goals>
- <goal>create-test-repository</goal>
- </goals>
- <configuration>
- <modules>addressing,rampart</modules>
-
<axis2xml>src/test/resources/security/complete.service.axis2.xml</axis2xml>
-
<outputDirectory>target/test-resources/complete_service_repo</outputDirectory>
- </configuration>
- </execution>
</executions>
<configuration>
<configurationDirectory>conf</configurationDirectory>
@@ -398,43 +156,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution>
- <id>generate-source</id>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <arg line="-uri
src/main/resources/ping/ping.wsdl -ss -o target/generated-code -p
org.apache.axis2.oasis.ping -d xmlbeans -g" />
- <classpath
refid="maven.dependency.classpath" />
- <classpath refid="maven.compile.classpath"
/>
- <classpath refid="maven.runtime.classpath"
/>
- </java>
- <!-- copy the service impl -->
- <copy
file="src/main/resources/ping/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
tofile="target/generated-code/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
overwrite="yes" />
- <!-- Password callback class for the interop
service -->
- <copy
file="src/main/resources/ping/src/org/apache/axis2/security/PWCallback.java"
tofile="target/generated-code/src/org/apache/axis2/security/PWCallback.java"
overwrite="yes" />
- <!-- Interop client -->
- <copy
file="src/main/resources/ping/src/org/apache/axis2/security/InteropScenarioClient.java"
tofile="target/generated-code/src/org/apache/axis2/security/InteropScenarioClient.java"
overwrite="yes" />
-
- <copy todir="target/test-classes">
- <fileset
dir="target/generated-code/resources">
- <include name="**/*" />
- </fileset>
- </copy>
-
-
- <javac srcdir="target/generated-code"
destdir="target/classes" fork="true">
- <classpath
refid="maven.dependency.classpath" />
- <classpath refid="maven.compile.classpath"
/>
- <classpath refid="maven.runtime.classpath"
/>
- </javac>
-
- </tasks>
- </configuration>
- </execution>
+
<execution>
<id>create-test-resources</id>
<phase>process-test-resources</phase>
@@ -642,63 +364,6 @@
<jar
jarfile="target/test-resources/rahas_service_repo_5/services/SecureService.aar"
basedir="target/temp-rahas" />
<!--RahasAttributeTest END-->
- <!-- Scenario 1 -->
- <mkdir
dir="target/test-resources/scenario1_service_repo/services" />
-
- <mkdir dir="target/temp-interop/META-INF" />
-
- <!-- Create the .aar file -->
- <copy
file="src/test/resources/security/s1.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
- <!-- Scenario 2 - Setup the client and service
repos -->
- <mkdir
dir="target/test-resources/scenario2_service_repo/services" />
- <copy
file="src/test/resources/security/s2.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Scenario 2a - set up repos -->
- <mkdir
dir="target/test-resources/scenario2a_service_repo/services" />
- <copy
file="src/test/resources/security/s2a.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
- <!-- Scenario 3 -->
- <mkdir
dir="target/test-resources/scenario3_service_repo/services" />
- <copy
file="src/test/resources/security/s3.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Scenario 4 -->
- <mkdir
dir="target/test-resources/scenario4_service_repo/services" />
- <copy
file="src/test/resources/security/s4.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Scenario 5 -->
- <mkdir
dir="target/test-resources/scenario5_service_repo/services" />
- <copy
file="src/test/resources/security/s5.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Scenario 6 -->
- <mkdir
dir="target/test-resources/scenario6_service_repo/services" />
- <copy
file="src/test/resources/security/s6.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Scenario 7 -->
- <mkdir
dir="target/test-resources/scenario7_service_repo/services" />
- <copy
file="src/test/resources/security/s7.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Scenario ST1 -->
- <mkdir
dir="target/test-resources/scenarioST1_service_repo/services" />
- <copy
file="src/test/resources/security/sST1.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- MTOM Optimized Security Test -->
- <mkdir
dir="target/test-resources/mtom_sec_service_repo/services" />
- <copy
file="src/test/resources/security/secMtom.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <jar
jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
-
- <!-- Test with addressing and MTOM -->
- <mkdir
dir="target/test-resources/complete_service_repo/services" />
- <copy
file="src/test/resources/security/complete.service.xml"
tofile="target/temp-interop/META-INF/services.xml" overwrite="true" />
- <!-- Create the .aar file -->
- <jar
jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
basedir="target/temp-interop" />
</tasks>
</configuration>
<goals>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml?rev=1457462&r1=1457461&r2=1457462&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/module.xml Sun Mar 17
15:23:27 2013
@@ -9,9 +9,6 @@
<handler name="PolicyBasedSecurityInHandler"
class="org.apache.rampart.handler.RampartReceiver">
<order phase="Security" phaseFirst="true"/>
</handler>
- <handler name="SecurityInHandler"
class="org.apache.rampart.handler.WSDoAllReceiver">
- <order phase="Security"/>
- </handler>
<handler name="PostDispatchVerificationHandler"
class="org.apache.rampart.handler.PostDispatchVerificationHandler">
<order phase="Dispatch" phaseLast="true"/>
</handler>
@@ -19,18 +16,12 @@
</InFlow>
<OutFlow>
- <handler name="SecurityOutHandler"
class="org.apache.rampart.handler.WSDoAllSender">
- <order phase="Security"/>
- </handler>
<handler name="PolicyBasedSecurityOutHandler"
class="org.apache.rampart.handler.RampartSender">
<order phase="Security" phaseLast="true"/>
</handler>
</OutFlow>
<OutFaultFlow>
- <handler name="SecurityOutHandler"
class="org.apache.rampart.handler.WSDoAllSender">
- <order phase="Security"/>
- </handler>
<handler name="PolicyBasedSecurityOutHandler"
class="org.apache.rampart.handler.RampartSender">
<order phase="Security" phaseLast="true"/>
</handler>
@@ -40,9 +31,6 @@
<handler name="PolicyBasedSecurityInHandler"
class="org.apache.rampart.handler.RampartReceiver">
<order phase="Security" phaseFirst="true"/>
</handler>
- <handler name="SecurityInHandler"
class="org.apache.rampart.handler.WSDoAllReceiver">
- <order phase="Security"/>
- </handler>
</InFaultFlow>
<supported-policy-namespaces
namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
