You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/12/11 06:18:13 UTC
svn commit: r355917 [2/3] - in /webservices/axis2/trunk/java/modules:
addressing/test-resources/ codegen/test-resources/xmls/
core/src/org/apache/axis2/context/ core/src/org/apache/axis2/deployment/
core/src/org/apache/axis2/description/ core/src/org/a...
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml Sat Dec 10 21:17:41 2005
@@ -13,29 +13,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -49,6 +46,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml Sat Dec 10 21:17:41 2005
@@ -19,7 +19,6 @@
</hostConfiguration>
-
<!--if you want to extract the service archive file and work with that please uncomment this-->
<!--else , it wont extract archive file or does not take into consideration if someone drop-->
<!--exploded directory into /service directory-->
@@ -67,7 +66,8 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
</transportSender>
@@ -83,7 +83,7 @@
<!-- ================================================= -->
<!-- Global Modules -->
<!-- ================================================= -->
-
+
<!--Configuring module , providing parameters for modules whether they refer or not-->
<!--<moduleConfig name="addressing">-->
@@ -97,29 +97,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -133,6 +130,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/moduleConfig/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/moduleConfig/axis2.xml?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/moduleConfig/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/moduleConfig/axis2.xml Sat Dec 10 21:17:41 2005
@@ -13,29 +13,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -49,6 +46,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml Sat Dec 10 21:17:41 2005
@@ -11,29 +11,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -47,6 +44,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml Sat Dec 10 21:17:41 2005
@@ -15,29 +15,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -51,6 +48,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/serviceGroupRepo/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/serviceGroupRepo/axis2.xml?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/serviceGroupRepo/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/serviceGroupRepo/axis2.xml Sat Dec 10 21:17:41 2005
@@ -53,38 +53,35 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
- <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
</transportSender>
-
<phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -98,6 +95,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java Sat Dec 10 21:17:41 2005
@@ -21,12 +21,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.soap.SOAPFactory;
@@ -130,14 +125,14 @@
mc.setWSAAction("DummyOp");
AxisEngine engine = new AxisEngine(engineContext);
engine.receive(mc);
- assertEquals(executedHandlers.size(), 14);
+ assertEquals(14, executedHandlers.size());
for (int i = 0; i < 14; i++) {
assertEquals(((Integer) executedHandlers.get(i)).intValue(),
i + 1);
}
- engine.receive(mc);
+ engine.resume(mc);
- assertEquals(27,executedHandlers.size());
+ assertEquals(27, executedHandlers.size());
for (int i = 15; i < 27; i++) {
assertEquals(((Integer) executedHandlers.get(i)).intValue(),
i + 1);
@@ -161,10 +156,9 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
- String paused = "paused";
- if (pause && msgContext.getProperty(paused) == null) {
- msgContext.setProperty(paused, "true");
- msgContext.setPausedTrue(getName());
+ if (pause) {
+ msgContext.pause();
+ pause = false;
} else {
executedHandlers.add(index);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java Sat Dec 10 21:17:41 2005
@@ -18,111 +18,101 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseHolder;
import javax.xml.namespace.QName;
import java.util.ArrayList;
+import java.util.Iterator;
public class BeforeAfterTest extends TestCase {
- public void testBeforeAfter() {
- try {
- ArrayList phases = new ArrayList();
- Phase p1 = new Phase("PhaseA");
- phases.add(p1);
- Phase p2 = new Phase("PhaseB");
- phases.add(p2);
-
- MessageContext msg = new MessageContext(
- new ConfigurationContext(new AxisConfiguration()));
-
- PhaseHolder ph = new PhaseHolder(phases);
- HandlerDescription hm = new HandlerDescription();
- hm.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
- Handler h1 = new PhaseRuleHandlers();
- h1.init(hm);
- ((PhaseRuleHandlers) h1).setName(new QName("First"));
- hm.setHandler(h1);
- hm.setName(new QName("H1"));
- PhaseRule rule = new PhaseRule();
- rule.setPhaseName("PhaseA");
- hm.setRules(rule);
- ph.addHandler(hm);
-
- HandlerDescription hm1 = new HandlerDescription();
- hm1.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
- Handler h2 = new PhaseRuleHandlers();
- ((PhaseRuleHandlers) h2).setName(new QName("Forth"));
- h2.init(hm1);
- hm1.setHandler(h2);
- hm1.setName(new QName("H2"));
- PhaseRule rule1 = new PhaseRule();
- rule1.setPhaseName("PhaseA");
- hm1.setRules(rule1);
- ph.addHandler(hm1);
-
-
- HandlerDescription hm3 = new HandlerDescription();
- hm3.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
- Handler h3 = new PhaseRuleHandlers();
- ((PhaseRuleHandlers) h3).setName(new QName("Second"));
- h3.init(hm3);
- hm3.setHandler(h3);
- hm3.setName(new QName("H3"));
- PhaseRule rule3 = new PhaseRule();
- rule3.setPhaseName("PhaseA");
- rule3.setAfter("H1");
- hm3.setRules(rule3);
- ph.addHandler(hm3);
-
- HandlerDescription hm4 = new HandlerDescription();
- hm4.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
- Handler h4 = new PhaseRuleHandlers();
- ((PhaseRuleHandlers) h4).setName(new QName("Third"));
- h4.init(hm4);
- hm4.setHandler(h4);
- hm4.setName(new QName("H4"));
- PhaseRule rule4 = new PhaseRule();
- rule4.setPhaseName("PhaseA");
- rule4.setAfter("H1");
- rule4.setBefore("H2");
- hm4.setRules(rule4);
- ph.addHandler(hm4);
-
- ArrayList handlers = p1.getHandlers();
-
- for (int i = 0; i < handlers.size(); i++) {
- Handler handler = (Handler) handlers.get(i);
- }
-
- Handler handler = (Handler) handlers.get(0);
- if (!handler.getName().equals(new QName("First"))) {
- fail("Computed Hnadler order is wrong ");
+ public void testBeforeAfter() throws Exception {
+ ArrayList phases = new ArrayList();
+ Phase p1 = new Phase("PhaseA");
+ phases.add(p1);
+ Phase p2 = new Phase("PhaseB");
+ phases.add(p2);
+
+ PhaseHolder ph = new PhaseHolder(phases);
+ HandlerDescription hm = new HandlerDescription();
+ hm.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
+ Handler h1 = new PhaseRuleHandlers();
+ h1.init(hm);
+ ((PhaseRuleHandlers) h1).setName(new QName("First"));
+ hm.setHandler(h1);
+ hm.setName(new QName("H1"));
+ PhaseRule rule = new PhaseRule();
+ rule.setPhaseName("PhaseA");
+ hm.setRules(rule);
+ ph.addHandler(hm);
+
+ HandlerDescription hm1 = new HandlerDescription();
+ hm1.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
+ Handler h2 = new PhaseRuleHandlers();
+ ((PhaseRuleHandlers) h2).setName(new QName("Forth"));
+ h2.init(hm1);
+ hm1.setHandler(h2);
+ hm1.setName(new QName("H2"));
+ PhaseRule rule1 = new PhaseRule();
+ rule1.setPhaseName("PhaseA");
+ hm1.setRules(rule1);
+ ph.addHandler(hm1);
+
+
+ HandlerDescription hm3 = new HandlerDescription();
+ hm3.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
+ Handler h3 = new PhaseRuleHandlers();
+ ((PhaseRuleHandlers) h3).setName(new QName("Second"));
+ h3.init(hm3);
+ hm3.setHandler(h3);
+ hm3.setName(new QName("H3"));
+ PhaseRule rule3 = new PhaseRule();
+ rule3.setPhaseName("PhaseA");
+ rule3.setAfter("H1");
+ hm3.setRules(rule3);
+ ph.addHandler(hm3);
+
+ HandlerDescription hm4 = new HandlerDescription();
+ hm4.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
+ Handler h4 = new PhaseRuleHandlers();
+ ((PhaseRuleHandlers) h4).setName(new QName("Third"));
+ h4.init(hm4);
+ hm4.setHandler(h4);
+ hm4.setName(new QName("H4"));
+ PhaseRule rule4 = new PhaseRule();
+ rule4.setPhaseName("PhaseA");
+ rule4.setAfter("H1");
+ rule4.setBefore("H2");
+ hm4.setRules(rule4);
+ ph.addHandler(hm4);
+
+ ArrayList handlers = p1.getHandlers();
+ boolean foundH1 = false;
+ boolean foundH4 = false;
+
+ for (Iterator iterator = handlers.iterator(); iterator.hasNext();) {
+ Handler handler = (Handler) iterator.next();
+ if (h3 == handler) {
+ if (!foundH1)
+ fail("H3 found before H1");
}
- handler = (Handler) handlers.get(1);
- if (!handler.getName().equals(new QName("Third"))) {
- fail("Computed Hnadler order is wrong ");
+ if (h1 == handler)
+ foundH1 = true;
+ if (h2 == handler) {
+ if (!foundH4) {
+ fail("H2 found before H4");
+ }
}
- handler = (Handler) handlers.get(2);
- if (!handler.getName().equals(new QName("Second"))) {
- fail("Computed Hnadler order is wrong ");
+ if (h4 == handler) {
+ if (!foundH1) {
+ fail("H4 found before H1");
+ }
+ foundH4 = true;
}
-
- handler = (Handler) handlers.get(3);
- if (!handler.getName().equals(new QName("Forth"))) {
- fail("Computed Hnadler order is wrong ");
- }
-
- } catch (AxisFault axisFault) {
- return;
}
-
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java Sat Dec 10 21:17:41 2005
@@ -70,11 +70,11 @@
ArrayList handlers = p1.getHandlers();
Handler handler = (Handler) handlers.get(0);
- if (!handler.getName().equals(new QName("Second"))) {
+ if (handler != h2) {
fail("Computed Hnadler order is wrong ");
}
handler = (Handler) handlers.get(1);
- if (!handler.getName().equals(new QName("First"))) {
+ if (handler !=h1) {
fail("Computed Hnadler order is wrong ");
}
p1.invoke(msg);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java Sat Dec 10 21:17:41 2005
@@ -71,12 +71,12 @@
ArrayList handlers = p1.getHandlers();
Handler handler = (Handler) handlers.get(0);
- if (!handler.getName().equals(new QName("Second"))) {
- fail("Computed Hnadler order is wrong ");
+ if (handler != h2) {
+ fail("Computed Handler order is wrong ");
}
handler = (Handler) handlers.get(1);
- if (!handler.getName().equals(new QName("First"))) {
- fail("Computed Hnadler order is wrong ");
+ if (handler != h1) {
+ fail("Computed Handler order is wrong ");
}
p1.invoke(msg);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java Sat Dec 10 21:17:41 2005
@@ -18,14 +18,12 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.phaseresolver.PhaseException;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -38,10 +36,6 @@
phases.add(p1);
Phase p2 = new Phase("PhaseB");
phases.add(p2);
-
- MessageContext msg = new MessageContext(
- new ConfigurationContext(new AxisConfiguration()));
-
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
hm.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
@@ -65,20 +59,14 @@
hm1.setName(new QName("H2"));
PhaseRule rule1 = new PhaseRule();
rule1.setPhaseName("PhaseA");
- rule1.setAfter("H1");
+ rule1.setBefore("H1");
hm1.setRules(rule1);
- ph.addHandler(hm1);
-
- ArrayList handlers = p1.getHandlers();
- Handler handler = (Handler) handlers.get(0);
- if (!handler.getName().equals(new QName("PhaseFirstHnadler"))) {
- fail("Computed Hnadler order is wrong ");
- }
- handler = (Handler) handlers.get(1);
- if (!handler.getName().equals(new QName("Second Handler"))) {
- fail("Computed Hnadler order is wrong ");
+ try {
+ ph.addHandler(hm1);
+ } catch (PhaseException e) {
+ return;
}
- p1.invoke(msg);
+ fail("Succeeded in deploying after PhaseFirst handler!");
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java Sat Dec 10 21:17:41 2005
@@ -18,13 +18,11 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.PhaseRule;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.Phase;
+import org.apache.axis2.phaseresolver.PhaseException;
import org.apache.axis2.phaseresolver.PhaseHolder;
import javax.xml.namespace.QName;
@@ -39,9 +37,6 @@
Phase p2 = new Phase("PhaseB");
phases.add(p2);
- MessageContext msg = new MessageContext(
- new ConfigurationContext(new AxisConfiguration()));
-
PhaseHolder ph = new PhaseHolder(phases);
HandlerDescription hm = new HandlerDescription();
hm.setClassName("org.apache.axis2.phaserule.PhaseRuleHandlers");
@@ -67,18 +62,12 @@
rule1.setPhaseName("PhaseA");
rule1.setAfter("H1");
hm1.setRules(rule1);
- ph.addHandler(hm1);
-
- ArrayList handlers = p1.getHandlers();
- Handler handler = (Handler) handlers.get(0);
- if (!handler.getName().equals(new QName("Second Handler"))) {
- fail("Computed Hnadler order is wrong ");
- }
- handler = (Handler) handlers.get(1);
- if (!handler.getName().equals(new QName("PhaseLast"))) {
- fail("Computed Hnadler order is wrong ");
+ try {
+ ph.addHandler(hm1);
+ } catch (PhaseException e) {
+ return;
}
+ fail("Succeeded in deploying after PhaseLast handler!");
- p1.invoke(msg);
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java Sat Dec 10 21:17:41 2005
@@ -17,6 +17,7 @@
package org.apache.axis2.phaserule;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.handlers.AbstractHandler;
@@ -34,11 +35,7 @@
public PhaseRuleHandlers() {
this.message = "inside service 2";
}
-
- public QName getName() {
- return name;
- }
-
+
public void invoke(MessageContext msgContext) throws AxisFault {
log.info("I am " + name + " Handler Running :)");
}
@@ -49,5 +46,9 @@
public void setName(QName name) {
this.name = name;
+ }
+
+ public void init(HandlerDescription handlerdesc) {
+ super.init(handlerdesc);
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleTest.java Sat Dec 10 21:17:41 2005
@@ -26,7 +26,6 @@
axisSytem = new AxisConfiguration();
ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
- Handler han = null;//(Handler)Class.forName("org.apache.axis2.handlers.AbstractHandler",true, Thread.currentThread().getContextClassLoader()).newInstance();
PhaseHolder ph = new PhaseHolder(inPhase);
HandlerDescription hm = new HandlerDescription();
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java?rev=355917&r1=355916&r2=355917&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java Sat Dec 10 21:17:41 2005
@@ -105,17 +105,6 @@
hm2.setRules(rule2);
ph.addHandler(hm2);
- HandlerDescription hm3 = new HandlerDescription();
- hm3.setClassName("org.apache.axis2.handlers.AbstractHandler");
- Handler h6 = new PhaseRuleHandlers();
- h6.init(hm3);
- hm3.setHandler(h6);
- hm3.setName(new QName("H4"));
- PhaseRule rule3 = new PhaseRule();
- rule3.setPhaseName("PostDispatch");
- hm3.setRules(rule3);
- ph.addHandler(hm3);
-
/*ArrayList oh = ph.getOrderHandler();
for (int i = 0; i < oh.size(); i++) {
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -44,33 +44,30 @@
</transportSender>
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -84,6 +81,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -57,29 +57,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -93,6 +90,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
@@ -106,7 +104,6 @@
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
-
</axisconfig>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -25,33 +25,30 @@
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -65,6 +62,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -37,7 +37,8 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
- <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
</transportSender>
@@ -49,34 +50,30 @@
<parameter name="transport.mail.smtp.port" locked="false">25</parameter>
</transportSender>
-->
-
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -90,6 +87,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -34,33 +34,30 @@
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -74,6 +71,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -54,29 +54,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -90,6 +87,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -31,34 +31,30 @@
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
-
- <phaseOrder type="inflow">
+<phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -72,6 +68,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -49,33 +49,30 @@
<parameter name="transport.mail.smtp.port" locked="false">25</parameter>
</transportSender>
-->
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -89,6 +86,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
@@ -102,6 +100,5 @@
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
-
</axisconfig>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -45,29 +45,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -81,6 +78,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -53,29 +53,26 @@
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -89,6 +86,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -10,25 +10,27 @@
<!-- Scenario 4: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>
- <items>Signature Encrypt Timestamp</items>
- <user>alice</user>
- <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
- <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
- <encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier>
- <encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
- <signaturePropFile>interop.properties</signaturePropFile>
- <EmbeddedKeyCallbackClass>org.apache.axis2.security.PWCallback</EmbeddedKeyCallbackClass>
- <EmbeddedKeyName>SessionKey</EmbeddedKeyName>
- </action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
+ <user>alice</user>
+ <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
+ <encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier>
+ <encryptionSymAlgorithm>
+ http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
+ <signaturePropFile>interop.properties</signaturePropFile>
+ <EmbeddedKeyCallbackClass>
+ org.apache.axis2.security.PWCallback</EmbeddedKeyCallbackClass>
+ <EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>
- <items>Signature Encrypt Timestamp</items>
- <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
- <signaturePropFile>interop.properties</signaturePropFile>
- </action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
+ <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ <signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Scenario 4: Client's Configuration:END-->
@@ -39,33 +41,30 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
-<phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -79,6 +78,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -37,7 +37,8 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
- <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
</transportSender>
@@ -49,33 +50,30 @@
<parameter name="transport.mail.smtp.port" locked="false">25</parameter>
</transportSender>
-->
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -89,6 +87,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
@@ -102,6 +101,5 @@
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
-
</axisconfig>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -11,21 +11,21 @@
<parameter name="OutflowSecurity">
- <action>
- <items>Signature NoSerialization</items>
- <user>alice</user>
- <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
- <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
- <signatureParts>{}{http://xmlsoap.org/Ping}ticket</signatureParts>
- <signaturePropFile>interop.properties</signaturePropFile>
- </action>
-
- <action>
- <items>Signature Timestamp</items>
- <user>alice</user>
- <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
- <signaturePropFile>interop.properties</signaturePropFile>
- </action>
+ <action>
+ <items>Signature NoSerialization</items>
+ <user>alice</user>
+ <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
+ <signatureParts>{}{http://xmlsoap.org/Ping}ticket</signatureParts>
+ <signaturePropFile>interop.properties</signaturePropFile>
+ </action>
+
+ <action>
+ <items>Signature Timestamp</items>
+ <user>alice</user>
+ <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ <signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
@@ -38,33 +38,30 @@
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
-<phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -78,6 +75,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -37,7 +37,8 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
- <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
</transportSender>
@@ -50,33 +51,30 @@
</transportSender>
-->
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -90,6 +88,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
@@ -103,6 +102,5 @@
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
-
</axisconfig>
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=355917&r1=355916&r2=355917&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 Sat Dec 10 21:17:41 2005
@@ -10,24 +10,25 @@
<!-- Scenario 6: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>
- <items>Encrypt Signature Timestamp</items>
- <user>alice</user>
- <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
- <encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
- <encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
- <encryptionUser>bob</encryptionUser>
- <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
- <signaturePropFile>interop.properties</signaturePropFile>
- </action>
+ <action>
+ <items>Encrypt Signature Timestamp</items>
+ <user>alice</user>
+ <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ <encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
+ <encryptionSymAlgorithm>
+ http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
+ <encryptionUser>bob</encryptionUser>
+ <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
+ <signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>
- <items>Encrypt Signature Timestamp</items>
- <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
- <signaturePropFile>interop.properties</signaturePropFile>
- </action>
+ <action>
+ <items>Encrypt Signature Timestamp</items>
+ <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ <signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Scenario 6: Client's Configuration:END-->
@@ -39,33 +40,30 @@
<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
</transportSender>
- <phaseOrder type="inflow">
+ <phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
<phase name="PreDispatch"/>
- <phase name="Dispatch">
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.engine.AddressingBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="RequestURIBasedDispatcher"
+
+ <handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.engine.RequestURIBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPActionBasedDispatcher"
+
+ <handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- <handler name="SOAPMessageBodyBasedDispatcher"
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
<order phase="Dispatch"/>
</handler>
- </phase>
- <phase name="PostDispatch">
- <handler name="DispatchPostConditionsEvaluator"
- class="org.apache.axis2.engine.DispatchingChecker">
- <order phase="PostDispatch"/>
- </handler>
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="PostDispatch"/>
@@ -79,6 +77,7 @@
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
<!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>