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 he...@apache.org on 2005/05/12 15:26:33 UTC
svn commit: r169815 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis:
description/OperationDescription.java engine/AxisConfiguration.java
engine/AxisSystemImpl.java phaseresolver/util/
Author: hemapani
Date: Thu May 12 06:26:30 2005
New Revision: 169815
URL: http://svn.apache.org/viewcvs?rev=169815&view=rev
Log:
remove the flow builder, add the code to AxisConfiguration and OperationDiscription
Removed:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/util/
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java?rev=169815&r1=169814&r2=169815&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java Thu May 12 06:26:30 2005
@@ -12,6 +12,8 @@
import org.apache.axis.engine.AxisError;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.MessageReceiver;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.PhaseMetadata;
import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLOperation;
import org.apache.wsdl.impl.WSDLOperationImpl;
@@ -37,6 +39,16 @@
this.setComponentProperty(PARAMETER_KEY, new ParameterIncludeImpl());
this.setComponentProperty(MODULEREF_KEY, new ArrayList());
this.setComponentProperty(PHASES_KEY, new PhasesIncludeImpl());
+
+ remainingPhasesInInFlow = new ArrayList();
+ remainingPhasesInInFlow.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
+
+ phasesInOutFlow = new ArrayList();
+ phasesInOutFlow.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
+ phasesInOutFlow.add(new Phase(PhaseMetadata.PHASE_MESSAGE_OUT));
+
+ phasesInFaultInFlow = new ArrayList();
+ phasesInFaultOutFlow = new ArrayList();
}
public OperationDescription(QName name) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java?rev=169815&r1=169814&r2=169815&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java Thu May 12 06:26:30 2005
@@ -101,7 +101,6 @@
*/
public void addMdoule(ModuleDescription module) throws AxisFault;
-
/**
* Method getTransports
*
@@ -114,9 +113,8 @@
* This returns
*/
public ArrayList getInPhasesUptoAndIncludingPostDispatch();
-
-
+ public ArrayList getPhasesInOutFaultFlow();
/**
* Method getServices
*
@@ -126,14 +124,11 @@
public Hashtable getFaulytServices();
-
- public TransportInDescription getTransportIn(QName name) throws AxisFault ;
- public void addTransportIn(TransportInDescription transport) throws AxisFault;
- public TransportOutDescription getTransportOut(QName name) throws AxisFault ;
- public void addTransportOut(TransportOutDescription transport) throws AxisFault ;
+ public TransportInDescription getTransportIn(QName name) throws AxisFault;
+ public void addTransportIn(TransportInDescription transport) throws AxisFault;
+ public TransportOutDescription getTransportOut(QName name) throws AxisFault;
+ public void addTransportOut(TransportOutDescription transport) throws AxisFault;
public HashMap getTransportsIn();
public HashMap getTransportsOut();
-
-
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java?rev=169815&r1=169814&r2=169815&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java Thu May 12 06:26:30 2005
@@ -26,6 +26,7 @@
import org.apache.axis.description.ServiceDescription;
import org.apache.axis.description.TransportInDescription;
import org.apache.axis.description.TransportOutDescription;
+import org.apache.axis.phaseresolver.PhaseMetadata;
/**
* Class EngineRegistryImpl
@@ -67,6 +68,10 @@
private ArrayList outPhases;
private ArrayList inFaultPhases;
private ArrayList outFaultPhases;
+
+ private ArrayList inPhasesUptoAndIncludingPostDispatch;
+ private ArrayList faultPhases;
+
/**
* Constructor EngineRegistryImpl
*
@@ -79,6 +84,15 @@
inFaultPhases = new ArrayList();
outFaultPhases = new ArrayList();
errornesServices = new Hashtable();
+
+ inPhases = new ArrayList();
+ inPhases.add(new Phase(PhaseMetadata.PHASE_TRANSPORTIN));
+ inPhases.add(new Phase(PhaseMetadata.PHASE_PRE_DISPATCH));
+ Phase dispatch = new Phase(PhaseMetadata.PHASE_DISPATCH);
+ dispatch.addHandler(new RequestURIBasedDispatcher(),0);
+ dispatch.addHandler(new AddressingBasedDispatcher(),1);
+ inPhases.add(dispatch) ;
+ inPhases.add(new Phase(PhaseMetadata.PHASE_POST_DISPATCH));
}
/**
@@ -229,8 +243,11 @@
public ArrayList getInPhasesUptoAndIncludingPostDispatch() {
- return inPhases;
+ return inPhasesUptoAndIncludingPostDispatch;
}
+ public ArrayList getPhasesInOutFaultFlow() {
+ return faultPhases;
+ }
public ArrayList getOutFlow() {
return outPhases;