You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2007/07/27 23:59:00 UTC
svn commit: r560397 [1/5] - in /webservices/axis2/branches/java/jaxws21: ./
etc/ legal/ modules/adb-codegen/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/schema/typemap/
modules/adb-codegen/test-res...
Author: pradine
Date: Fri Jul 27 14:58:51 2007
New Revision: 560397
URL: http://svn.apache.org/viewvc?view=rev&rev=560397
Log:
Sync with trunk to revision 559469.
Added:
webservices/axis2/branches/java/jaxws21/legal/commons-io-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/commons-io-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/geronimo-activation-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/geronimo-activation-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/geronimo-annotation-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/geronimo-annotation-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/httpcore-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/httpcore-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/httpcore-nio-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/httpcore-nio-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/httpcore-niossl-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/httpcore-niossl-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jaxb-api-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/jaxb-api-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jaxb-impl-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/jaxb-impl-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jaxb-xjc-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/jaxb-xjc-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jettison-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/jettison-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/xalan-LICENSE.txt
- copied unchanged from r559469, webservices/axis2/trunk/java/legal/xalan-LICENSE.txt
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/anytype.xsd
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/anytype.xsd
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/rampart.xsd
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/rampart.xsd
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/anytype/
- copied from r559469, webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/anytype/
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/rampart/
- copied from r559469, webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/rampart/RampartTest.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/RampartTest.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/writer/
- copied from r559469, webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilder.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareOMBuilder.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareXMLSerializer.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareXMLSerializer.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareXMLStreamWriter.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/MTOMAwareXMLStreamWriter.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/writer/OMElementStreamWriter.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/OMElementStreamWriter.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/writer/OMStreamNamespaceContext.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/writer/OMStreamNamespaceContext.java
webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/writer/
- copied from r559469, webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/
webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/writer/OMElementStreamWriterTest.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/utils/writer/OMElementStreamWriterTest.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/MustUnderstandChecker.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/MustUnderstandChecker.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/MustUnderstandUtils.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/MustUnderstandUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/MustUnderstandValidationDispatcher.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/MustUnderstandValidationDispatcher.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test-resources/axis2.xml
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test-resources/axis2.xml
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/core/
- copied from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/core/
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/core/MessageContextTests.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/core/MessageContextTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderChecker.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderChecker.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/
- copied from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/
- copied from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/MANIFEST.MF
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/MANIFEST.MF
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/ProviderSOAPMessage.wsdl
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/ProviderSOAPMessage.wsdl
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/services.xml
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/META-INF/services.xml
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/SoapMessageMUProvider.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsgmu/SoapMessageMUProvider.java
webservices/axis2/branches/java/jaxws21/modules/kernel/resources/
- copied from r559469, webservices/axis2/trunk/java/modules/kernel/resources/
webservices/axis2/branches/java/jaxws21/modules/kernel/resources/axis2.xsd
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/kernel/resources/axis2.xsd
webservices/axis2/branches/java/jaxws21/modules/kernel/resources/services.xsd
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/kernel/resources/services.xsd
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/validation/
- copied from r559469, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/validation/
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java
webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/MustUnderstandTests.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/MustUnderstandTests.java
webservices/axis2/branches/java/jaxws21/modules/saaj/src/org/apache/axis2/saaj/util/UnderstandAllHeadersHandler.java
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/UnderstandAllHeadersHandler.java
webservices/axis2/branches/java/jaxws21/modules/saaj/test-resources/commons-logging.properties
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/saaj/test-resources/commons-logging.properties
webservices/axis2/branches/java/jaxws21/modules/saaj/test-resources/log4j.properties
- copied unchanged from r559469, webservices/axis2/trunk/java/modules/saaj/test-resources/log4j.properties
Removed:
webservices/axis2/branches/java/jaxws21/build.xml
webservices/axis2/branches/java/jaxws21/etc/junit-frames.xsl
webservices/axis2/branches/java/jaxws21/etc/junit-noframes.xsl
webservices/axis2/branches/java/jaxws21/legal/bcel-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/bcprov-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/geronimo-spec-jms-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/groovy-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jakarta-httpcore-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jaxme-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jaxmeapi-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jaxmejs-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jaxmexs-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/jibx-run-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/openSAML-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/servlet-api-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/spring-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/stax-utils-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/wss4j-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/xerces-LICENSE.txt
webservices/axis2/branches/java/jaxws21/legal/xmlsec-LICENSE.txt
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/MEPContext.java
webservices/axis2/branches/java/jaxws21/modules/samples/security/
Modified:
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/sub-build.xml
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/populate/other/PopulateAnyTypeTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
webservices/axis2/branches/java/jaxws21/modules/addressing/src/META-INF/module.xml
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractPrettyPrinterExtension.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml
webservices/axis2/branches/java/jaxws21/modules/distribution/src/main/assembly/bin-assembly.xml
webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/deployment/deployment.both.axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/HandlerExecutionTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/pom.xml
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/ClientUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/PropertyMigrator.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/InvocationController.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerInvokerUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageContext.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/AttachmentUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/migrator/ApplicationContextMigratorUtil.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/CompositeMessageContextTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/AttachmentUtil.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclitswa/RPCLitSWAImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java
webservices/axis2/branches/java/jaxws21/modules/kernel/conf/axis2.xml
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/Phase.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/ServerWorker.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/OperationDescription.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/ConverterUtils.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ParameterDescriptionImpl.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
webservices/axis2/branches/java/jaxws21/modules/mex/src/org/apache/axis2/mex/MexMessageReceiver.java
webservices/axis2/branches/java/jaxws21/modules/mex/src/org/apache/axis2/mex/om/Metadata.java
webservices/axis2/branches/java/jaxws21/modules/mex/src/org/apache/axis2/mex/om/MetadataSection.java
webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
webservices/axis2/branches/java/jaxws21/modules/saaj/pom.xml
webservices/axis2/branches/java/jaxws21/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
webservices/axis2/branches/java/jaxws21/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
webservices/axis2/branches/java/jaxws21/modules/samples/quickstartadb/build.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-service-plugin/pom.xml
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Fri Jul 27 14:58:51 2007
@@ -710,7 +710,7 @@
org.apache.axiom.om.OMDataSource dataSource =
new org.apache.axis2.databinding.ADBDataSource(this,parentQName){
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
<xsl:value-of select="$name"/>.this.serialize(parentQName,factory,xmlWriter);
}
};
@@ -721,7 +721,7 @@
org.apache.axiom.om.OMDataSource dataSource =
new org.apache.axis2.databinding.ADBDataSource(this,MY_QNAME){
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter) throws javax.xml.stream.XMLStreamException {
<xsl:value-of select="$name"/>.this.serialize(MY_QNAME,factory,xmlWriter);
}
};
@@ -735,7 +735,7 @@
public void serialize(final javax.xml.namespace.QName parentQName,
final org.apache.axiom.om.OMFactory factory,
- javax.xml.stream.XMLStreamWriter xmlWriter)
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
<xsl:choose>
@@ -1166,7 +1166,7 @@
} else {
xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
}
- <xsl:value-of select="$varName"/>[i].serialize(xmlWriter);
+ org.apache.axis2.databinding.utils.ConverterUtil.serializeAnyType(<xsl:value-of select="$varName"/>[i], xmlWriter);
xmlWriter.writeEndElement();
} else {
<xsl:choose>
@@ -1261,7 +1261,7 @@
} else {
xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
}
- <xsl:value-of select="$varName"/>.serialize(xmlWriter);
+ org.apache.axis2.databinding.utils.ConverterUtil.serializeAnyType(<xsl:value-of select="$varName"/>, xmlWriter);
xmlWriter.writeEndElement();
} else {
<xsl:choose>
@@ -1497,8 +1497,7 @@
<!-- Handling the null byte array -->
if (<xsl:value-of select="$varName"/>!=null)
{
- org.apache.axiom.om.impl.llom.OMTextImpl <xsl:value-of select="$varName"/>_binary = new org.apache.axiom.om.impl.llom.OMTextImpl( <xsl:value-of select="$varName"/>, org.apache.axiom.om.OMAbstractFactory.getOMFactory());
- <xsl:value-of select="$varName"/>_binary.internalSerializeAndConsume(xmlWriter);
+ xmlWriter.writeDataHandler(<xsl:value-of select="$varName"/>);
}
</xsl:when>
<xsl:otherwise>
@@ -1685,12 +1684,14 @@
<xsl:when test="$propertyType='java.lang.String'">
xmlWriter.writeCharacters(<xsl:value-of select="$varName"/>);
</xsl:when>
+ <xsl:when test="property/@default">
+ org.apache.axis2.databinding.utils.ConverterUtil.serializeAnyType(<xsl:value-of select="$varName"/>, xmlWriter);
+ </xsl:when>
<xsl:when test="property/@binary">
<!-- Handling the null byte array -->
if (<xsl:value-of select="$varName"/>!=null)
{
- org.apache.axiom.om.impl.llom.OMTextImpl <xsl:value-of select="$varName"/>_binary = new org.apache.axiom.om.impl.llom.OMTextImpl( <xsl:value-of select="$varName"/>, org.apache.axiom.om.OMAbstractFactory.getOMFactory());
- <xsl:value-of select="$varName"/>_binary.internalSerializeAndConsume(xmlWriter);
+ xmlWriter.writeDataHandler(<xsl:value-of select="$varName"/>);
}
</xsl:when>
<xsl:otherwise>
@@ -2062,14 +2063,30 @@
<!-- handle binary - Since it is a Datahandler, we can just add it to the list
and the ADB pullparser would handle it right-->
<xsl:when test="@binary">
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>"));
+ <xsl:choose>
+ <xsl:when test="$simple">
+ elementList.add(org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT);
+ </xsl:when>
+ <xsl:otherwise>
+ elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+ "<xsl:value-of select="$propertyName"/>"));
+ </xsl:otherwise>
+ </xsl:choose>
elementList.add(<xsl:value-of select="$varName"/>);
</xsl:when>
<!-- the usual case!!!!-->
<xsl:otherwise>
- elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
+ <xsl:choose>
+ <xsl:when test="$simple">
+ <!-- if the type is simple then this must be only the element text -->
+ elementList.add(org.apache.axis2.databinding.utils.reader.ADBXMLStreamReader.ELEMENT_TEXT);
+ </xsl:when>
+ <xsl:otherwise>
+ elementList.add(new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>",
"<xsl:value-of select="$propertyName"/>"));
+ </xsl:otherwise>
+ </xsl:choose>
+
<xsl:if test="@primitive">
elementList.add(
org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
@@ -2842,13 +2859,7 @@
reader.next();
}else{
</xsl:if>
- // we parse it as an omElement
- // We need to wrap the reader so that it produces a fake START_DOCUEMENT event
- // this is needed by the builder classes
- org.apache.axis2.databinding.utils.NamedStaxOMBuilder <xsl:value-of select="$builderName"/> =
- new org.apache.axis2.databinding.utils.NamedStaxOMBuilder(
- new org.apache.axis2.util.StreamWrapper(reader),<xsl:value-of select="$startQname"/>);
- <xsl:value-of select="$listName"/>.add(<xsl:value-of select="$builderName"/>.getOMElement().getFirstElement());
+ <xsl:value-of select="$listName"/>.add(org.apache.axis2.databinding.utils.ConverterUtil.getAnyTypeObject(reader));
<xsl:if test="@nillable">}</xsl:if>
} else if (javax.xml.stream.XMLStreamConstants.START_ELEMENT == event &&
!<xsl:value-of select="$startQname"/>.equals(reader.getName())){
@@ -2870,9 +2881,7 @@
<xsl:value-of select="$listName"/>.toArray(new <xsl:value-of select="$basePropertyType"/>[<xsl:value-of select="$listName"/>.size()]));
</xsl:when>
<xsl:otherwise>
- object.set<xsl:value-of select="$javaName"/>((<xsl:value-of select="$propertyType"/>)
- org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
- <xsl:value-of select="$basePropertyType"/>.class,<xsl:value-of select="$listName"/>));
+ object.set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$listName"/>.toArray());
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -3183,26 +3192,7 @@
<!-- end of adb type handling code -->
<!-- start of OMelement handling -->
<xsl:when test="@default">
- boolean <xsl:value-of select="$loopBoolName"/> = false;
- javax.xml.namespace.QName <xsl:value-of select="$startQname"/> = new javax.xml.namespace.QName(
- "<xsl:value-of select="$namespace"/>",
- "<xsl:value-of select="$propertyName"/>");
-
- while(!<xsl:value-of select="$loopBoolName"/>){
- if (reader.isStartElement() && <xsl:value-of select="$startQname"/>.equals(reader.getName())){
- <xsl:value-of select="$loopBoolName"/> = true;
- }else{
- reader.next();
- }
- }
-
- <!-- todo put the code here for nillable -->
- // We need to wrap the reader so that it produces a fake START_DOCUEMENT event
- // this is needed by the builder classes
- org.apache.axis2.databinding.utils.NamedStaxOMBuilder <xsl:value-of select="$builderName"/> =
- new org.apache.axis2.databinding.utils.NamedStaxOMBuilder(
- new org.apache.axis2.util.StreamWrapper(reader),<xsl:value-of select="$startQname"/>);
- object.set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$builderName"/>.getOMElement().getFirstElement());
+ object.set<xsl:value-of select="$javaName"/>(org.apache.axis2.databinding.utils.ConverterUtil.getAnyTypeObject(reader));
<xsl:if test="$isType or $anon"> <!-- This is a subelement property to be consumed -->
reader.next();
</xsl:if>
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java Fri Jul 27 14:58:51 2007
@@ -88,7 +88,7 @@
//anytype is mapped to the OMElement instead of the java.lang.Object
addTypemapping(SchemaConstants.XSD_ANYTYPE,
- OMElement.class.getName());
+ Object.class.getName());
//Qname maps to jax rpc QName class
addTypemapping(SchemaConstants.XSD_QNAME,
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/sub-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/sub-build.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/sub-build.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/sub-build.xml Fri Jul 27 14:58:51 2007
@@ -346,6 +346,22 @@
<arg file="${testsuite.source.dir}/decimal.xsd"/>
<arg file="${schema.generated.src.dir}"/>
</java>
+ <echo>Compiling anttype.xsd</echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${testsuite.source.dir}/anytype.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
+ <echo>Compiling rampart.xsd</echo>
+ <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
+ <jvmarg line="${maven.junit.jvmargs}"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg file="${testsuite.source.dir}/rampart.xsd"/>
+ <arg file="${schema.generated.src.dir}"/>
+ </java>
</target>
</project>
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/DefaultNamespacesTest.java Fri Jul 27 14:58:51 2007
@@ -24,6 +24,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -65,9 +67,9 @@
try {
XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(stringWriter);
-
+ MTOMAwareXMLStreamWriter mtomAwareXMLStreamWriter = new MTOMAwareXMLSerializer(xmlStreamWriter);
testElement1.getTestElement1().serialize(new QName("http://tempuri.org/defaultnamepaces", "TestElement1", "ns1"),
- OMAbstractFactory.getSOAP11Factory(), xmlStreamWriter);
+ OMAbstractFactory.getSOAP11Factory(), mtomAwareXMLStreamWriter);
xmlStreamWriter.flush();
xmlStreamWriter.close();
String omElementString = stringWriter.toString();
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java Fri Jul 27 14:58:51 2007
@@ -45,15 +45,30 @@
try {
OMElement omElement = testComplexElement.getOMElement(TestComplexElement.MY_QNAME, OMAbstractFactory.getSOAP11Factory());
- String omElementString = omElement.toStringWithConsume();
+ String omElementString;
+ XMLStreamReader xmlReader;
+ TestComplexElement result;
+
+ omElementString = omElement.toStringWithConsume();
System.out.println("OM String ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- TestComplexElement result = TestComplexElement.Factory.parse(xmlReader);
+ xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
+ result = TestComplexElement.Factory.parse(xmlReader);
assertEquals(result.getTestComplexElement().getFirst(),"Amila");
assertEquals(result.getTestComplexElement().getMiddle(),"Chinthaka");
assertEquals(result.getTestComplexElement().getLast(),"Suriarachchi");
assertEquals(result.getTestComplexElement().getParentElement1(),"test1");
assertEquals(result.getTestComplexElement().getParentElement2(),"test2");
+
+ omElementString = omElement.toString();
+ System.out.println("OM String ==> " + omElementString);
+ xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
+ result = TestComplexElement.Factory.parse(xmlReader);
+ assertEquals(result.getTestComplexElement().getFirst(),"Amila");
+ assertEquals(result.getTestComplexElement().getMiddle(),"Chinthaka");
+ assertEquals(result.getTestComplexElement().getLast(),"Suriarachchi");
+ assertEquals(result.getTestComplexElement().getParentElement1(),"test1");
+ assertEquals(result.getTestComplexElement().getParentElement2(),"test2");
+
} catch (Exception e) {
assertFalse(true);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java Fri Jul 27 14:58:51 2007
@@ -38,22 +38,37 @@
fullName.setMiddle("chinthaka");
fullName.setLast("suriarachchi");
fullName.setLanguage(new Language("singhala"));
- fullName.setAttribute1(BaseType.Factory.fromString(BaseType._s1,""));
+ fullName.setAttribute1(BaseType.Factory.fromString(BaseType._s1, ""));
- fullName.setAttribute2(SimpleType.Factory.fromString("ATTRIBUTE",""));
+ fullName.setAttribute2(SimpleType.Factory.fromString("ATTRIBUTE", ""));
- try {
+ try {
OMElement omElement = fullName.getOMElement(FullName.MY_QNAME, OMAbstractFactory.getSOAP11Factory());
- String omElementString = omElement.toStringWithConsume();
+ String omElementString;
+ XMLStreamReader xmlReader;
+ FullName newFullName;
+
+ omElementString = omElement.toStringWithConsume();
+ System.out.println("OM String ==> " + omElementString);
+ xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
+ newFullName = FullName.Factory.parse(xmlReader);
+ assertEquals(newFullName.getFirst(), "amila");
+ assertEquals(newFullName.getMiddle(), "chinthaka");
+ assertEquals(newFullName.getLast(), "suriarachchi");
+ assertEquals(newFullName.getLanguage().toString(), "singhala");
+ assertEquals(newFullName.getAttribute1().toString(), BaseType._s1);
+ assertEquals(newFullName.getAttribute2().toString(), "ATTRIBUTE");
+
+ omElementString = omElement.toString();
System.out.println("OM String ==> " + omElementString);
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- FullName newFullName = FullName.Factory.parse(xmlReader);
- assertEquals(newFullName.getFirst(),"amila");
- assertEquals(newFullName.getMiddle(),"chinthaka");
- assertEquals(newFullName.getLast(),"suriarachchi");
- assertEquals(newFullName.getLanguage().toString(),"singhala");
- assertEquals(newFullName.getAttribute1().toString(),BaseType._s1);
- assertEquals(newFullName.getAttribute2().toString(),"ATTRIBUTE");
+ xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
+ newFullName = FullName.Factory.parse(xmlReader);
+ assertEquals(newFullName.getFirst(), "amila");
+ assertEquals(newFullName.getMiddle(), "chinthaka");
+ assertEquals(newFullName.getLast(), "suriarachchi");
+ assertEquals(newFullName.getLanguage().toString(), "singhala");
+ assertEquals(newFullName.getAttribute1().toString(), BaseType._s1);
+ assertEquals(newFullName.getAttribute2().toString(), "ATTRIBUTE");
} catch (Exception e) {
assertFalse(true);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/InnerChoiceTest.java Fri Jul 27 14:58:51 2007
@@ -22,6 +22,8 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
import test.axis2.apache.org.*;
import javax.xml.stream.XMLStreamReader;
@@ -55,8 +57,9 @@
// writtig result back
XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(System.out);
+ MTOMAwareXMLStreamWriter mtomAwareXMLStreamWriter = new MTOMAwareXMLSerializer(xmlStreamWriter);
result.serialize(new javax.xml.namespace.QName("org.apache.axis2.test", "TestInnerSequence1", "foo")
- , OMAbstractFactory.getSOAP11Factory(), xmlStreamWriter);
+ , OMAbstractFactory.getSOAP11Factory(), mtomAwareXMLStreamWriter);
xmlStreamWriter.flush();
} catch (Exception e) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/populate/other/PopulateAnyTypeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/populate/other/PopulateAnyTypeTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/populate/other/PopulateAnyTypeTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/populate/other/PopulateAnyTypeTest.java Fri Jul 27 14:58:51 2007
@@ -29,15 +29,8 @@
public class PopulateAnyTypeTest extends TestCase {
- private String xmlString = "<myObject xmlns=\"http://soapinterop.org/xsd2\">" +
- "<soapStructures>" +
- "<varFloat>3.3</varFloat>" +
- "<varInt>5</varInt>" +
- "<varString>Hello11</varString>" +
- "<varString>Hello11</varString>" +
- "<varString>Hello12</varString>" +
- "<varString>Hello13</varString>" +
- "</soapStructures>" +
+ private String xmlString = "<myObject xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns=\"http://soapinterop.org/xsd2\" xsi:type=\"xsd:int\">" +
+ "5" +
"</myObject>";
public void testPopulate() throws Exception{
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java Fri Jul 27 14:58:51 2007
@@ -47,6 +47,16 @@
return isEqual;
}
+ protected boolean isObjectsEqual(Object object1,Object object2){
+ boolean isEqual = false;
+ if ((object1 == null) || (object2 == null)){
+ isEqual = (object1 == object2);
+ } else {
+ isEqual = object1.equals(object2);
+ }
+ return isEqual;
+ }
+
public void testMethod(){
// dummy test method
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java Fri Jul 27 14:58:51 2007
@@ -146,12 +146,12 @@
}
public void testAnyType() {
- OMElement returnObject;
+ Object returnObject;
try {
returnObject = testAnyType(null, NILLABLE_TRUE);
- assertTrue(isOMElementsEqual(returnObject, null));
- returnObject = testAnyType(getOMElement(), NILLABLE_TRUE);
- assertTrue(isOMElementsEqual(returnObject, getOMElement()));
+ assertTrue(isObjectsEqual(returnObject, null));
+ returnObject = testAnyType(new Double(23.45), NILLABLE_TRUE);
+ assertTrue(isObjectsEqual(returnObject, new Double(23.45)));
} catch (Exception e) {
fail();
}
@@ -164,16 +164,16 @@
}
try {
- returnObject = testAnyType(getOMElement(), NILLABLE_FALSE);
- assertTrue(isOMElementsEqual(returnObject, getOMElement()));
+ returnObject = testAnyType(new Double(23.45), NILLABLE_FALSE);
+ assertTrue(isObjectsEqual(returnObject, new Double(23.45)));
} catch (Exception e) {
fail();
}
}
- private OMElement testAnyType(OMElement innerElement, int type) throws Exception {
+ private Object testAnyType(Object innerElement, int type) throws Exception {
OMElement omElement;
- OMElement returnString = null;
+ Object returnObject = null;
String omElementString;
switch (type) {
@@ -185,7 +185,7 @@
System.out.println("OMElement ==> " + omElementString);
XMLStreamReader xmlReader =
StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- returnString = OuterTestAnyType1.Factory.parse(xmlReader).getOuterTestAnyType1();
+ returnObject = OuterTestAnyType1.Factory.parse(xmlReader).getOuterTestAnyType1();
break;
}
@@ -197,11 +197,11 @@
System.out.println("OMElement ==> " + omElementString);
XMLStreamReader xmlReader =
StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
- returnString = OuterTestAnyType2.Factory.parse(xmlReader).getOuterTestAnyType2();
+ returnObject = OuterTestAnyType2.Factory.parse(xmlReader).getOuterTestAnyType2();
break;
}
}
- return returnString;
+ return returnObject;
}
public void testBookInformation() {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java Fri Jul 27 14:58:51 2007
@@ -35,17 +35,17 @@
public static final int MIN_EQUALS_ONE_NILLABLE_FALSE_TEST = 4;
public void testAnyTypeArray() {
- OMElement[] returnObject;
+ Object[] returnObject;
System.out.println("minOccurs = 0 and nillable true");
try {
returnObject = testAnyTypeArray(null, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{null}));
- returnObject = testAnyTypeArray(new OMElement[]{null}, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{null}));
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement()}, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement()}));
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement(), null}, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement(), null}));
+ assertTrue(assertArrayEqual(returnObject, new Object[]{null}));
+ returnObject = testAnyTypeArray(new Object[]{null}, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{null}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67)}, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67)}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67), null}, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67), null}));
} catch (Exception e) {
e.printStackTrace();
fail();
@@ -55,12 +55,12 @@
try {
returnObject = testAnyTypeArray(null, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
assertTrue(assertArrayEqual(returnObject, null));
- returnObject = testAnyTypeArray(new OMElement[]{null}, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
+ returnObject = testAnyTypeArray(new Object[]{null}, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
assertTrue(assertArrayEqual(returnObject, null));
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement()}, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement()}));
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement(), null}, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement()}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67)}, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67)}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67), null}, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67)}));
} catch (Exception e) {
fail();
}
@@ -68,13 +68,13 @@
System.out.println("minOccurs = 1 and nillable true");
try {
returnObject = testAnyTypeArray(null, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{null}));
- returnObject = testAnyTypeArray(new OMElement[]{null}, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{null}));
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement()}, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement()}));
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement(), null}, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement(), null}));
+ assertTrue(assertArrayEqual(returnObject, new Object[]{null}));
+ returnObject = testAnyTypeArray(new Object[]{null}, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{null}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67)}, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67)}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67), null}, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67), null}));
} catch (Exception e) {
fail();
}
@@ -89,32 +89,32 @@
}
try {
- returnObject = testAnyTypeArray(new OMElement[]{null}, MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{null}));
+ returnObject = testAnyTypeArray(new Object[]{null}, MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{null}));
fail();
} catch (Exception e) {
assertTrue(true);
}
try {
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement(), null}, MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement(), null}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67), null}, MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67), null}));
fail();
} catch (Exception e) {
assertTrue(true);
}
try {
- returnObject = testAnyTypeArray(new OMElement[]{getOMElement()}, MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
- assertTrue(assertArrayEqual(returnObject, new OMElement[]{getOMElement()}));
+ returnObject = testAnyTypeArray(new Object[]{new Double(5.67)}, MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
+ assertTrue(assertArrayEqual(returnObject, new Object[]{new Double(5.67)}));
} catch (Exception e) {
fail();
}
}
- public OMElement[] testAnyTypeArray(OMElement[] innerElement, int type) throws Exception {
+ public Object[] testAnyTypeArray(Object[] innerElement, int type) throws Exception {
OMElement omElement;
- OMElement[] returnObject = null;
+ Object[] returnObject = null;
String omElementString;
switch (type) {
case MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST : {
@@ -167,31 +167,31 @@
public void testAnyType() {
- OMElement returnObject;
+ Object returnObject;
System.out.println("minOccurs = 0 nillable true");
try {
returnObject = testAnyType(null, MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
- assertTrue(isOMElementsEqual(returnObject, null));
- returnObject = testAnyType(getOMElement(), MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
- assertTrue(isOMElementsEqual(returnObject, getOMElement()));
+ assertTrue(isObjectsEqual(returnObject, null));
+ returnObject = testAnyType(new Double(23.45), MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST);
+ assertTrue(isObjectsEqual(returnObject, new Double(23.45)));
} catch (Exception e) {
fail();
}
System.out.println("minOccurs = 0 nillable false");
try {
returnObject = testAnyType(null, MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
- assertTrue(isOMElementsEqual(returnObject, null));
- returnObject = testAnyType(getOMElement(), MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
- assertTrue(isOMElementsEqual(returnObject, getOMElement()));
+ assertTrue(isObjectsEqual(returnObject, null));
+ returnObject = testAnyType(new Double(23.45), MIN_EQUALS_ZERO_NILLABLE_FALSE_TEST);
+ assertTrue(isObjectsEqual(returnObject, new Double(23.45)));
} catch (Exception e) {
fail();
}
System.out.println("minOccurs = 1 nillable true");
try {
returnObject = testAnyType(null, MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
- assertTrue(isOMElementsEqual(returnObject, null));
- returnObject = testAnyType(getOMElement(), MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
- assertTrue(isOMElementsEqual(returnObject, getOMElement()));
+ assertTrue(isObjectsEqual(returnObject, null));
+ returnObject = testAnyType(new Double(23.45), MIN_EQUALS_ONE_NILLABLE_TRUE_TEST);
+ assertTrue(isObjectsEqual(returnObject, new Double(23.45)));
} catch (Exception e) {
fail();
}
@@ -204,17 +204,17 @@
}
try {
- returnObject = testAnyType(getOMElement(), MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
- assertTrue(isOMElementsEqual(returnObject, getOMElement()));
+ returnObject = testAnyType(new Double(23.45), MIN_EQUALS_ONE_NILLABLE_FALSE_TEST);
+ assertTrue(isObjectsEqual(returnObject, new Double(23.45)));
} catch (Exception e) {
fail();
}
}
- public OMElement testAnyType(OMElement innerElement, int type) throws Exception {
+ public Object testAnyType(Object innerElement, int type) throws Exception {
OMElement omElement;
- OMElement returnObject = null;
+ Object returnObject = null;
String omElementString;
switch (type) {
case MIN_EQUALS_ZERO_NILLABLE_TRUE_TEST : {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBDataSource.java Fri Jul 27 14:58:51 2007
@@ -21,6 +21,10 @@
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axis2.databinding.utils.writer.OMElementStreamWriter;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareOMBuilder;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -73,8 +77,12 @@
* @throws XMLStreamException
* @see OMDataSource#serialize(javax.xml.stream.XMLStreamWriter)
*/
- public abstract void serialize(XMLStreamWriter xmlWriter)
- throws XMLStreamException;
+ public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException{
+ MTOMAwareXMLStreamWriter mtomAwareXMLStreamWriter = new MTOMAwareXMLSerializer(xmlWriter);
+ serialize(mtomAwareXMLStreamWriter);
+ }
+
+ public abstract void serialize(MTOMAwareXMLStreamWriter xmlWriter) throws XMLStreamException;
/**
@@ -83,8 +91,10 @@
*/
public XMLStreamReader getReader() throws XMLStreamException {
// since only ADBBeans related to elements can be serialized
- // we are safe in passing null here.
- return bean.getPullParser(parentQName);
+ // we are safe in passing null here.
+ MTOMAwareOMBuilder mtomAwareOMBuilder = new MTOMAwareOMBuilder();
+ serialize(mtomAwareOMBuilder);
+ return mtomAwareOMBuilder.getOMElement().getXMLStreamReader();
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Fri Jul 27 14:58:51 2007
@@ -149,8 +149,7 @@
Method readMethod = propDesc.getReadMethod();
Object value;
if(readMethod!=null){
- value = readMethod.invoke(beanObject,
- null);
+ value = readMethod.invoke(beanObject, null);
} else {
throw new AxisFault("can not find read method for : " + propDesc.getName());
}
@@ -159,7 +158,6 @@
object.add(value == null ? null : SimpleTypeMapper.getStringValue(value));
} else if (ptype.isArray()) {
if (SimpleTypeMapper.isSimpleType(ptype.getComponentType())) {
-
Method readMethod = propDesc.getReadMethod();
Object value;
if(readMethod!=null){
@@ -169,17 +167,21 @@
throw new AxisFault("can not find read method for : " + propDesc.getName());
}
if (value != null) {
- int i1 = Array.getLength(value);
- for (int j = 0; j < i1; j++) {
- Object o = Array.get(value, j);
+ if("byte".equals(ptype.getComponentType().getName())) {
addTypeQname(elemntNameSpace, object, propDesc, beanName,processingDocLitBare);
- object.add(o == null ? null : SimpleTypeMapper.getStringValue(o));
+ object.add(Base64.encode((byte[]) value));
+ } else {
+ int i1 = Array.getLength(value);
+ for (int j = 0; j < i1; j++) {
+ Object o = Array.get(value, j);
+ addTypeQname(elemntNameSpace, object, propDesc, beanName,processingDocLitBare);
+ object.add(o == null ? null : SimpleTypeMapper.getStringValue(o));
+ }
}
} else {
addTypeQname(elemntNameSpace, object, propDesc, beanName,processingDocLitBare);
object.add(value);
}
-
} else {
Object value [] = (Object[])propDesc.getReadMethod().invoke(beanObject,
null);
@@ -302,25 +304,29 @@
if (beanClass.isArray()) {
ArrayList valueList = new ArrayList();
Class arrayClassType = beanClass.getComponentType();
- Iterator parts = beanElement.getChildElements();
- OMElement omElement;
- while (parts.hasNext()) {
- Object objValue = parts.next();
- if (objValue instanceof OMElement) {
- omElement = (OMElement)objValue;
- if (!arrayLocalName.equals(omElement.getLocalName())) {
- continue;
- }
- Object obj = deserialize(arrayClassType,
- omElement,
- objectSupplier, null);
- if (obj != null) {
- valueList.add(obj);
+ if ("byte".equals(arrayClassType.getName())) {
+ return Base64.decode(beanElement.getFirstElement().getText());
+ } else {
+ Iterator parts = beanElement.getChildElements();
+ OMElement omElement;
+ while (parts.hasNext()) {
+ Object objValue = parts.next();
+ if (objValue instanceof OMElement) {
+ omElement = (OMElement)objValue;
+ if (!arrayLocalName.equals(omElement.getLocalName())) {
+ continue;
+ }
+ Object obj = deserialize(arrayClassType,
+ omElement,
+ objectSupplier, null);
+ if (obj != null) {
+ valueList.add(obj);
+ }
}
}
+ return ConverterUtil.convertToArray(arrayClassType,
+ valueList);
}
- return ConverterUtil.convertToArray(arrayClassType,
- valueList);
} else {
if (SimpleTypeMapper.isSimpleType(beanClass)) {
return SimpleTypeMapper.getSimpleTypeObject(beanClass, beanElement);
@@ -349,28 +355,35 @@
} else {
continue;
}
+ OMAttribute attribute = parts.getAttribute(
+ new QName("http://www.w3.org/2001/XMLSchema-instance", "nil", "xsi"));
+
// if parts/@href != null then need to find element with id and deserialize.
// before that first check whether we already have it in the hashtable
String partsLocalName = parts.getLocalName();
- PropertyDescriptor prty = (PropertyDescriptor)properties.get(partsLocalName);
+ PropertyDescriptor prty = (PropertyDescriptor)properties.remove(partsLocalName);
if (prty != null) {
Class parameters = prty.getPropertyType();
if (prty.equals("class"))
continue;
Object partObj;
- if (SimpleTypeMapper.isSimpleType(parameters)) {
- partObj = SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
- } else if (SimpleTypeMapper.isCollection(parameters)) {
- partObj = SimpleTypeMapper.getArrayList((OMElement)
- parts.getParent(), prty.getName());
- } else if (SimpleTypeMapper.isDataHandler(parameters)){
- partObj = SimpleTypeMapper.getDataHandler(parts);
- } else if (parameters.isArray()) {
- partObj = deserialize(parameters, (OMElement)parts.getParent(),
- objectSupplier, prty.getName());
+ if (attribute != null) {
+ partObj = null;
} else {
- partObj = deserialize(parameters, parts, objectSupplier, null);
+ if (SimpleTypeMapper.isSimpleType(parameters)) {
+ partObj = SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
+ } else if (SimpleTypeMapper.isCollection(parameters)) {
+ partObj = SimpleTypeMapper.getArrayList((OMElement)
+ parts.getParent(), prty.getName());
+ } else if (SimpleTypeMapper.isDataHandler(parameters)){
+ partObj = SimpleTypeMapper.getDataHandler(parts);
+ } else if (parameters.isArray()) {
+ partObj = deserialize(parameters, (OMElement)parts.getParent(),
+ objectSupplier, prty.getName());
+ } else {
+ partObj = deserialize(parameters, parts, objectSupplier, null);
+ }
}
Object [] parms = new Object[] { partObj };
Method writeMethod = prty.getWriteMethod();
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java Fri Jul 27 14:58:51 2007
@@ -27,6 +27,7 @@
static String NIL = "nil";
static String TRUE = "true";
static String XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance";
+ static String XSD_NAMESPACE = "http://www.w3.org/2001/XMLSchema";
static Object OM_ATTRIBUTE_KEY = new OMAttribKey();
static Object OM_ELEMENT_KEY = new OMElementKey();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org