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 gd...@apache.org on 2007/03/04 19:17:07 UTC
svn commit: r514453 [1/26] - in
/webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/
src/org/apache/axis2/builder/ src/org/apache/axis2/client/
src/org/apache/axis2/c...
Author: gdaniels
Date: Sun Mar 4 10:16:54 2007
New Revision: 514453
URL: http://svn.apache.org/viewvc?view=rev&rev=514453
Log:
Some code cleanup. This is an example of using IDEA's code reformatter, which as per list discussion we should be running over the whole codebase before cutting the branch for each release.
(now, if it could only fix typos/spelling errors... :) )
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/RelatesTo.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/ServiceName.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/Builder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/async/AsyncResult.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusterManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContextConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/OutputForm.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractOperationDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractServiceDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/ActionBasedOperationDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfigurator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEvent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/MessageBundle.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/MessagesConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/ProjectResourceBundle.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/RB.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/java/security/AccessController.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/Module.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/ModulePolicyExtension.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/modules/PolicyExtension.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/namespace/Constants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/phaseresolver/PhaseHolder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisAdminServlet.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisRequestEntity.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorkerFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/TransportHeaders.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisParams.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpConnectionFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpConnectionManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/IOProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/IOProcessorCallback.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/LoggingProcessorDecorator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/OutputBuffer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/SessionManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/Worker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/WorkerFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/RESTUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/SOAPUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/URIEncoderDecoder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/URLTemplatingUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalResponder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/Constants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/EMailSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/EmailReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MimeBase64BodyPart.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailAddress.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/Storage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPWorker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Base64.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOption.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionParser.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/DefaultEntityResolver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ExternalPolicySerializer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/LoggingControl.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultiParentClassLoader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SchemaUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SelfManagedDataHolder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SessionUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigrator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ThreadContextMigratorUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/URLProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/UUIDGenerator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLChar.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XMLUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/XSLTTemplateProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/SOAPHeaderMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/SOAPModuleMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDL4JImportedWSDLHelper.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/Echo2.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/InavalidModuleImpl.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/ModuleHandler1.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/AddressingHelperTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AddingObserverTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisMessageTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/AxisObserverImpl.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BadModuleTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/DeploymentTotalTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SpeakingHandler.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/MockFlow.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/SpeakingHandler1.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/ActionBasedOperationDispatchTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcherTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcherTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcherTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcherTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcherTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OptionsSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ParameterAddTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ParameterLocked.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/SOAPActionBasedDispatcherTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/handlers/Handler2.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/action/Action.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/driver/Java2SecTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/interf/Actor.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/less/LessPermission.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/less/LessPermissionAccessControlContext.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/less/LessPermissionPrivilegedExceptionAction.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/more/MorePermission.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/more/MorePermissionAccessControlContext.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/java/security/more/MorePermissionPrivilegedExceptionAction.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/misc/MiscTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/AddingHandlerToEachPhaseTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/registry/Handler3.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/sample/echo/EchoImpl.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/sample/handlers/LoggingHandler.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/URLTemplatingUtilTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/tcp/TCPTransportTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/ThreadContextMigratorTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/UtilsParseRequestTest.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java Sun Mar 4 10:16:54 2007
@@ -58,14 +58,14 @@
* a SOAP1.1 fault is created, spurious information can be discarded.
* Mapping
* <pre>
- * SOAP1.2 SOAP1.1
- * node faultactor
- * reason(0).text faultstring
- * faultcode.value faultcode
- * faultcode.subcode (discarded)
- * detail detail
- * role (discarded)
- * </pre>
+ * SOAP1.2 SOAP1.1
+ * node faultactor
+ * reason(0).text faultstring
+ * faultcode.value faultcode
+ * faultcode.subcode (discarded)
+ * detail detail
+ * role (discarded)
+ * </pre>
*/
public class AxisFault extends RemoteException {
@@ -94,7 +94,7 @@
* processing may take place before they return control (e.g. JAX-WS.)
*/
private MessageContext faultMessageContext;
-
+
/**
* SOAP1.2: URI of faulting node. Null for unknown.
* <p/>
@@ -128,7 +128,8 @@
setFaultCode(faultCode);
}
- public AxisFault(QName faultCode, String faultReason, String faultNode, String faultRole, OMElement faultDetail) {
+ public AxisFault(QName faultCode, String faultReason, String faultNode, String faultRole,
+ OMElement faultDetail) {
this(faultReason, faultCode);
this.faultNode = faultNode;
this.faultRole = faultRole;
@@ -146,29 +147,31 @@
* @param soapFaultRole
*/
public AxisFault(SOAPFaultCode soapFaultCode, SOAPFaultReason soapFaultReason,
- SOAPFaultNode soapFaultNode, SOAPFaultRole soapFaultRole, SOAPFaultDetail soapFaultDetail) {
- initializeValues(soapFaultCode, soapFaultReason, soapFaultNode, soapFaultRole, soapFaultDetail);
+ SOAPFaultNode soapFaultNode, SOAPFaultRole soapFaultRole,
+ SOAPFaultDetail soapFaultDetail) {
+ initializeValues(soapFaultCode, soapFaultReason, soapFaultNode, soapFaultRole,
+ soapFaultDetail);
}
-
- public AxisFault(SOAPFault fault) {
+
+ public AxisFault(SOAPFault fault) {
initializeValues(fault);
}
-
+
public AxisFault(SOAPFault fault, MessageContext faultCtx) {
initializeValues(fault);
faultMessageContext = faultCtx;
}
-
+
private void initializeValues(SOAPFault fault) {
if (fault != null) {
- initializeValues(fault.getCode(), fault.getReason(), fault.getNode(),
- fault.getRole(), fault.getDetail());
- }
+ initializeValues(fault.getCode(), fault.getReason(), fault.getNode(),
+ fault.getRole(), fault.getDetail());
+ }
}
- private void initializeValues(SOAPFaultCode soapFaultCode,
- SOAPFaultReason soapFaultReason,
- SOAPFaultNode soapFaultNode,
+ private void initializeValues(SOAPFaultCode soapFaultCode,
+ SOAPFaultReason soapFaultReason,
+ SOAPFaultNode soapFaultNode,
SOAPFaultRole soapFaultRole,
SOAPFaultDetail soapFaultDetail) {
if (faultElements == null) {
@@ -197,12 +200,13 @@
}
- if(soapFaultCode != null && soapFaultCode.getValue() != null) {
+ if (soapFaultCode != null && soapFaultCode.getValue() != null) {
faultCode = soapFaultCode.getValue().getTextAsQName();
}
}
-
- private void setToElementsListIfNotNull(String soapFaultElementName, OMElement soapFaultElement) {
+
+ private void setToElementsListIfNotNull(String soapFaultElementName,
+ OMElement soapFaultElement) {
if (soapFaultElement != null) {
faultElements.put(soapFaultElementName, soapFaultElement);
}
@@ -273,15 +277,15 @@
/**
* Create an AxisFault by providing a textual message and a MessageContext
* that contains the actual fault representation.
- *
- * @param message A string that's really only useful for logging.
+ *
+ * @param message A string that's really only useful for logging.
* @param faultMessageContext
*/
public AxisFault(String message, MessageContext faultMessageContext) {
- super(message);
- this.faultMessageContext = faultMessageContext;
+ super(message);
+ this.faultMessageContext = faultMessageContext;
}
-
+
/**
* Add a header to the list of fault headers
*
@@ -385,7 +389,8 @@
* {@link #AxisFault(org.apache.axiom.soap.SOAPFaultCode, org.apache.axiom.soap.SOAPFaultReason, org.apache.axiom.soap.SOAPFaultNode, org.apache.axiom.soap.SOAPFaultRole, org.apache.axiom.soap.SOAPFaultDetail) AxisFault}
*/
public SOAPFaultCode getFaultCodeElement() {
- return (SOAPFaultCode) (faultElements != null ? faultElements.get(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME) : null);
+ return (SOAPFaultCode) (faultElements != null ?
+ faultElements.get(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME) : null);
}
/**
@@ -393,7 +398,8 @@
* {@link #AxisFault(org.apache.axiom.soap.SOAPFaultCode, org.apache.axiom.soap.SOAPFaultReason, org.apache.axiom.soap.SOAPFaultNode, org.apache.axiom.soap.SOAPFaultRole, org.apache.axiom.soap.SOAPFaultDetail) AxisFault}
*/
public SOAPFaultReason getFaultReasonElement() {
- return (SOAPFaultReason) (faultElements != null ? faultElements.get(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME) : null);
+ return (SOAPFaultReason) (faultElements != null ?
+ faultElements.get(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME) : null);
}
/**
@@ -401,7 +407,8 @@
* {@link #AxisFault(org.apache.axiom.soap.SOAPFaultCode, org.apache.axiom.soap.SOAPFaultReason, org.apache.axiom.soap.SOAPFaultNode, org.apache.axiom.soap.SOAPFaultRole, org.apache.axiom.soap.SOAPFaultDetail) AxisFault}
*/
public SOAPFaultNode getFaultNodeElement() {
- return (SOAPFaultNode) (faultElements != null ? faultElements.get(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME) : null);
+ return (SOAPFaultNode) (faultElements != null ?
+ faultElements.get(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME) : null);
}
/**
@@ -409,7 +416,8 @@
* {@link #AxisFault(org.apache.axiom.soap.SOAPFaultCode, org.apache.axiom.soap.SOAPFaultReason, org.apache.axiom.soap.SOAPFaultNode, org.apache.axiom.soap.SOAPFaultRole, org.apache.axiom.soap.SOAPFaultDetail) AxisFault}
*/
public SOAPFaultRole getFaultRoleElement() {
- return (SOAPFaultRole) (faultElements != null ? faultElements.get(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME) : null);
+ return (SOAPFaultRole) (faultElements != null ?
+ faultElements.get(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME) : null);
}
/**
@@ -417,7 +425,8 @@
* {@link #AxisFault(org.apache.axiom.soap.SOAPFaultCode, org.apache.axiom.soap.SOAPFaultReason, org.apache.axiom.soap.SOAPFaultNode, org.apache.axiom.soap.SOAPFaultRole, org.apache.axiom.soap.SOAPFaultDetail) AxisFault}
*/
public SOAPFaultDetail getFaultDetailElement() {
- return (SOAPFaultDetail) (faultElements != null ? faultElements.get(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME) : null);
+ return (SOAPFaultDetail) (faultElements != null ?
+ faultElements.get(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME) : null);
}
/**
@@ -479,15 +488,15 @@
/**
* Returns the MessageContext representation of the fault if the fault
- * was created by providing that.
- *
+ * was created by providing that.
+ *
* @return The MessageContext representing the fault message or null if the
- * fault was not created with MessageContext representation.
+ * fault was not created with MessageContext representation.
*/
public MessageContext getFaultMessageContext() {
- return faultMessageContext;
+ return faultMessageContext;
}
-
+
class FaultReason {
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java Sun Mar 4 10:16:54 2007
@@ -195,7 +195,7 @@
public static final String RESPONSE_WRITTEN = "CONTENT_WRITTEN";
//To have a floag if the replyTo is not annon one
public static final String DIFFERENT_EPR = "DIFFERENT_EPR";
-
+
/**
* This can be set in the MessageContext to give an response code the transport should use when sending it out.
*/
@@ -238,10 +238,10 @@
/**
* Property name for inbound fault processor to set a fault on the message
* context to be thrown by the client code in favour of a simple translation
- * from SOAPFault to AxisFault
+ * from SOAPFault to AxisFault
*/
public static final String INBOUND_FAULT_OVERRIDE = "inboundFaultOverride";
-
+
public static interface Configuration {
public static final String ENABLE_REST = "enableREST";
public static final String ENABLE_REST_THROUGH_GET = "restThroughGet";
@@ -256,8 +256,8 @@
public static final String MM7_COMPATIBLE = "MM7Compatible";
public static final String MM7_INNER_BOUNDARY = "MM7InnerBoundary";
public static final String MM7_PART_CID = "MM7PartCID";
-
-
+
+
public static final String HTTP_METHOD_GET = "GET";
public static final String HTTP_METHOD_DELETE = "DELETE";
public static final String HTTP_METHOD_PUT = "PUT";
@@ -276,9 +276,11 @@
public static final String URL_PARAMETER_LIST = "URLParameterList";
public static final String URL_HTTP_LOCATION_PARAMS_LIST = "HTTPLocationParamsList";
- public static final String SEND_STACKTRACE_DETAILS_WITH_FAULTS = "sendStacktraceDetailsWithFaults";
+ public static final String SEND_STACKTRACE_DETAILS_WITH_FAULTS =
+ "sendStacktraceDetailsWithFaults";
- public static final String DRILL_DOWN_TO_ROOT_CAUSE_FOR_FAULT_REASON = "drillDownToRootCauseForFaultReason";
+ public static final String DRILL_DOWN_TO_ROOT_CAUSE_FOR_FAULT_REASON =
+ "drillDownToRootCauseForFaultReason";
public static final String DISABLE_REST = "disableREST";
@@ -288,7 +290,8 @@
/**
* @deprecated please use org.apache.axis2.addressing.AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES
*/
- public static final String DISABLE_ADDRESSING_FOR_OUT_MESSAGES = "disableAddressingForOutMessages";
+ public static final String DISABLE_ADDRESSING_FOR_OUT_MESSAGES =
+ "disableAddressingForOutMessages";
// if this property is set to Boolean.TRUE then the SOAPAction header, if present,
// will NOT be set to the value of Options.getAction(). The empty value, "", will
@@ -306,13 +309,13 @@
* its own manner.
*/
public static final String USE_CUSTOM_LISTENER = "UseCustomListener";
-
+
/**
- * If this is set to a Boolean 'true' value, then OutIn operations will always be treated
- * as async. This is useful for modules that layer async behaviour on top of sync channels.
- */
+ * If this is set to a Boolean 'true' value, then OutIn operations will always be treated
+ * as async. This is useful for modules that layer async behaviour on top of sync channels.
+ */
public static final String USE_ASYNC_OPERATIONS = "UseAsyncOperations";
-
+
/**
* This is used to specify the message format which the message needs to be serializes.
*
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java Sun Mar 4 10:16:54 2007
@@ -47,7 +47,7 @@
// ====================== WSDL Binding Constants ========================
public static final String USING_ADDRESSING = "UsingAddressing";
public static final String ANONYMOUS = "Anonymous";
-
+
// ====================== Addressing Requirement Levels ==================
// These are used to represent the requirement level on WS-Addressing indicated
// in a services.xml or a WSDL file.
@@ -56,21 +56,23 @@
public static final String ADDRESSING_UNSPECIFIED = "unspecified";
// ADDRESSING_OPTIONAL is the equivalent of <wsaw:UsingAddressing required="false" />
// in a WSDL file
- public static final String ADDRESSING_OPTIONAL = "optional";
+ public static final String ADDRESSING_OPTIONAL = "optional";
// ADDRESSING_REQUIRED is the equivalent of <wsaw:UsingAddressing required="true" />
// in a WSDL file
- public static final String ADDRESSING_REQUIRED = "required";
+ public static final String ADDRESSING_REQUIRED = "required";
// If this property is set, addressing headers will be replaced from the information in the
// message context.
public static final String REPLACE_ADDRESSING_HEADERS = "ReplaceAddressingHeaders";
-
+
// this property once set to Boolean.TRUE will make the messages to skip Addressing Handler.
// So you will not see Addressing Headers in the OUT path.
- public static final String DISABLE_ADDRESSING_FOR_OUT_MESSAGES = "disableAddressingForOutMessages";
-
- public static final String ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS = "addMustUnderstandToAddressingHeaders";
-
+ public static final String DISABLE_ADDRESSING_FOR_OUT_MESSAGES =
+ "disableAddressingForOutMessages";
+
+ public static final String ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS =
+ "addMustUnderstandToAddressingHeaders";
+
/**
* A property pointing to an ArrayList of OMAttribute objects representing any attributes
* of the wsa:Action header.
@@ -81,13 +83,13 @@
* of the wsa:MessageID header.
*/
public static final String MESSAGEID_ATTRIBUTES = "messageidAttributes";
-
+
/**
* When set to Boolean.TRUE this will cause the addressing out handler to output all
* populated addressing headers in a message, including any optional ones.
*/
public static final String INCLUDE_OPTIONAL_HEADERS = "includeOptionalHeaders";
-
+
/**
* This property, if set to Boolean.TRUE, will mean that the addressing handler allows partially
* ws-addressed messages to be sent even if they are then invalid rather than throwing a fault.
@@ -95,14 +97,16 @@
* It is not clear how necessary this property is and it may be removed before the next release if
* it is not seen to be necessary - davidillsley@apache.org
*/
- public static final String DISABLE_OUTBOUND_ADDRESSING_VALIDATION = "disableAddressingOutboundValidation";
+ public static final String DISABLE_OUTBOUND_ADDRESSING_VALIDATION =
+ "disableAddressingOutboundValidation";
public static final String WSAW_ANONYMOUS_PARAMETER_NAME = "wsawAnonymous";
-
+
// ======================== Common Faults ==============================
public static final String FAULT_ACTION_NOT_SUPPORTED = "ActionNotSupported";
- public static final String FAULT_ACTION_NOT_SUPPORTED_REASON = "The [action] cannot be processed at the receiver.";
-
+ public static final String FAULT_ACTION_NOT_SUPPORTED_REASON =
+ "The [action] cannot be processed at the receiver.";
+
public interface Final {
// ====================== Addressing 1.0 Final Version Constants ====================
@@ -139,16 +143,22 @@
public static final String FAULT_HEADER_PROB_HEADER = "ProblemHeader";
public static final String FAULT_HEADER_DETAIL = "FaultDetail";
public static final String FAULT_INVALID_HEADER = "InvalidAddressingHeader";
- public static final String FAULT_INVALID_HEADER_REASON = "A header representing a Message Addressing Property is not valid and the message cannot be processed";
- public static final String FAULT_ADDRESSING_HEADER_REQUIRED = "MessageAddressingHeaderRequired";
- public static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON = "A required header representing a Message Addressing Property is not present";
+ public static final String FAULT_INVALID_HEADER_REASON =
+ "A header representing a Message Addressing Property is not valid and the message cannot be processed";
+ public static final String FAULT_ADDRESSING_HEADER_REQUIRED =
+ "MessageAddressingHeaderRequired";
+ public static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON =
+ "A required header representing a Message Addressing Property is not present";
public static final String FAULT_INVALID_CARDINALITY = "InvalidCardinality";
- public static final String FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED = "OnlyAnonymousAddressSupported";
- public static final String FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED = "OnlyNonAnonymousAddressSupported";
+ public static final String FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED =
+ "OnlyAnonymousAddressSupported";
+ public static final String FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED =
+ "OnlyNonAnonymousAddressSupported";
public static final String FAULT_PROBLEM_ACTION_NAME = "ProblemAction";
- public static final QName WSAW_USING_ADDRESSING = new QName(WSAW_NAMESPACE,USING_ADDRESSING);
- public static final QName WSAW_ANONYMOUS = new QName(WSAW_NAMESPACE,USING_ADDRESSING);
+ public static final QName WSAW_USING_ADDRESSING =
+ new QName(WSAW_NAMESPACE, USING_ADDRESSING);
+ public static final QName WSAW_ANONYMOUS = new QName(WSAW_NAMESPACE, USING_ADDRESSING);
}
@@ -168,13 +178,17 @@
public static final String EPR_REFERENCE_PROPERTIES = "ReferenceProperties";
public static final String WSA_FAULT_ACTION =
"http://schemas.xmlsoap.org/ws/2004/08/addressing/fault";
-
+
// fault information
public static final String FAULT_INVALID_HEADER = "InvalidMessageInformationHeader";
- public static final String FAULT_INVALID_HEADER_REASON = "A message information header is not valid and the message cannot be processed. The validity failure can be either structural or semantic, e.g. a [destination] that is not a URI or a [relationship] to a [message id] that was never issued.";
- public static final String FAULT_ADDRESSING_HEADER_REQUIRED = "MessageInformationHeaderRequired";
- public static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON = "A required message information header, To, MessageID, or Action, is not present.";
+ public static final String FAULT_INVALID_HEADER_REASON =
+ "A message information header is not valid and the message cannot be processed. The validity failure can be either structural or semantic, e.g. a [destination] that is not a URI or a [relationship] to a [message id] that was never issued.";
+ public static final String FAULT_ADDRESSING_HEADER_REQUIRED =
+ "MessageInformationHeaderRequired";
+ public static final String FAULT_ADDRESSING_HEADER_REQUIRED_REASON =
+ "A required message information header, To, MessageID, or Action, is not present.";
- public static final QName WSAW_USING_ADDRESSING = new QName(WSA_NAMESPACE,USING_ADDRESSING);
+ public static final QName WSAW_USING_ADDRESSING =
+ new QName(WSA_NAMESPACE, USING_ADDRESSING);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java Sun Mar 4 10:16:54 2007
@@ -43,7 +43,8 @@
EndpointReference replyTo = messageContext.getReplyTo();
if (replyTo == null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug(messageContext.getLogIDString()+" isReplyRedirected: ReplyTo is null. Returning false");
+ log.debug(messageContext.getLogIDString() +
+ " isReplyRedirected: ReplyTo is null. Returning false");
}
return false;
} else {
@@ -63,7 +64,8 @@
EndpointReference faultTo = messageContext.getFaultTo();
if (faultTo == null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug(messageContext.getLogIDString()+" isReplyRedirected: FaultTo is null. Returning isReplyRedirected");
+ log.debug(messageContext.getLogIDString() +
+ " isReplyRedirected: FaultTo is null. Returning isReplyRedirected");
}
return isReplyRedirected(messageContext);
} else {
@@ -77,20 +79,24 @@
*
* @return true if the fault should be sent to the FaultTo
*/
- public static boolean shouldSendFaultToFaultTo(MessageContext messageContext){
+ public static boolean shouldSendFaultToFaultTo(MessageContext messageContext) {
// there are some information that the fault thrower wants to pass to the fault path.
// Means that the fault is a ws-addressing one hence use the ws-addressing fault action.
- Object faultInfoForHeaders = messageContext.getProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
+ Object faultInfoForHeaders =
+ messageContext.getProperty(Constants.FAULT_INFORMATION_FOR_HEADERS);
// if the exception is due to a problem in the faultTo header itself, we can not use those
// fault informatio to send the error. Try to send using replyTo, leave it to transport
boolean doNotSendFaultUsingFaultTo = false;
if (faultInfoForHeaders != null) {
- String problemHeaderName = (String) ((Map) faultInfoForHeaders).get(AddressingConstants.Final.FAULT_HEADER_PROB_HEADER_QNAME);
- doNotSendFaultUsingFaultTo = (problemHeaderName != null && (AddressingConstants.WSA_DEFAULT_PREFIX + ":" + AddressingConstants.WSA_FAULT_TO).equals(problemHeaderName));
+ String problemHeaderName = (String) ((Map) faultInfoForHeaders)
+ .get(AddressingConstants.Final.FAULT_HEADER_PROB_HEADER_QNAME);
+ doNotSendFaultUsingFaultTo = (problemHeaderName != null && (AddressingConstants
+ .WSA_DEFAULT_PREFIX + ":" + AddressingConstants.WSA_FAULT_TO)
+ .equals(problemHeaderName));
}
return !doNotSendFaultUsingFaultTo;
}
-
+
/**
* Extract the parameter representing the Anonymous flag from the AxisOperation
* and return the String value. Return the default of "optional" if not specified.
@@ -100,7 +106,8 @@
public static String getAnonymousParameterValue(AxisOperation axisOperation) {
String value = "";
if (axisOperation != null) {
- value = Utils.getParameterValue(axisOperation.getParameter(AddressingConstants.WSAW_ANONYMOUS_PARAMETER_NAME));
+ value = Utils.getParameterValue(
+ axisOperation.getParameter(AddressingConstants.WSAW_ANONYMOUS_PARAMETER_NAME));
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
log.debug("getAnonymousParameterValue: value: '" + value + "'");
}
@@ -128,7 +135,8 @@
return;
}
- Parameter param = axisOperation.getParameter(AddressingConstants.WSAW_ANONYMOUS_PARAMETER_NAME);
+ Parameter param =
+ axisOperation.getParameter(AddressingConstants.WSAW_ANONYMOUS_PARAMETER_NAME);
// If an existing parameter exists
if (param != null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
@@ -137,7 +145,8 @@
// and is not locked
if (!param.isLocked()) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug("setAnonymousParameterValue: Parameter not locked. Setting value: " + value);
+ log.debug("setAnonymousParameterValue: Parameter not locked. Setting value: " +
+ value);
}
// set the value
param.setValue(value);
@@ -162,7 +171,8 @@
// of the same name already exists and this should be dealt with by the outer
// if statement.
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug("setAnonymousParameterValue: addParameter failed: " + af.getMessage());
+ log.debug(
+ "setAnonymousParameterValue: addParameter failed: " + af.getMessage());
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java Sun Mar 4 10:16:54 2007
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -128,39 +127,40 @@
this.address = address;
}
- public ArrayList getAddressAttributes(){
+ public ArrayList getAddressAttributes() {
return addressAttributes;
}
-
- public void setAddressAttributes(ArrayList al){
+
+ public void setAddressAttributes(ArrayList al) {
addressAttributes = al;
}
-
- public ArrayList getMetadataAttributes(){
+
+ public ArrayList getMetadataAttributes() {
return metaDataAttributes;
}
-
- public void setMetadataAttributes(ArrayList al){
+
+ public void setMetadataAttributes(ArrayList al) {
metaDataAttributes = al;
}
-
+
/**
* hasAnonymousAddress
*
* @return true if address is 'Anonymous URI'
*/
- public boolean hasAnonymousAddress(){
- boolean result = (AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(address) ||
- AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(address) ||
-
- //The following is added to give WS-RM anonymous a semantics to indicate
- //that any response messages should be sent synchronously, using the
- //transports back channel, as opposed to asynchronously. No other
- //semantics normally associated with WS-Addressing anonymous values should
- //be assumed, by it's presence here.
- (address != null && address.startsWith("http://docs.oasis-open.org/ws-rx/wsmc/200702/anonymous?id=")));
- if(log.isTraceEnabled()){
- log.trace("hasAnonymousAddress: "+address+" is Anonymous: "+result);
+ public boolean hasAnonymousAddress() {
+ boolean result = (AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(address) ||
+ AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(address) ||
+
+ //The following is added to give WS-RM anonymous a semantics to indicate
+ //that any response messages should be sent synchronously, using the
+ //transports back channel, as opposed to asynchronously. No other
+ //semantics normally associated with WS-Addressing anonymous values should
+ //be assumed, by it's presence here.
+ (address != null && address.startsWith(
+ "http://docs.oasis-open.org/ws-rx/wsmc/200702/anonymous?id=")));
+ if (log.isTraceEnabled()) {
+ log.trace("hasAnonymousAddress: " + address + " is Anonymous: " + result);
}
return result;
}
@@ -273,10 +273,10 @@
public String toString() {
StringBuffer buffer = new StringBuffer("Address: " + address);
- if(addressAttributes != null){
+ if (addressAttributes != null) {
buffer.append(", Address Attributes: ").append(addressAttributes);
}
-
+
if (metaData != null) {
buffer.append(", Metadata: ").append(metaData);
}
@@ -312,9 +312,10 @@
OMAttribute attribute = (OMAttribute) allAddrAttributes.next();
addressAttributes.add(attribute);
}
-
-
- OMElement refParamElement = eprOMElement.getFirstChildWithName(new QName(AddressingConstants.EPR_REFERENCE_PARAMETERS));
+
+
+ OMElement refParamElement = eprOMElement
+ .getFirstChildWithName(new QName(AddressingConstants.EPR_REFERENCE_PARAMETERS));
if (refParamElement != null) {
Iterator refParams = refParamElement.getChildElements();
@@ -325,7 +326,8 @@
}
- OMElement metaDataElement = eprOMElement.getFirstChildWithName(new QName(AddressingConstants.Final.WSA_METADATA));
+ OMElement metaDataElement = eprOMElement
+ .getFirstChildWithName(new QName(AddressingConstants.Final.WSA_METADATA));
if (metaDataElement != null) {
Iterator children = metaDataElement.getChildren();
while (children.hasNext()) {
@@ -370,7 +372,8 @@
if (prefix != null) {
OMNamespace wrapNs = fac.createOMNamespace(nsurl, prefix);
OMElement epr = fac.createOMElement(localName, wrapNs);
- OMNamespace wsaNS = fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_DEFAULT_PREFIX);
+ OMNamespace wsaNS = fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE,
+ AddressingConstants.WSA_DEFAULT_PREFIX);
OMElement addressE = fac.createOMElement(AddressingConstants.EPR_ADDRESS, wsaNS, epr);
addressE.setText(address);
@@ -381,9 +384,10 @@
addressE.addAttribute(omAttributes);
}
}
-
+
if (this.metaData != null) {
- OMElement metadataE = fac.createOMElement(AddressingConstants.Final.WSA_METADATA, wsaNS, epr);
+ OMElement metadataE =
+ fac.createOMElement(AddressingConstants.Final.WSA_METADATA, wsaNS, epr);
Iterator metadata = this.metaData.iterator();
while (metadata.hasNext()) {
metadataE.addChild((OMNode) metadata.next());
@@ -391,7 +395,8 @@
}
if (this.referenceParameters != null) {
- OMElement refParameterElement = fac.createOMElement(AddressingConstants.EPR_REFERENCE_PARAMETERS, wsaNS, epr);
+ OMElement refParameterElement = fac.createOMElement(
+ AddressingConstants.EPR_REFERENCE_PARAMETERS, wsaNS, epr);
Iterator refParms = referenceParameters.values().iterator();
while (refParms.hasNext()) {
refParameterElement.addChild((OMNode) refParms.next());
@@ -421,19 +426,19 @@
}
/**
- * Compares key parts of the state from the current instance of
- * this class with the specified instance to see if they are
- * equivalent.
+ * Compares key parts of the state from the current instance of
+ * this class with the specified instance to see if they are
+ * equivalent.
* <p/>
* This differs from the java.lang.Object.equals() method in
- * that the equals() method generally looks at both the
+ * that the equals() method generally looks at both the
* object identity (location in memory) and the object state
* (data).
* <p/>
- *
- * @param epr The object to compare with
+ *
+ * @param epr The object to compare with
* @return TRUE if this object is equivalent with the specified object
- * that is, key fields match
+ * that is, key fields match
* FALSE, otherwise
*/
public boolean isEquivalent(EndpointReference epr) {
@@ -462,18 +467,17 @@
return false;
}
-
- // TODO: is a strict test ok to use?
+ // TODO: is a strict test ok to use?
ArrayList eprMetaData = epr.getMetaData();
if ((this.metaData != null) && (eprMetaData != null)) {
if (!this.metaData.equals(eprMetaData)) {
// This is a strict test
- // Returns true if and only if the specified object
- // is also a list, both lists have the same size, and
+ // Returns true if and only if the specified object
+ // is also a list, both lists have the same size, and
// all corresponding pairs of elements in the two lists
- // are equal, ie, two lists are defined to be equal if
+ // are equal, ie, two lists are defined to be equal if
// they contain the same elements in the same order.
return false;
@@ -491,10 +495,10 @@
if ((this.extensibleElements != null) && (eprExtensibleElements != null)) {
if (!this.extensibleElements.equals(eprExtensibleElements)) {
// This is a strict test
- // Returns true if and only if the specified object
- // is also a list, both lists have the same size, and
+ // Returns true if and only if the specified object
+ // is also a list, both lists have the same size, and
// all corresponding pairs of elements in the two lists
- // are equal, ie, two lists are defined to be equal if
+ // are equal, ie, two lists are defined to be equal if
// they contain the same elements in the same order.
return false;
@@ -512,10 +516,10 @@
if ((this.attributes != null) && (eprAttributes != null)) {
if (!this.attributes.equals(eprAttributes)) {
// This is a strict test
- // Returns true if and only if the specified object
- // is also a list, both lists have the same size, and
+ // Returns true if and only if the specified object
+ // is also a list, both lists have the same size, and
// all corresponding pairs of elements in the two lists
- // are equal, ie, two lists are defined to be equal if
+ // are equal, ie, two lists are defined to be equal if
// they contain the same elements in the same order.
return false;
@@ -531,10 +535,9 @@
return true;
}
-
//REVIEW: The following code is rather heavyweight, because we have to build the OM tree -- it would probably be better to have two serialization/deserialization paths and therefore, for trivial EPRs, store a smaller amount of info
-
+
/**
* Write the EPR to the specified OutputStream. Because of potential
* OMElements/Attributes, we need to actually serialize the OM structures
@@ -542,39 +545,41 @@
*/
private void writeObject(java.io.ObjectOutputStream out)
throws IOException {
- OMElement om = EndpointReferenceHelper.toOM(OMAbstractFactory.getOMFactory(), this, new QName("urn:axis2","omepr","ser"), AddressingConstants.Final.WSA_NAMESPACE);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+ OMElement om = EndpointReferenceHelper.toOM(OMAbstractFactory.getOMFactory(), this,
+ new QName("urn:axis2", "omepr", "ser"),
+ AddressingConstants.Final.WSA_NAMESPACE);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
try {
- om.serialize(baos);
- }
+ om.serialize(baos);
+ }
catch (javax.xml.stream.XMLStreamException e) {
- throw (IOException)(new IOException("Unable to serialize the EPR")).initCause(e);
- }
- out.writeInt(baos.size());
- out.write(baos.toByteArray());
+ throw (IOException) (new IOException("Unable to serialize the EPR")).initCause(e);
+ }
+ out.writeInt(baos.size());
+ out.write(baos.toByteArray());
}
-
+
/**
* Read the EPR to the specified InputStream.
*/
private void readObject(java.io.ObjectInputStream in)
throws IOException, ClassNotFoundException {
- int numBytes = in.readInt();
-
- byte[] serBytes = new byte[numBytes];
-
- in.read(serBytes, 0, numBytes);
- ByteArrayInputStream bais = new ByteArrayInputStream(serBytes);
+ int numBytes = in.readInt();
+
+ byte[] serBytes = new byte[numBytes];
+
+ in.read(serBytes, 0, numBytes);
+ ByteArrayInputStream bais = new ByteArrayInputStream(serBytes);
try {
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(bais);
- StAXOMBuilder builder = new StAXOMBuilder(xmlReader);
- OMElement om = builder.getDocumentElement();
-
- EndpointReferenceHelper.fromOM(this, om, AddressingConstants.Final.WSA_NAMESPACE);
- }
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(bais);
+ StAXOMBuilder builder = new StAXOMBuilder(xmlReader);
+ OMElement om = builder.getDocumentElement();
+
+ EndpointReferenceHelper.fromOM(this, om, AddressingConstants.Final.WSA_NAMESPACE);
+ }
catch (javax.xml.stream.XMLStreamException e) {
- throw (IOException)(new IOException("Unable to deserialize the EPR")).initCause(e);
- }
+ throw (IOException) (new IOException("Unable to deserialize the EPR")).initCause(e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org