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 pr...@apache.org on 2007/07/27 23:59:00 UTC
svn commit: r560397 [2/5] - in /webservices/axis2/branches/java/jaxws21: ./
etc/ legal/ modules/adb-codegen/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/schema/typemap/
modules/adb-codegen/test-res...
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Fri Jul 27 14:58:51 2007
@@ -26,6 +26,7 @@
import org.apache.axiom.om.util.Base64;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.databinding.ADBBean;
+import org.apache.axis2.databinding.ADBException;
import org.apache.axis2.databinding.i18n.ADBMessages;
import org.apache.axis2.databinding.types.*;
@@ -33,6 +34,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Array;
@@ -1024,4 +1026,183 @@
}
}
+
+ // serialization methods for xsd any type
+ public static void serializeAnyType(Object value, XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ if (value instanceof String) {
+ serializeAnyType("string", value.toString(), xmlStreamWriter);
+ } else if (value instanceof Integer) {
+ serializeAnyType("int", value.toString(), xmlStreamWriter);
+ } else if (value instanceof Boolean) {
+ serializeAnyType("boolean", value.toString(), xmlStreamWriter);
+ } else if (value instanceof URI) {
+ serializeAnyType("anyURI", value.toString(), xmlStreamWriter);
+ } else if (value instanceof Date) {
+ serializeAnyType("date", convertToString((Date) value), xmlStreamWriter);
+ } else if (value instanceof Calendar) {
+ serializeAnyType("dateTime", convertToString((Calendar) value), xmlStreamWriter);
+ } else if (value instanceof Time) {
+ serializeAnyType("time", convertToString((Time) value), xmlStreamWriter);
+ } else if (value instanceof Float) {
+ serializeAnyType("float", value.toString(), xmlStreamWriter);
+ } else if (value instanceof Long) {
+ serializeAnyType("long", value.toString(), xmlStreamWriter);
+ } else if (value instanceof Double) {
+ serializeAnyType("double", value.toString(), xmlStreamWriter);
+ } else if (value instanceof Short) {
+ serializeAnyType("short", value.toString(), xmlStreamWriter);
+ } else if (value instanceof BigDecimal) {
+ serializeAnyType("decimal", value.toString(), xmlStreamWriter);
+ } else if (value instanceof QName) {
+ QName qNameValue = (QName) value;
+ String prefix = xmlStreamWriter.getPrefix(qNameValue.getNamespaceURI());
+ if (prefix == null) {
+ prefix = BeanUtil.getUniquePrefix();
+ xmlStreamWriter.writeNamespace(prefix, qNameValue.getNamespaceURI());
+ xmlStreamWriter.setPrefix(prefix, qNameValue.getNamespaceURI());
+ }
+ String attributeValue = qNameValue.getLocalPart();
+ if (!prefix.equals("")) {
+ attributeValue = prefix + ":" + attributeValue;
+ }
+ serializeAnyType("QName", attributeValue, xmlStreamWriter);
+ } else if (value instanceof UnsignedLong) {
+ serializeAnyType("unsignedLong", convertToString((UnsignedLong) value), xmlStreamWriter);
+ } else if (value instanceof UnsignedInt) {
+ serializeAnyType("unsignedInt", convertToString((UnsignedInt) value), xmlStreamWriter);
+ } else if (value instanceof UnsignedShort) {
+ serializeAnyType("unsignedShort", convertToString((UnsignedShort) value), xmlStreamWriter);
+ } else if (value instanceof UnsignedByte) {
+ serializeAnyType("unsignedByte", convertToString((UnsignedByte) value), xmlStreamWriter);
+ } else if (value instanceof PositiveInteger) {
+ serializeAnyType("positiveInteger", convertToString((PositiveInteger) value), xmlStreamWriter);
+ } else if (value instanceof NegativeInteger) {
+ serializeAnyType("negativeInteger", convertToString((NegativeInteger) value), xmlStreamWriter);
+ } else if (value instanceof NonNegativeInteger) {
+ serializeAnyType("nonNegativeInteger", convertToString((NonNegativeInteger) value), xmlStreamWriter);
+ } else if (value instanceof NonPositiveInteger) {
+ serializeAnyType("nonPositiveInteger", convertToString((NonPositiveInteger) value), xmlStreamWriter);
+ } else {
+ throw new XMLStreamException("Unknow type can not serialize");
+ }
+ }
+
+
+ /**
+ * this method writes the xsi:type attrubte and the value to the xmlstreamwriter
+ * to serialize the anytype object
+ * @param type - xsd type of the attribute
+ * @param value - string value of the object
+ * @param xmlStreamWriter
+ * @throws XMLStreamException
+ */
+ private static void serializeAnyType(String type,
+ String value,
+ XMLStreamWriter xmlStreamWriter)
+ throws XMLStreamException {
+
+ String prefix = xmlStreamWriter.getPrefix(Constants.XSI_NAMESPACE);
+ if (prefix == null) {
+ prefix = BeanUtil.getUniquePrefix();
+ xmlStreamWriter.writeNamespace(prefix, Constants.XSI_NAMESPACE);
+ xmlStreamWriter.setPrefix(prefix, Constants.XSI_NAMESPACE);
+ }
+
+ prefix = xmlStreamWriter.getPrefix(Constants.XSD_NAMESPACE);
+ if (prefix == null) {
+ prefix = BeanUtil.getUniquePrefix();
+ xmlStreamWriter.writeNamespace(prefix, Constants.XSD_NAMESPACE);
+ xmlStreamWriter.setPrefix(prefix, Constants.XSD_NAMESPACE);
+ }
+
+ String attributeValue = null;
+ if (prefix.equals("")) {
+ attributeValue = type;
+ } else {
+ attributeValue = prefix + ":" + type;
+ }
+
+ xmlStreamWriter.writeAttribute(Constants.XSI_NAMESPACE, "type", attributeValue);
+ xmlStreamWriter.writeCharacters(value);
+ }
+
+ public static Object getAnyTypeObject(XMLStreamReader xmlStreamReader) throws XMLStreamException {
+ Object returnObject = null;
+
+ // first check whether this element is null or not
+ String nillableValue = xmlStreamReader.getAttributeValue(Constants.XSI_NAMESPACE, "nil");
+ if ("true".equals(nillableValue) || "1".equals(nillableValue)){
+ returnObject = null;
+ } else {
+ String attributeType = xmlStreamReader.getAttributeValue(Constants.XSI_NAMESPACE, "type");
+ if (attributeType != null) {
+ if (attributeType.indexOf(":") > -1) {
+ attributeType = attributeType.substring(attributeType.indexOf(":") + 1);
+ }
+ String attribValue = xmlStreamReader.getElementText();
+ if (attribValue != null){
+ if (attributeType.equals("string")) {
+ returnObject = attribValue;
+ } else if (attributeType.equals("int")) {
+ returnObject = new Integer(attribValue);
+ } else if (attributeType.equals("QName")) {
+ String namespacePrefix = null;
+ String localPart = null;
+ if (attribValue.indexOf(":") > -1){
+ namespacePrefix = attribValue.substring(0,attribValue.indexOf(":"));
+ localPart = attribValue.substring(attribValue.indexOf(":") + 1);
+ returnObject = new QName(xmlStreamReader.getNamespaceURI(namespacePrefix),localPart);
+ }
+ } else if ("boolean".equals(attributeType)) {
+ returnObject = new Boolean(attribValue);
+ } else if ("anyURI".equals(attributeType)) {
+ try {
+ returnObject = new URI(attribValue);
+ } catch (URI.MalformedURIException e) {
+ throw new XMLStreamException("Invalid URI");
+ }
+ } else if ("date".equals(attributeType)) {
+ returnObject = ConverterUtil.convertToDate(attribValue);
+ } else if ("dateTime".equals(attributeType)) {
+ returnObject = ConverterUtil.convertToDateTime(attribValue);
+ } else if ("time".equals(attributeType)) {
+ returnObject = ConverterUtil.convertToTime(attribValue);
+ } else if ("float".equals(attributeType)) {
+ returnObject = new Float(attribValue);
+ } else if ("long".equals(attributeType)) {
+ returnObject = new Long(attribValue);
+ } else if ("double".equals(attributeType)) {
+ returnObject = new Double(attribValue);
+ } else if ("decimal".equals(attributeType)) {
+ returnObject = new BigDecimal(attribValue);
+ } else if ("unsignedLong".equals(attributeType)) {
+ returnObject = new UnsignedLong(attribValue);
+ } else if ("unsignedInt".equals(attributeType)) {
+ returnObject = new UnsignedInt(attribValue);
+ } else if ("unsignedShort".equals(attributeType)) {
+ returnObject = new UnsignedShort(attribValue);
+ } else if ("unsignedByte".equals(attributeType)) {
+ returnObject = new UnsignedByte(attribValue);
+ } else if ("positiveInteger".equals(attributeType)) {
+ returnObject = new PositiveInteger(attribValue);
+ } else if ("negativeInteger".equals(attributeType)) {
+ returnObject = new NegativeInteger(attribValue);
+ } else if ("nonNegativeInteger".equals(attributeType)) {
+ returnObject = new NonNegativeInteger(attribValue);
+ } else if ("nonPositiveInteger".equals(attributeType)) {
+ returnObject = new NonPositiveInteger(attribValue);
+ } else {
+ throw new ADBException("Unknown type ==> " + attributeType);
+ }
+ } else {
+ throw new ADBException("Attribute value is null");
+ }
+
+ } else {
+ throw new ADBException("Any type element type has not been given");
+ }
+ }
+ return returnObject;
+ }
+
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java Fri Jul 27 14:58:51 2007
@@ -24,6 +24,7 @@
import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axis2.databinding.ADBBean;
import org.apache.axis2.databinding.utils.BeanUtil;
+import org.apache.axis2.databinding.utils.ConverterUtil;
import org.apache.axis2.description.java2wsdl.TypeTable;
import javax.activation.DataHandler;
@@ -576,7 +577,12 @@
if (state == DELEGATED_STATE) {
return childReader.getText();
} else if (state == TEXT_STATE) {
- return (String)properties[currentPropertyIndex - 1];
+ Object property = properties[currentPropertyIndex - 1];
+ if (property instanceof DataHandler){
+ return ConverterUtil.getStringFromDatahandler((DataHandler)property);
+ } else {
+ return (String)properties[currentPropertyIndex - 1];
+ }
} else {
throw new IllegalStateException();
}
Modified: webservices/axis2/branches/java/jaxws21/modules/addressing/src/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/addressing/src/META-INF/module.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/addressing/src/META-INF/module.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/addressing/src/META-INF/module.xml Fri Jul 27 14:58:51 2007
@@ -20,13 +20,13 @@
<Description>This is the WS-Addressing implementation on Axis2, supporting the WS-Addressing 1.0 Recommendation, as well as the Submission version (2004/08).</Description>
<InFlow>
<handler name="AddressingFinalInHandler" class="org.apache.axis2.handlers.addressing.AddressingFinalInHandler">
- <order phase="PreDispatch"/>
+ <order phase="Addressing" before="AddressingBasedDispatcher"/>
</handler>
<handler name="AddressingSubmissionInHandler" class="org.apache.axis2.handlers.addressing.AddressingSubmissionInHandler">
- <order phase="PreDispatch"/>
+ <order phase="Addressing" before="AddressingBasedDispatcher"/>
</handler>
<handler name="AddressingValidationHandler" class="org.apache.axis2.handlers.addressing.AddressingValidationHandler">
- <order phase="Dispatch" after="AddressingBasedDispatcher"/>
+ <order phase="Addressing" after="AddressingBasedDispatcher"/>
</handler>
</InFlow>
@@ -45,13 +45,13 @@
<InFaultFlow>
<handler name="AddressingFinalInHandler" class="org.apache.axis2.handlers.addressing.AddressingFinalInHandler">
- <order phase="PreDispatch"/>
+ <order phase="Addressing" before="AddressingBasedDispatcher"/>
</handler>
<handler name="AddressingSubmissionInHandler" class="org.apache.axis2.handlers.addressing.AddressingSubmissionInHandler">
- <order phase="PreDispatch"/>
+ <order phase="Addressing" before="AddressingBasedDispatcher"/>
</handler>
<handler name="AddressingInFaultHandler" class="org.apache.axis2.handlers.addressing.AddressingInFaultHandler">
- <order phase="Dispatch"/>
+ <order phase="Addressing" after="AddressingBasedDispatcher"/>
</handler>
<!-- AddressingValidationHandler not present on the INfaultflow so that we don't get faults bouncing around forever -->
</InFaultFlow>
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Fri Jul 27 14:58:51 2007
@@ -373,6 +373,7 @@
public CodeGenConfiguration(Map optionMap) {
CodegenConfigLoader.loadConfig(this, optionMap);
this.axisServices = new ArrayList();
+ this.outputXmlFileNamesList = new ArrayList();
}
@@ -553,5 +554,20 @@
public void setOverride(boolean override) {
isOverride = override;
+ }
+
+ // this is used to keep the generated xml file list to pretty print.
+ private List outputXmlFileNamesList;
+
+ public List getOutputXmlFileNamesList() {
+ return outputXmlFileNamesList;
+ }
+
+ public void setOutputXmlFileNamesList(List outputXmlFileNamesList) {
+ this.outputXmlFileNamesList = outputXmlFileNamesList;
+ }
+
+ public void addXmlFileName(String fileName){
+ this.outputXmlFileNamesList.add(fileName);
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Fri Jul 27 14:58:51 2007
@@ -563,6 +563,7 @@
antBuildWriter.setDatabindingFramework(codeGenConfiguration.getDatabindingType());
antBuildWriter.setOverride(codeGenConfiguration.isOverride());
writeFile(skeletonModel, antBuildWriter);
+ codeGenConfiguration.addXmlFileName(antBuildWriter.getOutputFile().getAbsolutePath());
}
/**
@@ -1885,6 +1886,7 @@
this.codeGenConfiguration.getOutputLanguage());
serviceXmlWriter.setOverride(codeGenConfiguration.isOverride());
writeFile(serviceXMLModel, serviceXmlWriter);
+ codeGenConfiguration.addXmlFileName(serviceXmlWriter.getOutputFile().getAbsolutePath());
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractPrettyPrinterExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractPrettyPrinterExtension.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractPrettyPrinterExtension.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractPrettyPrinterExtension.java Fri Jul 27 14:58:51 2007
@@ -22,6 +22,8 @@
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import java.io.File;
+import java.util.List;
+import java.util.Iterator;
public abstract class AbstractPrettyPrinterExtension extends AbstractCodeGenerationExtension {
/** If the extension for property file changes it might effect this as well !!! */
@@ -31,7 +33,7 @@
//recurse through the output files and prettify them
File outputFolder = configuration.getOutputLocation();
- prettify(outputFolder);
+ prettify(outputFolder,configuration);
}
@@ -41,16 +43,13 @@
*
* @param file
*/
- protected void prettify(File file) {
- if (file.isFile() &&
- file.exists() &&
- file.getName().toLowerCase().endsWith(fileExtension)) {
- prettifyFile(file);
- } else if (file.isDirectory()) {
- File[] childFiles = file.listFiles();
- for (int i = 0; i < childFiles.length; i++) {
- prettify(childFiles[i]);
- }
+ protected void prettify(File file, CodeGenConfiguration configuration) {
+
+ List xmlFileList = configuration.getOutputXmlFileNamesList();
+ String fileName = null;
+ for (Iterator iter = xmlFileList.iterator();iter.hasNext();){
+ fileName = (String) iter.next();
+ prettifyFile(new File(fileName));
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java Fri Jul 27 14:58:51 2007
@@ -46,7 +46,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
"build",
".xml");
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java Fri Jul 27 14:58:51 2007
@@ -188,4 +188,12 @@
public void setOverride(boolean override) {
isOverride = override;
}
+
+ public File getOutputFile() {
+ return outputFile;
+ }
+
+ public void setOutputFile(File outputFile) {
+ this.outputFile = outputFile;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java Fri Jul 27 14:58:51 2007
@@ -36,7 +36,7 @@
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
packageName,
"services",
".xml");
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Fri Jul 27 14:58:51 2007
@@ -384,12 +384,15 @@
if (<xsl:value-of select="@name"/>!=null){
<xsl:choose>
<xsl:when test="@mustUnderstand = 'true'">
- org.apache.axiom.om.OMElement omElement = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")))
- setMustUnderstand(omElement);
- env.getHeader().addChild(omElement);
+ org.apache.axiom.om.OMElement omElement<xsl:value-of select="@name"/> = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")));
+ org.apache.axiom.soap.SOAPHeaderBlock soapHeaderBlock<xsl:value-of select="@name"/> = env.getHeader().addHeaderBlock(omElement<xsl:value-of select="@name"/>.getLocalName(),omElement<xsl:value-of select="@name"/>.getNamespace());
+ soapHeaderBlock<xsl:value-of select="@name"/>.setMustUnderstand(true);
+ soapHeaderBlock<xsl:value-of select="@name"/>.addChild(omElement<xsl:value-of select="@name"/>.getFirstElement());
</xsl:when>
<xsl:otherwise>
- env.getHeader().addChild(toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>"))));
+ org.apache.axiom.om.OMElement omElement<xsl:value-of select="@name"/> = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")));
+ org.apache.axiom.soap.SOAPHeaderBlock soapHeaderBlock<xsl:value-of select="@name"/> = env.getHeader().addHeaderBlock(omElement<xsl:value-of select="@name"/>.getLocalName(),omElement<xsl:value-of select="@name"/>.getNamespace());
+ soapHeaderBlock<xsl:value-of select="@name"/>.addChild(omElement<xsl:value-of select="@name"/>.getFirstElement());
</xsl:otherwise>
</xsl:choose>
}
@@ -658,12 +661,15 @@
if (<xsl:value-of select="@name"/>!=null){
<xsl:choose>
<xsl:when test="@mustUnderstand = 'true'">
- org.apache.axiom.om.OMElement omElement = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")))
- setMustUnderstand(omElement);
- env.getHeader().addChild(omElement);
+ org.apache.axiom.om.OMElement omElement<xsl:value-of select="@name"/> = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")));
+ org.apache.axiom.soap.SOAPHeaderBlock soapHeaderBlock<xsl:value-of select="@name"/> = env.getHeader().addHeaderBlock(omElement<xsl:value-of select="@name"/>.getLocalName(),omElement<xsl:value-of select="@name"/>.getNamespace());
+ soapHeaderBlock<xsl:value-of select="@name"/>.setMustUnderstand(true);
+ soapHeaderBlock<xsl:value-of select="@name"/>.addChild(omElement<xsl:value-of select="@name"/>.getFirstElement());
</xsl:when>
<xsl:otherwise>
- env.getHeader().addChild(toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>"))));
+ org.apache.axiom.om.OMElement omElement<xsl:value-of select="@name"/> = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")));
+ org.apache.axiom.soap.SOAPHeaderBlock soapHeaderBlock<xsl:value-of select="@name"/> = env.getHeader().addHeaderBlock(omElement<xsl:value-of select="@name"/>.getLocalName(),omElement<xsl:value-of select="@name"/>.getNamespace());
+ soapHeaderBlock<xsl:value-of select="@name"/>.addChild(omElement<xsl:value-of select="@name"/>.getFirstElement());
</xsl:otherwise>
</xsl:choose>
}
@@ -904,12 +910,15 @@
if (<xsl:value-of select="@name"/>!=null){
<xsl:choose>
<xsl:when test="@mustUnderstand = 'true'">
- org.apache.axiom.om.OMElement omElement = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")))
- setMustUnderstand(omElement);
- env.getHeader().addChild(omElement);
+ org.apache.axiom.om.OMElement omElement<xsl:value-of select="@name"/> = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")));
+ org.apache.axiom.soap.SOAPHeaderBlock soapHeaderBlock<xsl:value-of select="@name"/> = env.getHeader().addHeaderBlock(omElement<xsl:value-of select="@name"/>.getLocalName(),omElement<xsl:value-of select="@name"/>.getNamespace());
+ soapHeaderBlock<xsl:value-of select="@name"/>.setMustUnderstand(true);
+ soapHeaderBlock<xsl:value-of select="@name"/>.addChild(omElement<xsl:value-of select="@name"/>.getFirstElement());
</xsl:when>
<xsl:otherwise>
- env.getHeader().addChild(toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>"))));
+ org.apache.axiom.om.OMElement omElement<xsl:value-of select="@name"/> = toOM(<xsl:value-of select="@name"/>, optimizeContent(new javax.xml.namespace.QName("<xsl:value-of select="$method-ns"/>", "<xsl:value-of select="$method-name"/>")));
+ org.apache.axiom.soap.SOAPHeaderBlock soapHeaderBlock<xsl:value-of select="@name"/> = env.getHeader().addHeaderBlock(omElement<xsl:value-of select="@name"/>.getLocalName(),omElement<xsl:value-of select="@name"/>.getNamespace());
+ soapHeaderBlock<xsl:value-of select="@name"/>.addChild(omElement<xsl:value-of select="@name"/>.getFirstElement());
</xsl:otherwise>
</xsl:choose>
}
Modified: webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml Fri Jul 27 14:58:51 2007
@@ -241,9 +241,9 @@
<configuration>
<finalName>axis2-${version}</finalName>
<descriptors>
- <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
<descriptor>src/main/assembly/war-assembly.xml</descriptor>
<descriptor>src/main/assembly/src-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified: webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml Fri Jul 27 14:58:51 2007
@@ -231,6 +231,13 @@
<include>axis2-xmlbeans-${version}.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../../modules/tool/axis2-ant-plugin/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>axis2-ant-plugin-${version}.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>../../legal</directory>
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java Fri Jul 27 14:58:51 2007
@@ -26,6 +26,9 @@
import java.rmi.RemoteException;
import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.extensions.TestSetup;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -39,54 +42,10 @@
*/
public class FastInfosetTest extends TestCase {
- private SimpleHTTPServer server;
- private static int serverCount = 0;
-
- private AxisService service;
-
- private EndpointReference target;
- private ConfigurationContext configurationContext;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- System.out.println("Setting up the Simple HTTP Server");
-
- if (serverCount == 0) {
- int port = findAvailablePort();
- port = 5555; //Uncomment to test with tcpmon
- target = new EndpointReference("http://127.0.0.1:" + (port)
- + "/axis2/services/SimpleAddService");
-
- File configFile = new File(System.getProperty("basedir",".") + "/test-resources/axis2.xml");
- configurationContext = ConfigurationContextFactory
- .createConfigurationContextFromFileSystem("target/test-classes", configFile
- .getAbsolutePath());
-
- server = new SimpleHTTPServer(configurationContext, port);
-
- server.start();
- }
-
- serverCount++;
-
- service = AxisService.createService("org.apache.axis2.fastinfoset.SimpleAddService",
- server.getConfigurationContext().getAxisConfiguration());
-
- server.getConfigurationContext().getAxisConfiguration().addService(
- service);
-
- System.out.println("Simple HTTP Server is started");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if(serverCount == 1) {
- server.stop();
- serverCount = 0;
- System.out.println("Stopped the Simple HTTP Server");
- }
- }
+ private static SimpleHTTPServer server;
+ private static AxisService service;
+ private static EndpointReference target;
+ private static ConfigurationContext configurationContext;
public void testAdd() throws RemoteException {
SimpleAddServiceClient client = new SimpleAddServiceClient(target); //Comment to test with tcpmon.
@@ -123,7 +82,7 @@
TestCase.assertEquals(50.0f, result2, 0.0005f);
}
- private int findAvailablePort() throws SocketException, IOException {
+ private static int findAvailablePort() throws SocketException, IOException {
//Create a server socket on any free socket to find a free socket.
ServerSocket ss = new ServerSocket(0);
int port = ss.getLocalPort();
@@ -132,21 +91,39 @@
return port;
}
- /**
- * Run this class as a Java application, will host this SimpleAddService for further testing.
- * There is a main method in SimpleAddServiceClient which can be used with this.
- *
- * Note: Useful when debugging.
- *
- * @param args - Not required.
- */
- public static void main(String args[]) {
- FastInfosetTest test = new FastInfosetTest();
- try {
- test.setUp();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
+ public static Test suite() {
+ return new TestSetup(new TestSuite(FastInfosetTest.class)) {
+ public void setUp() throws Exception {
+
+ System.out.println("Setting up the Simple HTTP Server");
+
+ int port = findAvailablePort();
+ port = 5555; //Uncomment to test with tcpmon
+ target = new EndpointReference("http://127.0.0.1:" + (port)
+ + "/axis2/services/SimpleAddService");
+
+ File configFile = new File(System.getProperty("basedir",".") + "/test-resources/axis2.xml");
+ configurationContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem("target/test-classes", configFile
+ .getAbsolutePath());
+
+ server = new SimpleHTTPServer(configurationContext, port);
+
+ server.start();
+
+ service = AxisService.createService("org.apache.axis2.fastinfoset.SimpleAddService",
+ server.getConfigurationContext().getAxisConfiguration());
+
+ server.getConfigurationContext().getAxisConfiguration().addService(
+ service);
+
+ System.out.println("Simple HTTP Server is started");
+ }
+
+ public void tearDown() throws Exception {
+ server.stop();
+ System.out.println("Stopped the Simple HTTP Server");
+ }
+ };
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml Fri Jul 27 14:58:51 2007
@@ -215,16 +215,22 @@
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
<order phase="Transport"/>
</handler>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
<order phase="Transport"/>
</handler>
</phase>
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
@@ -246,23 +252,27 @@
<phase name="Security"/>
</phaseOrder>
<phaseOrder type="InFaultFlow">
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </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"/>
- </phase>
- <phase name="RMPhase"/>
+
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase> <phase name="RMPhase"/>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
</phaseOrder>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/deployment/deployment.both.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/deployment/deployment.both.axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/deployment/deployment.both.axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/deployment/deployment.both.axis2.xml Fri Jul 27 14:58:51 2007
@@ -84,24 +84,27 @@
<order phase="Dispatch"/>
</handler>
</phase>
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+ 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>
- </phase>
- <!-- System pre defined phases -->
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase> <!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="OperationInPhase"/>
</phaseOrder>
@@ -114,33 +117,27 @@
<phase name="MessageOut"/>
</phaseOrder>
<phaseOrder type="InFaultFlow">
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </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>
- </phase>
- <!-- user can add his own phases to this area -->
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase> <!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
</phaseOrder>
<phaseOrder type="OutFaultFlow">
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -90,31 +90,26 @@
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -131,31 +126,26 @@
<phaseOrder type="InFaultFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -92,31 +92,26 @@
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -133,31 +128,26 @@
<phaseOrder type="InFaultFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-enabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-enabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -92,31 +92,26 @@
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -133,31 +128,26 @@
<phaseOrder type="InFaultFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -94,31 +94,26 @@
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -135,31 +130,26 @@
<phaseOrder type="InFaultFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java Fri Jul 27 14:58:51 2007
@@ -263,7 +263,7 @@
}
catch (AxisFault e) {
}
- List expectedExecutionState = Arrays.asList(new String[] { "In1", "kaboom", "FCIn1" });
+ List expectedExecutionState = Arrays.asList(new String[] {"In1", "kaboom","FCIn1"});
assertEquals(expectedExecutionState, testResults);
middleGlobalInHandler.shouldFail(false);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -119,31 +119,26 @@
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -159,31 +154,26 @@
</phaseOrder>
<phaseOrder type="InFaultFlow">
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -87,31 +87,26 @@
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -127,31 +122,26 @@
</phaseOrder>
<phaseOrder type="InFaultFlow">
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -69,31 +69,26 @@
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -109,31 +104,26 @@
</phaseOrder>
<phaseOrder type="InFaultFlow">
<phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <phase name="Addressing">
<handler name="AddressingBasedDispatcher"
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
- <order phase="Dispatch"/>
+ <order phase="Addressing"/>
</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>
-
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ 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"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org