You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2007/06/29 20:54:51 UTC
svn commit: r551999 [1/9] - in /webservices/axis2/branches/java/jaxws21:
modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/test-resources/testsuite/ modules/adb-codegen/test/o...
Author: pradine
Date: Fri Jun 29 11:54:44 2007
New Revision: 551999
URL: http://svn.apache.org/viewvc?view=rev&rev=551999
Log:
Sync with trunk to revision 551859.
Added:
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypesDocLitBare/
- copied from r551859, webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypesDocLitBare/
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypesDocLitBare/ComplexDataTypesDocLitBare.wsdl
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypesDocLitBare/ComplexDataTypesDocLitBare.wsdl
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/wsdl/Version.wsdl
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/integration/test-resources/wsdl/Version.wsdl
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/deployment/WSDL11ToAxisServiceBuilderTest.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/WSDL11ToAxisServiceBuilderTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/ComplexDataTypesDocLitBare.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/ComplexDataTypesDocLitBare.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/
- copied from r551859, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/GenericProviderDispatcher.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/dispatchers/GenericProviderDispatcher.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/CompositeMessageContextTests.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/CompositeMessageContextTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/provider/GenericOperationProviderTest.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/GenericOperationProviderTest.java
webservices/axis2/branches/java/jaxws21/modules/metadata/test/org/apache/axis2/jaxws/description/GetSyncOperationTests.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/GetSyncOperationTests.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/
- copied from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/Action.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/Action.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/CancelAction.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/CancelAction.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/DefaultWizardComponents.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/DefaultWizardComponents.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/FinishAction.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/FinishAction.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/Utilities.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/Utilities.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/Wizard.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/Wizard.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardComponents.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardComponents.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardPanel.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/
- copied from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/CodegenFrame.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/CodegenFrame.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java
- copied unchanged from r551859, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java
Modified:
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/template/ADBBeanTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/testattribute.xsd
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/innerparticles/InnerParticlesTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.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/Union.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/ConverterUtil.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.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/RPCInOutAsyncMessageReceiver.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/branches/java/jaxws21/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/DeleteServiceGroupContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/codegen/pom.xml
webservices/axis2/branches/java/jaxws21/modules/codegen/project.xml
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/CodeGenConfiguration.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/CodegenConfigLoader.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/SchemaUnwrapperExtension.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.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/i18n/resource.properties
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.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/NoneDatabindingTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTIncludeResolver.java
webservices/axis2/branches/java/jaxws21/modules/integration/itest-build.xml
webservices/axis2/branches/java/jaxws21/modules/integration/maven.xml
webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/BaseDataTypes.wsdl
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfPerson.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfanyType.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
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/context/WebServiceContextImpl.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/LogicalMessageImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.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/XMLPartBase.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.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/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/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/LogicalMessageContextTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/message/FaultTests.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
webservices/axis2/branches/java/jaxws21/modules/kernel/pom.xml
webservices/axis2/branches/java/jaxws21/modules/kernel/project.xml
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/AxisFault.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/Constants.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/context/AbstractContext.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.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/deployment/AxisConfigBuilder.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/repository/util/ArchiveReader.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/AxisMessage.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/AxisServiceGroup.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.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/java2wsdl/DefaultSchemaGenerator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.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/DispatchPhase.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/Handler.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/i18n/resource.properties
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.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/ApplicationXMLFormatter.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/HTTPTransportUtils.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/AxisHttpService.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/util/SOAPUtil.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/local/LocalResponder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.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/tcp/TCPTransportSender.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/engine/SOAPActionBasedDispatcherTest.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointInterfaceDescription.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/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/description/impl/URIResolverImpl.java
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/SOAPElementImpl.java
webservices/axis2/branches/java/jaxws21/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
webservices/axis2/branches/java/jaxws21/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultTest.java
webservices/axis2/branches/java/jaxws21/modules/samples/deprecated/googlesearch/src/sample/google/search/GUIHandler.java
webservices/axis2/branches/java/jaxws21/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
webservices/axis2/branches/java/jaxws21/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
webservices/axis2/branches/java/jaxws21/xdocs/@axis2_version_dir@/migration.html
webservices/axis2/branches/java/jaxws21/xdocs/release-process.html
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?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- 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 Fri Jun 29 11:54:44 2007
@@ -11,6 +11,8 @@
import org.apache.axis2.wsdl.util.Constants;
import org.apache.axis2.util.URLProcessor;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.schema.typemap.TypeMap;
+import org.apache.axis2.schema.typemap.JavaTypeMap;
import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
@@ -198,7 +200,29 @@
private static void setComplexTypeName(AxisMessage axisMessage) throws AxisFault {
if (axisMessage.getSchemaElement() != null){
- XmlSchemaType schemaType = axisMessage.getSchemaElement().getSchemaType();
+
+ XmlSchemaElement schemaElement = axisMessage.getSchemaElement();
+ XmlSchemaType schemaType = schemaElement.getSchemaType();
+ QName schemaTypeQname = schemaElement.getSchemaTypeName();
+
+ if (schemaType == null) {
+ if (schemaTypeQname != null) {
+ // find the schema type from all the schemas
+ // now we need to get the schema of the extension type from the parent schema. For that let's first retrieve
+ // the parent schema
+ AxisService axisService = (AxisService) axisMessage.getParent().getParent();
+ ArrayList schemasList = axisService.getSchema();
+ XmlSchema schema = null;
+ for (Iterator iter = schemasList.iterator(); iter.hasNext();) {
+ schema = (XmlSchema) iter.next();
+ schemaType = getSchemaType(schema, schemaTypeQname);
+ if (schemaType != null) {
+ break;
+ }
+ }
+ }
+ }
+
if (schemaType instanceof XmlSchemaComplexType){
XmlSchemaComplexType complexType = (XmlSchemaComplexType) schemaType;
if ((complexType.getName() != null) && (complexType.getQName() != null)) {
@@ -241,10 +265,39 @@
String qnameSuffix) {
if (message.getParameter(Constants.UNWRAPPED_KEY) != null) {
- XmlSchemaType schemaType = message.getSchemaElement().getSchemaType();
+
+ XmlSchemaElement schemaElement = message.getSchemaElement();
+ XmlSchemaType schemaType = schemaElement.getSchemaType();
+ QName schemaTypeQname = schemaElement.getSchemaTypeName();
+
+ if (schemaType == null) {
+ if (schemaTypeQname != null) {
+ // find the schema type from all the schemas
+ // now we need to get the schema of the extension type from the parent schema. For that let's first retrieve
+ // the parent schema
+ AxisService axisService = (AxisService) message.getParent().getParent();
+ ArrayList schemasList = axisService.getSchema();
+
+ XmlSchema schema = null;
+ for (Iterator iter = schemasList.iterator(); iter.hasNext();) {
+ schema = (XmlSchema) iter.next();
+ schemaType = getSchemaType(schema, schemaTypeQname);
+ if (schemaType != null) {
+ break;
+ }
+ }
+ }
+ }
+
//create a type mapper
+ TypeMap basicTypeMap = new JavaTypeMap();
if (schemaType instanceof XmlSchemaComplexType) {
processXMLSchemaComplexType(schemaType, mapper, opName, schemaMap, qnameSuffix);
+ } else if ((schemaTypeQname != null) && basicTypeMap.getTypeMap().containsKey(schemaTypeQname)){
+ QName partQName = WSDLUtil.getPartQName(opName,
+ qnameSuffix,
+ message.getElementQName().getLocalPart());
+ mapper.addTypeMappingName(partQName, (String)basicTypeMap.getTypeMap().get(schemaTypeQname));
} else if (schemaType instanceof XmlSchemaSimpleType) {
XmlSchemaSimpleType xmlSchemaSimpleType = (XmlSchemaSimpleType) schemaType;
populateClassName(xmlSchemaSimpleType.getMetaInfoMap(),
@@ -253,6 +306,7 @@
false,
message.getElementQName().getLocalPart(),
qnameSuffix);
+ // handle xsd:anyType
}
}
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?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- 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 Fri Jun 29 11:54:44 2007
@@ -91,8 +91,6 @@
public static final String USE_REQUIRED = "required";
public static final String USE_NONE = "none";
- private static int typeCounter = 0;
-
/**
* @return the processes element map
* includes the Qname of the element as the key and a
@@ -724,6 +722,11 @@
private XmlSchema resolveParentSchema(QName schemaTypeName, XmlSchema currentSchema)
throws SchemaCompilationException {
String targetNamespace = schemaTypeName.getNamespaceURI();
+
+ // if the current schema has the same namespace we use it
+ if (currentSchema.getTargetNamespace().equals(targetNamespace)){
+ return currentSchema;
+ }
Object loadedSchema = loadedSchemaMap.get(targetNamespace);
if (loadedSchema != null) {
return (XmlSchema) loadedSchema;
@@ -745,37 +748,15 @@
*/
private QName generateTypeQName(QName referenceEltQName, XmlSchema parentSchema) {
QName generatedTypeName = new QName(referenceEltQName.getNamespaceURI(),
- referenceEltQName.getLocalPart() + getNextTypeSuffix());
+ referenceEltQName.getLocalPart() + getNextTypeSuffix(referenceEltQName.getLocalPart()));
while (parentSchema.getTypeByName(generatedTypeName) != null) {
generatedTypeName = new QName(referenceEltQName.getNamespaceURI(),
- referenceEltQName.getLocalPart() + getNextTypeSuffix());
+ referenceEltQName.getLocalPart() + getNextTypeSuffix(referenceEltQName.getLocalPart()));
}
return generatedTypeName;
}
/**
- * Generate a unique attribute Qname using the ref name
- *
- * @param attrRefName
- * @param parentSchema
- * @return Returns the generated attribute name
- */
- private QName generateAttributeQName(QName attrRefName, XmlSchema parentSchema) {
-
- if (typeCounter == Integer.MAX_VALUE) {
- typeCounter = 0;
- }
- QName generatedAttrName = new QName(attrRefName.getNamespaceURI(),
- attrRefName.getLocalPart() + typeCounter++);
-
- while (parentSchema.getTypeByName(generatedAttrName) != null) {
- generatedAttrName = new QName(attrRefName.getNamespaceURI(),
- attrRefName.getLocalPart() + typeCounter++);
- }
- return generatedAttrName;
- }
-
- /**
* Finds whether a given class is already made
*
* @param qName
@@ -1036,7 +1017,7 @@
if (xmlSchemaAttributeGroup != null){
processAttributes(xmlSchemaAttributeGroup.getAttributes(),metaInfHolder,parentSchema);
} else {
- throw new SchemaCompilationException("Can not find an attribute group for group reference"
+ throw new SchemaCompilationException("Can not find an attribute group for group reference "
+ attributeGroupRefName.getLocalPart());
}
} else {
@@ -1690,7 +1671,7 @@
schemaTypeQName = attributeSimpleType.getQName();
} else {
schemaTypeQName = new QName(parentSchema.getTargetNamespace(),
- attributeQName.getLocalPart() + getNextTypeSuffix());
+ attributeQName.getLocalPart() + getNextTypeSuffix(attributeQName.getLocalPart()));
}
}
@@ -1838,6 +1819,38 @@
}
+ } else if (particle instanceof XmlSchemaGroupRef){
+
+ XmlSchemaGroupRef xmlSchemaGroupRef = (XmlSchemaGroupRef) particle;
+ QName groupQName = xmlSchemaGroupRef.getRefName();
+ if (groupQName != null) {
+ if (!processedTypemap.containsKey(groupQName)) {
+ // processe the schema here
+ XmlSchema resolvedParentSchema = resolveParentSchema(groupQName, parentSchema);
+ XmlSchemaGroup xmlSchemaGroup = getGroup(groupQName, resolvedParentSchema);
+ if (xmlSchemaGroup != null) {
+ processGroup(xmlSchemaGroup, groupQName, parentSchema);
+ } else {
+ throw new SchemaCompilationException("Refered Group " + groupQName.getLocalPart() + " can not be found ");
+ }
+ }
+ } else {
+ throw new SchemaCompilationException("Referenced name is null");
+ }
+ boolean isArray = xmlSchemaGroupRef.getMaxOccurs() > 1;
+
+ // add this as an array to the original class
+ metainfHolder.registerMapping(groupQName, groupQName, findClassName(groupQName, isArray));
+ if (isArray) {
+ metainfHolder.addtStatus(groupQName, SchemaConstants.ARRAY_TYPE);
+ }
+ metainfHolder.addtStatus(groupQName, SchemaConstants.PARTICLE_TYPE_ELEMENT);
+ metainfHolder.addMaxOccurs(groupQName, xmlSchemaGroupRef.getMaxOccurs());
+ metainfHolder.addMinOccurs(groupQName, xmlSchemaGroupRef.getMinOccurs());
+ metainfHolder.setHasParticleType(true);
+ metainfHolder.setOrdered(true);
+ metainfHolder.registerQNameIndex(groupQName,metainfHolder.getOrderStartPoint() + 1);
+
}
}
@@ -1903,8 +1916,9 @@
BeanWriterMetaInfoHolder beanWriterMetaInfoHolder = new BeanWriterMetaInfoHolder();
process(parentElementQName, xmlSchemaSequence.getItems(), beanWriterMetaInfoHolder, true, parentSchema);
beanWriterMetaInfoHolder.setParticleClass(true);
+ String localName = parentElementQName.getLocalPart() + "Sequence";
QName sequenceQName = new QName(parentElementQName.getNamespaceURI(),
- parentElementQName.getLocalPart() + "Sequence" + getNextTypeSuffix());
+ localName + getNextTypeSuffix(localName));
String javaClassName = writeComplexParticle(sequenceQName, beanWriterMetaInfoHolder);
processedTypemap.put(sequenceQName, javaClassName);
@@ -1927,8 +1941,9 @@
beanWriterMetaInfoHolder.setChoice(true);
process(parentElementQName, xmlSchemaChoice.getItems(), beanWriterMetaInfoHolder, false, parentSchema);
beanWriterMetaInfoHolder.setParticleClass(true);
+ String localName = parentElementQName.getLocalPart() + "Choice";
QName choiceQName = new QName(parentElementQName.getNamespaceURI(),
- parentElementQName.getLocalPart() + "Choice" + getNextTypeSuffix());
+ localName + getNextTypeSuffix(localName));
String javaClassName = writeComplexParticle(choiceQName, beanWriterMetaInfoHolder);
processedTypemap.put(choiceQName, javaClassName);
@@ -2422,7 +2437,7 @@
QName fakeQname;
if (xsElt != null) {
- fakeQname = new QName(xsElt.getQName().getNamespaceURI(), xsElt.getQName().getLocalPart() + getNextTypeSuffix());
+ fakeQname = new QName(xsElt.getQName().getNamespaceURI(), xsElt.getQName().getLocalPart() + getNextTypeSuffix(xsElt.getQName().getLocalPart()));
// we have to set this otherwise the ours attribute would not set properly if refered to this simple
// type from any other element
xsElt.setSchemaTypeName(fakeQname);
@@ -2543,7 +2558,7 @@
childQname = unionSimpleType.getQName();
if (childQname == null) {
// we create a fake Qname for all these simple types since most propably they don't have one
- childQname = new QName(parentSimpleTypeQname.getNamespaceURI(), parentSimpleTypeQname.getLocalPart() + "_type" + i);
+ childQname = new QName(parentSimpleTypeQname.getNamespaceURI(), parentSimpleTypeQname.getLocalPart() + getNextTypeSuffix(parentSimpleTypeQname.getLocalPart()));
}
// this is an inner simple type of the union so it shold not have
// processed
@@ -2611,11 +2626,18 @@
}
- private String getNextTypeSuffix() {
- if (typeCounter == Integer.MAX_VALUE) {
- typeCounter = 0;
+ HashMap mapTypeCount = new HashMap();
+ private String getNextTypeSuffix(String localName) {
+ Integer typeCounter = (Integer) mapTypeCount.get(localName);
+ int count = 0;
+ if (typeCounter != null) {
+ if(typeCounter.intValue() == Integer.MAX_VALUE) {
+ count = 0;
+ } else {
+ count = typeCounter.intValue();
+ }
}
- return ("_type" + typeCounter++);
+ mapTypeCount.put(localName, new Integer(count+1));
+ return ("_type" + count);
}
-
}
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=551999&r1=551998&r2=551999
==============================================================================
--- 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 Jun 29 11:54:44 2007
@@ -453,10 +453,10 @@
if (param==java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='double'">
- if (param==java.lang.Double.NaN) {
+ if (java.lang.Double.isNaN(param)) {
</xsl:when>
<xsl:when test="$propertyType='float'">
- if (param==java.lang.Float.NaN) {
+ if (java.lang.Float.isNaN(param)) {
</xsl:when>
<xsl:when test="$propertyType='short'">
if (param==java.lang.Short.MIN_VALUE) {
@@ -903,10 +903,10 @@
if (<xsl:value-of select="$varName"/>!=java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='double'">
- if (<xsl:value-of select="$varName"/>!=java.lang.Double.NaN) {
+ if (!java.lang.Double.isNaN(<xsl:value-of select="$varName"/>)) {
</xsl:when>
<xsl:when test="$propertyType='float'">
- if (<xsl:value-of select="$varName"/>!=java.lang.Float.NaN) {
+ if (!java.lang.Float.isNaN(<xsl:value-of select="$varName"/>)) {
</xsl:when>
<xsl:when test="$propertyType='short'">
if (<xsl:value-of select="$varName"/>!=java.lang.Short.MIN_VALUE) {
@@ -1292,10 +1292,10 @@
if (<xsl:value-of select="$varName"/>[i]!=java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyBaseType='double'">
- if (<xsl:value-of select="$varName"/>[i]!=java.lang.Double.NaN) {
+ if (!java.lang.Double.isNaN(<xsl:value-of select="$varName"/>[i])) {
</xsl:when>
<xsl:when test="$propertyBaseType='float'">
- if (<xsl:value-of select="$varName"/>[i]!=java.lang.Float.NaN) {
+ if (!java.lang.Float.isNaN(<xsl:value-of select="$varName"/>[i])) {
</xsl:when>
<xsl:when test="$propertyBaseType='short'">
if (<xsl:value-of select="$varName"/>[i]!=java.lang.Short.MIN_VALUE) {
@@ -1522,10 +1522,10 @@
if (<xsl:value-of select="$varName"/>==java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='double'">
- if (<xsl:value-of select="$varName"/>==java.lang.Double.NaN) {
+ if (java.lang.Double.isNaN(<xsl:value-of select="$varName"/>)) {
</xsl:when>
<xsl:when test="$propertyType='float'">
- if (<xsl:value-of select="$varName"/>==java.lang.Float.NaN) {
+ if (java.lang.Float.isNaN(<xsl:value-of select="$varName"/>)) {
</xsl:when>
<xsl:when test="$propertyType='short'">
if (<xsl:value-of select="$varName"/>==java.lang.Short.MIN_VALUE) {
@@ -1682,10 +1682,10 @@
if (<xsl:value-of select="$varName"/>==java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='double'">
- if (<xsl:value-of select="$varName"/>==java.lang.Double.NaN) {
+ if (java.lang.Double.isNaN(<xsl:value-of select="$varName"/>)) {
</xsl:when>
<xsl:when test="$propertyType='float'">
- if (<xsl:value-of select="$varName"/>==java.lang.Float.NaN) {
+ if (java.lang.Float.isNaN(<xsl:value-of select="$varName"/>)) {
</xsl:when>
<xsl:when test="$propertyType='short'">
if (<xsl:value-of select="$varName"/>==java.lang.Short.MIN_VALUE) {
@@ -2461,7 +2461,14 @@
<xsl:if test="$propertyName != 'extraAttributes'">
// handle attribute "<xsl:value-of select="$propertyName"/>"
java.lang.String <xsl:value-of select="$attribName"/> =
- reader.getAttributeValue("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>");
+ <xsl:choose>
+ <xsl:when test="string-length(normalize-space($namespace)) > 0">
+ reader.getAttributeValue("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>");
+ </xsl:when>
+ <xsl:otherwise>
+ reader.getAttributeValue(null,"<xsl:value-of select="$propertyName"/>");
+ </xsl:otherwise>
+ </xsl:choose>
if (<xsl:value-of select="$attribName"/>!=null){
java.lang.String content = <xsl:value-of select="$attribName"/>;
<xsl:choose>
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl Fri Jun 29 11:54:44 2007
@@ -25,7 +25,7 @@
<xsl:value-of select="@type"/>.MY_QNAME,
org.apache.axiom.om.OMAbstractFactory.getOMFactory());
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:when>
<xsl:when test="@type = 'org.apache.axiom.om.OMElement'">
@@ -36,7 +36,7 @@
return param.getOMElement(<xsl:value-of select="@type"/>.MY_QNAME,
org.apache.axiom.om.OMAbstractFactory.getOMFactory());
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:otherwise>
</xsl:choose>
@@ -103,7 +103,7 @@
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
}
@@ -125,7 +125,7 @@
<xsl:value-of select="$inputElementType"/>.MY_QNAME,factory));
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:when>
<xsl:when test="$inputElementType = 'org.apache.axiom.om.OMElement'">
@@ -140,7 +140,7 @@
emptyEnvelope.getBody().addChild(param.getOMElement(<xsl:value-of select="$inputElementType"/>.MY_QNAME,factory));
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
</xsl:otherwise>
</xsl:choose>
@@ -247,7 +247,7 @@
return emptyEnvelope;
} catch(org.apache.axis2.databinding.ADBException e){
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
}
</xsl:if>
@@ -388,7 +388,7 @@
}
</xsl:for-each>
} catch (java.lang.Exception e) {
- throw new org.apache.axis2.AxisFault(e.getMessage());
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
return null;
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/testattribute.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/testattribute.xsd?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/testattribute.xsd (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test-resources/testsuite/testattribute.xsd Fri Jun 29 11:54:44 2007
@@ -1,4 +1,5 @@
<xs:schema elementFormDefault="qualified"
+ attributeFormDefault="qualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://tempuri.org/attribute"
targetNamespace="http://tempuri.org/attribute">
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=551999&r1=551998&r2=551999
==============================================================================
--- 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 Jun 29 11:54:44 2007
@@ -34,10 +34,10 @@
testSequence.setSequence1("test sequence");
testSequence.setSequence2(3);
- TestInnerSequence1Choice_type2 testInnerSequence1Choice_type2 = new TestInnerSequence1Choice_type2();
- testInnerSequence1Choice_type2.setChoice1("test choice");
- testInnerSequence1Choice_type2.setChoice2(5);
- testSequence.setTestInnerSequence1Choice_type2(testInnerSequence1Choice_type2);
+ TestInnerSequence1Choice_type0 TestInnerSequence1Choice_type0 = new TestInnerSequence1Choice_type0();
+ TestInnerSequence1Choice_type0.setChoice1("test choice");
+ TestInnerSequence1Choice_type0.setChoice2(5);
+ testSequence.setTestInnerSequence1Choice_type0(TestInnerSequence1Choice_type0);
try {
OMElement omElement = testSequence.getOMElement(TestInnerSequence1.MY_QNAME,
@@ -48,7 +48,7 @@
TestInnerSequence1 result = TestInnerSequence1.Factory.parse(xmlReader);
assertEquals(result.getSequence1(), "test sequence");
assertEquals(result.getSequence2(), 3);
- assertEquals(result.getTestInnerSequence1Choice_type2().getChoice2(), 5);
+ assertEquals(result.getTestInnerSequence1Choice_type0().getChoice2(), 5);
// writtig result back
XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(System.out);
@@ -65,9 +65,9 @@
TestInnerSequence2 testSequence = new TestInnerSequence2();
testSequence.setSequence1("sequence");
testSequence.setSequence2(3);
- TestInnerSequence2Choice_type1 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type1();
+ TestInnerSequence2Choice_type0 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type0();
testInnerSequence2Choice_type1.setChoice1(new String[]{"choice1", "choice2"});
- testSequence.setTestInnerSequence2Choice_type1(testInnerSequence2Choice_type1);
+ testSequence.setTestInnerSequence2Choice_type0(testInnerSequence2Choice_type1);
try {
OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
@@ -78,7 +78,7 @@
TestInnerSequence2 result = TestInnerSequence2.Factory.parse(xmlReader);
assertEquals(result.getSequence1(), "sequence");
assertEquals(result.getSequence2(), 3);
- assertTrue(isEqual(result.getTestInnerSequence2Choice_type1().getChoice1(), new String[]{"choice1", "choice2"}));
+ assertTrue(isEqual(result.getTestInnerSequence2Choice_type0().getChoice1(), new String[]{"choice1", "choice2"}));
} catch (Exception e) {
fail();
}
@@ -88,9 +88,9 @@
TestInnerSequence2 testSequence = new TestInnerSequence2();
testSequence.setSequence1("sequence");
testSequence.setSequence2(3);
- TestInnerSequence2Choice_type1 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type1();
+ TestInnerSequence2Choice_type0 testInnerSequence2Choice_type1 = new TestInnerSequence2Choice_type0();
testInnerSequence2Choice_type1.setChoice2(new int[]{2, 4});
- testSequence.setTestInnerSequence2Choice_type1(testInnerSequence2Choice_type1);
+ testSequence.setTestInnerSequence2Choice_type0(testInnerSequence2Choice_type1);
try {
OMElement omElement = testSequence.getOMElement(TestInnerSequence2.MY_QNAME,
@@ -101,7 +101,7 @@
TestInnerSequence2 result = TestInnerSequence2.Factory.parse(xmlReader);
assertEquals(result.getSequence1(), "sequence");
assertEquals(result.getSequence2(), 3);
- assertTrue(isEqual(result.getTestInnerSequence2Choice_type1().getChoice2(), new int[]{2, 4}));
+ assertTrue(isEqual(result.getTestInnerSequence2Choice_type0().getChoice2(), new int[]{2, 4}));
} catch (Exception e) {
fail();
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/InnerParticlesTest.java Fri Jun 29 11:54:44 2007
@@ -64,10 +64,10 @@
TestInnerParticle2 testInnerParticle2 = new TestInnerParticle2();
testInnerParticle2.setParam1("Param1");
- TestInnerParticle2Choice_type5 testInnerParticle2Choice_type1 = new TestInnerParticle2Choice_type5();
+ TestInnerParticle2Choice_type0 testInnerParticle2Choice_type1 = new TestInnerParticle2Choice_type0();
testInnerParticle2Choice_type1.setParam2("Param2");
testInnerParticle2Choice_type1.setParam3("Param3");
- testInnerParticle2.setTestInnerParticle2Choice_type5(testInnerParticle2Choice_type1);
+ testInnerParticle2.setTestInnerParticle2Choice_type0(testInnerParticle2Choice_type1);
testInnerParticle2.setParam4("Param4");
try {
@@ -78,7 +78,7 @@
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle2 result = TestInnerParticle2.Factory.parse(xmlReader);
assertEquals(result.getParam1(), "Param1");
- assertEquals(result.getTestInnerParticle2Choice_type5().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle2Choice_type0().getParam3(), "Param3");
assertEquals(result.getParam4(), "Param4");
} catch (XMLStreamException e) {
fail();
@@ -112,10 +112,10 @@
public void testInnerParticle32() {
TestInnerParticle3 testInnerParticle3 = new TestInnerParticle3();
- TestInnerParticle3Choice_type1 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type1();
+ TestInnerParticle3Choice_type0 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type0();
testInnerParticle3Choice_type1.setParam2("Param2");
testInnerParticle3Choice_type1.setParam3("Param3");
- testInnerParticle3.setTestInnerParticle3Choice_type1(testInnerParticle3Choice_type1);
+ testInnerParticle3.setTestInnerParticle3Choice_type0(testInnerParticle3Choice_type1);
try {
OMElement omElement =
@@ -124,7 +124,7 @@
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle3 result = TestInnerParticle3.Factory.parse(xmlReader);
- assertEquals(result.getTestInnerParticle3Choice_type1().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle3Choice_type0().getParam3(), "Param3");
} catch (XMLStreamException e) {
e.printStackTrace();
fail();
@@ -139,10 +139,10 @@
TestInnerParticle3 testInnerParticle3 = new TestInnerParticle3();
testInnerParticle3.setParam1("Param1");
- TestInnerParticle3Choice_type1 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type1();
+ TestInnerParticle3Choice_type0 testInnerParticle3Choice_type1 = new TestInnerParticle3Choice_type0();
testInnerParticle3Choice_type1.setParam2("Param2");
testInnerParticle3Choice_type1.setParam3("Param3");
- testInnerParticle3.setTestInnerParticle3Choice_type1(testInnerParticle3Choice_type1);
+ testInnerParticle3.setTestInnerParticle3Choice_type0(testInnerParticle3Choice_type1);
testInnerParticle3.setParam4("Param4");
try {
@@ -187,10 +187,10 @@
public void testInnerParticle42() {
TestInnerParticle4 testInnerParticle4 = new TestInnerParticle4();
- TestInnerParticle4Sequence_type2 testInnerParticle4Sequence_type2 = new TestInnerParticle4Sequence_type2();
- testInnerParticle4Sequence_type2.setParam2("Param2");
- testInnerParticle4Sequence_type2.setParam3("Param3");
- testInnerParticle4.setTestInnerParticle4Sequence_type2(testInnerParticle4Sequence_type2);
+ TestInnerParticle4Sequence_type0 TestInnerParticle4Sequence_type0 = new TestInnerParticle4Sequence_type0();
+ TestInnerParticle4Sequence_type0.setParam2("Param2");
+ TestInnerParticle4Sequence_type0.setParam3("Param3");
+ testInnerParticle4.setTestInnerParticle4Sequence_type0(TestInnerParticle4Sequence_type0);
try {
OMElement omElement =
@@ -199,8 +199,8 @@
System.out.println("OM String ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle4 result = TestInnerParticle4.Factory.parse(xmlReader);
- assertEquals(result.getTestInnerParticle4Sequence_type2().getParam2(), "Param2");
- assertEquals(result.getTestInnerParticle4Sequence_type2().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle4Sequence_type0().getParam2(), "Param2");
+ assertEquals(result.getTestInnerParticle4Sequence_type0().getParam3(), "Param3");
} catch (XMLStreamException e) {
e.printStackTrace();
fail();
@@ -238,16 +238,16 @@
TestInnerParticle5 testInnerParticle5 = new TestInnerParticle5();
testInnerParticle5.setParam1("Param1");
- TestInnerParticle5Sequence_type4 testInnerParticle2Choice_type1 = new TestInnerParticle5Sequence_type4();
+ TestInnerParticle5Sequence_type1 testInnerParticle2Choice_type1 = new TestInnerParticle5Sequence_type1();
testInnerParticle2Choice_type1.setParam2("Param2");
testInnerParticle2Choice_type1.setParam3("Param3");
- TestInnerParticle5Sequence_type3 testInnerParticle5Sequence_type3 = new TestInnerParticle5Sequence_type3();
- testInnerParticle5Sequence_type3.setParam4("Param4");
- testInnerParticle5Sequence_type3.setParam5("Param5");
+ TestInnerParticle5Sequence_type0 innerParticle5Sequence_type0 = new TestInnerParticle5Sequence_type0();
+ innerParticle5Sequence_type0.setParam4("Param4");
+ innerParticle5Sequence_type0.setParam5("Param5");
- testInnerParticle2Choice_type1.setTestInnerParticle5Sequence_type3(testInnerParticle5Sequence_type3);
- testInnerParticle5.setTestInnerParticle5Sequence_type4(testInnerParticle2Choice_type1);
+ testInnerParticle2Choice_type1.setTestInnerParticle5Sequence_type0(innerParticle5Sequence_type0);
+ testInnerParticle5.setTestInnerParticle5Sequence_type1(testInnerParticle2Choice_type1);
testInnerParticle5.setParam6("Param6");
try {
@@ -258,10 +258,10 @@
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerParticle5 result = TestInnerParticle5.Factory.parse(xmlReader);
assertEquals(result.getParam1(), "Param1");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getParam2(), "Param2");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getParam3(), "Param3");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getTestInnerParticle5Sequence_type3().getParam4(), "Param4");
- assertEquals(result.getTestInnerParticle5Sequence_type4().getTestInnerParticle5Sequence_type3().getParam5(), "Param5");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getParam2(), "Param2");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getParam3(), "Param3");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getTestInnerParticle5Sequence_type0().getParam4(), "Param4");
+ assertEquals(result.getTestInnerParticle5Sequence_type1().getTestInnerParticle5Sequence_type0().getParam5(), "Param5");
assertEquals(result.getParam6(), "Param6");
} catch (XMLStreamException e) {
fail();
@@ -278,9 +278,9 @@
new TestInnterParticleExtensionChildComplexType();
testInnterParticleExtension.setTestInnterParticleExtension(testInnterParticleExtensionChildComplexType);
- TestInnterParticleExtensionParentComplexTypeChoice_type6 testInnterParticleExtensionParentComplexTypeChoice_type0 =
- new TestInnterParticleExtensionParentComplexTypeChoice_type6();
- testInnterParticleExtensionChildComplexType.setTestInnterParticleExtensionParentComplexTypeChoice_type6(testInnterParticleExtensionParentComplexTypeChoice_type0);
+ TestInnterParticleExtensionParentComplexTypeChoice_type0 testInnterParticleExtensionParentComplexTypeChoice_type0 =
+ new TestInnterParticleExtensionParentComplexTypeChoice_type0();
+ testInnterParticleExtensionChildComplexType.setTestInnterParticleExtensionParentComplexTypeChoice_type0(testInnterParticleExtensionParentComplexTypeChoice_type0);
testInnterParticleExtensionParentComplexTypeChoice_type0.setParam1("param1");
testInnterParticleExtensionParentComplexTypeChoice_type0.setParam2("param2");
@@ -295,7 +295,7 @@
assertTrue(result.getTestInnterParticleExtension() instanceof TestInnterParticleExtensionChildComplexType);
TestInnterParticleExtensionChildComplexType resultComplexType =
(TestInnterParticleExtensionChildComplexType) result.getTestInnterParticleExtension();
- assertEquals(resultComplexType.getTestInnterParticleExtensionParentComplexTypeChoice_type6().getParam2(),"param2");
+ assertEquals(resultComplexType.getTestInnterParticleExtensionParentComplexTypeChoice_type0().getParam2(),"param2");
} catch (ADBException e) {
fail();
} catch (XMLStreamException e) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java Fri Jun 29 11:54:44 2007
@@ -142,9 +142,9 @@
address.setLine1("line1");
address.setLine2("line2");
address.setState("state");
- Zip_type3 ziptype = new Zip_type3();
+ Zip_type1 ziptype = new Zip_type1();
address.setZip(ziptype);
- ziptype.setZip_type2("C");
+ ziptype.setZip_type0("C");
try {
OMElement omElement = personElement.getOMElement(ComplexRestrictionTypeTestElement.MY_QNAME, OMAbstractFactory.getOMFactory());
@@ -160,7 +160,7 @@
assertEquals(resultAddress.getLine1(),"line1");
assertEquals(resultAddress.getLine2(),"line2");
assertEquals(resultAddress.getState(),"state");
- assertEquals(resultAddress.getZip().getZip_type2(),"C");
+ assertEquals(resultAddress.getZip().getZip_type0(),"C");
} catch (Exception e) {
e.printStackTrace();
assertFalse(true);
Modified: webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb-codegen/test/org/apache/axis2/schema/union/UnionTest.java Fri Jun 29 11:54:44 2007
@@ -109,9 +109,9 @@
TestInnerUnionType testInnerUnionType = new TestInnerUnionType();
PackingType_T packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
- PackingType_T_type2 packingType_t_type2 = new PackingType_T_type2();
- packingType_t_type2.setPackingType_T_type2("MINOR_a");
- packingType_t.setObject(packingType_t_type2);
+ PackingType_T_type0 packingType_t_type0 = new PackingType_T_type0();
+ packingType_t_type0.setPackingType_T_type0("MINOR_a");
+ packingType_t.setObject(packingType_t_type0);
OMElement omElement;
try {
omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME, OMAbstractFactory.getOMFactory());
@@ -119,7 +119,7 @@
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(packingType_t_type2.toString(),result.getTestInnerUnionType().getObject().toString());
+ assertEquals(packingType_t_type0.toString(),result.getTestInnerUnionType().getObject().toString());
} catch (Exception e) {
assertTrue(false);
}
@@ -127,9 +127,9 @@
testInnerUnionType = new TestInnerUnionType();
packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
- PackingType_T_type3 packingType_t_type3 = new PackingType_T_type3();
- packingType_t_type3.setPackingType_T_type3("PROP_a");
- packingType_t.setObject(packingType_t_type3);
+ PackingType_T_type1 packingType_t_type1 = new PackingType_T_type1();
+ packingType_t_type1.setPackingType_T_type1("PROP_a");
+ packingType_t.setObject(packingType_t_type1);
try {
omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
@@ -137,7 +137,7 @@
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(packingType_t_type3.toString(),result.getTestInnerUnionType().getObject().toString());
+ assertEquals(packingType_t_type1.toString(),result.getTestInnerUnionType().getObject().toString());
} catch (Exception e) {
assertTrue(false);
}
@@ -145,7 +145,7 @@
testInnerUnionType = new TestInnerUnionType();
packingType_t = new PackingType_T();
testInnerUnionType.setTestInnerUnionType(packingType_t);
- packingType_t.setObject(PackingType_T_type4.TAR);
+ packingType_t.setObject(PackingType_T_type2.TAR);
try {
omElement = testInnerUnionType.getOMElement(TestInnerUnionType.MY_QNAME,OMAbstractFactory.getOMFactory());
@@ -153,7 +153,7 @@
System.out.println("OM Element ==> " + omElementString);
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new ByteArrayInputStream(omElementString.getBytes()));
TestInnerUnionType result = TestInnerUnionType.Factory.parse(xmlReader);
- assertEquals(PackingType_T_type4.TAR,result.getTestInnerUnionType().getObject());
+ assertEquals(PackingType_T_type2.TAR,result.getTestInnerUnionType().getObject());
} catch (Exception e) {
assertTrue(false);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java Fri Jun 29 11:54:44 2007
@@ -21,6 +21,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
+import org.apache.axis2.databinding.utils.ConverterUtil;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -109,9 +110,9 @@
} else if (name.equals(W_CHAR)) {
return new Character(text.toCharArray()[0]);
} else if (name.equals(W_CALENDAR)) {
- return makeCalendar(text, false);
+ return makeCalendar(text);
} else if (name.equals(W_DATE)) {
- return makeCalendar(text, true);
+ return makeDate(text);
}/*
* return the correpsonding object for adding data type
*/
@@ -293,109 +294,12 @@
return obj.toString();
}
- public static Object makeCalendar(String source, boolean returnDate) {
- Calendar calendar = Calendar.getInstance();
- Date date;
- boolean bc = false;
-
- // validate fixed portion of format
- if (source == null || source.length() == 0) {
- throw new NumberFormatException("Calendar cannot be null");
- }
- if (source.charAt(0) == '+') {
- source = source.substring(1);
- }
- if (source.charAt(0) == '-') {
- source = source.substring(1);
- bc = true;
- }
- if (source.length() < 19) {
- throw new NumberFormatException("Calendar string too short");
- }
- if (source.charAt(4) != '-' || source.charAt(7) != '-' ||
- source.charAt(10) != 'T') {
- throw new NumberFormatException("Invalid date format");
- }
- if (source.charAt(13) != ':' || source.charAt(16) != ':') {
- throw new NumberFormatException("Invalid time format");
- }
- // convert what we have validated so far
- try {
- SimpleDateFormat zulu = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
- zulu.setTimeZone(TimeZone.getTimeZone("GMT"));
- date = zulu.parse(source.substring(0, 19) + ".000Z");
- } catch (Exception e) {
- throw new NumberFormatException(e.toString());
- }
- int pos = 19;
-
- // parse optional milliseconds
- if (pos < source.length() && source.charAt(pos) == '.') {
- int milliseconds;
- int start = ++pos;
- while (pos < source.length() &&
- Character.isDigit(source.charAt(pos))) {
- pos++;
- }
- String decimal = source.substring(start, pos);
- if (decimal.length() == 3) {
- milliseconds = Integer.parseInt(decimal);
- } else if (decimal.length() < 3) {
- milliseconds = Integer.parseInt((decimal + "000")
- .substring(0, 3));
- } else {
- milliseconds = Integer.parseInt(decimal.substring(0, 3));
- if (decimal.charAt(3) >= '5') {
- ++milliseconds;
- }
- }
-
- // add milliseconds to the current date
- date.setTime(date.getTime() + milliseconds);
- }
-
- // parse optional timezone
- if (pos + 5 < source.length() &&
- (source.charAt(pos) == '+' || (source.charAt(pos) == '-'))) {
- if (!Character.isDigit(source.charAt(pos + 1)) ||
- !Character.isDigit(source.charAt(pos + 2)) ||
- source.charAt(pos + 3) != ':' ||
- !Character.isDigit(source.charAt(pos + 4)) ||
- !Character.isDigit(source.charAt(pos + 5))) {
- throw new NumberFormatException("Invalid timezone");
- }
- int hours = (source.charAt(pos + 1) - '0') * 10
- + source.charAt(pos + 2) - '0';
- int mins = (source.charAt(pos + 4) - '0') * 10
- + source.charAt(pos + 5) - '0';
- int milliseconds = (hours * 60 + mins) * 60 * 1000;
-
- // subtract milliseconds from current date to obtain GMT
- if (source.charAt(pos) == '+') {
- milliseconds = -milliseconds;
- }
- date.setTime(date.getTime() + milliseconds);
- pos += 6;
- }
- if (pos < source.length() && source.charAt(pos) == 'Z') {
- pos++;
- calendar.setTimeZone(TimeZone.getTimeZone("GMT"));
- }
- if (pos < source.length()) {
- throw new NumberFormatException("Unknown chars after calendar string");
- }
- calendar.setTime(date);
-
- // support dates before the Christian era
- if (bc) {
- calendar.set(Calendar.ERA, GregorianCalendar.BC);
- }
+ public static Object makeCalendar(String source) {
+ return ConverterUtil.convertToDateTime(source);
+ }
- if (returnDate) {
- return date;
- } else {
- return calendar;
- }
+ public static Object makeDate(String source) {
+ return ConverterUtil.convertToDate(source);
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Union.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Union.java?view=diff&rev=551999&r1=551998&r2=551999
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Union.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Union.java Fri Jun 29 11:54:44 2007
@@ -21,6 +21,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import java.math.BigDecimal;
/** this class is the super class of all the union simple types */
@@ -72,8 +73,7 @@
} else {
setObject(new QName(value));
}
-
- } else if ("datetime".equals(type)) {
+ } else if ("dateTime".equals(type)) {
setObject(ConverterUtil.convertToDateTime(value));
} else if ("time".equals(type)) {
setObject(ConverterUtil.convertToTime(value));
@@ -81,8 +81,26 @@
setObject(new Float(value));
} else if ("long".equals(type)) {
setObject(new Long(value));
- } else if ("dobule".equals(type)) {
+ } else if ("double".equals(type)) {
setObject(new Double(value));
+ } else if ("decimal".equals(type)) {
+ setObject(new BigDecimal(value));
+ } else if ("unsignedLong".equals(type)) {
+ setObject(new UnsignedLong(value));
+ } else if ("unsignedInt".equals(type)) {
+ setObject(new UnsignedInt(value));
+ } else if ("unsignedShort".equals(type)) {
+ setObject(new UnsignedShort(value));
+ } else if ("unsignedByte".equals(type)) {
+ setObject(new UnsignedByte(value));
+ } else if ("positiveInteger".equals(type)) {
+ setObject(new PositiveInteger(value));
+ } else if ("negativeInteger".equals(type)) {
+ setObject(new NegativeInteger(value));
+ } else if ("nonNegativeInteger".equals(type)) {
+ setObject(new NonNegativeInteger(value));
+ } else if ("nonPositiveInteger".equals(type)) {
+ setObject(new NonPositiveInteger(value));
} else {
throw new RuntimeException("Object not found");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org