This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-4091
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 351f97b76d956f3d221e5ec47bab5b3e542cd124
Merge: d341fa3 845f7ec
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Sun Dec 17 22:34:08 2017 +0000
Merge remaining changes from trunk.
.gitignore | 4 +
apidocs/pom.xml | 390 +++
databinding-tests/jaxbri-tests/pom.xml | 282 +++
.../java/org/apache/axis2/jaxbri/Test01Impl.java | 0
.../java/org/apache/axis2/jaxbri/Test01Test.java | 0
.../IdentityLinkingServiceImpl.java | 0
.../identityservice/IdentityServiceTest.java | 0
.../org/apache/axis2/jaxbri/mtom/MtomImpl.java | 49 +
.../org/apache/axis2/jaxbri/mtom/MtomTest.java | 0
.../axis2/jaxbri/processor/ProcessorImpl.java | 0
.../axis2/jaxbri/processor/ProcessorTest.java | 0
.../jaxbri-tests/src/test/repo/conf/axis2.xml | 163 ++
.../org/apache/axis2/jaxbri/processor/request.xml | 0
.../org/apache/axis2/jaxbri/processor/response.xml | 0
.../jaxbri-tests/src/test/wsdl/Test01.wsdl | 64 +
.../jaxbri-tests}/src/test/wsdl/identity.xsd | 0
.../src/test/wsdl/identityService.wsdl | 0
.../jaxbri-tests}/src/test/wsdl/mtom.wsdl | 0
.../jaxbri-tests}/src/test/wsdl/processor.wsdl | 0
databinding-tests/pom.xml | 46 +
etc/dist.py | 51 +
etc/doap_Axis2.rdf | 12 +-
legal/XmlSchema-LICENSE.txt | 202 --
legal/activation-LICENSE.txt | 119 -
...oden-impl-dom-LICENSE.txt => axiom-LICENSE.txt} | 0
legal/axiom-api-LICENSE.txt | 202 --
legal/axiom-dom-LICENSE.txt | 202 --
legal/axiom-impl-LICENSE.txt | 202 --
legal/commons-httpclient-LICENSE.txt | 202 --
legal/geronimo-saaj-LICENSE.txt | 203 --
legal/geronimo-stax-api-LICENSE.txt | 203 --
legal/gson-LICENSE.txt | 202 ++
...-commons-LICENSE.txt => httpclient-LICENSE.txt} | 0
legal/jalopy-LICENSE.txt | 43 -
legal/{mail-LICENSE.txt => javax.mail-LICENSE.txt} | 0
legal/stax2-api.LICENSE.txt | 26 +
...oden-api-LICENSE.txt => woden-core-LICENSE.txt} | 0
...x-LICENSE.txt => woodstox-core-asl-LICENSE.txt} | 0
...gexp-LICENSE.txt => xmlschema-core-LICENSE.txt} | 0
modules/adb-codegen/pom.xml | 73 +-
.../axis2/schema/BeanWriterMetaInfoHolder.java | 31 +-
.../org/apache/axis2/schema/SchemaCompiler.java | 165 +-
.../axis2/schema/template/ADBBeanTemplate-bean.xsl | 53 +-
.../schema/template/ADBBeanTemplate-helpermode.xsl | 44 +-
.../schema/template/ADBDatabindingTemplate.xsl | 12 +-
.../org/apache/axis2/schema/typemap/CTypeMap.java | 101 -
.../apache/axis2/schema/typemap/JavaTypeMap.java | 110 -
.../org/apache/axis2/schema/typemap/TypeMap.java | 2 -
.../apache/axis2/schema/writer/JavaBeanWriter.java | 10 +-
modules/adb-codegen/sub-build.xml | 127 -
.../test-resources/testsuite/base64binary.xsd | 2 +-
.../test-resources/testsuite/soapencoding.xsd | 43 -
.../org/apache/axis2/schema/AbstractTestCase.java | 419 ----
.../apache/axis2/schema/ExtensionUtilityTest.java | 4 +-
.../schema/base64binary/Base64BinaryTest.java | 90 -
.../compile/AbstractSchemaCompilerTester.java | 2 +-
.../defaultnamespaces/DefaultNamespacesTest.java | 87 -
.../schema/extension/SimpleExtensionTest.java | 174 --
.../axis2/schema/populate/other/ADBInOutTest.java | 79 -
.../schema/soapencoding/SoapEncodingTest.java | 261 --
modules/adb-tests/pom.xml | 520 ++++
.../apache/axis2/schema/testsuite/TrackerTest.java | 0
.../axis2/databinding/axis2_5741/ServiceTest.java | 43 +
.../axis2_5741/service/FiverxLinkServiceImpl.java | 34 +
.../axis2/databinding/axis2_5749/ServiceTest.java | 46 +
.../axis2_5749/service/ColorServiceImpl.java | 36 +
.../axis2/databinding/axis2_5750/ServiceTest.java | 49 +
.../axis2_5750/service/FixedValueServiceImpl.java | 35 +
.../axis2/databinding/axis2_5758/ServiceTest.java | 48 +
.../axis2_5758/service/StockQuoteServiceImpl.java | 33 +
.../axis2/databinding/axis2_5799/ServiceTest.java | 46 +
.../databinding/axis2_5799/service/EchoImpl.java | 29 +
.../databinding/axis2_5809/EchoServiceImpl.java | 32 +
.../axis2/databinding/axis2_5809/ServiceTest.java | 61 +
.../axis2/databinding/axis2_5887/ParseTest.java | 45 +
.../apache/axis2/databinding/mtom/MTOMTest.java | 51 +
.../databinding/mtom/service/MTOMServiceImpl.java | 34 +
.../java}/org/apache/axis2/schema/ADBBeanUtil.java | 0
.../org/apache/axis2/schema/AbstractTestCase.java | 419 ++++
.../java}/org/apache/axis2/schema/all/AllTest.java | 0
.../apache/axis2/schema/anytype/AnyTypeTest.java | 0
.../axis2/schema/attribute/AttributeTest.java | 0
.../schema/axis2_5771/IgnoreUnexpectedTest.java | 59 +
.../schema/base64binary/Base64BinaryTest.java | 91 +
.../axis2/schema/booleantest/BooleanTest.java | 0
.../axis2/schema/chameleon/ChameleonTest.java | 0
.../org/apache/axis2/schema/choice/ChoiceTest.java | 0
.../apache/axis2/schema/decimal/DecimalTest.java | 0
.../defaultnamespaces/DefaultNamespacesTest.java | 68 +
.../schema/defaultvalue/DefaultValueTest.java | 0
.../axis2/schema/enumeration/EnumerationTest.java | 0
.../schema/extension/ComplexExtenstionTest.java | 0
.../schema/extension/SimpleExtensionTest.java | 171 ++
.../apache/axis2/schema/fix/DefaultValueTest.java | 0
.../apache/axis2/schema/fix/FixedValueTest.java | 0
.../org/apache/axis2/schema/group/GroupTest.java | 0
.../axis2/schema/innerchoice/InnerChoiceTest.java | 0
.../TestInnerParticleExtension.java | 0
.../schema/innerparticles/InnerParticlesTest.java | 0
.../org/apache/axis2/schema/list/ListTest.java | 0
.../axis2/schema/nonamespace/NoNamespaceTest.java | 0
.../particlemaxoccurs/ParticleMaxOccursTest.java | 0
.../org/apache/axis2/schema/populate/Util.java | 0
.../populate/derived/AbstractDerivedPopulater.java | 0
.../derived/DerivedTypeBytePopulateTest.java | 0
.../derived/DerivedTypeIntPopulateTest.java | 0
.../derived/DerivedTypeIntegerPopulateTest.java | 0
.../derived/DerivedTypeLongPopulateTest.java | 0
.../DerivedTypeNegativeIntegerPopulateTest.java | 0
.../DerivedTypeNonNegativeIntegerPopulateTest.java | 0
.../DerivedTypeNonPositiveIntegerPopulateTest.java | 0
.../DerivedTypePositveIntegerPopulateTest.java | 0
.../derived/DerivedTypeShortPopulateTest.java | 0
.../DerivedTypeUnsignedBytePopulateTest.java | 0
.../DerivedTypeUnsignedIntPopulateTest.java | 0
.../DerivedTypeUnsignedLongPopulateTest.java | 0
.../DerivedTypeUnsignedShortPopulateTest.java | 0
.../other/PopulateAnonComplexTypeTest.java | 0
.../schema/populate/other/PopulateAnyTypeTest.java | 0
.../populate/other/PopulateArrayInArrayTest.java | 0
.../schema/populate/other/PopulateArrayTest.java | 0
.../schema/populate/other/PopulateChoiceTest.java | 0
.../other/PopulateComplexMinOccurs0Test.java | 0
.../populate/other/PopulateMinOccurs0Test.java | 0
.../other/PopulateMixedMinoccurs0Test.java | 0
.../populate/other/PopulateParticleAllTest.java | 0
.../populate/other/PopulateRecursiveTest.java | 0
.../populate/simple/AbstractSimplePopulater.java | 0
.../simple/SimpleTypeAnyURIPopulateTest.java | 0
.../simple/SimpleTypeBase64BinPopulateTest.java | 0
.../simple/SimpleTypeBooleanPopulateTest.java | 0
.../simple/SimpleTypeDatePopulateTest.java | 0
.../simple/SimpleTypeDateTimePopulateTest.java | 0
.../populate/simple/SimpleTypeDayPopulateTest.java | 0
.../simple/SimpleTypeDoublePopulateTest.java | 0
.../simple/SimpleTypeDurationPopulateTest.java | 0
.../simple/SimpleTypeFloatPopulateTest.java | 0
.../simple/SimpleTypeHexBinaryPopulateTest.java | 0
.../simple/SimpleTypeMonthDayPopulateTest.java | 0
.../simple/SimpleTypeQNamePopulateTest.java | 0
.../simple/SimpleTypeTimePopulateTest.java | 0
.../simple/SimpleTypegMonthPopulateTest.java | 0
.../simple/SimpleTypegYearMonthPopulateTest.java | 0
.../simple/SimpleTypegYearPopulateTest.java | 0
.../axis2/schema/populate/simple/package.html | 0
.../axis2/schema/references/ReferenceTest.java | 0
.../schema/restriction/ComplexRestrictionTest.java | 0
.../schema/restriction/SchemaRestrictionTest.java | 0
.../schema/restriction/SimpleRestrictionTest.java | 0
.../axis2/schema/testsuite/AbstractTest.java | 0
.../axis2/schema/testsuite/AnyElementsTest.java | 0
.../axis2/schema/testsuite/CustomElementsTest.java | 0
.../axis2/schema/testsuite/IntElementsTest.java | 0
.../axis2/schema/testsuite/OuterElementsTest.java | 0
.../axis2/schema/testsuite/StringElementsTest.java | 0
.../apache/axis2/schema/testsuite/TrackerTest.java | 0
.../axis2/schema/testsuite/XsdAnyElementsTest.java | 0
.../org/apache/axis2/schema/union/UnionTest.java | 0
.../org/apache/axis2/schema/union2/Union2Test.java | 0
.../axis2/schema/unqualified/UnqualifiedTest.java | 0
.../adb-tests/src/test/repo/AXIS2-5809/axis2.xml | 300 +++
.../axis2_5887/getOrdersByStatus_response.xml | 8 +
modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl | 309 +++
modules/adb-tests/src/test/wsdl/AXIS2-5749.wsdl | 62 +
modules/adb-tests/src/test/wsdl/AXIS2-5750.wsdl | 61 +
modules/adb-tests/src/test/wsdl/AXIS2-5758.wsdl | 63 +
modules/adb-tests/src/test/wsdl/AXIS2-5799.wsdl | 47 +
modules/adb-tests/src/test/wsdl/AXIS2-5809.wsdl | 50 +
modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl | 2536 ++++++++++++++++++++
modules/adb-tests/src/test/wsdl/MTOMService.wsdl | 48 +
modules/adb-tests/src/test/xsd/AXIS2-5771.xsd | 32 +
modules/adb-tests/src/test/xslt/AXIS2-5741.xsl | 11 +
modules/adb-tests/src/test/xslt/AXIS2-5749.xsl | 11 +
modules/adb-tests/src/test/xslt/AXIS2-5809.xsl | 11 +
modules/adb/pom.xml | 21 +-
.../databinding/typemapping/SimpleTypeMapper.java | 11 +-
.../databinding/types/soapencoding/AnyType.java | 413 ----
.../databinding/types/soapencoding/AnyURI.java | 469 ----
.../databinding/types/soapencoding/Array.java | 710 ------
.../types/soapencoding/ArrayCoordinate.java | 437 ----
.../databinding/types/soapencoding/ArrayE.java | 361 ---
.../databinding/types/soapencoding/Base64.java | 437 ----
.../types/soapencoding/Base64Binary.java | 452 ----
.../axis2/databinding/types/soapencoding/Date.java | 469 ----
.../databinding/types/soapencoding/DateTime.java | 469 ----
.../databinding/types/soapencoding/Decimal.java | 469 ----
.../databinding/types/soapencoding/Duration.java | 469 ----
.../databinding/types/soapencoding/ENTITIES.java | 469 ----
.../databinding/types/soapencoding/ENTITY.java | 469 ----
.../types/soapencoding/ExtensionMapper.java | 513 ----
.../axis2/databinding/types/soapencoding/GDay.java | 469 ----
.../databinding/types/soapencoding/GMonth.java | 469 ----
.../databinding/types/soapencoding/GMonthDay.java | 469 ----
.../databinding/types/soapencoding/GYear.java | 469 ----
.../databinding/types/soapencoding/GYearMonth.java | 469 ----
.../databinding/types/soapencoding/HexBinary.java | 469 ----
.../axis2/databinding/types/soapencoding/ID.java | 469 ----
.../databinding/types/soapencoding/IDREF.java | 469 ----
.../databinding/types/soapencoding/IDREFS.java | 469 ----
.../databinding/types/soapencoding/Integer.java | 469 ----
.../databinding/types/soapencoding/Language.java | 469 ----
.../databinding/types/soapencoding/NCName.java | 469 ----
.../databinding/types/soapencoding/NMTOKEN.java | 469 ----
.../databinding/types/soapencoding/NMTOKENS.java | 469 ----
.../databinding/types/soapencoding/NOTATION.java | 476 ----
.../axis2/databinding/types/soapencoding/Name.java | 469 ----
.../types/soapencoding/NegativeInteger.java | 469 ----
.../types/soapencoding/NonNegativeInteger.java | 469 ----
.../types/soapencoding/NonPositiveInteger.java | 469 ----
.../types/soapencoding/NormalizedString.java | 469 ----
.../types/soapencoding/PositiveInteger.java | 469 ----
.../databinding/types/soapencoding/QName.java | 476 ----
.../databinding/types/soapencoding/String.java | 469 ----
.../databinding/types/soapencoding/Struct.java | 641 -----
.../axis2/databinding/types/soapencoding/Time.java | 469 ----
.../databinding/types/soapencoding/Token.java | 469 ----
.../types/soapencoding/UnsignedByte.java | 469 ----
.../types/soapencoding/UnsignedInt.java | 469 ----
.../types/soapencoding/UnsignedLong.java | 469 ----
.../types/soapencoding/UnsignedShort.java | 469 ----
.../databinding/types/soapencoding/_boolean.java | 464 ----
.../databinding/types/soapencoding/_byte.java | 464 ----
.../databinding/types/soapencoding/_double.java | 464 ----
.../databinding/types/soapencoding/_float.java | 464 ----
.../axis2/databinding/types/soapencoding/_int.java | 448 ----
.../databinding/types/soapencoding/_long.java | 464 ----
.../databinding/types/soapencoding/_short.java | 464 ----
.../apache/axis2/databinding/types/xsd/AnyURI.java | 469 ----
.../apache/axis2/databinding/types/xsd/Base64.java | 437 ----
.../axis2/databinding/types/xsd/Base64Binary.java | 468 ----
.../apache/axis2/databinding/types/xsd/Date.java | 469 ----
.../axis2/databinding/types/xsd/DateTime.java | 469 ----
.../axis2/databinding/types/xsd/Decimal.java | 469 ----
.../axis2/databinding/types/xsd/Duration.java | 469 ----
.../axis2/databinding/types/xsd/ENTITIES.java | 469 ----
.../apache/axis2/databinding/types/xsd/ENTITY.java | 469 ----
.../databinding/types/xsd/ExtensionMapper.java | 492 ----
.../apache/axis2/databinding/types/xsd/GDay.java | 469 ----
.../apache/axis2/databinding/types/xsd/GMonth.java | 469 ----
.../axis2/databinding/types/xsd/GMonthDay.java | 469 ----
.../apache/axis2/databinding/types/xsd/GYear.java | 469 ----
.../axis2/databinding/types/xsd/GYearMonth.java | 469 ----
.../axis2/databinding/types/xsd/HexBinary.java | 469 ----
.../org/apache/axis2/databinding/types/xsd/ID.java | 469 ----
.../apache/axis2/databinding/types/xsd/IDREF.java | 469 ----
.../apache/axis2/databinding/types/xsd/IDREFS.java | 469 ----
.../axis2/databinding/types/xsd/Integer.java | 469 ----
.../axis2/databinding/types/xsd/Language.java | 469 ----
.../apache/axis2/databinding/types/xsd/NCName.java | 469 ----
.../axis2/databinding/types/xsd/NMTOKEN.java | 469 ----
.../axis2/databinding/types/xsd/NMTOKENS.java | 469 ----
.../axis2/databinding/types/xsd/NOTATION.java | 476 ----
.../apache/axis2/databinding/types/xsd/Name.java | 469 ----
.../databinding/types/xsd/NegativeInteger.java | 469 ----
.../databinding/types/xsd/NonNegativeInteger.java | 469 ----
.../databinding/types/xsd/NonPositiveInteger.java | 469 ----
.../databinding/types/xsd/NormalizedString.java | 469 ----
.../databinding/types/xsd/PositiveInteger.java | 469 ----
.../apache/axis2/databinding/types/xsd/QName.java | 476 ----
.../apache/axis2/databinding/types/xsd/String.java | 469 ----
.../apache/axis2/databinding/types/xsd/Time.java | 469 ----
.../apache/axis2/databinding/types/xsd/Token.java | 469 ----
.../axis2/databinding/types/xsd/UnsignedByte.java | 469 ----
.../axis2/databinding/types/xsd/UnsignedInt.java | 469 ----
.../axis2/databinding/types/xsd/UnsignedLong.java | 469 ----
.../axis2/databinding/types/xsd/UnsignedShort.java | 469 ----
.../axis2/databinding/types/xsd/_boolean.java | 448 ----
.../apache/axis2/databinding/types/xsd/_byte.java | 464 ----
.../axis2/databinding/types/xsd/_double.java | 464 ----
.../apache/axis2/databinding/types/xsd/_float.java | 464 ----
.../apache/axis2/databinding/types/xsd/_int.java | 464 ----
.../apache/axis2/databinding/types/xsd/_long.java | 464 ----
.../apache/axis2/databinding/types/xsd/_short.java | 464 ----
.../apache/axis2/databinding/utils/BeanUtil.java | 1742 +++++++-------
.../apache/axis2/databinding/utils/Constants.java | 5 -
.../axis2/databinding/utils/ConverterUtil.java | 4 +-
.../axis2/databinding/utils/FactoryUtil.java | 37 +
.../axis2/databinding/utils/MultirefHelper.java | 4 +-
.../databinding/utils/NamedStaxOMBuilder.java | 73 -
.../utils/SimpleArrayReaderStateMachine.java | 218 --
.../utils/SimpleElementReaderStateMachine.java | 219 --
.../org/apache/axis2/databinding/utils/States.java | 34 -
.../utils/reader/ADBDataHandlerStreamReader.java | 44 +-
.../utils/reader/ADBXMLStreamReaderImpl.java | 61 +-
.../utils/reader/NameValuePairStreamReader.java | 14 +-
.../utils/reader/NullXMLStreamReader.java | 8 +-
.../utils/reader/WrappingXMLStreamReader.java | 41 +-
.../axis2/rpc/receivers/RPCMessageReceiver.java | 8 +-
.../org/apache/axis2/rpc/receivers/RPCUtil.java | 5 +-
.../databinding/types/soapencoding/ArrayTest.java | 196 --
.../axis2/databinding/types/xsd/ArrayTest.java | 164 --
.../axis2/databinding/utils/BeanUtilTest.java | 14 +-
.../utils/ComplexTypeWithAnyTypeElement.java | 31 +
.../axis2/databinding/utils/ConverterUtilTest.java | 7 +-
.../databinding/utils/NamedStaxOMBuilderTest.java | 80 -
.../utils/SimpleArrayReaderStateMachineTest.java | 111 -
.../utils/SimpleElementReaderStateMachineTest.java | 78 -
.../utils/reader/ADBXMLStreamReaderTest.java | 22 +-
modules/addressing/pom.xml | 6 +-
.../addressing/AddressingInFaultHandler.java | 4 +-
.../handlers/addressing/AddressingOutHandler.java | 2 +-
modules/addressing/test-resources/axis2.xml | 2 +-
.../addressing/AddressingOutHandlerTest.java | 7 +-
modules/all/pom.xml | 240 --
modules/clustering/pom.xml | 6 +-
modules/codegen/build-wsdls.xml | 1 +
modules/codegen/pom.xml | 46 +-
.../src/org/apache/axis2/util/PrettyPrinter.java | 55 +
.../apache/axis2/util/XSLTTemplateProcessor.java | 0
.../src/org/apache/axis2/wsdl/WSDL2Code.java | 6 +-
.../axis2/wsdl/codegen/CodeGenConfiguration.java | 151 +-
.../axis2/wsdl/codegen/CodeGenerationEngine.java | 170 --
.../axis2/wsdl/codegen/CodegenConfigLoader.java | 7 +-
.../extension/JavaPrettyPrinterExtension.java | 5 -
.../java/InterfaceImplementationTemplate.xsl | 31 +-
.../schemas/custom_schemas/generated.xsd | 3 +-
.../wsdl/codegen/CodeGenConfigurationTest.java | 6 +-
.../extension/JAXWSWapperExtensionTest.java | 9 +-
.../extension/WSDLValidatorExtensionTest.java | 6 +-
.../jaxws/JAXWSCodeGenerationEngineTest.java | 1 +
.../wsdl/codegen/writer/SchemaWriterTest.java | 25 +-
modules/corba/pom.xml | 6 +-
.../apache/axis2/corba/deployer/CorbaDeployer.java | 20 +-
.../axis2/corba/deployer/SchemaGenerator.java | 18 +-
modules/distribution/pom.xml | 185 +-
.../src/main/assembly/bin-assembly.xml | 22 +-
.../src/main/assembly/src-assembly.xml | 26 +-
.../src/main/assembly/war-assembly.xml | 7 +-
modules/fastinfoset/pom.xml | 44 +-
.../axis2/fastinfoset/FastInfosetBuilder.java | 53 +-
.../fastinfoset/FastInfosetMessageFormatter.java | 230 +-
.../axis2/fastinfoset/FastInfosetPOXBuilder.java | 53 +-
.../FastInfosetPOXMessageFormatter.java | 238 +-
modules/fastinfoset/test-resources/axis2.xml | 4 +-
.../fastinfoset/FastInfosetInputOutputTest.java | 57 +-
modules/integration/conf/axis2.xml | 4 +-
modules/integration/itest-build.xml | 5 -
modules/integration/pom.xml | 241 +-
.../SOAP12Testing/SOAP12TestModuleB/build.xml | 73 -
.../handlers/SOAP12InFlowHandlerDefaultB.java | 165 --
.../SOAP12Testing/SOAP12TestModuleC/build.xml | 73 -
.../handlers/SOAP12InFlowHandlerDefaultC.java | 167 --
.../SOAP12Testing/SOAP12TestServiceB/build.xml | 74 -
.../SOAP12Testing/SOAP12TestServiceC/build.xml | 74 -
.../test-resources/SwA-enabled-axis2.xml | 2 +-
.../test-resources/SwA-fileCache-enabled-axis2.xml | 2 +-
.../deployment/deployment.both.axis2.xml | 4 +-
.../test-resources/deployment/server-transport.xml | 2 +-
.../test-resources/generics/generics.wsdl | 25 +-
.../test-resources/jaxrs/pojo-enabled-axis2.xml | 4 +-
.../test-resources/mtom/MTOM-enabled-axis2.xml | 2 +-
.../mtom/MTOM-fileCache-enabled-axis2.xml | 2 +-
.../test-resources/swa/SwA-enabled-axis2.xml | 2 +-
.../swa/SwA-fileCache-enabled-axis2.xml | 2 +-
.../org/apache/axis2/async/AsyncServiceTest.java | 2 +-
.../org/apache/axis2/deployment/LifecycleTest.java | 14 -
.../test/org/apache/axis2/deployment/Service.java | 38 +
.../org/apache/axis2/engine/EnginePausingTest.java | 4 +-
.../engine/EngineWithoutPhaseResolvingTest.java | 4 +-
.../org/apache/axis2/engine/FaultHandlingTest.java | 14 +-
.../apache/axis2/engine/HandlerFailureTest.java | 3 +-
.../axis2/engine/MessageContextSaveATest.java | 8 +-
.../axis2/engine/MessageContextSaveBTest.java | 8 +-
.../axis2/engine/MessageContextSaveCTest.java | 8 +-
.../engine/MessageContextSelfManagedDataTest.java | 8 +-
.../axis2/engine/OperationContextSaveTest.java | 4 +-
.../org/apache/axis2/engine/OptionsSaveTest.java | 8 +-
.../org/apache/axis2/engine/ThreadingTest.java | 106 +-
.../axis2/engine/chunking-disabled-axis2.xml | 4 +-
.../apache/axis2/engine/chunking-enabled-axis2.xml | 2 +-
.../axis2/engine/commons-http-enabled-axis2.xml | 2 +-
.../apache/axis2/engine/map/MapServiceTest.java | 1 +
.../org/apache/axis2/engine/util/FaultHandler.java | 15 +-
.../apache/axis2/engine/util/InvokerThread.java | 79 -
.../org/apache/axis2/generics/GenericService.java | 3 +
.../axis2/generics/GenericWSDLGenerationTest.java | 2 +
.../apache/axis2/mtom/EchoRawMTOMToBase64Test.java | 2 +-
.../test/org/apache/axis2/om/OMAttributeTest.java | 10 +-
.../org/apache/axis2/rest/RESTfulServiceTest.java | 15 +-
.../test/org/apache/axis2/rpc/MultirefTest.java | 27 +-
.../test/org/apache/axis2/rpc/RPCCallTest.java | 29 +-
.../org/apache/axis2/wsdl/ExtensionTypesTest.java | 94 +
modules/java2wsdl/pom.xml | 63 +-
.../ws/java2wsdl/Java2WSDLCodegenEngine.java | 2 +-
.../apache/axis2/description/Java2WSDLTest.java | 40 +-
modules/jaxbri/pom.xml | 191 +-
.../apache/axis2/jaxbri/CodeGenerationUtility.java | 4 +-
.../jaxbri/template/JaxbRIDatabindingTemplate.xsl | 6 +-
.../org/apache/axis2/jaxbri/mtom/MtomImpl.java | 53 -
.../java/org/temp/CodeGenerationUtilityTest.java | 5 +-
modules/jaxbri/src/test/repo/conf/axis2.xml | 163 --
modules/jaxws-integration/build.xml | 38 -
modules/jaxws-integration/pom.xml | 1324 +++++-----
.../BookStoreService}/META-INF/SOAPActionTest.wsdl | 0
.../BookStoreService}/META-INF/services.xml | 0
.../services/EchoService}/META-INF/services.xml | 0
modules/jaxws-integration/test-resources/axis2.xml | 6 +-
.../test-resources/axis2_addressing.xml | 4 +-
.../test-resources/log4j.properties | 3 +-
.../test-resources/wsdl/ProxyDocLitnonWrapped.wsdl | 102 -
.../test-resources/wsdl/SOAPActionTest.wsdl | 153 --
.../test-resources/wsdl/gorilla_dlw.wsdl | 904 -------
.../test/org/apache/axis2/META-INF/MANIFEST.MF | 4 -
.../jaxws/anytype/AnyTypeMessagePortTypeImpl.java | 4 +-
.../jaxws/anytype/sei/AnyTypeMessagePortType.java | 55 -
.../jaxws/anytype/sei/AnyTypeMessageService.java | 80 -
.../axis2/jaxws/anytype/tests/AnyTypeTests.java | 50 +-
.../axis2/jaxws/client/soapaction/BookStore.java | 88 -
.../jaxws/client/soapaction/BookStoreService.java | 72 -
.../axis2/jaxws/context/MessageContextImpl.java | 2 +-
.../jaxws/context/sei/MessageContextService.java | 2 +-
.../axis2/jaxws/dispatch/CallbackHandler.java | 63 -
.../jaxws/dispatch/DOMSourceDispatchTests.java | 16 +-
.../jaxws/dispatch/OMElementDispatchTest.java | 104 +-
.../jaxws/dispatch/SAXSourceDispatchTests.java | 81 +-
.../jaxws/dispatch/StreamSourceDispatchTests.java | 82 +-
.../jaxws/dispatch/server/OMElementProvider.java | 3 +-
.../axis2/jaxws/jaxb/string/JAXBStringService.java | 2 +-
.../apache/axis2/jaxws/misc/JAXBContextTest.java | 36 +-
.../nonanonymous/complextype/EchoMessageImpl.java | 3 +-
.../complextype/NonAnonymousComplexTypeTests.java | 2 -
.../complextype/sei/EchoMessagePortType.java | 55 -
.../complextype/sei/EchoMessageService.java | 80 -
.../shape/sei/PolymorphicShapePortType.java | 70 -
.../shape/sei/PolymorphicShapeService.java | 80 -
.../polymorphic/shape/tests/PolymorphicTests.java | 4 +-
.../jaxws/provider/AddressingProviderTests.java | 2 +-
.../axis2/jaxws/provider/OMProviderTests.java | 15 +-
.../jaxws/provider/addressing/META-INF/MANIFEST.MF | 1 -
.../axis2/jaxws/provider/jaxb/META-INF/MANIFEST.MF | 1 -
.../apache/axis2/jaxws/provider/om/OMProvider.java | 10 +-
.../provider/soapbinding/META-INF/MANIFEST.MF | 1 -
.../jaxws/provider/soapmsg/META-INF/MANIFEST.MF | 1 -
.../provider/soapmsgcheckmtom/META-INF/MANIFEST.MF | 1 -
.../jaxws/provider/soapmsgmu/META-INF/MANIFEST.MF | 1 -
.../soapmsgreturnnull/META-INF/MANIFEST.MF | 1 -
.../jaxws/provider/source/META-INF/MANIFEST.MF | 1 -
.../jaxws/provider/sourcemsg/META-INF/MANIFEST.MF | 1 -
.../jaxws/provider/string/META-INF/MANIFEST.MF | 1 -
.../jaxws/provider/stringmsg/META-INF/MANIFEST.MF | 1 -
.../apache/axis2/jaxws/proxy/AsyncCallback.java | 4 +-
.../axis2/jaxws/proxy/GorillaDLWProxyTests.java | 16 +-
.../axis2/jaxws/proxy/ProxyNonWrappedTests.java | 20 +-
.../org/apache/axis2/jaxws/proxy/ProxyTests.java | 20 +-
.../axis2/jaxws/proxy/RPCLitSWAProxyTests.java | 4 +-
.../apache/axis2/jaxws/proxy/RPCProxyTests.java | 4 +-
.../proxy/doclitnonwrapped/META-INF/MANIFEST.MF | 1 -
.../META-INF/proxy_doclit_unwr.wsdl | 5 +-
.../sei/DocLitnonWrappedProxy.java | 84 -
.../sei/ProxyDocLitUnwrappedService.java | 71 -
.../jaxws/proxy/doclitwrapped/META-INF/MANIFEST.MF | 1 -
.../doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl | 3 +
.../doclitwrapped/sei/DocLitWrappedProxy.java | 249 --
.../sei/ProxyDocLitWrappedService.java | 82 -
.../jaxws/proxy/gorilla_dlw/META-INF/MANIFEST.MF | 1 -
.../jaxws/proxy/gorilla_dlw/sei/AssertFault.java | 146 +-
.../proxy/gorilla_dlw/sei/GorillaInterface.java | 682 +++---
.../proxy/gorilla_dlw/sei/GorillaService.java | 142 +-
.../axis2/jaxws/proxy/rpclit/META-INF/MANIFEST.MF | 1 -
.../jaxws/proxy/rpclitswa/META-INF/MANIFEST.MF | 1 -
.../jaxws/proxy/soap12/SOAP12EchoService.java | 2 +-
.../axis2/jaxws/rpclit/enumtype/sei/Service.java | 2 +-
.../stringarray/sei/RPCLitStringArrayService.java | 2 +-
.../axis2/jaxws/sample/AsyncExecutorTests.java | 55 +-
.../jaxws/sample/MtomSampleByteArrayTests.java | 2 +-
.../org/apache/axis2/jaxws/sample/WrapTests.java | 3 -
.../jaxws/sample/addnumbers/AddNumbersService.java | 2 +-
.../AddNumbersHandlerService.java | 2 +-
.../sample/asyncdoclit/client/AsyncService.java | 2 +-
.../sample/asyncdoclit/server/META-INF/MANIFEST.MF | 4 -
.../sample/doclitbare/sei/BareDocLitService.java | 2 +-
.../doclitbaremin/sei/BareDocLitMinService.java | 2 +-
.../sei/BareDocLitNoArgService.java | 2 +-
.../sample/faults/FaultyWebServiceService.java | 2 +-
.../jaxws/sample/faultsservice/FaultsService.java | 2 +-
.../headershandler/HeadersHandlerService.java | 2 +-
.../jaxws/sample/headershandler/TestHeaders.java | 6 +-
.../sample/nonwrap/sei/DocLitNonWrapService.java | 2 +-
.../sample/parallelasync/server/AsyncService.java | 2 +-
.../server/DocLitWrappedPortImpl.java | 28 +-
.../parallelasync/server/META-INF/MANIFEST.MF | 4 -
.../sei/ResourceInjectionService.java | 2 +-
.../sample/stringlist/sei/StringListService.java | 2 +-
.../jaxws/sample/wrap/sei/DocLitWrapService.java | 2 +-
.../jaxws/sample/wsgen/client/WSGenService.java | 2 +-
.../jaxws/security/server/META-INF/MANIFEST.MF | 1 -
.../jaxws/swamtom/server/META-INF/MANIFEST.MF | 1 -
.../apache/axis2/jaxws/utility/SimpleServer.java | 4 +-
.../xmlhttp/DispatchXMessageDataSourceTests.java | 199 ++
.../jaxws/xmlhttp/DispatchXMessageSourceTests.java | 116 +
.../jaxws/xmlhttp/DispatchXMessageStringTests.java | 135 ++
.../jaxws/xmlhttp/DispatchXPayloadJAXBTests.java | 96 +
.../jaxws/xmlhttp/DispatchXPayloadSourceTests.java | 84 +
.../jaxws/xmlhttp/DispatchXPayloadStringTests.java | 135 ++
.../DispatchXMessageDataSourceTests.java | 187 --
.../dispatch/jaxb/DispatchXPayloadJAXBTests.java | 99 -
.../source/DispatchXMessageSourceTests.java | 132 -
.../source/DispatchXPayloadSourceTests.java | 99 -
.../string/DispatchXMessageStringTests.java | 137 --
.../string/DispatchXPayloadStringTests.java | 137 --
.../message/datasource/META-INF/MANIFEST.MF | 1 -
.../provider/message/source/META-INF/MANIFEST.MF | 1 -
.../provider/message/string/META-INF/MANIFEST.MF | 1 -
.../provider/payload/source/META-INF/MANIFEST.MF | 1 -
.../provider/payload/string/META-INF/MANIFEST.MF | 1 -
modules/jaxws-mar/pom.xml | 6 +-
modules/jaxws/build.xml | 38 -
modules/jaxws/pom.xml | 227 +-
.../apache/axis2/datasource/SourceDataSource.java | 27 +-
.../axis2/datasource/XMLStringDataSource.java | 78 -
.../jaxb/AbstractJAXBAttachmentUnmarshaller.java | 178 --
.../axis2/datasource/jaxb/AttachmentContext.java | 47 +
.../datasource/jaxb/JAXBAttachmentMarshaller.java | 77 +-
.../jaxb/JAXBAttachmentUnmarshaller.java | 153 +-
.../axis2/datasource/jaxb/JAXBCustomBuilder.java | 92 +-
.../axis2/datasource/jaxb/JAXBDSContext.java | 268 +--
.../axis2/datasource/jaxb/JAXBDataSource.java | 84 +-
.../jaxb/MessageContextAttachmentContext.java | 79 +
.../datasource/jaxb/XMLStreamWriterFilterBase.java | 256 ++
.../jaxb/XMLStreamWriterRemoveIllegalChars.java | 163 ++
.../apache/axis2/jaxws/api/MessageAccessor.java | 29 +-
.../context/listener/CompositeInputStream.java | 155 --
.../context/listener/ContextListenerUtils.java | 183 --
.../listener/ParserInputStreamCustomBuilder.java | 387 ---
.../listener/ProviderOMContextListener.java | 131 -
.../apache/axis2/jaxws/core/MessageContext.java | 29 +-
.../controller/impl/AxisInvocationController.java | 2 +-
.../axis2/jaxws/framework/JAXWSDeployer.java | 28 +-
.../framework/JAXWSServiceBuilderExtension.java | 2 +-
.../impl/alt/UnmarshalMessageContextListener.java | 6 +-
.../src/org/apache/axis2/jaxws/message/Block.java | 2 +-
.../attachments/JAXBAttachmentMarshaller.java | 94 -
.../attachments/JAXBAttachmentUnmarshaller.java | 47 -
.../attachments/MessageAttachmentContext.java | 79 +
.../jaxws/message/databinding/DataSourceBlock.java | 4 +-
.../axis2/jaxws/message/databinding/JAXBBlock.java | 2 +-
.../message/databinding/JAXBBlockContext.java | 17 +-
.../axis2/jaxws/message/databinding/OMBlock.java | 3 +-
.../message/databinding/ParsedEntityReader.java | 39 -
.../message/databinding/SOAPEnvelopeBlock.java | 4 +-
.../jaxws/message/databinding/SourceBlock.java | 4 +-
.../jaxws/message/databinding/XMLStringBlock.java | 2 +-
.../databinding/impl/DataSourceBlockImpl.java | 136 +-
.../message/databinding/impl/JAXBBlockImpl.java | 98 +-
.../message/databinding/impl/OMBlockImpl.java | 61 +-
.../databinding/impl/ParsedEntityReaderImpl.java | 45 -
.../impl/SOAPEnvelopeBlockFactoryImpl.java | 4 +-
.../databinding/impl/SOAPEnvelopeBlockImpl.java | 60 +-
.../message/databinding/impl/SourceBlockImpl.java | 160 +-
.../databinding/impl/XMLStringBlockImpl.java | 65 +-
.../message/factory/ParsedEntityReaderFactory.java | 46 -
.../axis2/jaxws/message/impl/BlockFactoryImpl.java | 5 +-
.../apache/axis2/jaxws/message/impl/BlockImpl.java | 192 +-
.../jaxws/message/impl/MessageFactoryImpl.java | 11 +-
.../axis2/jaxws/message/impl/XMLPartBase.java | 9 +-
.../jaxws/message/impl/XMLPartFactoryImpl.java | 6 +-
.../axis2/jaxws/message/impl/XMLSpineImpl.java | 73 +-
.../apache/axis2/jaxws/message/util/DOMReader.java | 60 -
.../axis2/jaxws/message/util/Reader2Writer.java | 26 +-
.../axis2/jaxws/message/util/ResettableReader.java | 5 +-
.../jaxws/message/util/SOAPElementReader.java | 60 -
.../axis2/jaxws/message/util/XMLFaultUtils.java | 17 +-
.../message/util/impl/NamespaceContextFromDOM.java | 108 -
.../jaxws/message/util/impl/SAAJConverterImpl.java | 32 +-
.../message/util/impl/XMLStreamReaderFromDOM.java | 765 ------
.../axis2/jaxws/registry/FactoryRegistry.java | 3 -
.../marshal/impl/PackageSetBuilder.java | 2 +-
.../server/dispatcher/ProviderDispatcher.java | 3 -
.../apache/axis2/jaxws/spi/ServiceDelegate.java | 14 -
.../org/apache/axis2/jaxws/utility/ClassUtils.java | 59 +-
.../axis2/jaxws/utility/DataSourceFormatter.java | 47 +-
modules/jaxws/test-resources/axis2.xml | 4 +-
modules/jaxws/test-resources/log4j.properties | 3 +-
.../JAXBCustomBuilderDisableStreamingTests.java | 226 +-
.../util/EndpointReferenceUtilsTests.java | 7 +-
.../util/ReferenceParameterListTests.java | 6 +-
.../jaxws/attachments/MTOMSerializationTests.java | 17 +-
.../jaxws/catalog/MultiRedirectionCatalogTest.java | 2 +-
.../axis2/jaxws/catalog/XMLCatalogTests.java | 14 +-
.../axis2/jaxws/client/ClientConfigTests.java | 2 +-
.../axis2/jaxws/client/ReleaseServiceTests.java | 2 +-
.../listener/CompositeInputStreamTests.java | 147 --
.../ParserInputStreamCustomBuilderTests.java | 138 --
.../listener/ProviderOMContextListenerTests.java | 83 -
.../jaxws/description/DescriptionTestUtils2.java | 6 +-
.../sample/addnumbers/AddNumbersService.java | 2 +-
.../jaxws/handler/HandlerPrePostInvokerTests.java | 453 ++--
.../axis2/jaxws/handler/HandlerResolverTest.java | 2 +-
.../SOAPHeadersAdapterTests.java | 39 +-
.../jaxws/injection/ResourceInjectionTests.java | 97 +-
.../org/apache/axis2/jaxws/message/BlockTests.java | 86 +-
.../org/apache/axis2/jaxws/message/FaultTests.java | 12 +-
.../jaxws/message/JAXBCustomBuilderTests.java | 8 +-
.../axis2/jaxws/message/JAXBDSContextTests.java | 112 +-
.../jaxws/message/MessagePersistanceTests.java | 41 +-
.../axis2/jaxws/message/MessageRPCTests.java | 7 +-
.../apache/axis2/jaxws/message/MessageTests.java | 18 +-
.../axis2/jaxws/message/SAAJConverterTests.java | 9 +-
.../apache/axis2/jaxws/message/SOAP12Tests.java | 14 +-
.../jaxws/spi/ClientMetadataHandlerChainTest.java | 2 +-
.../apache/axis2/jaxws/spi/ClientMetadataTest.java | 2 +-
.../jaxws/wsdl/schemareader/SchemaReaderTests.java | 2 +-
modules/jibx-codegen/pom.xml | 75 +
.../apache/axis2/jibx/CodeGenerationUtility.java | 1195 +++++++++
.../jibx/template/JibXDatabindingTemplate.xsl | 0
modules/jibx/pom.xml | 25 +-
.../apache/axis2/jibx/CodeGenerationUtility.java | 1195 ---------
modules/jibx/src/test/repo/conf/axis2.xml | 4 +-
modules/json/pom.xml | 58 +-
.../json/src/org/apache/axis2/json/JSONUtil.java | 4 +-
.../axis2/json/gson/GsonXMLStreamReader.java | 13 +-
.../axis2/json/gson/GsonXMLStreamWriter.java | 10 +-
.../apache/axis2/json/gson/JSONMessageHandler.java | 62 +-
.../org/apache/axis2/json/gson/JsonBuilder.java | 33 +-
.../axis2/json/gson/factory/XmlNodeGenerator.java | 39 +-
modules/json/test-repository/gson/axis2.xml | 4 +-
modules/json/test-repository/json/axis2.xml | 8 +-
.../test-resources/custom_schema/testSchema_2.xsd | 27 +-
.../test-resources/custom_schema/testSchema_3.xsd | 16 +
modules/json/test/org/apache/axis2/json/Echo.java | 8 +-
.../org/apache/axis2/json/JSONDataSourceTest.java | 95 +-
.../org/apache/axis2/json/JSONIntegrationTest.java | 42 +-
.../org/apache/axis2/json/JSONTestConstants.java | 2 +-
.../axis2/json/gson/GsonXMLStreamReaderTest.java | 5 +-
.../axis2/json/gson/JSONXMLStreamAPITest.java | 30 +-
.../json/gson/factory/XmlNodeGeneratorTest.java | 56 +-
.../json/gson/rpc/JSONRPCIntegrationTest.java | 24 +-
modules/kernel/conf/axis2.xml | 4 +-
modules/kernel/conf/log4j.properties | 3 +-
modules/kernel/pom.xml | 27 +-
modules/kernel/src/org/apache/axis2/AxisFault.java | 9 +-
modules/kernel/src/org/apache/axis2/Constants.java | 16 +-
.../axis2/addressing/AddressingConstants.java | 10 +
.../apache/axis2/addressing/AddressingHelper.java | 53 +-
.../axis2/builder/ApplicationXMLBuilder.java | 9 +-
.../src/org/apache/axis2/builder/Builder.java | 3 +-
.../src/org/apache/axis2/builder/BuilderUtil.java | 209 +-
.../apache/axis2/builder/DataSourceBuilder.java | 4 +-
.../src/org/apache/axis2/builder/MTOMBuilder.java | 1 +
.../src/org/apache/axis2/builder/SOAPBuilder.java | 10 +-
.../axis2/classloader/AbstractResourceHandle.java | 63 -
.../classloader/AbstractUrlResourceLocation.java | 53 -
.../axis2/classloader/DirectoryResourceHandle.java | 97 -
.../classloader/DirectoryResourceLocation.java | 89 -
.../src/org/apache/axis2/classloader/IoUtil.java | 147 --
.../axis2/classloader/JarFileClassLoader.java | 351 ---
.../axis2/classloader/JarFileUrlConnection.java | 135 --
.../axis2/classloader/JarFileUrlStreamHandler.java | 113 -
.../axis2/classloader/JarResourceHandle.java | 80 -
.../axis2/classloader/JarResourceLocation.java | 153 --
.../axis2/classloader/JarStreamHandlerFactory.java | 32 -
.../axis2/classloader/ResourceEnumeration.java | 83 -
.../apache/axis2/classloader/ResourceFinder.java | 55 -
.../apache/axis2/classloader/ResourceHandle.java | 97 -
.../apache/axis2/classloader/ResourceLocation.java | 33 -
.../axis2/classloader/UrlResourceFinder.java | 293 ---
.../src/org/apache/axis2/client/FaultMapKey.java | 24 +-
.../org/apache/axis2/context/MessageContext.java | 73 +-
.../externalize/MessageExternalizeUtils.java | 57 +-
.../axis2/dataretrieval/AxisDataLocatorImpl.java | 4 +-
.../apache/axis2/deployment/AxisConfigBuilder.java | 62 +-
.../apache/axis2/deployment/ClusterBuilder.java | 16 +-
.../axis2/deployment/DeploymentClassLoader.java | 215 +-
.../axis2/deployment/DeploymentConstants.java | 4 +-
.../apache/axis2/deployment/DeploymentEngine.java | 35 +-
.../axis2/deployment/DescriptionBuilder.java | 30 +-
.../org/apache/axis2/deployment/ModuleBuilder.java | 8 +-
.../apache/axis2/deployment/ModuleDeployer.java | 13 +-
.../org/apache/axis2/deployment/POJODeployer.java | 11 +-
.../axis2/deployment/RepositoryListener.java | 8 +-
.../apache/axis2/deployment/ServiceBuilder.java | 1692 ++++++-------
.../apache/axis2/deployment/ServiceDeployer.java | 13 +-
.../axis2/deployment/ServiceGroupBuilder.java | 12 +-
.../apache/axis2/deployment/TransportDeployer.java | 4 +-
.../axis2/deployment/WarBasedAxisConfigurator.java | 5 +
.../org/apache/axis2/deployment/axis2_default.xml | 4 +-
.../repository/util/DeploymentFileData.java | 10 +-
.../org/apache/axis2/deployment/util/Utils.java | 199 +-
.../org/apache/axis2/description/AxisService.java | 3 +-
.../axis2/description/AxisService2WSDL11.java | 99 +-
.../axis2/description/ParameterIncludeImpl.java | 58 +-
.../description/WSDL11ToAxisServiceBuilder.java | 62 +-
.../java2wsdl/DefaultSchemaGenerator.java | 9 +
.../org/apache/axis2/engine/DependencyManager.java | 15 +-
.../org/apache/axis2/transport/TransportUtils.java | 333 ++-
.../apache/axis2/transport/http/HTTPConstants.java | 5 -
.../axis2/transport/http/SOAPMessageFormatter.java | 53 +-
.../axis2/util/MessageProcessorSelector.java | 52 -
.../src/org/apache/axis2/util/PrettyPrinter.java | 102 -
.../kernel/src/org/apache/axis2/util/Utils.java | 7 +-
.../kernel/src/org/apache/axis2/util/XMLUtils.java | 44 +-
.../kernel/src/org/apache/axis2/wsdl/WSDLUtil.java | 73 +
.../axis2/wsdl/util/WSDLWrapperReloadImpl.java | 41 +-
.../AddressingIdentityServiceTest/service.xml | 12 +
.../deployment/BadConfigOrderChange/axis2.xml | 2 +-
.../deployment/SystemPhaseRemove/axis2.xml | 2 +-
.../deployment/builderSelectorTest/axis2.xml | 4 +-
.../deployment/builderSelectorTest/bad-axis2.xml | 4 +-
.../test-resources/deployment/echo/build.xml | 6 +-
.../deployment/hostConfigrepo/axis2.xml | 4 +-
.../deployment/invalidservice/build.xml | 6 +-
.../deployment/messageFormatterTest/bad-axis2.xml | 4 +-
.../test-resources/deployment/module1/build.xml | 6 +-
.../kernel/test-resources/deployment/server1.xml | 2 +-
.../test-resources/deployment/service2/build.xml | 6 +-
.../deployment/serviceModule/build.xml | 6 +-
modules/kernel/test-resources/wsdl/Version.wsdl | 300 +++
.../kernel/test-resources/wsdl/actionTests.wsdl | 28 +
modules/kernel/test-resources/wsdl/identity.wsdl | 165 ++
.../wsdl/imports/binding/EchoBindings.wsdl | 51 +
.../wsdl/imports/binding/EchoService.wsdl | 59 +
.../wsdl/imports/binding/EchoTypes.xsd | 19 +
.../imports/binding_recursive/EchoBindings.wsdl | 53 +
.../imports/binding_recursive/EchoService.wsdl | 59 +
.../wsdl/imports/binding_recursive/EchoTypes.xsd | 19 +
.../wsdl/imports/portType/EchoBindings.wsdl | 53 +
.../wsdl/imports/portType/EchoPortType.wsdl | 31 +
.../wsdl/imports/portType/EchoService.wsdl | 37 +
.../wsdl/imports/portType/EchoTypes.xsd | 19 +
.../kernel/test/org/apache/axis2/Axis2Repo.java | 56 +
.../addressing/EndpointReferenceHelperTest.java | 41 +-
.../addressing/wsdl/WSDL11ActionHelperTest.java | 158 +-
.../org/apache/axis2/builder/SOAPBuilderTest.java | 4 +-
.../axis2/classloader/JarFileClassLoaderTest.java | 74 -
.../org/apache/axis2/client/ServiceClientTest.java | 2 +-
.../axis2/dataretrieval/SchemaDataLocatorTest.java | 2 +-
.../deployment/AddressingIdentityServiceTest.java | 236 ++
.../axis2/deployment/DeploymentTotalTest.java | 33 +-
.../repository/util/DeploymentFileDataTest.java | 44 +
.../axis2/description/AxisService2WSDLTest.java | 8 +-
.../apache/axis2/description/AxisServiceTest.java | 6 +-
.../WSDL11ToAxisServiceBuilderTest.java | 231 +-
.../apache/axis2/description/WSDLWrapperTest.java | 46 +-
.../java2wsdl/DefaultSchemaGeneratorTest.java | 24 +-
.../axis2/description/java2wsdl/XMLSchemaTest.java | 27 +-
.../axis2/transport/tcp/TCPTransportTest.java | 51 -
.../test/org/apache/axis2/util/FinalClass.java | 23 +
.../axis2/util/MessageContextBuilderTest.java | 2 +-
.../test/org/apache/axis2/util/UtilsTest.java | 39 +
.../axis2/validation/ValidateAxis2XMLTest.java | 2 +-
.../test/org/apache/axis2/wsdl/WSDLUtilTest.java | 86 +
modules/metadata/pom.xml | 110 +-
.../description/builder/JAXWSRIWSDLGenerator.java | 9 +-
.../description/impl/OperationDescriptionImpl.java | 15 +-
.../jaxws/description/impl/URIResolverImpl.java | 2 +-
.../apache/axis2/jaxws/util/BaseWSDLLocator.java | 2 +-
.../axis2/jaxws/util/CatalogWSDLLocator.java | 4 +-
.../apache/axis2/jaxws/util/ModuleWSDLLocator.java | 4 +-
.../src/org/apache/axis2/jaxws/util/SoapUtils.java | 12 +-
.../org/apache/axis2/jaxws/util/WSDL4JWrapper.java | 5 +-
.../jaxws/wsdl/WSDLReaderConfiguratorImpl.java | 41 +-
.../metadata/registry/MetadataFactoryRegistry.java | 2 +-
modules/metadata/test-resources/log4j.properties | 1 -
.../jaxws/description/DescriptionTestUtils.java | 7 +-
.../impl/ClientDBCSupportEndpointTests.java | 2 +-
.../impl/ClientDBCSupportHandlersTests.java | 2 +-
.../impl/DescriptionFactoryImplTests.java | 2 +-
.../impl/ParameterDescriptionImplTests.java | 25 +-
.../registry/MetadataFactoryRegistryTests.java | 31 +-
modules/mex/pom.xml | 6 +-
.../mex/src/org/apache/axis2/mex/om/Metadata.java | 4 +-
.../mex/src/org/apache/axis2/mex/util/MexUtil.java | 4 +-
modules/mtompolicy-mar/pom.xml | 6 +-
modules/mtompolicy/pom.xml | 6 +-
.../axis2/policy/model/MTOMAssertionTest.java | 7 +-
modules/osgi-tests/pom.xml | 160 ++
modules/osgi-tests/src/test/java/OSGiTest.java | 175 ++
.../org/apache/axis2/osgi/module/Handler1.java | 31 +
.../org/apache/axis2/osgi/module/Handler2.java | 31 +
.../org/apache/axis2/osgi/module/SimpleModule.java | 51 +
.../org/apache/axis2/osgi/service/Activator.java | 39 +
.../org/apache/axis2/osgi/service/Calculator.java | 26 +
.../org/apache/axis2/osgi/service/Version.java | 25 +
.../src/test/resources/META-INF/module.xml | 18 +
.../src/test/resources/META-INF/services.xml | 28 +
modules/osgi/pom.xml | 48 +-
.../org/apache/axis2/osgi/deployment/axis2.xml | 4 +-
.../src/org/apache/axis2/osgi/OSGiAxisServlet.java | 45 +-
.../OSGiConfigurationContextFactory.java | 13 +-
.../osgi/deployment/OSGiServerConfigurator.java | 34 +-
.../osgi/deployment/OSGiServiceGroupBuilder.java | 10 +-
.../axis2/osgi/deployment/ServiceRegistry.java | 18 +-
.../org/apache/axis2/osgi/internal/Activator.java | 76 +-
modules/ping/pom.xml | 6 +-
.../org/apache/axis2/ping/PingMessageReceiver.java | 4 +-
modules/resource-bundle/pom.xml | 6 +-
modules/saaj/pom.xml | 51 +-
.../src/org/apache/axis2/saaj/CommentImpl.java | 13 +-
.../saaj/src/org/apache/axis2/saaj/DetailImpl.java | 8 +-
.../saaj/src/org/apache/axis2/saaj/NodeImpl.java | 43 +
.../saaj/src/org/apache/axis2/saaj/ProxyNode.java | 357 +++
.../src/org/apache/axis2/saaj/SAAJDocument.java | 179 ++
.../saaj/src/org/apache/axis2/saaj/SAAJNode.java | 472 ----
.../org/apache/axis2/saaj/SOAPBodyElementImpl.java | 2 +-
.../src/org/apache/axis2/saaj/SOAPBodyImpl.java | 76 +-
.../src/org/apache/axis2/saaj/SOAPElementImpl.java | 97 +-
.../org/apache/axis2/saaj/SOAPEnvelopeImpl.java | 16 +-
.../src/org/apache/axis2/saaj/SOAPFaultImpl.java | 80 +-
.../apache/axis2/saaj/SOAPHeaderElementImpl.java | 10 +-
.../src/org/apache/axis2/saaj/SOAPHeaderImpl.java | 36 +-
.../src/org/apache/axis2/saaj/SOAPMessageImpl.java | 26 +-
.../src/org/apache/axis2/saaj/SOAPPartImpl.java | 49 +-
.../saaj/src/org/apache/axis2/saaj/TextImplEx.java | 49 +-
.../src/org/apache/axis2/saaj/util/SAAJUtil.java | 89 +-
modules/saaj/test-resources/log4j.properties | 3 +-
modules/saaj/test-resources/saaj-repo/axis2.xml | 2 +-
.../test/org/apache/axis2/saaj/AttachmentTest.java | 2 +-
.../org/apache/axis2/saaj/ImplementationTest.java | 30 +
.../org/apache/axis2/saaj/SOAPEnvelopeTest.java | 2 +-
.../test/org/apache/axis2/saaj/SOAPHeaderTest.java | 2 +-
.../test/org/apache/axis2/saaj/SOAPPartTest.java | 45 -
modules/samples/book/src/main/log4j.properties | 3 +-
modules/samples/databinding/README.txt | 1 -
modules/samples/databinding/build.xml | 4 +-
.../src/samples/databinding/StockClient.java | 16 +-
.../src/samples/databinding/StockClient2.java | 37 +-
.../databinding/StockQuoteServiceSkeleton.java | 27 +-
modules/samples/dynamicclient/server/pom.xml | 10 -
modules/samples/eventing/build.xml | 105 -
modules/samples/eventing/listner1.services.xml | 32 -
modules/samples/eventing/listner2.services.xml | 32 -
modules/samples/eventing/publisher.services.xml | 36 -
modules/samples/eventing/readme.txt | 19 -
modules/samples/eventing/run.bat | 58 -
modules/samples/eventing/run.sh | 29 -
.../eventing/src/sample/eventing/Client.java | 296 ---
.../src/sample/eventing/ListnerService1.java | 35 -
.../src/sample/eventing/ListnerService2.java | 35 -
.../src/sample/eventing/PublisherService.java | 96 -
modules/samples/java_first_jaxws/pom.xml | 38 +-
.../java_first_jaxws/src/webapp/WEB-INF/axis2.xml | 4 +-
.../src/webapp/WEB-INF/classes/log4j.properties | 3 +-
modules/samples/jaxws-addressbook/pom.xml | 74 +-
modules/samples/jaxws-calculator/pom.xml | 31 +-
modules/samples/jaxws-interop/pom.xml | 33 +-
modules/samples/jaxws-samples/pom.xml | 40 +-
.../jaxws-samples/src/webapp/WEB-INF/axis2.xml | 4 +-
.../src/webapp/WEB-INF/classes/log4j.properties | 3 +-
modules/samples/jaxws-version/pom.xml | 30 +-
modules/samples/json/resources/axis2.xml | 4 +-
modules/samples/json/src/META-INF/services.xml | 6 +-
modules/samples/pom.xml | 63 +
.../transport/https-sample/httpsClient/pom.xml | 7 +-
.../transport/https-sample/httpsService/pom.xml | 12 +-
.../httpsService/src/main/webapp/WEB-INF/axis2.xml | 4 +-
modules/samples/transport/https-sample/pom.xml | 33 +-
.../transport/jms-sample/jmsService/pom.xml | 7 +-
.../jmsService/src/main/resources/axis2.xml | 2 +-
modules/samples/transport/jms-sample/pom.xml | 33 +-
modules/samples/userguide/conf/axis2.xml | 4 +-
modules/samples/version/pom.xml | 14 +-
.../samples/yahoojsonsearch/resources/axis2.xml | 4 +-
modules/scripting/pom.xml | 6 +-
.../axis2/scripting/ScriptDeploymentEngine.java | 4 +-
.../convertors/DefaultOMElementConvertor.java | 17 +-
.../scripting/convertors/JSOMElementConvertor.java | 17 +-
.../scripting/convertors/RBOMElementConvertor.java | 18 +-
.../apache/axis2/scripting/ScriptModuleTest.java | 6 +-
.../test/org/apache/axis2/scripting/TestUtils.java | 15 +-
modules/soapmonitor/module/pom.xml | 6 +-
modules/soapmonitor/servlet/pom.xml | 6 +-
modules/spring/pom.xml | 6 +-
modules/testutils/pom.xml | 16 +-
.../axis2/testutils/AbstractAxis2Server.java | 72 +
.../org/apache/axis2/testutils/Axis2Server.java | 77 +
.../org/apache/axis2/testutils/ClientHelper.java | 103 +
.../org/apache/axis2/testutils/JettyServer.java | 287 +++
.../axis2/testutils/RuntimeIgnoreRunNotifier.java | 4 +-
modules/tool/archetype/quickstart-webapp/pom.xml | 13 +-
modules/tool/archetype/quickstart/pom.xml | 13 +-
modules/tool/axis2-aar-maven-plugin/pom.xml | 58 +-
.../axis2-aar-maven-plugin/src/it/test1/pom.xml | 49 +
.../test1/src/main/resources/META-INF/services.xml | 27 +
.../axis2-aar-maven-plugin/src/it/test1/verify.bsh | 5 +
.../test2}/AdditionalDir/AdditionalFile.txt | 0
.../axis2-aar-maven-plugin/src/it/test2/pom.xml | 58 +
.../src/it/test2/services.xml | 27 +
.../src/{test/resources => it/test2}/simple.wsdl | 0
.../axis2-aar-maven-plugin/src/it/test2/verify.bsh | 5 +
.../java/org/apache/axis2/maven2/aar/AarMojo.java | 12 +-
.../apache/axis2/maven2/aar/AbstractAarMojo.java | 17 +-
.../org/apache/axis2/maven2/aar/AarMojoTest.java | 44 -
.../apache/axis2/maven2/aar/AbstractAarTest.java | 68 -
.../src/test/resources/aar-plugin-config-1.xml | 38 -
.../src/test/resources/aar-plugin-config-2.xml | 47 -
.../src/test/resources/services.xml | 27 -
modules/tool/axis2-ant-plugin/pom.xml | 81 +-
.../org/apache/axis2/tool/ant/AntCodegenTask.java | 6 +-
.../org/apache/axis2/tool/ant/Java2WSDLTask.java | 2 -
.../main/java}/org/apache/ws/java2wsdl/Mapper.java | 0
.../java}/org/apache/ws/java2wsdl/MappingSet.java | 0
.../org/apache/ws/java2wsdl/NamespaceMapping.java | 0
.../src/test/resources/log4j.properties | 1 -
modules/tool/axis2-eclipse-codegen-plugin/pom.xml | 61 +-
.../axis2/tool/codegen/WSDL2JavaGenerator.java | 2 +-
.../axis2/tool/codegen/eclipse/CodeGenWizard.java | 4 +-
.../tool/codegen/eclipse/util/ClassFileReader.java | 2 +-
.../codegen/eclipse/util/WSDLPropertyReader.java | 4 +-
.../apache/axis2/tool/core/ClassFileHandler.java | 2 +-
modules/tool/axis2-eclipse-service-plugin/pom.xml | 53 +-
.../apache/axis2/tool/core/ClassFileHandler.java | 2 +-
.../eclipse/ui/ServiceXMLGenerationPage.java | 4 +-
.../tool/service/eclipse/ui/WSDLOptionsPage.java | 2 +-
.../axis2-idea-plugin/idea-plugin-aseembly.xml | 1 +
modules/tool/axis2-idea-plugin/pom.xml | 40 +-
.../axis2/tools/bean/ClassLoadingTestBean.java | 2 +-
.../org/apache/axis2/tools/bean/CodegenBean.java | 13 +-
.../frames/ServiceXMLGenerationPage.java | 4 +-
.../ideaplugin/frames/WSDLFileSelectionPage.java | 4 +-
.../tool/axis2-idea-plugin/src/site/apt/howto.apt | 23 -
.../src/site/apt/introduction.apt | 15 -
modules/tool/axis2-idea-plugin/src/site/site.xml | 42 -
modules/tool/axis2-java2wsdl-maven-plugin/pom.xml | 59 +-
.../src/it/test1/pom.xml | 50 +
.../apache/axis2/maven2/java2wsdl/test/Adder.java | 0
.../axis2/maven2/java2wsdl/Java2WSDLMojo.java | 14 +-
.../axis2/maven2/java2wsdl/Java2WSDLMojoTest.java | 61 -
.../src/test/test1/pom.xml | 40 -
modules/tool/axis2-mar-maven-plugin/pom.xml | 37 +-
.../apache/axis2/maven2/mar/AbstractMarMojo.java | 17 +-
.../java/org/apache/axis2/maven2/mar/MarMojo.java | 12 +-
modules/tool/axis2-repo-maven-plugin/pom.xml | 83 +-
.../src/it/AXIS2-5782/pom.xml | 71 +
.../maven2/repo/AbstractCreateRepositoryMojo.java | 172 +-
.../apache/axis2/maven2/repo/ArchiveDeployer.java | 2 +-
.../axis2/maven2/repo/CreateRepositoryMojo.java | 23 +
.../maven2/repo/CreateTestRepositoryMojo.java | 31 +-
.../axis2/maven2/repo/GeneratedAxis2Xml.java | 40 +
.../org/apache/axis2/maven2/repo/JAXWSService.java | 40 +
.../apache/axis2/maven2/repo/MessageHandler.java | 40 +
.../tool/axis2-repo-maven-plugin/src/site/site.xml | 30 +
modules/tool/axis2-wsdl2code-maven-plugin/pom.xml | 138 +-
.../src/it/test1/pom.xml | 56 +
.../{test => it}/test1/src/main/axis2/service.wsdl | 0
.../src/it/test2/pom.xml | 57 +
.../test2/src/main/axis2/test dir/service.wsdl | 0
.../test2/src/main/axis2/test dir/service.xsd | 0
.../maven2/wsdl2code/AbstractWSDL2CodeMojo.java | 375 +++
.../maven2/wsdl2code/GenerateSourcesMojo.java | 48 +
.../maven2/wsdl2code/GenerateTestSourcesMojo.java | 50 +
.../maven2/wsdl2code/NamespaceURIMapping.java | 46 -
.../axis2/maven2/wsdl2code/WSDL2CodeMojo.java | 638 +----
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 36 +
.../src/site/apt/configuration.apt | 71 -
.../src/site/apt/goals.apt | 55 -
.../src/site/apt/introduction.apt | 14 -
.../src/site/markdown/index.md | 27 +
.../src/site/markdown/usage.md | 56 +
.../axis2-wsdl2code-maven-plugin/src/site/site.xml | 35 +-
.../axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java | 64 -
.../src/test/resources/log4j.properties | 1 -
.../src/test/test1/pom.xml | 44 -
.../src/test/test2/pom.xml | 45 -
modules/tool/axis2-xsd2java-maven-plugin/pom.xml | 114 +
.../axis2/maven/xsd2java/AbstractXSD2JavaMojo.java | 121 +
.../axis2/maven/xsd2java/GenerateSourcesMojo.java | 48 +
.../maven/xsd2java/GenerateTestSourcesMojo.java | 50 +
.../src/site/markdown/index.md | 25 +
.../src/site/markdown/usage.md | 64 +
.../axis2-xsd2java-maven-plugin/src/site/site.xml | 33 +
modules/tool/maven-shared/pom.xml | 61 +
.../axis2/maven/shared/NamespaceMapping.java | 46 +
.../axis2/maven/shared/NamespaceMappingUtil.java | 45 +
modules/tool/simple-server-maven-plugin/pom.xml | 38 +-
modules/transport/base/pom.xml | 7 +-
.../apache/axis2/format/PlainTextFormatter.java | 6 +-
.../axis2/format/TextFromElementDataSource.java | 3 +-
.../org/apache/axis2/transport/base/BaseUtils.java | 30 +-
.../base/endpoint/config/URLEndpointFactory.java | 8 +-
.../config/URLEndpointsConfigurationFactory.java | 8 +-
modules/transport/http-hc3/pom.xml | 91 +
.../transport/http/CommonsHTTPTransportSender.java | 28 +
.../impl/httpclient3/AxisRequestEntityImpl.java | 59 +
.../httpclient3/HTTPClient3TransportSender.java | 62 +
.../impl/httpclient3/HTTPProxcyConfigurator.java | 0
.../impl/httpclient3/HTTPProxyConfigurator.java | 463 ++++
.../http/impl/httpclient3/HTTPSenderImpl.java | 106 +
.../httpclient3/HttpTransportPropertiesImpl.java | 0
.../http/impl/httpclient3/RequestImpl.java | 329 +++
.../http/security/SSLProtocolSocketFactory.java | 0
.../http/util/HTTPProxyConfigurationUtil.java | 0
.../CommonsHTTPTransportSenderClientSideTest.java | 84 +
.../transport/http/HTTPClient3SenderTest.java | 0
.../http/HTTPClient3TransportSenderTest.java | 47 +
.../axis2/transport/http/NonProxyHostTest.java | 0
.../org/apache/axis2/transport/http/axis2.xml | 156 ++
modules/transport/http/pom.xml | 51 +-
.../apache/axis2/transport/http/AbstractAgent.java | 12 +-
.../axis2/transport/http/AbstractHTTPSender.java | 80 -
.../http/AbstractHTTPTransportSender.java | 496 ++++
.../axis2/transport/http/AxisRequestEntity.java | 97 +-
.../apache/axis2/transport/http/AxisServlet.java | 66 +-
.../transport/http/CommonsHTTPTransportSender.java | 516 ----
.../transport/http/CommonsTransportHeaders.java | 43 +-
.../http/ForbidSessionCreationWrapper.java | 44 +
.../apache/axis2/transport/http/HTTPSender.java | 500 +++-
.../axis2/transport/http/HTTPTransportUtils.java | 18 +
.../apache/axis2/transport/http/HTTPWorker.java | 7 +-
.../apache/axis2/transport/http/ListingAgent.java | 36 +-
.../axis2/transport/http/RESTRequestEntity.java | 192 --
.../axis2/transport/http/RESTRequestEntity2.java | 69 -
.../org/apache/axis2/transport/http/Request.java | 46 +
.../impl/httpclient3/AxisRequestEntityImpl.java | 50 -
.../httpclient3/HTTPClient3TransportSender.java | 52 -
.../impl/httpclient3/HTTPProxyConfigurator.java | 463 ----
.../http/impl/httpclient3/HTTPSenderImpl.java | 1026 --------
.../impl/httpclient3/HTTPTransportHeaders.java | 43 -
.../impl/httpclient3/RESTRequestEntity2Impl.java | 35 -
.../impl/httpclient3/RESTRequestEntityImpl.java | 39 -
.../impl/httpclient4/AxisRequestEntityImpl.java | 52 +-
.../httpclient4/HTTPClient4TransportSender.java | 30 +-
.../impl/httpclient4/HTTPProxyConfigurator.java | 29 +-
.../http/impl/httpclient4/HTTPSenderImpl.java | 980 +-------
.../impl/httpclient4/HTTPTransportHeaders.java | 44 -
.../impl/httpclient4/RESTRequestEntity2Impl.java | 65 -
.../impl/httpclient4/RESTRequestEntityImpl.java | 68 -
.../http/impl/httpclient4/RequestImpl.java | 310 +++
.../transport/http/server/SimpleHttpServer.java | 4 +-
.../org/apache/axis2/transport/http/axis2.xml | 156 --
.../CommonsHTTPTransportSenderClientSideTest.java | 82 -
.../http/CommonsHTTPTransportSenderTest.java | 30 +-
.../http/HTTPClient3TransportSenderTest.java | 32 -
.../transport/http/HTTPClient4SenderTest.java | 144 --
.../http/HTTPClient4TransportSenderTest.java | 1 -
.../axis2/transport/http/HTTPSenderTest.java | 18 +-
.../http/HttpTransportDescriptionFactory.java | 3 +-
.../http/mock/server/AbstractHTTPServerTest.java | 5 +-
modules/transport/jms/pom.xml | 17 +-
.../org/apache/axis2/transport/jms/JMSUtils.java | 18 +-
.../org/apache/axis2/transport/jms/package.html | 2 +
.../apache/axis2/transport/jms/JMSAsyncClient.java | 3 +-
.../org/apache/axis2/transport/jms/JMSClient.java | 2 +-
.../transport/jms/JMSRequestResponseClient.java | 2 +-
.../apache/axis2/transport/jms/JMSUtilsTest.java | 40 +
.../transport/jms/ctype/ContentTypeRuleTest.java | 4 +-
modules/transport/local/pom.xml | 6 +-
.../axis2/transport/local/LocalResponder.java | 145 +-
.../transport/local/LocalTransportReceiver.java | 83 +-
.../transport/local/LocalTransportSender.java | 9 +-
.../local/NonBlockingLocalTransportSender.java | 28 -
modules/transport/mail/pom.xml | 34 +-
.../axis2/transport/mail/MailAsyncClient.java | 3 +-
.../apache/axis2/transport/mail/MailClient.java | 2 +-
.../transport/mail/MailRequestResponseClient.java | 2 +-
modules/transport/tcp/pom.xml | 7 +-
.../axis2/transport/tcp/TCPEchoRawXMLTest.java | 13 +-
.../transport/tcp/TCPTwoChannelEchoRawXMLTest.java | 4 +-
modules/transport/testkit/pom.xml | 124 +-
.../axis2/transport/AbstractTransportTest.java | 4 +-
.../axis2/transport/CustomAxisConfigurator.java | 16 +-
.../axis2/transport/testkit/axis2/LogAspect.java | 58 +-
.../testkit/axis2/client/AxisAsyncTestClient.java | 3 +-
.../client/AxisRequestResponseTestClient.java | 3 +-
.../testkit/axis2/client/AxisTestClient.java | 9 +-
.../axis2/client/AxisTestClientContext.java | 9 -
.../client/AxisTestClientContextConfigurator.java | 4 +
.../endpoint/ContentTypeServiceConfigurator.java | 3 +-
.../transport/testkit/client/AsyncTestClient.java | 2 +-
.../testkit/client/AsyncTestClientAdapter.java | 3 +-
.../transport/testkit/client/ClientOptions.java | 3 +-
.../testkit/client/RequestResponseTestClient.java | 3 +-
.../client/RequestResponseTestClientAdapter.java | 3 +-
.../axis2/transport/testkit/client/TestClient.java | 3 +-
.../testkit/doclet/TestkitJavadocDoclet.java | 4 +-
.../testkit/endpoint/AsyncEndpointAdapter.java | 3 +-
.../testkit/endpoint/InOnlyEndpointSupport.java | 3 +-
.../transport/testkit/http/JavaNetClient.java | 6 +-
.../transport/testkit/http/JavaNetRESTClient.java | 3 +-
.../testkit/http/JettyByteArrayAsyncEndpoint.java | 5 +-
.../transport/testkit/message/IncomingMessage.java | 2 +-
.../transport/testkit/message/MessageDecoder.java | 2 +-
.../transport/testkit/message/MessageEncoder.java | 9 +-
.../transport/testkit/message/XMLMessage.java | 32 +-
.../transport/testkit/tests/MessageTestCase.java | 3 +-
.../testkit/tests/async/AsyncMessageTestCase.java | 3 +-
.../testkit/tests/async/BinaryTestCase.java | 6 +-
.../tests/async/LargeSOAPAsyncMessageTestCase.java | 3 +-
.../transport/testkit/tests/async/SwATestCase.java | 3 +-
.../testkit/tests/async/TextPlainTestCase.java | 6 +-
.../tests/async/XMLAsyncMessageTestCase.java | 3 +-
.../tests/echo/RequestResponseMessageTestCase.java | 3 +-
.../echo/XMLRequestResponseMessageTestCase.java | 3 +-
.../testkit/tests/misc/MinConcurrencyTest.java | 2 +-
.../transport/testkit/util/ContentTypeUtil.java | 54 -
.../axis2/transport/testkit/util/LogManager.java | 4 +
.../resources/org/apache/axis2/transport/axis2.xml | 254 --
.../org/apache/axis2/transport/repo/__root__ | 0
.../axis2/transport/repo/modules/modules.list | 1 -
modules/transport/udp/pom.xml | 7 +-
modules/transport/xmpp/pom.xml | 7 +-
.../apache/axis2/transport/xmpp/XMPPListener.java | 4 +-
.../apache/axis2/transport/xmpp/XMPPSender.java | 15 +-
modules/webapp/conf/axis2.xml | 4 +-
modules/webapp/conf/jetty.xml | 29 +
modules/webapp/conf/web.xml | 17 +-
modules/webapp/pom.xml | 178 +-
modules/webapp/scripts/build.xml | 12 +-
.../main/java/org/apache/axis2/webapp/Action.java | 33 +
.../org/apache/axis2/webapp/ActionHandler.java | 82 +
.../java/org/apache/axis2/webapp/ActionResult.java | 30 +
.../java/org/apache/axis2/webapp/AdminActions.java | 630 +++++
.../java/org/apache/axis2/webapp/AdminAgent.java | 639 -----
.../org/apache/axis2/webapp/AxisAdminServlet.java | 101 +-
.../webapp/CSRFPreventionResponseWrapper.java | 102 +
.../org/apache/axis2/webapp/CSRFTokenCache.java | 43 +
.../java/org/apache/axis2/webapp/Redirect.java | 77 +
.../main/java/org/apache/axis2/webapp/Status.java | 41 +
.../java/org/apache/axis2/webapp/StatusCache.java | 48 +
.../main/java/org/apache/axis2/webapp/View.java | 40 +
.../src/main/webapp/WEB-INF/include/LeftFrame.jsp | 205 ++
.../{axis2-web => WEB-INF}/include/adminfooter.inc | 0
.../{axis2-web => WEB-INF}/include/adminfooter.jsp | 0
.../main/webapp/WEB-INF/include/adminheader.jsp | 82 +
.../{axis2-web => WEB-INF}/include/footer.inc | 0
.../{axis2-web => WEB-INF}/include/header.inc | 0
.../src/main/webapp/WEB-INF/include/httpbase.jsp | 72 +
.../{axis2-web => WEB-INF}/include/link-footer.inc | 0
.../main/webapp/WEB-INF/include/link-footer.jsp | 70 +
.../webapp/src/main/webapp/WEB-INF/tags/status.tag | 7 +
.../src/main/webapp/WEB-INF/views/admin/Login.jsp | 90 +
.../webapp/WEB-INF/views/admin/SelectService.jsp | 69 +
.../webapp/WEB-INF/views/admin/activateService.jsp | 83 +
.../src/main/webapp/WEB-INF/views/admin/admin.jsp | 31 +
.../WEB-INF/views/admin/deactivateService.jsp | 84 +
.../WEB-INF/views/admin/editServiceParameters.jsp | 68 +
.../webapp/WEB-INF/views/admin/engageGlobally.jsp | 65 +
.../WEB-INF/views/admin/engageToOperation.jsp | 122 +
.../webapp/WEB-INF/views/admin/engageToService.jsp | 123 +
.../WEB-INF/views/admin/engageToServiceGroup.jsp | 133 +
.../webapp/WEB-INF/views/admin/errorModule.jsp | 31 +
.../webapp/WEB-INF/views/admin/globalModules.jsp | 55 +
.../webapp/WEB-INF/views/admin/listModules.jsp | 81 +
.../WEB-INF/views/admin/listServiceGroups.jsp | 69 +
.../webapp/WEB-INF/views/admin/listServices.jsp | 149 ++
.../WEB-INF/views/admin/listSingleService.jsp | 89 +
.../src/main/webapp/WEB-INF/views/admin/upload.jsp | 64 +
.../webapp/WEB-INF/views/admin/viewContexts.jsp | 68 +
.../WEB-INF/views/admin/viewGlobalChains.jsp | 137 ++
.../views/admin/viewOperationSpecificChains.jsp | 147 ++
.../WEB-INF/views/admin/viewServiceContext.jsp | 50 +
.../views/admin/viewServiceGroupContext.jsp | 55 +
.../main/webapp/WEB-INF/views/admin/viewphases.jsp | 111 +
.../webapp/WEB-INF/views/listFaultyService.jsp | 92 +
.../src/main/webapp/WEB-INF/views/listServices.jsp | 112 +
.../src/main/webapp/axis2-web/ActivateService.jsp | 82 -
.../main/webapp/axis2-web/EngageToServiceGroup.jsp | 138 --
.../src/main/webapp/axis2-web/Error/error404.jsp | 4 +-
.../src/main/webapp/axis2-web/Error/error500.jsp | 4 +-
.../webapp/src/main/webapp/axis2-web/HappyAxis.jsp | 8 +-
.../main/webapp/axis2-web/InActivateService.jsp | 83 -
.../webapp/src/main/webapp/axis2-web/LeftFrame.jsp | 204 --
.../src/main/webapp/axis2-web/ListServiceGroup.jsp | 68 -
modules/webapp/src/main/webapp/axis2-web/Login.jsp | 90 -
.../src/main/webapp/axis2-web/SelectService.jsp | 80 -
.../src/main/webapp/axis2-web/ServiceParaEdit.jsp | 122 -
.../webapp/src/main/webapp/axis2-web/TopFrame.jsp | 30 -
.../src/main/webapp/axis2-web/ViewContexts.jsp | 67 -
.../main/webapp/axis2-web/ViewGlobalHandlers.jsp | 137 --
.../main/webapp/axis2-web/ViewServiceHandlers.jsp | 147 --
modules/webapp/src/main/webapp/axis2-web/admin.jsp | 31 -
.../src/main/webapp/axis2-web/deleteService.jsp | 23 -
.../webapp/src/main/webapp/axis2-web/disengage.jsp | 22 -
.../src/main/webapp/axis2-web/engagingglobally.jsp | 71 -
.../webapp/axis2-web/engagingtoanoperation.jsp | 128 -
.../main/webapp/axis2-web/engagingtoaservice.jsp | 150 --
modules/webapp/src/main/webapp/axis2-web/error.jsp | 4 +-
.../src/main/webapp/axis2-web/errorModule.jsp | 31 -
.../src/main/webapp/axis2-web/globalModules.jsp | 55 -
.../main/webapp/axis2-web/include/adminheader.inc | 28 -
.../main/webapp/axis2-web/include/adminheader.jsp | 81 -
.../src/main/webapp/axis2-web/include/httpbase.jsp | 71 -
.../main/webapp/axis2-web/include/link-footer.jsp | 69 -
modules/webapp/src/main/webapp/axis2-web/index.jsp | 8 +-
.../main/webapp/axis2-web/listFaultyService.jsp | 91 -
.../src/main/webapp/axis2-web/listGroupService.jsp | 129 -
.../src/main/webapp/axis2-web/listModules.jsp | 81 -
.../src/main/webapp/axis2-web/listService.jsp | 172 --
.../src/main/webapp/axis2-web/listServices.jsp | 137 --
.../main/webapp/axis2-web/listSingleService.jsp | 108 -
.../webapp/src/main/webapp/axis2-web/upload.jsp | 75 -
.../main/webapp/axis2-web/viewServiceContext.jsp | 50 -
.../webapp/axis2-web/viewServiceGroupContext.jsp | 55 -
.../src/main/webapp/axis2-web/viewphases.jsp | 111 -
modules/xmlbeans/pom.xml | 8 +-
.../template/XmlbeansDatabindingTemplate.xsl | 2 +-
.../axis2/xmlbeans/WSDL2JavaSuccessTestBase.java | 6 +-
pom.xml | 1170 +++++++--
release-notes.html | 593 -----
src/main/assembly/dists.xml | 113 -
src/main/assembly/doc.xml | 53 -
src/main/assembly/jar.xml | 76 -
src/site/markdown/docs/reference.md | 129 +
src/site/markdown/download.md.vm | 78 +
src/site/markdown/maven-help.md.vm | 47 +
src/site/markdown/release-notes/1.6.1.md | 9 +
src/site/markdown/release-notes/1.6.2.md | 8 +
src/site/markdown/release-notes/1.6.3.md | 9 +
src/site/markdown/release-notes/1.6.4.md | 10 +
src/site/markdown/release-notes/1.7.0.md | 54 +
src/site/markdown/release-notes/1.8.0.md | 11 +
src/site/markdown/release-process.md | 244 ++
.../markdown/tools/eclipse/plugin-installation.md | 81 +
src/site/resources/css/site.css | 288 ---
src/site/resources/download.cgi | 24 -
src/site/resources/images/breadcrumbs-bg.gif | Bin 198 -> 0 bytes
src/site/resources/images/h2-bg.gif | Bin 202 -> 0 bytes
src/site/resources/images/home-top.gif | Bin 804 -> 0 bytes
src/site/resources/images/leftcolumn-bg.gif | Bin 523 -> 0 bytes
src/site/resources/images/menu-back.gif | Bin 827 -> 0 bytes
src/site/site.xml | 27 +-
src/site/xdoc/archived_news.xml | 869 -------
src/site/xdoc/articles.xml | 7 -
src/site/xdoc/docs/axis2config.xml | 2 +-
src/site/xdoc/docs/contents.xml.vm | 2 +-
src/site/xdoc/docs/reference.xml | 140 --
src/site/xdoc/docs/soapmonitor-module.xml.vm | 5 +
src/site/xdoc/docs/toc.xml | 2 +-
src/site/xdoc/docs/userguide.xml | 16 +-
src/site/xdoc/download.xml | 709 ------
src/site/xdoc/index.xml | 195 --
src/site/xdoc/maven-help.xml | 203 --
src/site/xdoc/modules/index.xml | 10 +-
src/site/xdoc/release-process.xml | 238 --
.../xdoc/tools/eclipse/plugin-installation.xml | 72 -
.../xdoc/tools/eclipse/servicearchiver-plugin.xml | 2 +-
src/site/xdoc/tools/eclipse/wsdl2java-plugin.xml | 2 +-
.../xdoc/tools/idea/Idea_plug-in_userguide.xml | 4 +-
src/site/xdoc/tools/index.xml | 127 +
src/site/xdoc/tools/index.xml.vm | 136 --
.../tools/maven-plugins/maven-wsdl2code-plugin.xml | 229 --
.../SOAP12TestModuleB}/module.xml | 0
systests/SOAP12TestModuleB/pom.xml | 50 +
.../soap12testing/handlers/HeaderConstants.java | 0
.../handlers/SOAP12InFlowHandlerDefaultB.java | 165 ++
.../handlers/SOAP12OutFaultFlowHandlerDefault.java | 0
.../handlers/SOAP12OutFlowHandlerDefault.java | 0
.../SOAP12TestModuleC}/module.xml | 0
systests/SOAP12TestModuleC/pom.xml | 50 +
.../soap12testing/handlers/HeaderConstants.java | 0
.../handlers/SOAP12InFlowHandlerDefaultC.java | 167 ++
.../handlers/SOAP12OutFaultFlowHandlerDefault.java | 0
.../handlers/SOAP12OutFlowHandlerDefault.java | 0
systests/SOAP12TestServiceB/pom.xml | 50 +
.../SOAP12TestServiceB}/services.xml | 0
.../webservices/SOAP12TestWebServiceDefault.java | 0
systests/SOAP12TestServiceC/pom.xml | 50 +
.../SOAP12TestServiceC}/services.xml | 0
.../webservices/SOAP12TestWebServiceDefault.java | 0
systests/echo/pom.xml | 50 +
systests/echo/services.xml | 25 +
.../java/org/apache/axis2/echo/EchoService.java | 27 +
systests/pom.xml | 51 +
systests/webapp-tests/pom.xml | 185 ++
.../org/apache/axis2/webapp/Axis2WebTester.java | 55 +
.../axis2/webapp/AxisAdminServletITCase.java | 97 +
.../org/apache/axis2/webapp/AxisServletITCase.java | 45 +
.../org/apache/axis2/webapp/NoSessionITCase.java | 60 +
1257 files changed, 33709 insertions(+), 86241 deletions(-)
diff --cc
modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
index 04cdb4d,cdf1c9b..9e896fe
---
a/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
+++
b/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
@@@ -18,18 -18,21 +18,26 @@@
*/
package org.apache.axis2.description;
+ import java.io.File;
import java.io.FileInputStream;
+ import java.io.IOException;
import java.io.InputStream;
- import java.util.List;
import java.util.ArrayList;
- import java.util.Set;
+ import java.util.HashMap;
+import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
++import java.util.Set;
+ import javax.wsdl.xml.WSDLLocator;
import javax.xml.namespace.QName;
+ import org.apache.axis2.engine.AxisConfiguration;
+ import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaObject;
+ import org.xml.sax.InputSource;
import junit.framework.TestCase;
@@@ -62,42 -65,223 +70,261 @@@ public class WSDL11ToAxisServiceBuilder
}
}
+ public void testNonDuplicatedElementsHttpBinding() throws Exception {
+ final String wsdlPath =
"test-resources/wsdl/nonduplicatedElements.wsdl";
+ InputStream in = new FileInputStream(wsdlPath);
+ final String targetNamespace = "http://www.example.org";;
+ final QName serviceName = new QName(targetNamespace, "FooService");
+ final String portName = "FooHttpGetPort";
+
+ AxisService service = new WSDL11ToAxisServiceBuilder(in, serviceName,
portName).populateService();
+ List schemaDocuments = service.getSchema();
+ List duplicatedGlobalElements =
findDuplicatedGlobalElements(schemaDocuments);
+ // NO duplicated element should exists
+ assertTrue("Duplicated global element declarations found in '" +
wsdlPath,
+ duplicatedGlobalElements.isEmpty());
+ }
+
+ protected List findDuplicatedGlobalElements(List schemaDocuments) {
+ List duplicatedGlobalElementDeclarations = new ArrayList();
+ Set globalElementDeclarations = new HashSet();
+ // Iterate over all schema documents
+ for (int i = 0; i < schemaDocuments.size(); i++) {
+ XmlSchema schemaDocument = (XmlSchema)schemaDocuments.get(i);
+ for (XmlSchemaObject xmlSchemaObject : schemaDocument.getItems())
{
+ // Check only XML schema elements
+ if (xmlSchemaObject instanceof XmlSchemaElement) {
+ QName elementName =
((XmlSchemaElement)xmlSchemaObject).getQName();
+ /* Was another element with the same name found in this or
+ other XML schema document? */
+ if (globalElementDeclarations.contains(elementName)) {
+ duplicatedGlobalElementDeclarations.add(elementName);
+ } else {
+ globalElementDeclarations.add(elementName);
+ }
+ }
+ }
+ }
+ return duplicatedGlobalElementDeclarations;
+ }
+
+ private AxisService populateAxisService(AxisConfiguration axisConf, File
wsdlFile) throws IOException {
+ InputStream in = null;
+ try {
+ in = new FileInputStream(wsdlFile);
+ WSDL11ToAxisServiceBuilder wsdl11Builder = new
WSDL11ToAxisServiceBuilder(in);
+ if (axisConf != null) {
+ wsdl11Builder.useAxisConfiguration(axisConf);
+ }
+ AxisService service = wsdl11Builder.populateService();
+ assertNotNull("Could not load AxisService from wsdl: " +
wsdlFile.getAbsolutePath(), service);
+
+ return service;
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+ private void checkOperationActions(AxisService service, AxisOperation
operation, String expectedInputAction, String expectedOutputAction, String
expectedFaultAction) {
+ assertEquals(String.format("Expected that operation '%s' of service
'%s' defines an input action of '%s' but it defines '%s' instead.",
operation.getName(), service.getName(), expectedInputAction,
operation.getInputAction()), expectedInputAction, operation.getInputAction());
+ assertEquals(String.format("Expected that operation '%s' of service
'%s' defines an output action of '%s' but it defines '%s' instead.",
operation.getName(), service.getName(), expectedOutputAction,
operation.getOutputAction()), expectedOutputAction,
operation.getOutputAction());
+ assertEquals(String.format("Expected that operation '%s' of service
'%s' defines an input action of '%s' but it defines '%s' instead.",
operation.getName(), service.getName(), expectedFaultAction,
operation.getFaultAction()), expectedFaultAction, operation.getFaultAction());
+
+ ArrayList<String> wsaMappingList = operation.getWSAMappingList();
+ assertEquals(String.format("Expected that operation '%s' of service
'%s' has a 'wsaMappingList' of size '%d' but size is '%d' instead.",
operation.getName(), service.getName(), 1, wsaMappingList.size()), 1,
wsaMappingList.size());
+ assertTrue(String.format("Expected that the 'wsaMappingList' of
operation '%s' of service '%s' contains an entry of '%s' but it does not.",
operation.getName(), service.getName(), expectedInputAction),
wsaMappingList.contains(expectedInputAction));
+
+ assertSame(String.format("Expected that 'operationsAliasesMap' of
service '%s' contains a '%s' operation for action '%s'.", service.getName(),
operation.getName(), expectedInputAction),
service.getOperationByAction(expectedInputAction), operation);
+ }
+
+ public void testGetVersionActions() throws IOException {
+ AxisConfiguration axisConf = new AxisConfiguration();
+ AxisService service = populateAxisService(axisConf, new
File("test-resources/wsdl/Version.wsdl"));
+
+ String[] operationNames = new String[] {
+ "getVersionWSAW", "getVersionWSA", "getVersionWSAM",
"getVersionWSAWSubmission",
+ "getVersionWSAWURI", "getVersionWSAURI",
"getVersionWSAMURI", "getVersionWSAWSubmissionURI"
+ };
+
+ for (String operationName : operationNames) {
+ QName operationQName = new QName("http://axisversion.sample";,
operationName);
+ AxisOperation operation = service.getOperation(operationQName);
+ assertNotNull(String.format("Could not find AxisOperation '%s'
in service: %s", operationQName.toString(), service.getName()), operation);
+
+ String prefix = operationName.endsWith("URI") ? "ns:Version" :
"http://axisversion.sample";;
+ String expectedInputAction =
String.format("%s/VersionPortType/%sRequest", prefix,
operationQName.getLocalPart());
+ String expectedOutputAction =
String.format("%s/VersionPortType/%sResponse", prefix,
operationQName.getLocalPart());
+ String expectedFaultAction =
String.format("%s/VersionPortType/Fault/%sException", prefix,
operationQName.getLocalPart());
+
+ checkOperationActions(service, operation,
expectedInputAction,expectedOutputAction,expectedFaultAction);
+ }
+ }
+
+ /**
+ * Tests parsing of <code>EchoService.wsdl</code> into an AxisService
instance. The <code>EchoService.wsdl</code>
+ * imports <code>EchoBindings.wsdl</code>, which contains the binding
definitions (note that it does not reverse-import the EchoService.wsdl).
+ * Parsing the wsdl should cause neither a "There is no port type
associated with the binding" exception, nor a "Cannot determine the MEP"
exception,
+ * provided that Axis2 does not recursively search the port type in all
imported wsdls, but looks it up via {@link
javax.wsdl.Definition#getPortType(QName)},
+ * falling back to {@link javax.wsdl.Binding#getPortType()} if not
available (will be the case when port type is imported through another document
but not directly)
+ *
+ * The test verifies that no exceptions are thrown and additionally
checks that the endpoint, binding, operation and its in/out messages are
correctly populated from the WSDL definition.
+ * @throws IOException
+ */
+ public void testImportedBindings() throws IOException {
+ AxisConfiguration axisConf = new AxisConfiguration();
+ WSDLLocator wsdlLocator = new
CustomWSDLLocator("test-resources/wsdl/imports/binding/", "EchoService.wsdl");
+ AxisService service = populateAxisService(axisConf, new
File(wsdlLocator.getBaseURI()), wsdlLocator);
+ assertValidEchoService(service, wsdlLocator);
+ }
+
+ /**
+ * Tests parsing of <code>EchoService.wsdl</code> into an AxisService
instance. The <code>EchoService.wsdl</code>
+ * imports <code>EchoBindings.wsdl</code>, which reverse-imports the
EchoService.wsdl (i.e. we have a circular import).
+ * Parsing the wsdl should cause neither a "There is no port type
associated with the binding" exception, nor a "Cannot determine the MEP"
exception,
+ * provided that Axis2 does not recursively search the port type in all
imported wsdls, but looks it up via {@link
javax.wsdl.Definition#getPortType(QName)},
+ * falling back to {@link javax.wsdl.Binding#getPortType()} if not
available (will be the case when port type is imported through another document
but not directly)
+ *
+ * The test verifies that no exceptions are thrown and additionally
checks that the endpoint, binding, operation and its in/out messages are
correctly populated from the WSDL definition.
+ * @throws IOException
+ */
+ public void testCircularImportedBindings() throws IOException {
+ AxisConfiguration axisConf = new AxisConfiguration();
+ WSDLLocator wsdlLocator = new
CustomWSDLLocator("test-resources/wsdl/imports/binding_recursive/",
"EchoService.wsdl");
+ AxisService service = populateAxisService(axisConf, new
File(wsdlLocator.getBaseURI()), wsdlLocator);
+ assertValidEchoService(service, wsdlLocator);
+ }
+
+ /**
+ * Tests parsing of <code>EchoService.wsdl</code> into an AxisService
instance. The <code>EchoService.wsdl</code>
+ * imports <code>EchoBindings.wsdl</code>, which in turn imports the
<code>EchoPortType.wsdl</code>.
+ * Parsing the wsdl should cause neither a "There is no port type
associated with the binding" exception, nor a "Cannot determine the MEP"
exception,
+ * provided that Axis2 does not recursively search the port type in all
imported wsdls, but looks it up via {@link
javax.wsdl.Definition#getPortType(QName)},
+ * falling back to {@link javax.wsdl.Binding#getPortType()} if not
available (will be the case when port type is imported through another document
but not directly)
+ *
+ * The test verifies that no exceptions are thrown and additionally
checks that the endpoint, binding, operation and its in/out messages are
correctly populated from the WSDL definition.
+ * @throws IOException
+ */
+ public void testImportedPortType() throws IOException {
+ AxisConfiguration axisConf = new AxisConfiguration();
+ WSDLLocator wsdlLocator = new
CustomWSDLLocator("test-resources/wsdl/imports/portType/", "EchoService.wsdl");
+ AxisService service = populateAxisService(axisConf, new
File(wsdlLocator.getBaseURI()), wsdlLocator);
+ assertValidEchoService(service, wsdlLocator);
+ }
+
+ private void assertValidEchoService(AxisService echoService, WSDLLocator
wsdlLocator) {
+ //check soap12 endpoint and binding are available
+ String endpointName = "EchoServiceHttpSoap12Endpoint";
+ AxisEndpoint soap12Endpoint = echoService.getEndpoint(endpointName);
+ assertNotNull(String.format("Cannot find %s endpoint in wsdl
definition: %s", endpointName, wsdlLocator.getBaseURI()), soap12Endpoint);
+
+ AxisBinding soap12Binding = soap12Endpoint.getBinding();
+ assertNotNull(String.format("Binding not set on %s endpoint in wsdl
definition: %s", endpointName, wsdlLocator.getBaseURI()), soap12Binding);
+
+ //check that policy reference is present on the binding subject
+ String bindingPolicyRefId = "#basicAuthPolicy";
+ assertNotNull(String.format("Cannot find policy reference %s on
binding %s", bindingPolicyRefId, soap12Binding.getName()),
+
soap12Binding.getPolicySubject().getAttachedPolicyComponent(bindingPolicyRefId));
+
+ //check that binding operation and respective operation are available
+ QName echoBindingOpName = new QName("http://tempuri.org/bindings";,
"echo");
+ AxisBindingOperation echoBindingOp = (AxisBindingOperation)
soap12Binding.getChild(echoBindingOpName);
+ assertNotNull(String.format("Cannot find %s binding operation on
binding %s", echoBindingOpName, soap12Binding), echoBindingOp);
+
+ AxisOperation echoOp = echoBindingOp.getAxisOperation();
+ assertNotNull(String.format("Operation not set on binding operation
%s", echoBindingOp.getName()), echoOp);
+
+ //check that operation style is correctly identified and an operation
with respective mep is created
+ assertTrue(String.format("Operation %s is not an instance of %s",
echoOp.getName(), InOutAxisOperation.class.getName()), echoOp instanceof
InOutAxisOperation);
+ assertEquals(String.format("Operation %s specifies an unexpected MEP
uri: %s", echoOp.getName(), echoOp.getMessageExchangePattern()),
+ WSDL2Constants.MEP_URI_IN_OUT,
echoOp.getMessageExchangePattern());
+
+ //check in/out messages
+ AxisMessage inMessage =
echoOp.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ assertNotNull(String.format("No input message set on operation %s",
echoOp.getName()), inMessage);
+ QName echoInMessageName = new QName("http://tempuri.org/types";,
"echo");
+ assertEquals(String.format("Unexpected input message QName set on
operation %s", echoOp.getName()), echoInMessageName,
inMessage.getElementQName());
+ //message name is 'echoRequest' whereas the QName's local name is
simply 'echo'
+ assertEquals(String.format("Unexpected input message name set on
operation %s", echoOp.getName()), "echoRequest", inMessage.getName());
+
+ AxisMessage outMessage =
echoOp.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+ assertNotNull(String.format("No output message set on operation %s",
echoOp.getName()), outMessage);
+ QName echoOutMessageName = new QName("http://tempuri.org/types";,
"echoResponse");
+ assertEquals(String.format("Unexpected output message QName set on
operation %s", echoOp.getName()), echoOutMessageName,
outMessage.getElementQName());
+ assertEquals(String.format("Unexpected output message name set on
operation %s", echoOp.getName()), echoOutMessageName.getLocalPart(),
outMessage.getName());
+ }
+
+ private AxisService populateAxisService(AxisConfiguration axisConf, File
wsdlFile, WSDLLocator wsdlLocator) throws IOException {
+ InputStream in = null;
+ try {
+ in = new FileInputStream(wsdlFile);
+ WSDL11ToAxisServiceBuilder wsdl11Builder = new
WSDL11ToAxisServiceBuilder(in);
+ if (wsdlLocator != null) {
+ wsdl11Builder.setCustomWSDLResolver(wsdlLocator);
+ }
+
wsdl11Builder.setDocumentBaseUri(wsdlFile.getParentFile().toURI().toString());
+ if (axisConf != null) {
+ wsdl11Builder.useAxisConfiguration(axisConf);
+ }
+ AxisService service = wsdl11Builder.populateService();
+ assertNotNull("Could not load AxisService from wsdl: " +
wsdlFile.getAbsolutePath(), service);
+
+ return service;
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+ //custom locator that can located imported wsdls relative to the base
wsdl uri (code borrowed from wsdl4j)
+ class CustomWSDLLocator implements WSDLLocator {
+ private String wsdlURI;
+
+ private InputSource baseInputSource;
+ private Map<String, InputSource> importInputSources = new
HashMap<String, InputSource>();
+ private boolean closed = false;
+ private String baseURI;
+ private String lastImportURI;
+
+ public CustomWSDLLocator(String baseURI, String wsdlURI) {
+ this.baseURI = baseURI;
+ this.wsdlURI = wsdlURI;
+ }
+
+ public InputSource getBaseInputSource() {
+ if (baseInputSource == null) {
+ lastImportURI = baseURI + wsdlURI;
+ baseInputSource = new InputSource(lastImportURI);
+ }
+ return baseInputSource;
+ }
+
+ public InputSource getImportInputSource(String parentLocation, String
importLocation) {
+ InputSource inSource = (InputSource)
importInputSources.get(importLocation);
+ if (inSource == null) {
+ lastImportURI = baseURI + importLocation;
+ inSource = new InputSource(lastImportURI);
+ importInputSources.put(importLocation, inSource);
+ }
+ return inSource;
+ }
+
+ public String getBaseURI() {
+ return baseURI + wsdlURI;
+ }
+
+ public String getLatestImportURI() {
+ return lastImportURI;
+ }
+
+ public void close() {
+ closed = true;
+ }
+
+ public boolean isClosed() {
+ return closed;
+ }
+ }
}
