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/10 13:42:22 UTC
svn commit: r545866 [1/7] - in /webservices/axis2/branches/java/jaxws21:
modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb/src/org/apache/axis2/databinding/types/
modules/adb/src/org/apache/axis2/databinding/utils/
modules/adb/src/org/apache...
Author: pradine
Date: Sun Jun 10 04:42:12 2007
New Revision: 545866
URL: http://svn.apache.org/viewvc?view=rev&rev=545866
Log:
Sync with trunk to revision 545510.
Added:
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/ContextClusteringCommandCollection.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/ContextClusteringCommandCollection.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/AckCommand.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/control/AckCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/BaseDataTypes.wsdl
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test-resources/BaseDataTypes.wsdl
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/
- copied from r545510, webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/META-INF/
- copied from r545510, webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/META-INF/
webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/META-INF/services.xml
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/META-INF/services.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/
- copied from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/BaseDataTypes.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/BaseDataTypes.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/BaseDataTypesTest.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/BaseDataTypesTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/
- copied from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/ComplexDataTypes.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/ComplexDataTypes.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/ComplexDataTypesTest.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/ComplexDataTypesTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/
- copied from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/BitMask.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/BitMask.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Employee.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/Employee.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Furniture.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/Furniture.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Group.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/Group.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Name.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/Name.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Person.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/Person.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/Table.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/Table.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/
- copied from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfArrayOfstring.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfArrayOfstring.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdateTime.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdateTime.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdecimal.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfNullableOfdecimal.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfPerson.java
- copied unchanged from r545510, webservices/axis2/trunk/java/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
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfanyType.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfint.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfint.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfshort.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfshort.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfstring.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/integration/test/org/tempuri/complex/data/arrays/ArrayOfstring.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/test/
- copied from r545510, webservices/axis2/trunk/java/modules/java2wsdl/test/
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/test-resources/
- copied from r545510, webservices/axis2/trunk/java/modules/java2wsdl/test-resources/
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/test/org/
- copied from r545510, webservices/axis2/trunk/java/modules/java2wsdl/test/org/
webservices/axis2/branches/java/jaxws21/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/
- copied from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/
- copied from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ChainedParamReader.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ChainedParamReader.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/MethodTable.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/MethodTable.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamNameExtractor.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamNameExtractor.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamReader.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamReader.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/description/AxisServiceTest.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/AxisServiceTest.java
webservices/axis2/branches/java/jaxws21/modules/saaj/test-resources/soap-part-iso-8859-1.xml
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/saaj/test-resources/soap-part-iso-8859-1.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BarThread.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BarThread.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ProgressBarPanel.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ProgressBarPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/FileFilter.java
- copied unchanged from r545510, webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/FileFilter.java
Removed:
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateServiceContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateServiceGroupContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateSessionContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/DeleteServiceContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/DeleteServiceGroupContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/ServiceContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/ServiceGroupContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/info/
webservices/axis2/branches/java/jaxws21/modules/clustering/test/org/apache/axis2/clustering/ManageContextTestCase.java
webservices/axis2/branches/java/jaxws21/modules/clustering/test/org/apache/axis2/clustering/tribes/ManageContextTest.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CSharpEmitter.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/databinding/CSharpTypeMapper.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/AnnotationConstants.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/DefaultNamespaceGenerator.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/NamespaceGenerator.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/bytecode/
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ContextListener.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/context/ContextListenerTest.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java
Modified:
webservices/axis2/branches/java/jaxws21/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.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/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/project.xml
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/DefaultConfigurationManager.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/CommitCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/ExceptionCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/PrepareCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/RollbackCommand.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/DefaultContextManager.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManagerListener.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateConfigurationContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/ControlCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/GetStateCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/control/GetStateResponseCommand.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.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/clustering/src/org/apache/axis2/clustering/tribes/TribesControlCommandProcessor.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesMembershipListener.java
webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesUtil.java
webservices/axis2/branches/java/jaxws21/modules/clustering/test/org/apache/axis2/clustering/UpdateStateTestCase.java
webservices/axis2/branches/java/jaxws21/modules/codegen/pom.xml
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties
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/i18n/resource.properties
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java
webservices/axis2/branches/java/jaxws21/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml
webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleSyncTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/util/RequestCounter.java
webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/pom.xml
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/project.xml
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOption.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOptionParser.java
webservices/axis2/branches/java/jaxws21/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
webservices/axis2/branches/java/jaxws21/modules/jaxbri/pom.xml
webservices/axis2/branches/java/jaxws21/modules/jaxbri/project.properties
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.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/core/util/MessageContextUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.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/dispatcher/factory/EndpointDispatcherFactory.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test-resources/log4j.properties
webservices/axis2/branches/java/jaxws21/modules/kernel/conf/axis2.xml
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/builder/BuilderUtil.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/client/OperationClient.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/client/ServiceClient.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/clustering/ClusterManager.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/clustering/ClusteringCommand.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/clustering/configuration/ConfigurationClusteringCommand.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/clustering/context/ContextClusteringCommand.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/clustering/context/ContextManager.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/clustering/context/ContextManagerListener.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/ServiceContext.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.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/ArchiveReader.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/AxisBinding.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.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/AxisServiceGroup.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/engine/AxisConfiguration.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.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/HTTPConstants.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/ListingAgent.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/FileWriter.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/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
webservices/axis2/branches/java/jaxws21/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
webservices/axis2/branches/java/jaxws21/modules/parent/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/SOAPPartImpl.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/SOAPConnectionTest.java
webservices/axis2/branches/java/jaxws21/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
webservices/axis2/branches/java/jaxws21/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
webservices/axis2/branches/java/jaxws21/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
webservices/axis2/branches/java/jaxws21/modules/samples/databinding/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/faulthandling/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/googlespellcheck/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/jms/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/mex/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/mtom/README.txt
webservices/axis2/branches/java/jaxws21/modules/samples/mtom/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/ping/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/pojo/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/pojoguide/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/pojoguidespring/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/quickstart/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/quickstartadb/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/quickstartaxiom/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/quickstartaxiom/src/samples/quickstart/service/axiom/StockQuoteService.java
webservices/axis2/branches/java/jaxws21/modules/samples/quickstartjibx/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/quickstartxmlbeans/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/script/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/security/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/servicelifecycle/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/userguide/README.txt
webservices/axis2/branches/java/jaxws21/modules/samples/userguide/build.xml
webservices/axis2/branches/java/jaxws21/modules/samples/version/build.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/resource/Codegen.properties
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java
webservices/axis2/branches/java/jaxws21/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
webservices/axis2/branches/java/jaxws21/xdocs/@axis2_version_dir@/reference.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=545866&r1=545865&r2=545866
==============================================================================
--- 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 Sun Jun 10 04:42:12 2007
@@ -205,6 +205,9 @@
Map metaInfo = complexType.getMetaInfoMap();
String complexTypeName = (String)
metaInfo.get(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY);
+ if (complexTypeName.endsWith("[]")){
+ complexTypeName = complexTypeName.substring(0,complexTypeName.length() -2);
+ }
// store the complext type name to process later
axisMessage.addParameter(new Parameter(Constants.COMPLEX_TYPE, complexTypeName));
}
@@ -240,7 +243,17 @@
if (message.getParameter(Constants.UNWRAPPED_KEY) != null) {
XmlSchemaType schemaType = message.getSchemaElement().getSchemaType();
//create a type mapper
- processXMLSchemaComplexType(schemaType, mapper, opName, schemaMap, qnameSuffix);
+ if (schemaType instanceof XmlSchemaComplexType) {
+ processXMLSchemaComplexType(schemaType, mapper, opName, schemaMap, qnameSuffix);
+ } else if (schemaType instanceof XmlSchemaSimpleType) {
+ XmlSchemaSimpleType xmlSchemaSimpleType = (XmlSchemaSimpleType) schemaType;
+ populateClassName(xmlSchemaSimpleType.getMetaInfoMap(),
+ mapper,
+ opName,
+ false,
+ message.getElementQName().getLocalPart(),
+ qnameSuffix);
+ }
}
}
@@ -284,6 +297,36 @@
}
+ private static XmlSchemaType getSchemaType(XmlSchema schema, QName typeName) {
+ XmlSchemaType xmlSchemaType = null;
+ if (schema != null) {
+ xmlSchemaType = schema.getTypeByName(typeName);
+ if (xmlSchemaType == null) {
+ // try to find in an import or an include
+ XmlSchemaObjectCollection includes = schema.getIncludes();
+ if (includes != null) {
+ Iterator includesIter = includes.getIterator();
+ Object object = null;
+ while (includesIter.hasNext()) {
+ object = includesIter.next();
+ if (object instanceof XmlSchemaImport) {
+ XmlSchema schema1 = ((XmlSchemaImport) object).getSchema();
+ xmlSchemaType = getSchemaType(schema1,typeName);
+ }
+ if (object instanceof XmlSchemaInclude) {
+ XmlSchema schema1 = ((XmlSchemaInclude) object).getSchema();
+ xmlSchemaType = getSchemaType(schema1,typeName);
+ }
+ if (xmlSchemaType != null){
+ break;
+ }
+ }
+ }
+ }
+ }
+ return xmlSchemaType;
+ }
+
private static void processComplexContentModel(XmlSchemaComplexType cmplxType,
TypeMapper mapper,
@@ -300,13 +343,15 @@
// process particles inside this extension, if any
processSchemaSequence(schemaExtension.getParticle(), mapper, opName, schemaMap, qnameSuffix);
- // now we need to get the schema of the extension type from the parent schema. For that let's first retrieve
- // the parent schema
- XmlSchema parentSchema = (XmlSchema) schemaMap.get(schemaExtension.getBaseTypeName().getNamespaceURI());
-
- // ok now we got the parent schema. Now let's get the extension's schema type
-
- XmlSchemaType extensionSchemaType = parentSchema.getTypeByName(schemaExtension.getBaseTypeName());
+ XmlSchema xmlSchema = null;
+ XmlSchemaType extensionSchemaType = null;
+ for (Iterator iter = schemaMap.values().iterator();iter.hasNext();){
+ xmlSchema = (XmlSchema) iter.next();
+ extensionSchemaType = getSchemaType(xmlSchema,schemaExtension.getBaseTypeName());
+ if (extensionSchemaType != null){
+ break;
+ }
+ }
processXMLSchemaComplexType(extensionSchemaType, mapper, opName, schemaMap, qnameSuffix);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Time.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Time.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Time.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/types/Time.java Sun Jun 10 04:42:12 2007
@@ -36,7 +36,7 @@
* timestamp
*/
private static SimpleDateFormat zulu =
- new SimpleDateFormat("HH:mm:ss.SSS'Z'");
+ new SimpleDateFormat("HH:mm:ss.SSSSSSSSS'Z'");
static {
zulu.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -103,12 +103,12 @@
// i.e this have the ('.'s+) part
if (rest.endsWith("Z")) {
// this is in gmt time zone
- simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSS'Z'");
+ simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSSSSSSSS'Z'");
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
} else if ((rest.indexOf("+") > 0) || (rest.indexOf("-") > 0)) {
// this is given in a general time zione
- simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSSz");
+ simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSSSSSSSSz");
if (rest.lastIndexOf("+") > 0) {
source = source.substring(0, source.lastIndexOf("+")) + "GMT" +
rest.substring(rest.lastIndexOf("+"));
@@ -118,7 +118,7 @@
}
} else {
// i.e it does not have time zone
- simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSS");
+ simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSSSSSSSS");
}
} else {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sun Jun 10 04:42:12 2007
@@ -25,11 +25,12 @@
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.java2wsdl.TypeTable;
import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
import org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.util.StreamWrapper;
-import org.apache.ws.java2wsdl.utils.TypeTable;
+import org.apache.axis2.util.Loader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jam.JClass;
@@ -79,7 +80,6 @@
if (cl == null)
cl = ClassLoader.getSystemClassLoader();
jam_service_parms.addClassLoader(cl);
-// beanObject.getClass().isArray()
jam_service_parms.includeClass(beanObject.getClass().getName());
JamService service = factory.createService(jam_service_parms);
@@ -278,10 +278,10 @@
// support polymorphism in POJO approach.
// For some reason, using QName(Constants.XSI_NAMESPACE, "type", "xsi") does not generate
// an xsi:type attribtue properly for inner objects. So just using a simple QName("type").
-// ArrayList objectAttributes = new ArrayList();
-// objectAttributes.add(new QName(Constants.XSI_NAMESPACE, "type", "xsi"));
-// objectAttributes.add(beanObject.getClass().getName());
- return new ADBXMLStreamReaderImpl(beanName, object.toArray(), null,
+ ArrayList objectAttributes = new ArrayList();
+ objectAttributes.add(new QName("type"));
+ objectAttributes.add(beanObject.getClass().getName());
+ return new ADBXMLStreamReaderImpl(beanName, object.toArray(), objectAttributes.toArray(),
typeTable, qualified);
} catch (java.io.IOException e) {
@@ -317,22 +317,18 @@
throws AxisFault {
Object beanObj =null;
try {
- // Added this block as a fix for issues AXIS2-2055 and AXIS2-1899
+ // Added this block as a fix for issues AXIS2-2055 and AXIS2-1899
// to support polymorphism in POJO approach.
// Retrieve the type name of the instance from the 'type' attribute
// and retrieve the class.
-// String instanceTypeName = beanElement.getAttributeValue(
-// new QName(Constants.XSI_NAMESPACE,"type","xsi"));
-// if ((instanceTypeName != null) && (! beanClass.isArray())) {
-// try {
-// beanClass = Class.forName(instanceTypeName);
-// } catch (ClassNotFoundException ce) {
-// log.warn(ce);
- // This breaks samples , and Need to improve a bit to fully
- // support this so , Exception just ignore here, we can fix
- // that later
-// }
-// }
+ String instanceTypeName = beanElement.getAttributeValue(new QName("type"));
+ if ((instanceTypeName != null) && (! beanClass.isArray())) {
+ try {
+ beanClass = Loader.loadClass(beanClass.getClassLoader(), instanceTypeName);
+ } catch (ClassNotFoundException ce) {
+ throw AxisFault.makeFault(ce);
+ }
+ }
if (beanClass.isArray()) {
ArrayList valueList = new ArrayList();
@@ -367,16 +363,15 @@
PropertyDescriptor proprty = propDescs[i];
properties.put(proprty.getName(), proprty);
}
- beanObj = objectSupplier.getObject(beanClass);
boolean tuched = false;
Iterator elements = beanElement.getChildren();
while (elements.hasNext()) {
// the beanClass could be an abstract one.
// so create an instance only if there are elements, in
// which case a concrete subclass is available to instantiate.
-// if (beanObj == null) {
-// beanObj = objectSupplier.getObject(beanClass);
-// }
+ if (beanObj == null) {
+ beanObj = objectSupplier.getObject(beanClass);
+ }
OMElement parts;
Object objValue = elements.next();
if (objValue instanceof OMElement) {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Sun Jun 10 04:42:12 2007
@@ -569,12 +569,12 @@
// i.e this have the ('.'s+) part
if (rest.endsWith("Z")) {
// this is in gmt time zone
- simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+ simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z'");
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
} else if ((rest.lastIndexOf("+") > 0) || (rest.lastIndexOf("-") > 0)) {
// this is given in a general time zione
- simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSz");
+ simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSz");
if (rest.lastIndexOf("+") > 0) {
source = source.substring(0, source.lastIndexOf("+")) + "GMT" +
rest.substring(rest.lastIndexOf("+"));
@@ -585,7 +585,7 @@
} else {
// i.e it does not have time zone
- simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+ simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS");
}
} else {
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java Sun Jun 10 04:42:12 2007
@@ -5,7 +5,7 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.databinding.ADBBean;
import org.apache.axis2.databinding.utils.BeanUtil;
-import org.apache.ws.java2wsdl.utils.TypeTable;
+import org.apache.axis2.description.java2wsdl.TypeTable;
import javax.activation.DataHandler;
import javax.xml.namespace.NamespaceContext;
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java Sun Jun 10 04:42:12 2007
@@ -32,10 +32,10 @@
public class RPCInOnlyMessageReceiver extends AbstractInMessageReceiver {
- private Method method;
private static Log log = LogFactory.getLog(RPCInOnlyMessageReceiver.class);
public void invokeBusinessLogic(MessageContext inMessage) throws AxisFault {
+ Method method = null;
try {
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(inMessage);
@@ -54,7 +54,7 @@
Method[] methods = ImplClass.getMethods();
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(methodName)) {
- this.method = methods[i];
+ method = methods[i];
break;
}
}
@@ -103,7 +103,7 @@
throw (AxisFault)cause;
}
}
- throw new AxisFault(msg);
+ throw new AxisFault(msg, e);
} catch (Exception e) {
String msg = "Exception occurred while trying to invoke service method " +
method.getName();
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java Sun Jun 10 04:42:12 2007
@@ -35,7 +35,6 @@
public class RPCInOutAsyncMessageReceiver extends AbstractInOutAsyncMessageReceiver {
- private Method method;
private static Log log = LogFactory.getLog(RPCInOnlyMessageReceiver.class);
/**
@@ -57,6 +56,7 @@
public void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage)
throws AxisFault {
+ Method method = null;
try {
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(inMessage);
@@ -75,7 +75,7 @@
Method[] methods = ImplClass.getMethods();
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(methodName)) {
- this.method = methods[i];
+ method = methods[i];
break;
}
}
@@ -120,7 +120,7 @@
}
OMNamespace ns = fac.createOMNamespace(messageNameSpace,
- service.getSchematargetNamespacePrefix());
+ service.getSchemaTargetNamespacePrefix());
SOAPEnvelope envelope = fac.getDefaultEnvelope();
OMElement bodyContent = null;
RPCUtil.processResponse(resObject, service,
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Sun Jun 10 04:42:12 2007
@@ -41,7 +41,6 @@
public class RPCMessageReceiver extends AbstractInOutSyncMessageReceiver {
- private Method method;
private static Log log = LogFactory.getLog(RPCMessageReceiver.class);
/**
@@ -63,6 +62,7 @@
public void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage)
throws AxisFault {
+ Method method = null;
try {
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(inMessage);
@@ -78,9 +78,10 @@
QName elementQName;
String methodName = op.getName().getLocalPart();
Method[] methods = ImplClass.getMethods();
+
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(methodName)) {
- this.method = methods[i];
+ method = methods[i];
break;
}
}
@@ -128,7 +129,7 @@
}
OMNamespace ns = fac.createOMNamespace(messageNameSpace,
- service.getSchematargetNamespacePrefix());
+ service.getSchemaTargetNamespacePrefix());
SOAPEnvelope envelope = fac.getDefaultEnvelope();
OMElement bodyContent = null;
RPCUtil.processResponse(resObject, service,
@@ -149,7 +150,7 @@
if (cause instanceof AxisFault) {
throw (AxisFault)cause;
}
- throw new AxisFault(msg);
+ throw new AxisFault(msg, e);
} catch (Exception e) {
String msg = "Exception occurred while trying to invoke service method " +
method.getName();
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java Sun Jun 10 04:42:12 2007
@@ -16,13 +16,13 @@
import org.apache.axis2.databinding.utils.reader.NullXMLStreamReader;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.java2wsdl.TypeTable;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.util.StreamWrapper;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.java2wsdl.utils.TypeTable;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
@@ -30,7 +30,6 @@
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Arrays;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -149,7 +148,7 @@
QName elementQName = outMessage.getAxisMessage().getElementQName();
if (resObject == null) {
ns = fac.createOMNamespace(service.getSchematargetNamespace(),
- service.getSchematargetNamespacePrefix());
+ service.getSchemaTargetNamespacePrefix());
OMElement bodyChild = fac.createOMElement(method.getName() + "Response", ns);
envelope.getBody().addChild(bodyChild);
} else {
@@ -159,7 +158,7 @@
if (service.isElementFormDefault()) {
resName = new QName(service.getSchematargetNamespace(),
RETURN_WRAPPER,
- service.getSchematargetNamespacePrefix());
+ service.getSchemaTargetNamespacePrefix());
} else {
resName = new QName(RETURN_WRAPPER);
}
@@ -169,7 +168,7 @@
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getSOAP11Factory(), parser);
ns = fac.createOMNamespace(service.getSchematargetNamespace(),
- service.getSchematargetNamespacePrefix());
+ service.getSchemaTargetNamespacePrefix());
OMElement bodyChild = fac.createOMElement(method.getName() + "Response", ns);
bodyChild.addChild(stAXOMBuilder.getDocumentElement());
envelope.getBody().addChild(bodyChild);
Modified: webservices/axis2/branches/java/jaxws21/modules/addressing/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/addressing/project.xml?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/addressing/project.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/addressing/project.xml Sun Jun 10 04:42:12 2007
@@ -139,5 +139,24 @@
</properties>
</dependency>
</dependencies>
-
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/DefaultConfigurationManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/DefaultConfigurationManager.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/DefaultConfigurationManager.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/DefaultConfigurationManager.java Sun Jun 10 04:42:12 2007
@@ -170,7 +170,7 @@
this.sender = sender;
}
- public void notifyListener(ConfigurationClusteringCommand command) throws ClusteringFault {
+ public void process(ConfigurationClusteringCommand command) throws ClusteringFault {
switch (command.getCommandType()) {
case ConfigurationClusteringCommand.RELOAD_CONFIGURATION:
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/CommitCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/CommitCommand.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/CommitCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/CommitCommand.java Sun Jun 10 04:42:12 2007
@@ -41,4 +41,8 @@
public void rollback(ConfigurationContext configContext) throws Exception {
// Nothing to implement
}
+
+ public String toString() {
+ return "CommitCommand";
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/ExceptionCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/ExceptionCommand.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/ExceptionCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/ExceptionCommand.java Sun Jun 10 04:42:12 2007
@@ -51,4 +51,8 @@
public void rollback(ConfigurationContext configContext) throws Exception {
// Nothing to implement
}
+
+ public String toString() {
+ return "ExceptionCommand";
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/PrepareCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/PrepareCommand.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/PrepareCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/PrepareCommand.java Sun Jun 10 04:42:12 2007
@@ -41,4 +41,8 @@
public void rollback(ConfigurationContext configContext) throws Exception {
// Nothing to implement
}
+
+ public String toString() {
+ return "PrepareCommand";
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/RollbackCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/RollbackCommand.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/RollbackCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/configuration/commands/RollbackCommand.java Sun Jun 10 04:42:12 2007
@@ -41,4 +41,8 @@
public void rollback(ConfigurationContext configContext) throws Exception {
// Nothing to implement
}
+
+ public String toString() {
+ return "RollbackCommand";
+ }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java Sun Jun 10 04:42:12 2007
@@ -15,13 +15,16 @@
*/
package org.apache.axis2.clustering.context;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.clustering.context.commands.*;
+import org.apache.axis2.clustering.tribes.AckManager;
import org.apache.axis2.context.*;
import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -33,6 +36,26 @@
private static final Log log = LogFactory.getLog(ContextClusteringCommandFactory.class);
+ public static ContextClusteringCommandCollection
+ getCommandCollection(AbstractContext[] contexts,
+ Map excludedReplicationPatterns) {
+
+ ArrayList commands = new ArrayList(contexts.length);
+ ContextClusteringCommandCollection collection =
+ new ContextClusteringCommandCollection(commands);
+ for (int i = 0; i < contexts.length; i++) {
+ ContextClusteringCommand cmd = getUpdateCommand(contexts[i],
+ excludedReplicationPatterns,
+ false);
+ if (cmd != null) {
+ commands.add(cmd);
+ }
+ }
+ collection.setUniqueId(UUIDGenerator.getUUID());
+ AckManager.addInitialAcknowledgement(collection);
+ return collection;
+ }
+
/**
* @param context
* @param excludedPropertyPatterns
@@ -44,40 +67,36 @@
Map excludedPropertyPatterns,
boolean includeAllProperties) {
- ContextClusteringCommand cmd = null;
+ UpdateContextCommand cmd = null;
if (context instanceof ConfigurationContext) {
cmd = new UpdateConfigurationContextCommand();
- fillProperties((UpdateContextCommand) cmd,
- context,
- excludedPropertyPatterns,
- includeAllProperties);
} else if (context instanceof ServiceGroupContext) {
ServiceGroupContext sgCtx = (ServiceGroupContext) context;
cmd = new UpdateServiceGroupContextCommand();
- UpdateServiceGroupContextCommand updateSgCmd =
- (UpdateServiceGroupContextCommand) cmd;
-
+ UpdateServiceGroupContextCommand updateSgCmd = (UpdateServiceGroupContextCommand) cmd;
updateSgCmd.setServiceGroupName(sgCtx.getDescription().getServiceGroupName());
updateSgCmd.setServiceGroupContextId(sgCtx.getId());
- fillProperties((UpdateContextCommand) cmd,
- context,
- excludedPropertyPatterns,
- includeAllProperties);
} else if (context instanceof ServiceContext) {
ServiceContext serviceCtx = (ServiceContext) context;
cmd = new UpdateServiceContextCommand();
- UpdateServiceContextCommand updateServiceCmd =
- (UpdateServiceContextCommand) cmd;
- updateServiceCmd.setServiceGroupName(serviceCtx.getGroupName());
+ UpdateServiceContextCommand updateServiceCmd = (UpdateServiceContextCommand) cmd;
+ String sgName =
+ serviceCtx.getServiceGroupContext().getDescription().getServiceGroupName();
+ updateServiceCmd.setServiceGroupName(sgName);
updateServiceCmd.setServiceGroupContextId(serviceCtx.getServiceGroupContext().getId());
updateServiceCmd.setServiceName(serviceCtx.getAxisService().getName());
- fillProperties((UpdateContextCommand) cmd,
+ }
+ if (cmd != null) {
+ cmd.setUniqueId(UUIDGenerator.getUUID());
+ fillProperties(cmd,
context,
excludedPropertyPatterns,
includeAllProperties);
- }
- if (cmd != null && ((UpdateContextCommand) cmd).isPropertiesEmpty()) {
- cmd = null;
+ if (cmd.isPropertiesEmpty()) {
+ cmd = null;
+ } else {
+ AckManager.addInitialAcknowledgement(cmd);
+ }
}
context.clearPropertyDifferences(); // Once we send the diffs, we should clear the diffs
return cmd;
@@ -95,19 +114,31 @@
Map excludedPropertyPatterns,
boolean includeAllProperties) {
if (!includeAllProperties) {
- Map diffs = context.getPropertyDifferences();
- for (Iterator iter = diffs.keySet().iterator(); iter.hasNext();) {
- String key = (String) iter.next();
- Object prop = context.getPropertyNonReplicable(key);
- if (prop instanceof Serializable) { // First check whether it is serializable
- // Next check whether it matches an excluded pattern
- if (!isExcluded(key, context.getClass().getName(), excludedPropertyPatterns)) {
- log.debug("sending property =" + key + "-" + prop);
- PropertyDifference diff = (PropertyDifference) diffs.get(key);
- diff.setValue(prop);
- updateCmd.addProperty(diff);
+ // Sometimes, there can be failures, so if an exception occurs, we retry
+ while (true) {
+ Map diffs = context.getPropertyDifferences();
+ try {
+ for (Iterator iter = diffs.keySet().iterator(); iter.hasNext();) {
+ String key = (String) iter.next();
+ Object prop = context.getPropertyNonReplicable(key);
+
+ // First check whether it is serializable
+ if (prop instanceof Serializable) {
+
+ // Next check whether it matches an excluded pattern
+ if (!isExcluded(key,
+ context.getClass().getName(),
+ excludedPropertyPatterns)) {
+ log.debug("sending property =" + key + "-" + prop);
+ PropertyDifference diff = (PropertyDifference) diffs.get(key);
+ diff.setValue(prop);
+ updateCmd.addProperty(diff);
+ }
+ }
}
+ break;
+ } catch (Exception ignored) {
}
}
} else {
@@ -165,44 +196,5 @@
}
}
return false;
- }
-
- public static ContextClusteringCommand getCreateCommand(AbstractContext abstractContext) {
- if (abstractContext instanceof ServiceGroupContext) {
- ServiceGroupContext sgCtx = (ServiceGroupContext) abstractContext;
- ServiceGroupContextCommand cmd = new CreateServiceGroupContextCommand();
- //TODO impl
- cmd.setServiceGroupName(sgCtx.getDescription().getServiceGroupName());
- cmd.setServiceGroupContextId(sgCtx.getId());
- return cmd;
- } else if (abstractContext instanceof ServiceContext) {
- ServiceContext serviceCtx = (ServiceContext) abstractContext;
- ServiceContextCommand cmd = new CreateServiceContextCommand();
- ServiceGroupContext sgCtx = (ServiceGroupContext) serviceCtx.getParent();
- cmd.setServiceGroupContextId(sgCtx.getId());
- cmd.setServiceGroupName(sgCtx.getDescription().getServiceGroupName());
- cmd.setServiceName(serviceCtx.getAxisService().getName());
- return cmd;
- }
- return null;
- }
-
- public static ContextClusteringCommand getRemoveCommand(AbstractContext abstractContext) {
- if (abstractContext instanceof ServiceGroupContext) {
- ServiceGroupContext sgCtx = (ServiceGroupContext) abstractContext;
- ServiceGroupContextCommand cmd = new DeleteServiceGroupContextCommand();
- // TODO: impl
- cmd.setServiceGroupName(sgCtx.getDescription().getServiceGroupName());
- cmd.setServiceGroupContextId(sgCtx.getId());
- return cmd;
- } else if (abstractContext instanceof ServiceContext) {
- ServiceContext serviceCtx = (ServiceContext) abstractContext;
- ServiceContextCommand cmd = new DeleteServiceContextCommand();
- // TODO: impl
- cmd.setServiceGroupName(serviceCtx.getGroupName());
- cmd.setServiceName(serviceCtx.getAxisService().getName());
- return cmd;
- }
- return null;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java Sun Jun 10 04:42:12 2007
@@ -19,7 +19,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.MessageSender;
+import org.apache.axis2.clustering.context.commands.ContextClusteringCommandCollection;
+import org.apache.axis2.clustering.tribes.AckManager;
+import org.apache.axis2.clustering.tribes.ChannelSender;
import org.apache.axis2.context.AbstractContext;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ServiceContext;
@@ -32,37 +34,39 @@
private ConfigurationContext configContext;
- private ContextManagerListener listener;
private Map parameters = new HashMap();
- private MessageSender sender;
+ private ChannelSender sender;
private ContextReplicationProcessor processor = new ContextReplicationProcessor();
private Map excludedReplicationPatterns = new HashMap();
- public void setSender(MessageSender sender) {
+ //TODO: Try how to use an interface
+ public void setSender(ChannelSender sender) {
this.sender = sender;
}
public DefaultContextManager() {
}
-
- public void addContext(final AbstractContext context) throws ClusteringFault {
- processor.process(ContextClusteringCommandFactory.getCreateCommand(context));
- }
-
- public void removeContext(AbstractContext context) throws ClusteringFault {
- processor.process(ContextClusteringCommandFactory.getRemoveCommand(context));
- }
-
- public void updateContext(AbstractContext context) throws ClusteringFault {
- ContextClusteringCommand message =
+
+ public String updateContext(AbstractContext context) throws ClusteringFault {
+ ContextClusteringCommand cmd =
ContextClusteringCommandFactory.getUpdateCommand(context,
excludedReplicationPatterns,
false);
- if (message != null) {
- processor.process(message);
+ if (cmd != null) {
+ processor.process(cmd);
+ return cmd.getUniqueId();
}
+ return null;
+ }
+
+ public String updateContexts(AbstractContext[] contexts) throws ClusteringFault {
+ ContextClusteringCommandCollection cmd =
+ ContextClusteringCommandFactory.getCommandCollection(contexts,
+ excludedReplicationPatterns);
+ processor.process(cmd);
+ return cmd.getUniqueId();
}
public boolean isContextClusterable(AbstractContext context) {
@@ -71,44 +75,29 @@
(context instanceof ServiceGroupContext);
}
- public void notifyListener(ContextClusteringCommand command) throws ClusteringFault {
- switch (command.getCommandType()) {
- case ContextClusteringCommand.CREATE_SERVICE_CONTEXT:
- case ContextClusteringCommand.CREATE_SERVICE_GROUP_CONTEXT:
- listener.contextAdded(command);
- break;
- case ContextClusteringCommand.UPDATE_SERVICE_CONTEXT:
- case ContextClusteringCommand.UPDATE_SERVICE_GROUP_CONTEXT:
- case ContextClusteringCommand.UPDATE_CONFIGURATION_CONTEXT:
- listener.contextUpdated(command);
- break;
- case ContextClusteringCommand.DELETE_SERVICE_CONTEXT:
- case ContextClusteringCommand.DELETE_SERVICE_GROUP_CONTEXT:
- listener.contextRemoved(command);
- break;
- default:
- throw new ClusteringFault("Invalid ContextClusteringCommand " +
- command.getClass().getName());
- }
+ public boolean isMessageAcknowledged(String messageUniqueId) throws ClusteringFault {
+ return AckManager.isMessageAcknowledged(messageUniqueId, sender);
+ }
+
+ public void process(ContextClusteringCommand command) throws ClusteringFault {
+ command.execute(configContext);
}
public void setContextManagerListener(ContextManagerListener listener) {
if (configContext != null) {
listener.setConfigurationContext(configContext);
}
- this.listener = listener;
}
public void setConfigurationContext(ConfigurationContext configurationContext) {
this.configContext = configurationContext;
- listener.setConfigurationContext(configurationContext);
}
public void setReplicationExcludePatterns(String contextType, List patterns) {
excludedReplicationPatterns.put(contextType, patterns);
}
- public Map getReplicationExcludePatterns(){
+ public Map getReplicationExcludePatterns() {
return excludedReplicationPatterns;
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManagerListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManagerListener.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManagerListener.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManagerListener.java Sun Jun 10 04:42:12 2007
@@ -26,18 +26,6 @@
private ConfigurationContext configurationContext;
private static final Log log = LogFactory.getLog(DefaultContextManagerListener.class);
- public void contextAdded(ContextClusteringCommand message) throws ClusteringFault {
- log.debug("Enter: DefaultContextManagerListener::contextAdded");
- message.execute(configurationContext);
- log.debug("Exit: DefaultContextManagerListener::contextAdded");
- }
-
- public void contextRemoved(ContextClusteringCommand message) throws ClusteringFault {
- log.debug("Enter: DefaultContextManagerListener::contextRemoved");
- message.execute(configurationContext);
- log.debug("Exit: DefaultContextManagerListener::contextRemoved");
- }
-
public void contextUpdated(ContextClusteringCommand message) throws ClusteringFault {
log.debug("Enter: DefaultContextManagerListener::contextRemoved");
message.execute(configurationContext);
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateConfigurationContextCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateConfigurationContextCommand.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateConfigurationContextCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateConfigurationContextCommand.java Sun Jun 10 04:42:12 2007
@@ -16,41 +16,18 @@
package org.apache.axis2.clustering.context.commands;
import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.context.ContextClusteringCommand;
-import org.apache.axis2.clustering.context.PropertyUpdater;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.PropertyDifference;
-
-import java.util.HashMap;
/**
*
*/
-public class UpdateConfigurationContextCommand
- extends ContextClusteringCommand implements UpdateContextCommand {
-
- private PropertyUpdater propertyUpdater = new PropertyUpdater();
+public class UpdateConfigurationContextCommand extends UpdateContextCommand {
public void execute(ConfigurationContext configurationContext) throws ClusteringFault {
propertyUpdater.updateProperties(configurationContext);
}
- public int getCommandType() {
- return UPDATE_CONFIGURATION_CONTEXT;
- }
-
- public boolean isPropertiesEmpty(){
- if (propertyUpdater.getProperties() == null) {
- propertyUpdater.setProperties(new HashMap());
- return true;
- }
- return propertyUpdater.getProperties().isEmpty();
- }
-
- public void addProperty(PropertyDifference diff) {
- if (propertyUpdater.getProperties() == null) {
- propertyUpdater.setProperties(new HashMap());
- }
- propertyUpdater.addContextProperty(diff);
+ public String toString() {
+ return "UpdateConfigurationContextCommand(" + uniqueId + ")";
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateContextCommand.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateContextCommand.java?view=diff&rev=545866&r1=545865&r2=545866
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateContextCommand.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateContextCommand.java Sun Jun 10 04:42:12 2007
@@ -15,15 +15,31 @@
*/
package org.apache.axis2.clustering.context.commands;
+import org.apache.axis2.clustering.context.ContextClusteringCommand;
+import org.apache.axis2.clustering.context.PropertyUpdater;
import org.apache.axis2.context.PropertyDifference;
-import java.io.Serializable;
+import java.util.HashMap;
/**
*
*/
-public interface UpdateContextCommand extends Serializable {
- void addProperty(PropertyDifference diff);
+public abstract class UpdateContextCommand extends ContextClusteringCommand {
- boolean isPropertiesEmpty();
+ protected PropertyUpdater propertyUpdater = new PropertyUpdater();
+
+ public boolean isPropertiesEmpty() {
+ if (propertyUpdater.getProperties() == null) {
+ propertyUpdater.setProperties(new HashMap());
+ return true;
+ }
+ return propertyUpdater.getProperties().isEmpty();
+ }
+
+ public void addProperty(PropertyDifference diff) {
+ if (propertyUpdater.getProperties() == null) {
+ propertyUpdater.setProperties(new HashMap());
+ }
+ propertyUpdater.addContextProperty(diff);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org