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 az...@apache.org on 2007/05/16 07:44:22 UTC
svn commit: r538440 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/engine/
kernel/src/org/apache/axis2/context/ kernel/src/org/apache/axis2/engine/
kernel/src/org/apache/axis2/phaseresolver/ kernel/test/org/apache/axis2/d...
Author: azeez
Date: Tue May 15 22:44:20 2007
New Revision: 538440
URL: http://svn.apache.org/viewvc?view=rev&rev=538440
Log:
Renamed the getters for the phases in the 4 main message flows to be consistent.
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java Tue May 15 22:44:20 2007
@@ -55,7 +55,7 @@
protected void setUp() throws Exception {
ConfigurationContext configurationContext = UtilServer.getConfigurationContext();
ArrayList inPhasesUptoAndIncludingPostDispatch =
- configurationContext.getAxisConfiguration().getGlobalInFlow();
+ configurationContext.getAxisConfiguration().getInFlowPhases();
Phase phaseOne = (Phase)inPhasesUptoAndIncludingPostDispatch.get(0);
phaseOne.addHandler(new FaultHandler());
}
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=538440&r1=538439&r2=538440
==============================================================================
--- 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 Tue May 15 22:44:20 2007
@@ -108,7 +108,7 @@
initDone = true;
ArrayList globalInPhases =
- UtilServer.getConfigurationContext().getAxisConfiguration().getGlobalInFlow();
+ UtilServer.getConfigurationContext().getAxisConfiguration().getInFlowPhases();
for (int i = 0; i < globalInPhases.size(); i++) {
Phase globalInPhase = (Phase)globalInPhases.get(i);
if (PhaseMetadata.PHASE_PRE_DISPATCH.equals(globalInPhase.getPhaseName())) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Tue May 15 22:44:20 2007
@@ -92,7 +92,7 @@
dispatchPhase.addHandler(sabd);
dispatchPhase.addHandler(smbd);
dispatchPhase.addHandler(id);
- config.getGlobalInFlow().add(dispatchPhase);
+ config.getInFlowPhases().add(dispatchPhase);
TransportInDescription tIn = new TransportInDescription(Constants.TRANSPORT_LOCAL);
tIn.setReceiver(new TransportListener() {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Tue May 15 22:44:20 2007
@@ -106,7 +106,7 @@
dispatchPhase.addHandler(sabd);
dispatchPhase.addHandler(smbd);
dispatchPhase.addHandler(id);
- config.getGlobalInFlow().add(dispatchPhase);
+ config.getInFlowPhases().add(dispatchPhase);
service.engageModule(m1);
AxisOperation axisOperation = new OutInAxisOperation();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java Tue May 15 22:44:20 2007
@@ -77,7 +77,7 @@
if (!initDone) {
initDone = true;
ArrayList globalInPhases =
- UtilServer.getConfigurationContext().getAxisConfiguration().getGlobalInFlow();
+ UtilServer.getConfigurationContext().getAxisConfiguration().getInFlowPhases();
for (int i = 0; i < globalInPhases.size(); i++) {
Phase globalInPhase = (Phase)globalInPhases.get(i);
if (PhaseMetadata.PHASE_PRE_DISPATCH.equals(globalInPhase.getPhaseName())) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Tue May 15 22:44:20 2007
@@ -4235,19 +4235,19 @@
// Does it do a deep clone of the Handlers held there? Does it matter?
switch (FLOW) {
case IN_FLOW:
- existingHandlers = (ArrayList) axisConfig.getGlobalInFlow().clone();
+ existingHandlers = (ArrayList) axisConfig.getInFlowPhases().clone();
break;
case OUT_FLOW:
- existingHandlers = (ArrayList) axisConfig.getGlobalOutPhases().clone();
+ existingHandlers = (ArrayList) axisConfig.getOutFlowPhases().clone();
break;
case IN_FAULT_FLOW:
- existingHandlers = (ArrayList) axisConfig.getInFaultFlow().clone();
+ existingHandlers = (ArrayList) axisConfig.getInFaultFlowPhases().clone();
break;
case OUT_FAULT_FLOW:
- existingHandlers = (ArrayList) axisConfig.getOutFaultFlow().clone();
+ existingHandlers = (ArrayList) axisConfig.getOutFaultFlowPhases().clone();
break;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Tue May 15 22:44:20 2007
@@ -572,18 +572,18 @@
}
// to get the out flow correpodning to the global out flow;
- public ArrayList getGlobalOutPhases() {
+ public ArrayList getOutFlowPhases() {
return this.outPhases;
}
/**
* @return Returns ArrayList.
*/
- public ArrayList getInFaultFlow() {
+ public ArrayList getInFaultFlowPhases() {
return inFaultPhases;
}
- public ArrayList getGlobalInFlow() {
+ public ArrayList getInFlowPhases() {
return inPhasesUptoAndIncludingPostDispatch;
}
@@ -668,7 +668,7 @@
/**
* @return Returns ArrayList.
*/
- public ArrayList getOutFaultFlow() {
+ public ArrayList getOutFaultFlowPhases() {
return outFaultPhases;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Tue May 15 22:44:20 2007
@@ -116,10 +116,10 @@
ConfigurationContext confContext = msgContext.getConfigurationContext();
ArrayList preCalculatedPhases;
if (msgContext.isFault()) {
- preCalculatedPhases = confContext.getAxisConfiguration().getInFaultFlow();
+ preCalculatedPhases = confContext.getAxisConfiguration().getInFaultFlowPhases();
msgContext.setFLOW(MessageContext.IN_FAULT_FLOW);
} else {
- preCalculatedPhases = confContext.getAxisConfiguration().getGlobalInFlow();
+ preCalculatedPhases = confContext.getAxisConfiguration().getInFlowPhases();
msgContext.setFLOW(MessageContext.IN_FLOW);
}
// Set the initial execution chain in the MessageContext to a *copy* of what
@@ -370,7 +370,7 @@
ArrayList outPhases = new ArrayList();
outPhases.addAll((ArrayList) executionChain.clone());
outPhases.addAll((ArrayList) msgContext.getConfigurationContext()
- .getAxisConfiguration().getGlobalOutPhases().clone());
+ .getAxisConfiguration().getOutFlowPhases().clone());
msgContext.setExecutionChain(outPhases);
msgContext.setFLOW(MessageContext.OUT_FLOW);
try {
@@ -462,7 +462,7 @@
}
msgContext.setExecutionChain((ArrayList) msgContext.getConfigurationContext()
- .getAxisConfiguration().getOutFaultFlow().clone());
+ .getAxisConfiguration().getOutFaultFlowPhases().clone());
msgContext.setFLOW(MessageContext.OUT_FAULT_FLOW);
InvocationResponse pi = invoke(msgContext, IS_OUTBOUND, NOT_RESUMING_EXECUTION);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseResolver.java Tue May 15 22:44:20 2007
@@ -65,7 +65,7 @@
if (axisConfig != null) {
Iterator itr_axis_config =
- axisConfig.getGlobalInFlow().iterator();
+ axisConfig.getInFlowPhases().iterator();
while (itr_axis_config.hasNext()) {
Object o = itr_axis_config.next();
@@ -98,7 +98,7 @@
}
if (axisConfig != null) {
- Iterator itr_axis_config = axisConfig.getGlobalOutPhases().iterator();
+ Iterator itr_axis_config = axisConfig.getOutFlowPhases().iterator();
while (itr_axis_config.hasNext()) {
Object o = itr_axis_config.next();
@@ -116,7 +116,7 @@
ArrayList phases = new ArrayList();
if (axisConfig != null) {
- Iterator itr_axis_config = axisConfig.getInFaultFlow().iterator();
+ Iterator itr_axis_config = axisConfig.getInFaultFlowPhases().iterator();
while (itr_axis_config.hasNext()) {
Object o = itr_axis_config.next();
@@ -147,7 +147,7 @@
phases.add(o);
}
if (axisConfig != null) {
- Iterator itr_axis_config = axisConfig.getOutFaultFlow().iterator();
+ Iterator itr_axis_config = axisConfig.getOutFaultFlowPhases().iterator();
while (itr_axis_config.hasNext()) {
Object o = itr_axis_config.next();
phases.add(o);
@@ -208,7 +208,7 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription handler = flow.getHandler(j);
- removeHandlerfromaPhase(handler, axisConfig.getGlobalInFlow());
+ removeHandlerfromaPhase(handler, axisConfig.getInFlowPhases());
}
}
//OUTFLOW
@@ -216,7 +216,7 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription handler = flow.getHandler(j);
- removeHandlerfromaPhase(handler, axisConfig.getGlobalOutPhases());
+ removeHandlerfromaPhase(handler, axisConfig.getOutFlowPhases());
}
}
//INFAULTFLOW
@@ -224,7 +224,7 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription handler = flow.getHandler(j);
- removeHandlerfromaPhase(handler, axisConfig.getInFaultFlow());
+ removeHandlerfromaPhase(handler, axisConfig.getInFaultFlowPhases());
}
}
//OUTFAULTFLOW
@@ -232,7 +232,7 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription handler = flow.getHandler(j);
- removeHandlerfromaPhase(handler, axisConfig.getOutFaultFlow());
+ removeHandlerfromaPhase(handler, axisConfig.getOutFaultFlowPhases());
}
}
}
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=538440&r1=538439&r2=538440
==============================================================================
--- 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 Tue May 15 22:44:20 2007
@@ -54,7 +54,7 @@
assertNotNull(module);
Phase predisptah;
Phase userPhase;
- ArrayList globalinflow = er.getGlobalInFlow();
+ ArrayList globalinflow = er.getInFlowPhases();
assertNotNull(globalinflow);
predisptah = (Phase) globalinflow.get(2);
assertNotNull(predisptah);
@@ -79,7 +79,7 @@
assertNotNull(module);
Phase predisptah;
Phase userPhase;
- ArrayList globalinflow = er.getGlobalInFlow();
+ ArrayList globalinflow = er.getInFlowPhases();
assertNotNull(globalinflow);
predisptah = (Phase) globalinflow.get(2);
assertNotNull(predisptah);
@@ -113,7 +113,7 @@
assertNotNull(module);
Phase predisptah;
Phase userPhase;
- ArrayList globalinflow = er.getGlobalInFlow();
+ ArrayList globalinflow = er.getInFlowPhases();
assertNotNull(globalinflow);
predisptah = (Phase) globalinflow.get(2);
assertNotNull(predisptah);
@@ -138,7 +138,7 @@
assertNotNull(module);
Phase predisptah;
Phase userPhase;
- ArrayList globalinflow = er.getGlobalInFlow();
+ ArrayList globalinflow = er.getInFlowPhases();
assertNotNull(globalinflow);
predisptah = (Phase) globalinflow.get(2);
assertNotNull(predisptah);
@@ -163,7 +163,7 @@
assertNotNull(module);
Phase predisptah;
Phase userPhase;
- ArrayList globalinflow = er.getGlobalInFlow();
+ ArrayList globalinflow = er.getInFlowPhases();
assertNotNull(globalinflow);
predisptah = (Phase) globalinflow.get(2);
assertNotNull(predisptah);
@@ -188,7 +188,7 @@
assertNotNull(module);
Phase predisptah;
Phase userPhase;
- ArrayList globalinflow = er.getGlobalInFlow();
+ ArrayList globalinflow = er.getInFlowPhases();
assertNotNull(globalinflow);
predisptah = (Phase) globalinflow.get(2);
assertNotNull(predisptah);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java Tue May 15 22:44:20 2007
@@ -98,7 +98,7 @@
dispatchPhase.addHandler(rud);
dispatchPhase.addHandler(sabd);
dispatchPhase.addHandler(smbd);
- configContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ configContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new MessageReceiver() {
public void receive(MessageContext messageCtx) {
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java Tue May 15 22:44:20 2007
@@ -131,7 +131,7 @@
dispatchPhase.addHandler(sabd);
dispatchPhase.addHandler(smbd);
- configurationContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ configurationContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
//-----------------------------------------------------------------
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java Tue May 15 22:44:20 2007
@@ -279,7 +279,7 @@
dispatchPhase.addHandler(sabd);
dispatchPhase.addHandler(smbd);
- configurationContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ configurationContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
//----------------------------
// transport-related objects
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java Tue May 15 22:44:20 2007
@@ -229,7 +229,7 @@
"http://www.w3.org/2004/08/wsdl/in-only", new RawXMLINOnlyMessageReceiver());
saveConfigurationContext.getAxisConfiguration().addMessageReceiver(
"http://www.w3.org/2004/08/wsdl/in-out", new RawXMLINOutMessageReceiver());
- saveConfigurationContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ saveConfigurationContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
restoreAxisConfiguration = new AxisConfiguration();
restoreConfigurationContext = new ConfigurationContext(restoreAxisConfiguration);
@@ -237,7 +237,7 @@
"http://www.w3.org/2004/08/wsdl/in-only", new RawXMLINOnlyMessageReceiver());
restoreConfigurationContext.getAxisConfiguration().addMessageReceiver(
"http://www.w3.org/2004/08/wsdl/in-out", new RawXMLINOutMessageReceiver());
- restoreConfigurationContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ restoreConfigurationContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
equivAxisConfiguration = new AxisConfiguration();
equivConfigurationContext = new ConfigurationContext(equivAxisConfiguration);
@@ -245,7 +245,7 @@
"http://www.w3.org/2004/08/wsdl/in-only", new RawXMLINOnlyMessageReceiver());
equivConfigurationContext.getAxisConfiguration().addMessageReceiver(
"http://www.w3.org/2004/08/wsdl/in-out", new RawXMLINOutMessageReceiver());
- equivConfigurationContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ equivConfigurationContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
//----------------------------
// transport-related objects
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Tue May 15 22:44:20 2007
@@ -31,7 +31,6 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
@@ -191,7 +190,7 @@
dispatchPhase.addHandler(sabd);
dispatchPhase.addHandler(smbd);
- cfgContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ cfgContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
//-----------------------------------------------------------------
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java Tue May 15 22:44:20 2007
@@ -124,7 +124,7 @@
dispatchPhase.addHandler(sabd);
dispatchPhase.addHandler(smbd);
- configurationContext.getAxisConfiguration().getGlobalInFlow().add(dispatchPhase);
+ configurationContext.getAxisConfiguration().getInFlowPhases().add(dispatchPhase);
//-----------------------------------------------------------------
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java Tue May 15 22:44:20 2007
@@ -37,7 +37,7 @@
public void testPhaseRules() throws Exception {
//TODO fix me
axisConfig = new AxisConfiguration();
- ArrayList inPhase = axisConfig.getGlobalInFlow();
+ ArrayList inPhase = axisConfig.getInFlowPhases();
Phase transportIN = new Phase("TransportIn");
Phase preDispatch = new Phase("PreDispatch");
DispatchPhase dispatchPhase = new DispatchPhase();
@@ -77,7 +77,7 @@
super.setUp();
//TODO fix me
axisConfig = new AxisConfiguration();
- ArrayList inPhase = axisConfig.getGlobalInFlow();
+ ArrayList inPhase = axisConfig.getInFlowPhases();
Phase transportIN = new Phase("TransportIn");
Phase preDispatch = new Phase("PreDispatch");
DispatchPhase dispatchPhase = new DispatchPhase();
@@ -111,7 +111,7 @@
public void testPhaseRulesWithAfter() throws Exception {
//TODO fix me
axisConfig = new AxisConfiguration();
- ArrayList inPhase = axisConfig.getGlobalInFlow();
+ ArrayList inPhase = axisConfig.getInFlowPhases();
Phase transportIN = new Phase("TransportIn");
Phase preDispatch = new Phase("PreDispatch");
DispatchPhase dispatchPhase = new DispatchPhase();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleTests.java Tue May 15 22:44:20 2007
@@ -304,7 +304,7 @@
public void testPhaseRules() throws Exception {
// TODO : What is this testing exactly?
- ArrayList inPhase = new AxisConfiguration().getGlobalInFlow();
+ ArrayList inPhase = new AxisConfiguration().getInFlowPhases();
Phase transportIN = new Phase("TransportIn");
Phase preDispatch = new Phase("PreDispatch");
DispatchPhase dispatchPhase = new DispatchPhase();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java?view=diff&rev=538440&r1=538439&r2=538440
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java Tue May 15 22:44:20 2007
@@ -40,7 +40,7 @@
//TODO Fix me
phaserul = new PreDispatchPhaseRuleTest("");
axisSytem = new AxisConfiguration();
- ArrayList inPhase = axisSytem.getGlobalInFlow();
+ ArrayList inPhase = axisSytem.getInFlowPhases();
Phase transportIN = new Phase("TransportIn");
Phase preDispatch = new Phase("PreDispatch");
DispatchPhase dispatchPhase = new DispatchPhase();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org