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 2007/07/19 15:12:05 UTC
svn commit: r557608 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/engine/ kernel/conf/
kernel/src/org/apache/axis2/deployment/ kernel/src/org/apache/axis2/engine/
kernel/test/org/apache/axis2/deployment/
Author: deepal
Date: Thu Jul 19 06:12:04 2007
New Revision: 557608
URL: http://svn.apache.org/viewvc?view=rev&rev=557608
Log:
- We need to run security handlers after the addressing handlers
- Oops someone has broken the phase rule. If the phase last is set then we need to add the handler b4 that phase last handler
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java?view=diff&rev=557608&r1=557607&r2=557608
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java Thu Jul 19 06:12:04 2007
@@ -159,9 +159,9 @@
TestingUtils.compareWithCreatedOMElement(result);
- List expectedExecutionState = Arrays.asList(new String[] { "COut1", "COut2", "COut3", "In1",
- "In2", "In3", "In4", "In5", "In6", "Out1", "Out2", "Out3", "FCOut3", "FCOut2",
- "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn3", "FCIn2", "FCIn1", "FCCOut3",
+ List expectedExecutionState = Arrays.asList(new String[] { "COut1", "COut2", "COut3", "In2",
+ "In3", "In1", "In4", "In5", "In6", "Out1", "Out2", "Out3", "FCOut3", "FCOut2",
+ "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn1", "FCIn3", "FCIn2", "FCCOut3",
"FCCOut2", "FCCOut1", "CIn1", "CIn2", "CIn3", "FCCIn3", "FCCIn2", "FCCIn1" });
assertEquals(expectedExecutionState, testResults);
}
@@ -231,8 +231,8 @@
}
catch (AxisFault e) {
}
- List expectedExecutionState = Arrays.asList(new String[] { "In1", "In2", "In3", "In4",
- "kaboom", "FCIn4", "FCIn3", "FCIn2", "FCIn1" });
+ List expectedExecutionState = Arrays.asList(new String[] { "In2", "In3", "In1", "In4",
+ "kaboom", "FCIn4", "FCIn1", "FCIn3", "FCIn2" });
assertEquals(expectedExecutionState, testResults);
middleOperationInHandler.shouldFail(false);
}
@@ -248,7 +248,7 @@
catch (AxisFault e) {
}
List expectedExecutionState = Arrays.asList(
- new String[] { "In1", "In2", "In3", "kaboom", "FCIn3", "FCIn2", "FCIn1" });
+ new String[] { "In2", "In3", "In1", "kaboom", "FCIn1", "FCIn3", "FCIn2" });
assertEquals(expectedExecutionState, testResults);
firstOperationInHandler.shouldFail(false);
}
@@ -263,7 +263,7 @@
}
catch (AxisFault e) {
}
- List expectedExecutionState = Arrays.asList(new String[] { "In1", "kaboom", "FCIn1" });
+ List expectedExecutionState = Arrays.asList(new String[] { "kaboom"});
assertEquals(expectedExecutionState, testResults);
middleGlobalInHandler.shouldFail(false);
}
@@ -278,9 +278,9 @@
}
catch (AxisFault e) {
}
- List expectedExecutionState = Arrays.asList(new String[] { "In1", "In2", "In3", "In4",
- "In5", "In6", "Out1", "kaboom", "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn3",
- "FCIn2", "FCIn1" });
+ List expectedExecutionState = Arrays.asList(new String[] { "In2", "In3", "In1", "In4",
+ "In5", "In6", "Out1", "kaboom", "FCOut1", "FCIn6", "FCIn5", "FCIn4", "FCIn1",
+ "FCIn3", "FCIn2" });
assertEquals(expectedExecutionState, testResults);
middleOperationOutHandler.shouldFail(false);
}
@@ -385,9 +385,9 @@
catch (AxisFault e) {
}
- List expectedExecutionState = Arrays.asList(new String[] { "In1", "In2", "In3", "In4",
+ List expectedExecutionState = Arrays.asList(new String[] { "In2", "In3", "In1", "In4",
"In5", "In6", "Out1", "Out2", "Out3", "FCOut3", "FCOut2", "FCOut1", "FCIn6",
- "FCIn5", "FCIn4", "FCIn3", "FCIn2", "FCIn1", "CIn1", "kaboom", "FCCIn1" });
+ "FCIn5", "FCIn4", "FCIn1", "FCIn3", "FCIn2", "CIn1", "kaboom", "FCCIn1" });
assertEquals(expectedExecutionState, testResults);
}
Modified: webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?view=diff&rev=557608&r1=557607&r2=557608
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Thu Jul 19 06:12:04 2007
@@ -354,20 +354,20 @@
<order phase="Transport"/>
</handler>
</phase>
+ <phase name="PreDispatch">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="PreDispatch" phaseLast="true"/>
+ </handler>
+ </phase>
<phase name="Security"/>
- <phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
-
<handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
-
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
-
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml?view=diff&rev=557608&r1=557607&r2=557608
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml Thu Jul 19 06:12:04 2007
@@ -180,37 +180,25 @@
<order phase="Transport"/>
</handler>
</phase>
+ <phase name="PreDispatch">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="PreDispatch" phaseLast="true"/>
+ </handler>
+ </phase>
<phase name="Security"/>
- <phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
</phase>
<phase name="RMPhase"/>
<!-- System pre defined phases -->
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java?view=diff&rev=557608&r1=557607&r2=557608
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java Thu Jul 19 06:12:04 2007
@@ -206,7 +206,7 @@
// If we don't care where it goes, tack it on at the end
if (beforeName == null && afterName == null) {
- handlers.add(handler);
+ addHandler(handler);
return;
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java?view=diff&rev=557608&r1=557607&r2=557608
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java Thu Jul 19 06:12:04 2007
@@ -62,9 +62,9 @@
Phase userPhase;
ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- phase = (Phase) globalinflow.get(2);
+ phase = (Phase) globalinflow.get(1);
assertNotNull(phase);
- assertEquals(phase.getHandlerCount(), 0);
+ assertEquals(phase.getHandlerCount(), 1);
AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
@@ -74,11 +74,11 @@
assertEquals(0, userPhase.getHandlerCount());
config.engageModule(module.getName());
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
config.disengageModule(module);
- assertEquals(0, phase.getHandlerCount());
+ assertEquals(1, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
@@ -89,9 +89,9 @@
Phase userPhase;
ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- phase = (Phase) globalinflow.get(2);
+ phase = (Phase) globalinflow.get(1);
assertNotNull(phase);
- assertEquals(0, phase.getHandlerCount());
+ assertEquals(1, phase.getHandlerCount());
AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
@@ -102,11 +102,11 @@
assertEquals(0, userPhase.getHandlerCount());
config.engageModule(module.getName());
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
service.disengageModule(module);
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
@@ -126,9 +126,9 @@
Phase userPhase;
ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- phase = (Phase) globalinflow.get(2);
+ phase = (Phase) globalinflow.get(1);
assertNotNull(phase);
- assertEquals(phase.getHandlerCount(), 0);
+ assertEquals(phase.getHandlerCount(), 1);
AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
@@ -138,11 +138,11 @@
assertEquals(0, userPhase.getHandlerCount());
config.engageModule(module.getName());
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
operation.disengageModule(module);
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
@@ -153,9 +153,9 @@
Phase userPhase;
ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- predisptah = (Phase) globalinflow.get(2);
+ predisptah = (Phase) globalinflow.get(1);
assertNotNull(predisptah);
- assertEquals(predisptah.getHandlerCount(), 0);
+ assertEquals(predisptah.getHandlerCount(), 1);
AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
@@ -165,11 +165,11 @@
assertEquals(0, userPhase.getHandlerCount());
service.engageModule(module);
- assertEquals(2, predisptah.getHandlerCount());
+ assertEquals(3, predisptah.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
service.disengageModule(module);
- assertEquals(0, predisptah.getHandlerCount());
+ assertEquals(1, predisptah.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
@@ -180,9 +180,9 @@
Phase userPhase;
ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- phase = (Phase) globalinflow.get(2);
+ phase = (Phase) globalinflow.get(1);
assertNotNull(phase);
- assertEquals(phase.getHandlerCount(), 0);
+ assertEquals(phase.getHandlerCount(), 1);
AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
@@ -192,11 +192,11 @@
assertEquals(0, userPhase.getHandlerCount());
service.engageModule(module);
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
operation.disengageModule(module);
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
@@ -207,9 +207,9 @@
Phase userPhase;
ArrayList globalinflow = config.getInFlowPhases();
assertNotNull(globalinflow);
- phase = (Phase) globalinflow.get(2);
+ phase = (Phase) globalinflow.get(1);
assertNotNull(phase);
- assertEquals(phase.getHandlerCount(), 0);
+ assertEquals(phase.getHandlerCount(), 1);
AxisService service = config.getService(serviceName);
assertNotNull(service);
AxisOperation operation = service.getOperation(opName);
@@ -218,10 +218,10 @@
assertNotNull(userPhase);
assertEquals(0, userPhase.getHandlerCount());
operation.engageModule(module);
- assertEquals(2, phase.getHandlerCount());
+ assertEquals(3, phase.getHandlerCount());
assertEquals(1, userPhase.getHandlerCount());
operation.disengageModule(module);
- assertEquals(0, phase.getHandlerCount());
+ assertEquals(1, phase.getHandlerCount());
assertEquals(0, userPhase.getHandlerCount());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org