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/12/01 15:43:54 UTC
svn commit: r600141 [1/10] - in
/webservices/axis2/branches/java/jaxws21/modules: adb-codegen/
adb-codegen/src/org/apache/axis2/schema/
adb-codegen/src/org/apache/axis2/schema/template/
adb-codegen/src/org/apache/axis2/schema/util/ adb-codegen/src/org/...
Author: pradine
Date: Sat Dec 1 06:43:28 2007
New Revision: 600141
URL: http://svn.apache.org/viewvc?rev=600141&view=rev
Log:
Sync with trunk to revision 600007.
Added:
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/complexExtension.xsd
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/complexExtension.xsd
webservices/axis2/branches/java/jaxws21/modules/addressing/test-resources/valid-messages/final/soapmessage.customrole.soap12.xml
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.customrole.soap12.xml
webservices/axis2/branches/java/jaxws21/modules/addressing/test-resources/valid-messages/final/soapmessage.customrole.xml
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.customrole.xml
webservices/axis2/branches/java/jaxws21/modules/addressing/test-resources/valid-messages/submission/soapmessage.customrole.xml
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/submission/soapmessage.customrole.xml
webservices/axis2/branches/java/jaxws21/modules/clustering/test/org/apache/axis2/clustering/tribes/ObjectSerializationTest.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ObjectSerializationTest.java
webservices/axis2/branches/java/jaxws21/modules/clustering/test/org/apache/axis2/clustering/tribes/TestDO.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/TestDO.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/
- copied from r600007, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/HandlerResolverImpl.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/HandlerResolverImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/LifecycleManager.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/LifecycleManager.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test-resources/configuration/
- copied from r600007, webservices/axis2/trunk/java/modules/jaxws/test-resources/configuration/
webservices/axis2/branches/java/jaxws21/modules/jaxws/test-resources/configuration/handlers/
- copied from r600007, webservices/axis2/trunk/java/modules/jaxws/test-resources/configuration/handlers/
webservices/axis2/branches/java/jaxws21/modules/jaxws/test-resources/configuration/handlers/handler.xml
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/test-resources/configuration/handlers/handler.xml
webservices/axis2/branches/java/jaxws21/modules/jaxws/test-resources/xml/addnumberstest.xml
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/test-resources/xml/addnumberstest.xml
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/
- copied from r600007, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummyLogicalHandler.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummySOAPHandler.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/DummySOAPHandler.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/HandlerResolverTests.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/spi/handler/HandlerResolverTests.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/soaproleconfiguration/
- copied from r600007, webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/soaproleconfiguration/
webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/SOAPRoleConfigurationTest.java
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SOAPRoleConfigurationTest.java
webservices/axis2/branches/java/jaxws21/modules/metadata/test-resources/test-handler.xml
- copied unchanged from r600007, webservices/axis2/trunk/java/modules/metadata/test-resources/test-handler.xml
Modified:
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/XSD2Java.java
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/template/CADBBeanTemplateHeader.xsl
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/util/PrimitiveTypeWrapper.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/sub-build.xml
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/anytype.xsd
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/element_references.xsd
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/extensions.xsd
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/anytype/AnyTypeTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDateTimePopulateTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBBean.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/ADBHelperDataSource.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/ADBSOAPModelBuilder.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Name.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Time.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/rpc/receivers/RPCInOnlyMessageReceiver.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
webservices/axis2/branches/java/jaxws21/modules/adb/test/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderTest.java
webservices/axis2/branches/java/jaxws21/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
webservices/axis2/branches/java/jaxws21/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis2/branches/java/jaxws21/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/branches/java/jaxws21/modules/addressing/test/org/apache/axis2/addressing/AddressingFaultsTest.java
webservices/axis2/branches/java/jaxws21/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingFinalInHandlerTest.java
webservices/axis2/branches/java/jaxws21/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInFaultHandlerTest.java
webservices/axis2/branches/java/jaxws21/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java
webservices/axis2/branches/java/jaxws21/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandlerTest.java
webservices/axis2/branches/java/jaxws21/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingValidationHandlerTest.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.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/emitter/CEmitter.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/databinding/CUtils.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/distribution/pom.xml
webservices/axis2/branches/java/jaxws21/modules/documentation/pom.xml
webservices/axis2/branches/java/jaxws21/modules/documentation/xdocs/tools/1_3/maven-plugins/maven-wsdl2code-plugin.xml
webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/binding/SOAPBinding.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/client/dispatch/BaseDispatch.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/HandlerResolverImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/MEPContext.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/SoapMessageContext.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/marshaller/factory/MethodMarshallerFactory.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMinimalMethodMarshaller.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Element.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/LegacyExceptionUtil.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLPart.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.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/impl/XMLPartBase.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpine.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.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/runtime/description/injection/impl/ResourceInjectionServiceRuntimeDescriptionBuilder.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/dispatcher/JavaBeanDispatcher.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/EndpointImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/Utils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/injection/impl/WebServiceContextInjectorImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/migrator/ApplicationContextMigratorUtil.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/utility/ClassUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/utility/PropertyDescriptorPlus.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/utility/XMLRootElementUtil.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test-resources/wsdl/AddNumbersHandler.wsdl
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/sample/AddNumbersHandlerTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersProtocolHandler.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/META-INF/AddNumbersHandler.wsdl
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/server/EchoString.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/server/EchoStringResponse.java
webservices/axis2/branches/java/jaxws21/modules/kernel/conf/axis2.xml
webservices/axis2/branches/java/jaxws21/modules/kernel/resources/services.xsd
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/Constants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/Options.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/clustering/ClusteringConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/MessageContext.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/dataretrieval/client/MexClient.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.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/ServiceBuilder.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/DeploymentFileData.java
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/resolver/AARFileBasedURIResolver.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/AxisDescription.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/OutInAxisOperation.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.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/WSDL2Constants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.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/dispatchers/HTTPLocationBasedDispatcher.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/transport/TransportUtils.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/HTTPWorker.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpRequestImpl.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/util/RESTUtil.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientHandler.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/ClientWorker.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/ConnectionPool.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/HttpCoreRequestResponseTransport.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/LoggingIOSession.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/NHttpConfiguration.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/ServerHandler.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/transport/nhttp/Util.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/nhttp/util/PipeImpl.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.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/builder/DescriptionBuilderComposite.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/impl/DescriptionFactoryImpl.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/EndpointDescriptionImpl.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.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/ServiceDescriptionImpl.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
webservices/axis2/branches/java/jaxws21/modules/rmi/src/org/apache/axis2/rmi/metadata/xml/XmlSchema.java
webservices/axis2/branches/java/jaxws21/modules/scripting/pom.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/build.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/idea-plugin-aseembly.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/pom.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/build.properties
webservices/axis2/branches/java/jaxws21/modules/tool/conf/codegen/plugin.xml
webservices/axis2/branches/java/jaxws21/modules/xmlbeans/pom.xml
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java Sat Dec 1 06:43:28 2007
@@ -46,6 +46,7 @@
private boolean generateAll = false;
private boolean offStrictValidation = false;
+ private boolean isUseWrapperClasses = false;
/**
* Package for the mapper
@@ -195,5 +196,11 @@
this.offStrictValidation = offStrictValidation;
}
+ public boolean isUseWrapperClasses() {
+ return isUseWrapperClasses;
+ }
+ public void setUseWrapperClasses(boolean useWrapperClasses) {
+ this.isUseWrapperClasses = useWrapperClasses;
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java Sat Dec 1 06:43:28 2007
@@ -584,6 +584,10 @@
options.setOffStrictValidation(true);
}
+ if (propertyMap.containsKey(SchemaConstants.SchemaCompilerArguments.USE_WRAPPER_CLASSES)){
+ options.setUseWrapperClasses(true);
+ }
+
//set helper mode
//this becomes effective only if the classes are unpacked
if (!options.isWrapClasses()) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Sat Dec 1 06:43:28 2007
@@ -21,6 +21,8 @@
import org.apache.axis2.namespace.Constants;
import org.apache.axis2.schema.i18n.SchemaCompilerMessages;
import org.apache.axis2.schema.util.SchemaPropertyLoader;
+import org.apache.axis2.schema.util.PrimitiveTypeFinder;
+import org.apache.axis2.schema.util.PrimitiveTypeWrapper;
import org.apache.axis2.schema.writer.BeanWriter;
import org.apache.axis2.util.URLProcessor;
import org.apache.axis2.util.SchemaUtil;
@@ -528,7 +530,7 @@
XmlSchemaType schemaType = xsElt.getSchemaType();
if (schemaType != null) {
- processSchema(xsElt, schemaType, parentSchema);
+ processSchema(xsElt, schemaType, parentSchema, false);
//at this time it is not wise to directly write the class for the element
//so we push the complete element to an arraylist and let the process
//pass through. We'll be iterating through the elements writing them
@@ -545,6 +547,11 @@
// always store the class name in the element meta Info itself
// this details only needed by the unwrappig to set the complex type
+ if (options.isUseWrapperClasses() &&
+ PrimitiveTypeFinder.isPrimitive(className) &&
+ ((xsElt.getMinOccurs() == 0) || (xsElt.isNillable()))) {
+ className = PrimitiveTypeWrapper.getWrapper(className);
+ }
schemaType.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY, className);
xsElt.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY, className);
@@ -637,53 +644,21 @@
SchemaCompilerMessages.getMessage("schema.referencedElementNotFound", xsElt.getRefName().toString()));
}
- //if the element is referenced, then it should be one of the outer (global) ones
- processElement(referencedElement, resolvedSchema);
-
- //no outer check required here. If the element is having a ref, then it is definitely
- //not an outer element since the top level elements are not supposed to have refs
- //Also we are sure that it should have a type reference
- QName referenceEltQName = referencedElement.getQName();
- if (referencedElement.getSchemaTypeName() != null) {
- // we have to only find the class name without arrary part
- String javaClassName = findClassName(referencedElement.getSchemaTypeName(), false);
- //if this element is referenced, there's no QName for this element
- this.processedElementRefMap.put(referenceEltQName, javaClassName);
+ // here what we want is to set the schema type name for the element
+ if (referencedElement.getSchemaType() != null) {
+ if (!this.processedElementRefMap.containsKey(referencedElement.getQName())){
+ processSchema(referencedElement, referencedElement.getSchemaType(), resolvedSchema, true);
+ // if this is an anonomous complex type we have to set this
+ this.processedElementRefMap.put(referencedElement.getQName(),
+ this.processedTypemap.get(referencedElement.getSchemaTypeName()));
+ }
+ String javaClassName = (String) this.processedTypemap.get(referencedElement.getSchemaTypeName());
referencedElement.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY,
javaClassName);
- // set the element class name to be used in unwrapping
xsElt.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY,
- javaClassName);
- } else {
- //this referenced element has an anon type and that anon type has been already
- //processed. But in this case we need it to be a seperate class since this
- //complextype has to be added as an attribute in a class.
- //generate a name for this type
- QName generatedTypeName = generateTypeQName(referenceEltQName, resolvedSchema);
- XmlSchemaType referenceSchemaType = referencedElement.getSchemaType();
-
-
- if (referenceSchemaType instanceof XmlSchemaComplexType) {
-
- if (referencedElement.getSchemaTypeName() == null) {
- referencedElement.setSchemaTypeName(generatedTypeName);
- }
-
- //set a name
- referenceSchemaType.setName(generatedTypeName.getLocalPart());
-
- String javaclassName = writeComplexType((XmlSchemaComplexType) referenceSchemaType,
- (BeanWriterMetaInfoHolder) processedAnonymousComplexTypesMap.get(referencedElement));
-
-
- processedTypemap.put(generatedTypeName, javaclassName);
- this.processedElementRefMap.put(referenceEltQName, javaclassName);
- // set the class name to be used in unwrapping
- xsElt.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY,
- javaclassName);
-
- }
+ javaClassName);
}
+
// schema type name is present but not the schema type object
} else if (xsElt.getSchemaTypeName() != null) {
//There can be instances where the SchemaType is null but the schemaTypeName is not!
@@ -698,7 +673,7 @@
if (typeByName != null) {
//this type is found in the schema so we can process it
- processSchema(xsElt, typeByName, resolvedSchema);
+ processSchema(xsElt, typeByName, resolvedSchema, false);
if (!isOuter) {
String className = findClassName(schemaTypeName, isArray(xsElt));
//since this is a inner element we should add it to the inner element map
@@ -847,11 +822,13 @@
*/
private void processSchema(XmlSchemaElement xsElt,
XmlSchemaType schemaType,
- XmlSchema parentSchema) throws SchemaCompilationException {
+ XmlSchema parentSchema,
+ boolean isWriteAnonComplexType) throws SchemaCompilationException {
if (schemaType instanceof XmlSchemaComplexType) {
//write classes for complex types
XmlSchemaComplexType complexType = (XmlSchemaComplexType) schemaType;
- if (complexType.getName() != null) {
+ // complex type name may not be null if we have set it
+ if (complexType.getName() != null && !this.changedComplexTypeSet.contains(schemaType)) {
// here complex type may be in another shcema so we have to find the
// correct parent schema.
XmlSchema resolvedSchema = getParentSchema(parentSchema,complexType.getQName(),COMPONENT_TYPE);
@@ -863,7 +840,7 @@
processNamedComplexSchemaType(complexType, resolvedSchema);
}
} else {
- processAnonymousComplexSchemaType(xsElt, complexType, parentSchema);
+ processAnonymousComplexSchemaType(xsElt, complexType, parentSchema, isWriteAnonComplexType);
}
} else if (schemaType instanceof XmlSchemaSimpleType) {
//process simple type
@@ -880,13 +857,49 @@
*/
private void processAnonymousComplexSchemaType(XmlSchemaElement elt,
XmlSchemaComplexType complexType,
- XmlSchema parentSchema)
+ XmlSchema parentSchema,
+ boolean isWriteAnonComplexType)
throws SchemaCompilationException {
+
+ //here we have a problem when processing the circulare element
+ // references if we differ this processing
+ // generate a name to the complex type and register it here
+ QName generatedTypeName = null;
+ String javaClassName = null;
+ if (isWriteAnonComplexType) {
+
+ generatedTypeName = generateTypeQName(elt.getQName(), parentSchema);
+
+ if (elt.getSchemaTypeName() == null) {
+ elt.setSchemaTypeName(generatedTypeName);
+ this.changedElementSet.add(elt);
+ }
+
+ //set a name
+ complexType.setName(generatedTypeName.getLocalPart());
+ this.changedComplexTypeSet.add(complexType);
+
+ javaClassName = writer.makeFullyQualifiedClassName(generatedTypeName);
+ processedTypemap.put(generatedTypeName, javaClassName);
+ this.processedElementRefMap.put(elt.getQName(), javaClassName);
+ complexType.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY, javaClassName);
+ }
+
+
BeanWriterMetaInfoHolder metaInfHolder = processComplexType(elt.getQName(),complexType, parentSchema);
+ // here the only difference is that we generate the class
+ // irrespective of where we need it or not
+ if (isWriteAnonComplexType) {
+ metaInfHolder.setOwnClassName(javaClassName);
+ metaInfHolder.setOwnQname(generatedTypeName);
+ writeComplexType(complexType, metaInfHolder);
+ }
+
//since this is a special case (an unnamed complex type) we'll put the already processed
//metainf holder in a special map to be used later
this.processedAnonymousComplexTypesMap.put(elt, metaInfHolder);
+
}
/**
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java Sat Dec 1 06:43:28 2007
@@ -110,7 +110,10 @@
public static final String PACKAGE = "p";
public static final String MAPPER_PACKAGE = "mp";
public static final String HELPER_MODE = "h";
+ // this option is used to set minOccurs =0 for all the elements
public static final String OFF_STRICT_VALIDATION = "osv";
+ // this option is used to use Wrapper classes for primitives
+ public static final String USE_WRAPPER_CLASSES = "uwc";
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/XSD2Java.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/XSD2Java.java?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/XSD2Java.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/XSD2Java.java Sat Dec 1 06:43:28 2007
@@ -83,6 +83,8 @@
//there's no point in not writing the classes here.
compilerOptions.setWriteOutput(true);
+// compilerOptions.setUseWrapperClasses(true);
+
SchemaCompiler compiler = new SchemaCompiler(compilerOptions);
compiler.compile(currentSchema);
}
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?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- 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 Sat Dec 1 06:43:28 2007
@@ -118,7 +118,7 @@
*/
private void clearAllSettingTrackers() {
<xsl:for-each select="property">
- <xsl:if test="$choice">
+ <xsl:if test="not(@attribute)">
local<xsl:value-of select="@javaname"/>Tracker = false;
</xsl:if>
</xsl:for-each>
@@ -741,11 +741,17 @@
</xsl:choose>
}
-
+ public void serialize(final javax.xml.namespace.QName parentQName,
+ final org.apache.axiom.om.OMFactory factory,
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
+ serialize(parentQName,factory,xmlWriter,false);
+ }
public void serialize(final javax.xml.namespace.QName parentQName,
final org.apache.axiom.om.OMFactory factory,
- org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+ org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter,
+ boolean serializeType)
throws javax.xml.stream.XMLStreamException, org.apache.axis2.databinding.ADBException{
<xsl:choose>
@@ -873,18 +879,22 @@
<!-- write the type attribute if needed -->
- <xsl:if test="$extension and not(@anon)">
- java.lang.String namespacePrefix = registerPrefix(xmlWriter,"<xsl:value-of select="$nsuri"/>");
- if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
- writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
- namespacePrefix+":<xsl:value-of select="$originalName"/>",
- xmlWriter);
- } else {
- writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
- "<xsl:value-of select="$originalName"/>",
- xmlWriter);
- }
+ <xsl:if test="not($extension) or @anon">
+ if (serializeType){
+ </xsl:if>
+ java.lang.String namespacePrefix = registerPrefix(xmlWriter,"<xsl:value-of select="$nsuri"/>");
+ if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+ namespacePrefix+":<xsl:value-of select="$originalName"/>",
+ xmlWriter);
+ } else {
+ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+ "<xsl:value-of select="$originalName"/>",
+ xmlWriter);
+ }
+ <xsl:if test="not($extension) or @anon">
+ }
</xsl:if>
<!--First serialize the attributes!-->
<xsl:for-each select="property[@attribute]">
@@ -1157,27 +1167,34 @@
if (<xsl:value-of select="$varName"/>!=null){
for (int i = 0;i < <xsl:value-of select="$varName"/>.length;i++){
if (<xsl:value-of select="$varName"/>[i] != null){
- // write null attribute
- java.lang.String namespace2 = "<xsl:value-of select="$namespace"/>";
- if (! namespace2.equals("")) {
- java.lang.String prefix2 = xmlWriter.getPrefix(namespace2);
- if (prefix2 == null) {
- prefix2 = generatePrefix(namespace2);
+ if (<xsl:value-of select="$varName"/>[i] instanceof org.apache.axis2.databinding.ADBBean){
+ ((org.apache.axis2.databinding.ADBBean)<xsl:value-of select="$varName"/>[i]).serialize(
+ new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>"),
+ factory,xmlWriter,true);
+ } else {
+ java.lang.String namespace2 = "<xsl:value-of select="$namespace"/>";
+ if (! namespace2.equals("")) {
+ java.lang.String prefix2 = xmlWriter.getPrefix(namespace2);
- xmlWriter.writeStartElement(prefix2,"<xsl:value-of select="$propertyName"/>", namespace2);
- xmlWriter.writeNamespace(prefix2, namespace2);
- xmlWriter.setPrefix(prefix2, namespace2);
+ if (prefix2 == null) {
+ prefix2 = generatePrefix(namespace2);
+
+ xmlWriter.writeStartElement(prefix2,"<xsl:value-of select="$propertyName"/>", namespace2);
+ xmlWriter.writeNamespace(prefix2, namespace2);
+ xmlWriter.setPrefix(prefix2, namespace2);
+
+ } else {
+ xmlWriter.writeStartElement(namespace2,"<xsl:value-of select="$propertyName"/>");
+ }
} else {
- xmlWriter.writeStartElement(namespace2,"<xsl:value-of select="$propertyName"/>");
+ xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
}
+ org.apache.axis2.databinding.utils.ConverterUtil.serializeAnyType(<xsl:value-of select="$varName"/>[i], xmlWriter);
+ xmlWriter.writeEndElement();
+ }
- } else {
- xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
- }
- org.apache.axis2.databinding.utils.ConverterUtil.serializeAnyType(<xsl:value-of select="$varName"/>[i], xmlWriter);
- xmlWriter.writeEndElement();
} else {
<xsl:choose>
<xsl:when test="@nillable">
@@ -1252,27 +1269,32 @@
<xsl:when test="@default and not(@array)">
<!-- Note - Assumed to be OMElement-->
if (<xsl:value-of select="$varName"/>!=null){
- // write null attribute
- java.lang.String namespace2 = "<xsl:value-of select="$namespace"/>";
- if (! namespace2.equals("")) {
- java.lang.String prefix2 = xmlWriter.getPrefix(namespace2);
-
- if (prefix2 == null) {
- prefix2 = generatePrefix(namespace2);
-
- xmlWriter.writeStartElement(prefix2,"<xsl:value-of select="$propertyName"/>", namespace2);
- xmlWriter.writeNamespace(prefix2, namespace2);
- xmlWriter.setPrefix(prefix2, namespace2);
+ if (<xsl:value-of select="$varName"/> instanceof org.apache.axis2.databinding.ADBBean){
+ ((org.apache.axis2.databinding.ADBBean)<xsl:value-of select="$varName"/>).serialize(
+ new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>"),
+ factory,xmlWriter,true);
+ } else {
+ java.lang.String namespace2 = "<xsl:value-of select="$namespace"/>";
+ if (! namespace2.equals("")) {
+ java.lang.String prefix2 = xmlWriter.getPrefix(namespace2);
+
+ if (prefix2 == null) {
+ prefix2 = generatePrefix(namespace2);
+
+ xmlWriter.writeStartElement(prefix2,"<xsl:value-of select="$propertyName"/>", namespace2);
+ xmlWriter.writeNamespace(prefix2, namespace2);
+ xmlWriter.setPrefix(prefix2, namespace2);
+
+ } else {
+ xmlWriter.writeStartElement(namespace2,"<xsl:value-of select="$propertyName"/>");
+ }
} else {
- xmlWriter.writeStartElement(namespace2,"<xsl:value-of select="$propertyName"/>");
+ xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
}
-
- } else {
- xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
- }
- org.apache.axis2.databinding.utils.ConverterUtil.serializeAnyType(<xsl:value-of select="$varName"/>, xmlWriter);
- xmlWriter.writeEndElement();
+ org.apache.axis2.databinding.utils.ConverterUtil.serializeAnyType(<xsl:value-of select="$varName"/>, xmlWriter);
+ xmlWriter.writeEndElement();
+ }
} else {
<xsl:choose>
<xsl:when test="@nillable">
@@ -1366,8 +1388,8 @@
<xsl:if test="not(@primitive)">
<xsl:choose>
- <xsl:when test="$propertyType='java.lang.String[]'">
- xmlWriter.writeCharacters(<xsl:value-of select="$varName"/>[i]);
+ <xsl:when test="@binary">
+ xmlWriter.writeDataHandler(<xsl:value-of select="$varName"/>[i]);
</xsl:when>
<xsl:otherwise>
xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>[i]));
@@ -1672,6 +1694,20 @@
} else {
xmlWriter.writeStartElement(localName);
}
+
+ // add the type details if this is used in a simple type
+ if (serializeType){
+ java.lang.String namespacePrefix = registerPrefix(xmlWriter,"<xsl:value-of select="$nsuri"/>");
+ if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){
+ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+ namespacePrefix+":<xsl:value-of select="$originalName"/>",
+ xmlWriter);
+ } else {
+ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type",
+ "<xsl:value-of select="$originalName"/>",
+ xmlWriter);
+ }
+ }
<xsl:if test="not($primitive)">
if (<xsl:value-of select="$varName"/>==null){
<xsl:choose>
@@ -1748,8 +1784,8 @@
xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
}
</xsl:if>
+ xmlWriter.writeEndElement();
- xmlWriter.writeEndElement();
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
@@ -2939,7 +2975,8 @@
reader.next();
}else{
</xsl:if>
- <xsl:value-of select="$listName"/>.add(org.apache.axis2.databinding.utils.ConverterUtil.getAnyTypeObject(reader));
+ <xsl:value-of select="$listName"/>.add(org.apache.axis2.databinding.utils.ConverterUtil.getAnyTypeObject(reader,
+ <xsl:value-of select="$mapperClass"/>.class));
<xsl:if test="@nillable">}</xsl:if>
} else if (javax.xml.stream.XMLStreamConstants.START_ELEMENT == event &&
!<xsl:value-of select="$startQname"/>.equals(reader.getName())){
@@ -3272,7 +3309,8 @@
<!-- end of adb type handling code -->
<!-- start of OMelement handling -->
<xsl:when test="@default">
- object.set<xsl:value-of select="$javaName"/>(org.apache.axis2.databinding.utils.ConverterUtil.getAnyTypeObject(reader));
+ object.set<xsl:value-of select="$javaName"/>(org.apache.axis2.databinding.utils.ConverterUtil.getAnyTypeObject(reader,
+ <xsl:value-of select="$mapperClass"/>.class));
<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/template/CADBBeanTemplateHeader.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl?rev=600141&r1=600140&r2=600141&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl Sat Dec 1 06:43:28 2007
@@ -27,7 +27,8 @@
{
#endif
- #define AXIS2_DEFAULT_DIGIT_LIMIT 128
+ #define ADB_DEFAULT_DIGIT_LIMIT 64
+ #define ADB_DEFAULT_NAMESPACE_PREFIX_LIMIT 64
/**
* <xsl:value-of select="$axis2_name"/> wrapped class classes ( structure for C )
@@ -57,13 +58,18 @@
#ifndef <xsl:value-of select="$caps_axis2_name"/>_H
#define <xsl:value-of select="$caps_axis2_name"/>_H
- /**
+ /**
* <xsl:value-of select="$axis2_name"/>.h
*
* This file was auto-generated from WSDL
* by the Apache Axis2/Java version: #axisVersion# #today#
*/
+ /**
+ * <xsl:value-of select="$axis2_name"/> class
+ */
+ typedef struct <xsl:value-of select="$axis2_name"/><xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t;
+
<xsl:for-each select="property">
<xsl:if test="@ours">
<xsl:variable name="propertyType"><xsl:if test="@ours">adb_</xsl:if><xsl:value-of select="@type"></xsl:value-of></xsl:variable>
@@ -98,11 +104,8 @@
{
#endif
- #define AXIS2_DEFAULT_DIGIT_LIMIT 64
- /**
- * <xsl:value-of select="$axis2_name"/> class
- */
- typedef struct <xsl:value-of select="$axis2_name"/><xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t;
+ #define ADB_DEFAULT_DIGIT_LIMIT 64
+ #define ADB_DEFAULT_NAMESPACE_PREFIX_LIMIT 64
/**
* Constructor for creating <xsl:value-of select="$axis2_name"/>_t
@@ -130,7 +133,7 @@
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/><xsl:text> </xsl:text> <xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
* @param node_value to deserialize
- * @param parent parent node which contain the simple type
+ * @param parent_element The parent element if it is an element, NULL otherwise
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t AXIS2_CALL
@@ -145,37 +148,42 @@
* Deserialize an XML to adb objects
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
- * @param parent to deserialize
+ * @param parent double pointer to the parent node to deserialize
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_deserialize(
<xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
- const axutil_env_t *env, axiom_node_t* parent);
+ const axutil_env_t *env, axiom_node_t** parent);
+
+ <!-- Here the double pointer is used to change the parent pointer - This can be happned when deserialize is called in a particle class -->
/**
- * Declare namespace in the parent node (Pass either the parent element or the stream and set the other NULL)
+ * Declare namespace in the most parent node
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/><xsl:text> </xsl:text> <xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
- * @param parent_element The parent element if it is an element, NULL otherwise
- * @param stream if parent is not an element and is a stream, pass the stream, NULL otherwise
+ * @param parent_element parent element
+ * @param namespaces hash of namespace uri to prefix
+ * @param next_ns_index pointer to an int which contain the next namespace index
*/
void AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_declare_parent_namespaces(
<xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
- const axutil_env_t *env, axiom_element_t *parent_element, axutil_stream_t *stream);
+ const axutil_env_t *env, axiom_element_t *parent_element,
+ axutil_hash_t *namespaces, int *next_ns_index);
<xsl:if test="@simple">
/**
* Serialize to a String from the adb objects
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
+ * @param namespaces hash of namespace uri to prefix
* @return serialized string
*/
axis2_char_t* AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_serialize_to_string(
<xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
- const axutil_env_t *env);
+ const axutil_env_t *env, axutil_hash_t *namespaces);
</xsl:if>
/**
@@ -183,14 +191,24 @@
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
* @param <xsl:value-of select="$name"/>_om_node node to serialize from
+ * @param <xsl:value-of select="$name"/>_om_element parent element to serialize from
* @param tag_closed whether the parent tag is closed or not
+ * @param namespaces hash of namespace uri to prefix
+ * @param next_ns_index an int which contain the next namespace index
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axiom_node_t* AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_serialize(
<xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
const axutil_env_t *env,
- axiom_node_t* <xsl:value-of select="$name"/>_om_node, int tag_closed);
+ axiom_node_t* <xsl:value-of select="$name"/>_om_node, axiom_element_t *<xsl:value-of select="$name"/>_om_element, int tag_closed, axutil_hash_t *namespaces, int *next_ns_index);
+
+ /**
+ * Check whether the <xsl:value-of select="$axis2_name"/> is a particle class (E.g. A group)
+ * @return whether this is a particle class.
+ */
+ axis2_bool_t AXIS2_CALL
+ <xsl:value-of select="$axis2_name"/>_is_particle();
<xsl:for-each select="property">
@@ -227,7 +245,7 @@
</xsl:choose>
</xsl:variable>
/**
- * Getter for <xsl:value-of select="$propertyName"/>.
+ * Getter for <xsl:value-of select="$propertyName"/>. <xsl:if test="@isarray">Deprecated for array types, Use <xsl:value-of select="$axis2_name"/>_get_<xsl:value-of select="$CName"/>_at instead</xsl:if>
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
* @return <xsl:value-of select="$paramComment"/>
@@ -238,19 +256,19 @@
const axutil_env_t *env);
/**
- * Setter for <xsl:value-of select="$propertyName"/>.
+ * Setter for <xsl:value-of select="$propertyName"/>.<xsl:if test="@isarray">Deprecated for array types, Use <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>_at
+ * or <xsl:value-of select="$axis2_name"/>_add_<xsl:value-of select="$CName"/> instead.</xsl:if>
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
- * @param param_<xsl:value-of select="$CName"/><xsl:text> </xsl:text> <xsl:value-of select="$paramComment"/>
+ * @param arg_<xsl:value-of select="$CName"/><xsl:text> </xsl:text> <xsl:value-of select="$paramComment"/>
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>(
<xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
const axutil_env_t *env,
- <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text> param_<xsl:value-of select="$CName"/>);
+ <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text> arg_<xsl:value-of select="$CName"/>);
- <xsl:if test="@isarray">
/**
* Resetter for <xsl:value-of select="$propertyName"/>
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
@@ -262,6 +280,35 @@
<xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
const axutil_env_t *env);
+
+ /**
+ * Check whether <xsl:value-of select="$propertyName"/> is nill
+ * @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
+ * @param env pointer to environment struct
+ * @return AXIS2_TRUE if the element is nil or AXIS2_FALSE otherwise
+ */
+ axis2_bool_t AXIS2_CALL
+ <xsl:value-of select="$axis2_name"/>_is_<xsl:value-of select="$CName"/>_nil(
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
+ const axutil_env_t *env);
+
+
+ <xsl:if test="@nillable or @optional">
+ /**
+ * Set <xsl:value-of select="$propertyName"/> to nill (currently the same as reset)
+ * @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ axis2_status_t AXIS2_CALL
+ <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>_nil(
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
+ const axutil_env_t *env);
+ </xsl:if>
+
+
+ <xsl:if test="@isarray">
+
/**
* Get ith element of <xsl:value-of select="$propertyName"/>.
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
@@ -275,17 +322,32 @@
const axutil_env_t *env, int i);
/**
+ * Set ith element of <xsl:value-of select="$propertyName"/>.
+ * @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
+ * @param env pointer to environment struct
+ * @param i index of the item to return
+ * @param <xsl:text>arg_</xsl:text> <xsl:value-of select="$CName"/> element to set <xsl:value-of select="$nativePropertyType"/> to the array
+ * @return ith <xsl:value-of select="$nativePropertyType"/> of the array
+ */
+ axis2_status_t AXIS2_CALL
+ <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>_at(
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
+ const axutil_env_t *env, int i,
+ <xsl:value-of select="$nativePropertyType"/><xsl:text> arg_</xsl:text> <xsl:value-of select="$CName"/>);
+
+
+ /**
* Add to <xsl:value-of select="$propertyName"/>.
* @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
* @param env pointer to environment struct
- * @param <xsl:text>param_</xsl:text> <xsl:value-of select="$CName"/> element to add <xsl:value-of select="$nativePropertyType"/> to the array
+ * @param <xsl:text>arg_</xsl:text> <xsl:value-of select="$CName"/> element to add <xsl:value-of select="$nativePropertyType"/> to the array
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_add_<xsl:value-of select="$CName"/>(
- <xsl:value-of select="$axis2_name"/>_t*<xsl:text> </xsl:text><xsl:value-of select="$name"/>,
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
const axutil_env_t *env,
- <xsl:value-of select="$nativePropertyType"/><xsl:text> param_</xsl:text> <xsl:value-of select="$CName"/>);
+ <xsl:value-of select="$nativePropertyType"/><xsl:text> arg_</xsl:text> <xsl:value-of select="$CName"/>);
/**
* Get the size of the <xsl:value-of select="$propertyName"/> array.
@@ -295,10 +357,37 @@
*/
int AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_sizeof_<xsl:value-of select="$CName"/>(
- <xsl:value-of select="$axis2_name"/>_t*<xsl:text> </xsl:text><xsl:value-of select="$name"/>,
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
const axutil_env_t *env);
+ /**
+ * Check whether <xsl:value-of select="$propertyName"/> is nill at i
+ * @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> <xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
+ * @param env pointer to environment struct.
+ * @param i index of the item to return.
+ * @return AXIS2_TRUE if the element is nil or AXIS2_FALSE otherwise
+ */
+ axis2_bool_t AXIS2_CALL
+ <xsl:value-of select="$axis2_name"/>_is_<xsl:value-of select="$CName"/>_nil_at(
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
+ const axutil_env_t *env, int i);
+
+
+ <xsl:if test="@nillable or @optional">
+ /**
+ * Set <xsl:value-of select="$propertyName"/> to nill at i
+ * @param <xsl:text> _</xsl:text><xsl:value-of select="$name"/> _<xsl:text> </xsl:text><xsl:value-of select="$axis2_name"/>_t object
+ * @param env pointer to environment struct.
+ * @param i index of the item to set.
+ * @return AXIS2_SUCCESS on success, or AXIS2_FAILURE otherwise.
+ */
+ axis2_status_t AXIS2_CALL
+ <xsl:value-of select="$axis2_name"/>_set_<xsl:value-of select="$CName"/>_nil_at(
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
+ const axutil_env_t *env, int i);
</xsl:if>
+
+ </xsl:if> <!-- closes isarray -->
</xsl:for-each>
#ifdef __cplusplus
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org