You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2018/12/27 18:42:36 UTC
svn commit: r1849802 [1/11] - in
/axis/axis2/java/core/branches/hermetic-tests: ./ apidocs/
databinding-tests/jaxbri-tests/
databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/
databinding-tests/jaxbri-tests/src/test/java/org/apache/ax...
Author: veithen
Date: Thu Dec 27 18:42:33 2018
New Revision: 1849802
URL: http://svn.apache.org/viewvc?rev=1849802&view=rev
Log:
Merge latest changes from trunk.
Added:
axis/axis2/java/core/branches/hermetic-tests/.travis-settings.xml
- copied unchanged from r1849801, axis/axis2/java/core/trunk/.travis-settings.xml
axis/axis2/java/core/branches/hermetic-tests/.travis.yml
- copied unchanged from r1849801, axis/axis2/java/core/trunk/.travis.yml
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/axis2_5919/
- copied from r1849801, axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/axis2_5919/
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/wsdl/AXIS2-5919.wsdl
- copied unchanged from r1849801, axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/wsdl/AXIS2-5919.wsdl
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/
- copied from r1849801, axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/resources/
- copied from r1849801, axis/axis2/java/core/trunk/modules/adb-tests/src/test/resources/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl
axis/axis2/java/core/branches/hermetic-tests/modules/codegen/src/org/apache/axis2/util/XSLTTemplateProcessor.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/util/XSLTTemplateProcessor.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxbri-codegen/
- copied from r1849801, axis/axis2/java/core/trunk/modules/jaxbri-codegen/
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/src/test/java/
- copied from r1849801, axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/src/test/servicejars/
- copied from r1849801, axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/servicejars/
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/util/LogWriter.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/LogWriter.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/src/main/
- copied from r1849801, axis/axis2/java/core/trunk/modules/samples/jaxws-interop/src/main/
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/src/test/
- copied from r1849801, axis/axis2/java/core/trunk/modules/samples/jaxws-interop/src/test/
axis/axis2/java/core/branches/hermetic-tests/modules/schema-validation/
- copied from r1849801, axis/axis2/java/core/trunk/modules/schema-validation/
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractConfigurationContextRule.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractConfigurationContextRule.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AxisServiceFactory.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/AxisServiceFactory.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Junit4ClassRunnerWithRuntimeIgnore.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/Junit4ClassRunnerWithRuntimeIgnore.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/SimpleAxisServiceFactory.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/SimpleAxisServiceFactory.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/jaxws/
- copied from r1849801, axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/jaxws/
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/ws/java2wsdl/Mapper.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/ws/java2wsdl/Mapper.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/ws/java2wsdl/MappingSet.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/ws/java2wsdl/MappingSet.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/ws/java2wsdl/NamespaceMapping.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/ws/java2wsdl/NamespaceMapping.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/JarFileWriter.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/JarFileWriter.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/SrcCompiler.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/SrcCompiler.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Deployer.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Deployer.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Handler.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Handler.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Parameter.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Parameter.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ServiceDescription.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ServiceDescription.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Transport.java
- copied unchanged from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/Transport.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/src/main/resources/
- copied from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/resources/
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-xsd2java-maven-plugin/src/main/resources/
- copied from r1849801, axis/axis2/java/core/trunk/modules/tool/axis2-xsd2java-maven-plugin/src/main/resources/
axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans-codegen/
- copied from r1849801, axis/axis2/java/core/trunk/modules/xmlbeans-codegen/
axis/axis2/java/core/branches/hermetic-tests/systests/SOAP12TestModuleB/
- copied from r1849801, axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/
axis/axis2/java/core/branches/hermetic-tests/systests/SOAP12TestModuleC/
- copied from r1849801, axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/
axis/axis2/java/core/branches/hermetic-tests/systests/SOAP12TestServiceB/
- copied from r1849801, axis/axis2/java/core/trunk/systests/SOAP12TestServiceB/
axis/axis2/java/core/branches/hermetic-tests/systests/SOAP12TestServiceC/
- copied from r1849801, axis/axis2/java/core/trunk/systests/SOAP12TestServiceC/
axis/axis2/java/core/branches/hermetic-tests/systests/echo/
- copied from r1849801, axis/axis2/java/core/trunk/systests/echo/
Removed:
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/repo/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/repo/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/xslt/
axis/axis2/java/core/branches/hermetic-tests/modules/integration/conf/
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test-resources/xsd/type-test.xsd
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/om/OMAttributeTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/java2wsdl/src/org/apache/ws/java2wsdl/Mapper.java
axis/axis2/java/core/branches/hermetic-tests/modules/java2wsdl/src/org/apache/ws/java2wsdl/MappingSet.java
axis/axis2/java/core/branches/hermetic-tests/modules/java2wsdl/src/org/apache/ws/java2wsdl/NamespaceMapping.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxbri/
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test-resources/wsdl/ProxyDocLitnonWrapped.wsdl
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test-resources/wsdl/gorilla_dlw.wsdl
axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/Echo.java
axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/repo/
axis/axis2/java/core/branches/hermetic-tests/modules/json/test-repository/gson/axis2.xml
axis/axis2/java/core/branches/hermetic-tests/modules/json/test-repository/json/axis2.xml
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/util/XSLTTemplateProcessor.java
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/resources/
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/src/com/
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/src/org/
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/UtilServer.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/FileCopier.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/JarFileWriter.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/SrcCompiler.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/util/
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java
axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/src/org/apache/axis2/xmlbeans/XSDConfig.java
axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/
Modified:
axis/axis2/java/core/branches/hermetic-tests/ (props changed)
axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
axis/axis2/java/core/branches/hermetic-tests/etc/dist.py
axis/axis2/java/core/branches/hermetic-tests/etc/doap_Axis2.rdf
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/schema/union2/Union2Test.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/adb/src/org/apache/axis2/databinding/ADBException.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb/src/org/apache/axis2/databinding/DataBindException.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
axis/axis2/java/core/branches/hermetic-tests/modules/clustering/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
axis/axis2/java/core/branches/hermetic-tests/modules/corba/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
axis/axis2/java/core/branches/hermetic-tests/modules/distribution/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/branches/hermetic-tests/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/itest-build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/integration/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test-resources/jaxrs/pojoTestModule/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/engine/ServiceClientTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/integration/UtilServer.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java
axis/axis2/java/core/branches/hermetic-tests/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/java2wsdl/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
axis/axis2/java/core/branches/hermetic-tests/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/handler/soapheadersadapter/SOAPHeadersAdapterTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/jibx-codegen/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
axis/axis2/java/core/branches/hermetic-tests/modules/jibx/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/json/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/Constants.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/AxisService.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test-resources/deployment/echo/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test-resources/deployment/invalidservice/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test-resources/deployment/module1/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test-resources/deployment/service2/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test-resources/deployment/serviceModule/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/description/WSDLWrapperTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/transport/http/MultipartFormDataFormatterTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/src/org/apache/axis2/jaxws/util/CatalogWSDLLocator.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/src/org/apache/axis2/jaxws/util/ModuleWSDLLocator.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportEndpointTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportHandlersTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/osgi-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/osgi-tests/src/test/java/OSGiTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/osgi/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-addressbook/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-samples/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/src/META-INF/services.xml
axis/axis2/java/core/branches/hermetic-tests/modules/samples/transport/jms-sample/jmsService/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java
axis/axis2/java/core/branches/hermetic-tests/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarExplodedMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarInPlaceMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateSourcesMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/GenerateTestSourcesMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/AbstractXSD2JavaMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/GenerateSourcesMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/GenerateTestSourcesMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterExAdapter.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/base/src/test/java/org/apache/axis2/format/PlainTextFormatterTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/jms/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/transport/mail/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/tcp/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/scripts/build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminActions.java
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/SelectService.jsp
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/activateService.jsp
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/deactivateService.jsp
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/engageToService.jsp
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listServices.jsp
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/admin/listSingleService.jsp
axis/axis2/java/core/branches/hermetic-tests/modules/webapp/src/main/webapp/WEB-INF/views/listServices.jsp
axis/axis2/java/core/branches/hermetic-tests/modules/xmlbeans/pom.xml
axis/axis2/java/core/branches/hermetic-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/download.md.vm
axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md
axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/axis2config.xml
axis/axis2/java/core/branches/hermetic-tests/systests/ (props changed)
axis/axis2/java/core/branches/hermetic-tests/systests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
axis/axis2/java/core/branches/hermetic-tests/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java
Propchange: axis/axis2/java/core/branches/hermetic-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 27 18:42:33 2018
@@ -3,4 +3,5 @@
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
/axis/axis2/java/core/branches/AXIS2-5785:1793298-1793391
/axis/axis2/java/core/branches/google-java-format:1800516-1800554
-/axis/axis2/java/core/trunk:1779063-1805674
+/axis/axis2/java/core/branches/schema-validation:1818704-1820349
+/axis/axis2/java/core/trunk:1779063-1849801
Modified: axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml Thu Dec 27 18:42:33 2018
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-jaxbri</artifactId>
+ <artifactId>axis2-jaxbri-codegen</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -274,6 +274,27 @@
</dependencies>
<build>
<plugins>
+ <!-- https://issues.apache.org/jira/browse/MJAVADOC-469 -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-javadoc-compat-out-dir</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>javadoc-compat-out-dir</name>
+ <value>${project.build.directory}</value>
+ <regex>\\</regex>
+ <replacement>\\\\</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
@@ -294,7 +315,7 @@
<doclet>org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet</doclet>
<useStandardDocletOptions>false</useStandardDocletOptions>
<show>private</show>
- <additionalparam>-out ${project.build.directory}/resource-info.dat</additionalparam>
+ <additionalparam>-out "${javadoc-compat-out-dir}/resource-info.dat"</additionalparam>
</configuration>
</execution>
<execution>
@@ -314,7 +335,8 @@
<doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
<useStandardDocletOptions>true</useStandardDocletOptions>
<additionalparam>
- -resource-info ${project.build.directory}/resource-info.dat
+ ${javadoc.nolint.param}
+ -resource-info "${javadoc-compat-out-dir}/resource-info.dat"
</additionalparam>
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
<destDir>.</destDir>
@@ -323,11 +345,10 @@
</executions>
<configuration>
<additionalJOption>-J-Xmx256m</additionalJOption>
+ <detectJavaApiLink>false</detectJavaApiLink>
<links>
- <link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
- <link>http://docs.oracle.com/javaee/5/api/</link>
+ <link>https://docs.oracle.com/javase/7/docs/api/</link>
<link>http://ws.apache.org/axiom/apidocs/</link>
- <link>http://jaxen.org/apidocs/</link>
</links>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
Modified: axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/pom.xml Thu Dec 27 18:42:33 2018
@@ -29,16 +29,13 @@
<url>http://axis.apache.org/axis2/java/core/</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-jaxbri</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-jaxb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -180,102 +177,147 @@
<outputDirectory>${project.build.directory}/gen/mtom</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>wsdl2code-axis2-5919</id>
+ <goals>
+ <goal>generate-test-sources</goal>
+ </goals>
+ <configuration>
+ <wsdlFile>src/test/wsdl/AXIS2-5919.wsdl</wsdlFile>
+ <generateServerSide>true</generateServerSide>
+ <generateServerSideInterface>true</generateServerSideInterface>
+ <generateServicesXml>true</generateServicesXml>
+ <generateAllClasses>true</generateAllClasses>
+ <outputDirectory>${project.build.directory}/gen/AXIS2-5919</outputDirectory>
+ </configuration>
+ </execution>
</executions>
<configuration>
<databindingName>jaxbri</databindingName>
<syncMode>sync</syncMode>
<unpackClasses>true</unpackClasses>
</configuration>
- <dependencies>
- <dependency>
- <!-- Work around "'file' access is not allowed due to restriction set by
- the accessExternalSchema property" error on Java 8. -->
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<id>Test01-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/Test01</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/Test01/resources</directory>
- <targetPath>services/Test01.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.Test01Impl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>processor-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/processor</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/processor/resources</directory>
- <targetPath>services/processor.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.processor.ProcessorImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>identityservice-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/identityservice</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/identityservice/resources</directory>
- <targetPath>services/identityservice.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <scope>application</scope>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.identityservice.IdentityLinkingServiceImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>mtom-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/mtom</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/mtom/resources</directory>
- <targetPath>services/mtom.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <scope>application</scope>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.mtom.MtomImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
+ <generatedAxis2xml>
+ <parameters>
+ <parameter>
+ <name>enableMTOM</name>
+ <value>true</value>
+ </parameter>
+ </parameters>
+ </generatedAxis2xml>
+ </configuration>
+ </execution>
+ <execution>
+ <id>axis2-5919-repo</id>
+ <goals>
+ <goal>create-test-repository</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/repo/AXIS2-5919</outputDirectory>
+ <serviceDescriptions>
+ <serviceDescription>
+ <directory>${project.build.directory}/gen/AXIS2-5919/resources</directory>
+ <scope>application</scope>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.jaxbri.axis2_5919.FaultServiceImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
</executions>
+ <configuration>
+ <generatedAxis2xml/>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java Thu Dec 27 18:42:33 2018
@@ -20,12 +20,9 @@ package org.apache.axis2.jaxbri;
import static org.junit.Assert.assertEquals;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.testutils.UtilServer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.axis2.testutils.Axis2Server;
+import org.apache.axis2.testutils.ClientHelper;
+import org.junit.ClassRule;
import org.junit.Test;
import com.foo.wsns.axis2.test01.Test01;
@@ -33,22 +30,15 @@ import com.foo.wsns.axis2.test01.Test01S
import com.foo.xmlns.axis2.test01.Add;
public class Test01Test {
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/Test01");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("Test01");
- service.getParameter(Constants.SERVICE_CLASS).setValue(Test01Impl.class.getName());
- }
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/Test01");
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static ClientHelper clientHelper = new ClientHelper(server);
@Test
public void test() throws Exception {
- Test01 stub = new Test01Stub(UtilServer.getConfigurationContext(), "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/Test01");
+ Test01 stub = clientHelper.createStub(Test01Stub.class, "Test01");
Add add = new Add();
add.setArg1(3);
add.setArg2(4);
Modified: axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java Thu Dec 27 18:42:33 2018
@@ -18,37 +18,25 @@
*/
package org.apache.axis2.jaxbri.identityservice;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.testutils.UtilServer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.axis2.testutils.Axis2Server;
+import org.apache.axis2.testutils.ClientHelper;
+import org.junit.ClassRule;
import org.junit.Test;
/**
* Regression test for AXIS2-4197.
*/
public class IdentityServiceTest {
- private static final String ENDPOINT = "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/IdentityLinkingService";
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/identityservice");
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/identityservice");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("IdentityLinkingService");
- service.getParameter(Constants.SERVICE_CLASS).setValue(IdentityLinkingServiceImpl.class.getName());
- service.setScope(Constants.SCOPE_APPLICATION);
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static ClientHelper clientHelper = new ClientHelper(server);
@Test
public void test() throws Exception {
- IdentityLinkingService stub = new IdentityLinkingServiceStub(UtilServer.getConfigurationContext(), ENDPOINT);
+ IdentityLinkingService stub = clientHelper.createStub(
+ IdentityLinkingServiceStub.class, "IdentityLinkingService");
LinkIdentitiesType linkIdentities = new LinkIdentitiesType();
linkIdentities.setOwningPlatform("test");
stub.createLinkedIdentities(linkIdentities);
Modified: axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java Thu Dec 27 18:42:33 2018
@@ -23,35 +23,21 @@ import javax.activation.DataSource;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.testutils.UtilServer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.axis2.testutils.Axis2Server;
+import org.apache.axis2.testutils.ClientHelper;
+import org.junit.ClassRule;
import org.junit.Test;
public class MtomTest {
- private static final String ENDPOINT = "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/mtom";
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/mtom");
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/mtom");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- axisConfiguration.getParameter(Constants.Configuration.ENABLE_MTOM).setValue(true);
- AxisService service = axisConfiguration.getService("mtom");
- service.getParameter(Constants.SERVICE_CLASS).setValue(MtomImpl.class.getName());
- service.setScope(Constants.SCOPE_APPLICATION);
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static ClientHelper clientHelper = new ClientHelper(server);
@Test
public void test() throws Exception {
- MtomStub stub = new MtomStub(UtilServer.getConfigurationContext(), ENDPOINT);
+ MtomStub stub = clientHelper.createStub(MtomStub.class, "mtom");
UploadDocument uploadRequest = new UploadDocument();
DataSource contentDS = new RandomDataSource(1234567L, 1024);
uploadRequest.setContent(new DataHandler(contentDS));
Modified: axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java Thu Dec 27 18:42:33 2018
@@ -29,20 +29,17 @@ import javax.xml.transform.dom.DOMResult
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.jaxbri.processor.client.Processor;
import org.apache.axis2.jaxbri.processor.client.ProcessorStub;
import org.apache.axis2.jaxbri.processor.data.ReplyMessage;
import org.apache.axis2.jaxbri.processor.data.RequestMessage;
-import org.apache.axis2.testutils.UtilServer;
+import org.apache.axis2.testutils.Axis2Server;
+import org.apache.axis2.testutils.ClientHelper;
import org.custommonkey.xmlunit.XMLAssert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -50,24 +47,15 @@ import org.w3c.dom.Document;
* Regression test for AXIS2-5147.
*/
public class ProcessorTest {
- private static final String ENDPOINT = "http://127.0.0.1:" + UtilServer.TESTING_PORT + "/axis2/services/Processor";
+ @ClassRule
+ public static Axis2Server server = new Axis2Server("target/repo/processor");
- @BeforeClass
- public static void startServer() throws Exception {
- UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/processor");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("Processor");
- service.getParameter(Constants.SERVICE_CLASS).setValue(ProcessorImpl.class.getName());
- }
-
- @AfterClass
- public static void stopServer() throws Exception {
- UtilServer.stop();
- }
+ @ClassRule
+ public static ClientHelper clientHelper = new ClientHelper(server);
@Test
public void testStub() throws Exception {
- Processor stub = new ProcessorStub(UtilServer.getConfigurationContext(), ENDPOINT);
+ Processor stub = clientHelper.createStub(ProcessorStub.class, "Processor");
RequestMessage request = new RequestMessage();
request.setRequestID("A3TN39840");
request.setRequestData("DATA");
@@ -85,9 +73,9 @@ public class ProcessorTest {
InputStream in = ProcessorTest.class.getResourceAsStream("request.xml");
try {
OMElement request = OMXMLBuilderFactory.createOMBuilder(in).getDocumentElement();
- ServiceClient client = new ServiceClient(UtilServer.getConfigurationContext(), null);
+ ServiceClient client = new ServiceClient(server.getConfigurationContext(), null);
Options options = client.getOptions();
- options.setTo(new EndpointReference(ENDPOINT));
+ options.setTo(new EndpointReference(server.getEndpoint("Processor")));
try {
OMElement omResponse = client.sendReceive(request);
TransformerFactory.newInstance().newTransformer().transform(omResponse.getSAXSource(false), new DOMResult(response));
Modified: axis/axis2/java/core/branches/hermetic-tests/etc/dist.py
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/etc/dist.py?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/etc/dist.py (original)
+++ axis/axis2/java/core/branches/hermetic-tests/etc/dist.py Thu Dec 27 18:42:33 2018
@@ -34,7 +34,7 @@ if exists(dist_root):
rmtree(dist_root)
call(["svn", "checkout", "https://dist.apache.org/repos/dist/dev/axis/axis2/java/core/", dist_root])
mkdir(dist_dir)
-for suffix in [ "zip", "zip.asc", "zip.md5", "zip.sha1" ]:
+for suffix in [ "zip", "zip.asc", "zip.sha512" ]:
for classifier in [ "bin", "src", "war" ]:
file = "axis2-" + release + "-" + classifier + "." + suffix
copyfile(join(root_dir, "modules", "distribution", "target", file), join(dist_dir, file))
Modified: axis/axis2/java/core/branches/hermetic-tests/etc/doap_Axis2.rdf
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/etc/doap_Axis2.rdf?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/etc/doap_Axis2.rdf (original)
+++ axis/axis2/java/core/branches/hermetic-tests/etc/doap_Axis2.rdf Thu Dec 27 18:42:33 2018
@@ -71,6 +71,9 @@
<release><Version><name>Apache Axis2</name><created>2016-10-21</created><revision>1.7.4</revision></Version></release>
<release><Version><name>Apache Axis2</name><created>2017-05-06</created><revision>1.7.5</revision></Version></release>
<release><Version><name>Apache Axis2</name><created>2017-07-30</created><revision>1.7.6</revision></Version></release>
+ <release><Version><name>Apache Axis2</name><created>2017-11-22</created><revision>1.7.7</revision></Version></release>
+ <release><Version><name>Apache Axis2</name><created>2018-05-19</created><revision>1.7.8</revision></Version></release>
+ <release><Version><name>Apache Axis2</name><created>2018-11-16</created><revision>1.7.9</revision></Version></release>
<repository>
<SVNRepository>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl Thu Dec 27 18:42:33 2018
@@ -2162,7 +2162,6 @@
<xsl:variable name="particleClassType" select="@particleClassType"></xsl:variable>
<xsl:variable name="propQName">new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>")</xsl:variable>
- <xsl:variable name="propQName2">new javax.xml.namespace.QName("","<xsl:value-of select="$propertyName"/>")</xsl:variable>
<xsl:choose>
<xsl:when test="$unordered and not($choice and $hasParticleType)"> <!-- One property per iteration if unordered -->
@@ -2187,7 +2186,7 @@
we have to sollow an excpetions : todo find a better solsution-->
try{
</xsl:if>
- if (reader.isStartElement() <xsl:if test="$simple"> || reader.hasText()</xsl:if> <xsl:if test="not($simple) and not($particleClassType)">&& <xsl:value-of select="$propQName"/>.equals(reader.getName()) || <xsl:value-of select="$propQName2"/>.equals(reader.getName()) </xsl:if>){
+ if (reader.isStartElement() <xsl:if test="$simple"> || reader.hasText()</xsl:if> <xsl:if test="not($simple) and not($particleClassType)">&& <xsl:value-of select="$propQName"/>.equals(reader.getName())</xsl:if>){
</xsl:otherwise>
</xsl:choose>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml Thu Dec 27 18:42:33 2018
@@ -44,12 +44,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -84,6 +78,13 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>schema-validation</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -321,80 +322,121 @@
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5809</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>wsdl2code-axis2-5887</id>
+ <goals>
+ <goal>generate-test-sources</goal>
+ </goals>
+ <configuration>
+ <wsdlFile>src/test/wsdl/AXIS2-5887.wsdl</wsdlFile>
+ <syncMode>sync</syncMode>
+ <unpackClasses>true</unpackClasses>
+ <namespaceMappings>
+ <namespaceMapping>
+ <uri>webservice/xtc/plugins/Speed4Trade/com</uri>
+ <packageName>org.apache.axis2.databinding.axis2_5887.client</packageName>
+ </namespaceMapping>
+ </namespaceMappings>
+ <packageName>org.apache.axis2.databinding.axis2_5887.client</packageName>
+ <outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5887</outputDirectory>
+ </configuration>
+ </execution>
</executions>
<configuration>
<databindingName>adb</databindingName>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
- <phase>generate-test-resources</phase>
+ <id>client-repo</id>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/repo</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <outputDirectory>${project.build.directory}/repo/client</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>repo-axis2-5741</id>
+ <goals>
+ <goal>create-test-repository</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/repo/AXIS2-5741</outputDirectory>
+ <serviceDescriptions>
+ <serviceDescription>
+ <directory>${project.build.directory}/wsdl2code/AXIS2-5741/resources</directory>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.databinding.axis2_5741.service.FiverxLinkServiceImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>repo-axis2-5749</id>
+ <goals>
+ <goal>create-test-repository</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/repo/AXIS2-5749</outputDirectory>
+ <serviceDescriptions>
+ <serviceDescription>
+ <directory>${project.build.directory}/wsdl2code/AXIS2-5749/resources</directory>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.databinding.axis2_5749.service.ColorServiceImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
<execution>
- <phase>generate-test-resources</phase>
+ <id>repo-axis2-5809</id>
<goals>
- <goal>transform</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
- <transformationSets>
- <transformationSet>
- <dir>${project.build.directory}/wsdl2code/AXIS2-5741/resources</dir>
- <includes>
- <include>services.xml</include>
- </includes>
- <stylesheet>src/test/xslt/AXIS2-5741.xsl</stylesheet>
- <outputDir>${project.build.directory}/repo/AXIS2-5741/services/FiverxLinkService/META-INF</outputDir>
- </transformationSet>
- <transformationSet>
- <dir>${project.build.directory}/wsdl2code/AXIS2-5749/resources</dir>
- <includes>
- <include>services.xml</include>
- </includes>
- <stylesheet>src/test/xslt/AXIS2-5749.xsl</stylesheet>
- <outputDir>${project.build.directory}/repo/AXIS2-5749/services/ColorService/META-INF</outputDir>
- </transformationSet>
- <transformationSet>
- <dir>${project.build.directory}/wsdl2code/AXIS2-5809/resources</dir>
- <includes>
- <include>services.xml</include>
- </includes>
- <stylesheet>src/test/xslt/AXIS2-5809.xsl</stylesheet>
- <outputDir>${project.build.directory}/repo/AXIS2-5809/services/EchoService/META-INF</outputDir>
- </transformationSet>
- </transformationSets>
+ <outputDirectory>${project.build.directory}/repo/AXIS2-5809</outputDirectory>
+ <serviceDescriptions>
+ <serviceDescription>
+ <directory>${project.build.directory}/wsdl2code/AXIS2-5809/resources</directory>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+ <value>org.apache.axis2.databinding.axis2_5809.EchoServiceImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
</executions>
+ <configuration>
+ <generatedAxis2xml>
+ <modules>
+ <module>schema-validation</module>
+ </modules>
+ </generatedAxis2xml>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>wsimport-maven-plugin</artifactId>
<executions>
<execution>
<id>wsimport-mtom</id>
<goals>
- <goal>wsimport-test</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
<wsdlFiles>
@@ -406,31 +448,33 @@
<execution>
<id>wsimport-axis2-5741</id>
<goals>
- <goal>wsimport-test</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
<wsdlFiles>
<wsdlFile>${basedir}/src/test/wsdl/AXIS2-5741.wsdl</wsdlFile>
</wsdlFiles>
<packageName>org.apache.axis2.databinding.axis2_5741.client</packageName>
+ <generateService>true</generateService>
</configuration>
</execution>
<execution>
<id>wsimport-axis2-5749</id>
<goals>
- <goal>wsimport-test</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
<wsdlFiles>
<wsdlFile>${basedir}/src/test/wsdl/AXIS2-5749.wsdl</wsdlFile>
</wsdlFiles>
<packageName>org.apache.axis2.databinding.axis2_5749.client</packageName>
+ <generateService>true</generateService>
</configuration>
</execution>
<execution>
<id>wsimport-axis2-5750</id>
<goals>
- <goal>wsimport-test</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
<wsdlFiles>
@@ -442,7 +486,7 @@
<execution>
<id>wsimport-axis2-5758</id>
<goals>
- <goal>wsimport-test</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
<wsdlFiles>
@@ -454,7 +498,7 @@
<execution>
<id>wsimport-axis2-5799</id>
<goals>
- <goal>wsimport-test</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
<wsdlFiles>