This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch AXIS-2882 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit e995dd6a69af8dcf6ce4267c1be1a2862b544154 Merge: cf18b49 9e16c33 Author: Andreas Veithen <veit...@apache.org> AuthorDate: Fri Dec 7 17:23:31 2012 +0000 Merged latest changes from trunk. .../tools/ant/wsdl/CustomGeneratorFactoryTest.java | 2 +- .../java/test/wsdl/clash/VerifyFilesTestCase.java | 3 +- .../java/test/wsdl/extra/ExtraClassesTestCase.java | 3 +- .../java/test/wsdl/filegen/AllOptionTestCase.java | 3 +- .../java/test/wsdl/filegen/FileGenTestCase.java | 3 +- .../test/java/test/wsdl/groups/GroupsTestCase.java | 3 +- .../java/test/wsdl/header/VerifyFilesTestCase.java | 3 +- .../literal/SalesRankNPrice_ServiceTestCase.java | 3 +- .../wsdl/multibinding/VerifyFilesTestCase.java | 3 +- .../wsdl/schemaImport/SchemaImportTestCase.java | 3 +- .../test/java/test/wsdl/split/SplitTestCase.java | 3 +- axis-codegen/pom.xml | 9 + .../apache/axis/wsdl/toJava/JavaDeployWriter.java | 326 +- axis-model/model/axis.genmodel | 117 + axis-model/model/soap.ecore | 8 + axis-model/model/wsdd.ecore | 209 ++ axis-model/model/xml.ecore | 7 + {axis => axis-model}/pom.xml | 76 +- .../org/apache/axis/model/soap/SOAPFactory.java | 26 + .../axis/model/soap/impl/SOAPFactoryImpl.java | 146 + .../axis/model/soap/impl/SOAPPackageImpl.java | 302 ++ .../org/apache/axis/model/util/AxisXMLHelper.java | 106 + .../apache/axis/model/util/AxisXMLResource.java | 67 + .../org/apache/axis/model/wsdd/ArrayMapping.java | 53 + .../org/apache/axis/model/wsdd/BeanMapping.java | 20 + .../org/apache/axis/model/wsdd/DeployableItem.java | 78 + .../org/apache/axis/model/wsdd/Deployment.java | 138 + .../java/org/apache/axis/model/wsdd/Fault.java | 130 + .../main/java/org/apache/axis/model/wsdd/Flow.java | 44 + .../axis/model/wsdd/GlobalConfiguration.java | 20 + .../java/org/apache/axis/model/wsdd/Handler.java | 79 + .../java/org/apache/axis/model/wsdd/Mapping.java | 104 + .../java/org/apache/axis/model/wsdd/Operation.java | 295 ++ .../apache/axis/model/wsdd/OperationParameter.java | 211 ++ .../java/org/apache/axis/model/wsdd/Parameter.java | 76 + .../org/apache/axis/model/wsdd/ParameterMode.java | 194 ++ .../apache/axis/model/wsdd/Parameterizable.java | 51 + .../java/org/apache/axis/model/wsdd/Service.java | 217 ++ .../java/org/apache/axis/model/wsdd/Transport.java | 79 + .../org/apache/axis/model/wsdd/TypeMapping.java | 77 + .../org/apache/axis/model/wsdd/WSDDFactory.java | 150 + .../java/org/apache/axis/model/wsdd/WSDDUtil.java | 64 + .../axis/model/wsdd/impl/ArrayMappingImpl.java | 153 + .../axis/model/wsdd/impl/BeanMappingImpl.java | 41 + .../axis/model/wsdd/impl/DeployableItemImpl.java | 222 ++ .../axis/model/wsdd/impl/DeploymentImpl.java | 354 +++ .../org/apache/axis/model/wsdd/impl/FaultImpl.java | 308 ++ .../org/apache/axis/model/wsdd/impl/FlowImpl.java | 145 + .../model/wsdd/impl/GlobalConfigurationImpl.java | 41 + .../apache/axis/model/wsdd/impl/HandlerImpl.java | 201 ++ .../apache/axis/model/wsdd/impl/MappingImpl.java | 257 ++ .../apache/axis/model/wsdd/impl/OperationImpl.java | 659 +++++ .../model/wsdd/impl/OperationParameterImpl.java | 462 +++ .../apache/axis/model/wsdd/impl/ParameterImpl.java | 205 ++ .../axis/model/wsdd/impl/ParameterizableImpl.java | 165 ++ .../apache/axis/model/wsdd/impl/ServiceImpl.java | 514 ++++ .../apache/axis/model/wsdd/impl/TransportImpl.java | 204 ++ .../axis/model/wsdd/impl/TypeMappingImpl.java | 203 ++ .../axis/model/wsdd/impl/WSDDFactoryImpl.java | 297 ++ .../axis/model/wsdd/impl/WSDDPackageImpl.java | 3110 ++++++++++++++++++++ .../java/org/apache/axis/model/xml/XmlFactory.java | 26 + .../apache/axis/model/xml/impl/XmlFactoryImpl.java | 134 + .../apache/axis/model/xml/impl/XmlPackageImpl.java | 258 ++ .../java/org/apache/axis/model/wsdd/LoadTest.java | 83 +- axis-model/src/test/wsdd/client-config.wsdd | 13 + axis-model/src/test/wsdd/schema2.wsdd | 83 + .../src/test/wsdd}/server-config.wsdd | 171 +- .../axis/deployment/wsdd/WSDDArrayMapping.java | 8 + .../axis/deployment/wsdd/WSDDDeployment.java | 55 +- .../apache/axis/deployment/wsdd/WSDDService.java | 60 +- .../axis/deployment/wsdd/WSDDTypeMapping.java | 69 +- .../org/apache/axis/wsdl/symbolTable/Utils.java | 35 - .../src/test/java/test/utils/TestMessages.java | 3 +- .../src/test/java/test/utils/TestSrcContent.java | 3 +- .../src/test/java/test/utils/TestXMLUtils.java | 2 +- axis/pom.xml | 1 - .../test/java/test/functional/TestAutoTypes.java | 4 +- .../test/wsdl/query/FileGenWrappedTestCase.java | 3 +- .../java/test/wsdl/types/DynamicProxyTestCase.java | 4 +- {axis-codegen => maven/maven-wsdd-plugin}/pom.xml | 45 +- .../axis/tools/maven/wsdd/GenerateWSDDMojo.java | 178 ++ .../maven/wsdl2java/JavaServiceIfaceWriterEx.java | 2 +- .../maven/wsdl2java/JavaServiceImplWriterEx.java | 2 +- .../tools/maven/wsdl2java/JavaStubWriterEx.java | 2 +- maven/pom.xml | 1 + pom.xml | 10 + .../test/functional/TestAttachmentsSample.java | 10 +- samples/echo-sample/pom.xml | 23 +- .../test/java/test/functional/TestEchoSample.java | 2 +- .../integrationGuide/example1/VerifyFilesTest.java | 2 +- .../integrationGuide/example2/VerifyFilesTest.java | 2 +- samples/transport-sample/pom.xml | 21 +- .../test/functional/TestTCPTransportSample.java | 2 +- .../java/test/functional/TestTransportSample.java | 2 +- tests/spring-compat-tests/pom.xml | 27 +- 95 files changed, 11758 insertions(+), 640 deletions(-)