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 di...@apache.org on 2007/02/25 21:14:45 UTC
svn commit: r511588 [1/8] - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: ./
addressing/ addressing/wsdl/ builder/ client/ context/ dataretrieval/
dataretrieval/client/ deployment/ deployment/resolver/ deployment/util/
descripti...
Author: dims
Date: Sun Feb 25 12:14:38 2007
New Revision: 511588
URL: http://svn.apache.org/viewvc?view=rev&rev=511588
Log:
one more try (NO CODE CHANGES)
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/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/OMBuilder.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/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/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/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/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/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/WarBasedAxisConfigurator.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/AARFileBasedURIResolver.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/AxisBindingOperation.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/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/ClientUtils.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/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/TransportInDescription.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/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/WSDLToAxisServiceBuilder.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/SOAPMessageBodyBasedOperationDispatcher.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/AxisEngine.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/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/Messages.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/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/receivers/AbstractInMessageReceiver.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/receivers/AbstractRobustInMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.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/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/ApplicationXMLFormatter.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/CommonsTransportHeaders.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/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/RESTRequestEntity.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.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/ServletBasedOutTransportInfo.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/XFormURLEncodedFormatter.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/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/HttpConnectionFactory.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/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/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/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/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/LocalTransportReceiver.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/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/MailClient.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/SimpleMailListener.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/POP3Server.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/SMTPServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.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/Builder.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/CommandLineOptionParser.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/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/MultipleEntryHashMap.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/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/TargetResolver.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/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/threadpool/ThreadPool.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.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=511588&r1=511587&r2=511588
==============================================================================
--- 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 Feb 25 12:14:38 2007
@@ -277,8 +277,7 @@
* @param message A string that's really only useful for logging.
* @param faultMessageContext
*/
- public AxisFault(String message, MessageContext faultMessageContext)
- {
+ public AxisFault(String message, MessageContext faultMessageContext) {
super(message);
this.faultMessageContext = faultMessageContext;
}
@@ -317,8 +316,9 @@
* @return faultReason
*/
public String getReason() {
- if (faultReasonList.size() >= 1)
+ if (faultReasonList.size() >= 1) {
return ((FaultReason) faultReasonList.get(0)).getText();
+ }
return null;
}
@@ -484,8 +484,7 @@
* @return The MessageContext representing the fault message or null if the
* fault was not created with MessageContext representation.
*/
- public MessageContext getFaultMessageContext()
- {
+ public MessageContext getFaultMessageContext() {
return faultMessageContext;
}
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=511588&r1=511587&r2=511588
==============================================================================
--- 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 Feb 25 12:14:38 2007
@@ -315,6 +315,7 @@
/**
* This is used to specify the message format which the message needs to be serializes.
+ *
* @see org.apache.axis2.transport.MessageFormatter
*/
public static final String MESSAGE_TYPE = "messageType";
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=511588&r1=511587&r2=511588
==============================================================================
--- 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 Feb 25 12:14:38 2007
@@ -71,11 +71,13 @@
public static final String ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS = "addMustUnderstandToAddressingHeaders";
- /** A property pointing to an ArrayList of OMAttribute objects representing any attributes
+ /**
+ * A property pointing to an ArrayList of OMAttribute objects representing any attributes
* of the wsa:Action header.
*/
public static final String ACTION_ATTRIBUTES = "actionAttributes";
- /** A property pointing to an ArrayList of OMAttribute objects representing any attributes
+ /**
+ * A property pointing to an ArrayList of OMAttribute objects representing any attributes
* of the wsa:MessageID header.
*/
public static final String MESSAGEID_ATTRIBUTES = "messageidAttributes";
@@ -89,7 +91,7 @@
/**
* 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.
- *
+ * <p/>
* 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
*/
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=511588&r1=511587&r2=511588
==============================================================================
--- 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 Feb 25 12:14:38 2007
@@ -15,11 +15,8 @@
*/
package org.apache.axis2.addressing;
-import java.util.Map;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants.Final;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.Parameter;
@@ -27,6 +24,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.Map;
+
public class AddressingHelper {
private static final Log log = LogFactory.getLog(AddressingHelper.class);
@@ -75,6 +74,7 @@
/**
* If the inbound FaultTo header was invalid and caused a fault, the fault should not be
* sent to it.
+ *
* @return true if the fault should be sent to the FaultTo
*/
public static boolean shouldSendFaultToFaultTo(MessageContext messageContext){
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=511588&r1=511587&r2=511588
==============================================================================
--- 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 Feb 25 12:14:38 2007
@@ -277,17 +277,21 @@
buffer.append(", Address Attributes: ").append(addressAttributes);
}
- if (metaData != null)
+ if (metaData != null) {
buffer.append(", Metadata: ").append(metaData);
+ }
- if (referenceParameters != null)
+ if (referenceParameters != null) {
buffer.append(", Reference Parameters: ").append(referenceParameters);
+ }
- if (extensibleElements != null)
+ if (extensibleElements != null) {
buffer.append(", Extensibility elements: ").append(extensibleElements);
+ }
- if (attributes != null)
+ if (attributes != null) {
buffer.append(", Attributes: ").append(attributes);
+ }
return buffer.toString();
}
@@ -420,53 +424,40 @@
* Compares key parts of the state from the current instance of
* this class with the specified instance to see if they are
* equivalent.
- * <P>
+ * <p/>
* This differs from the java.lang.Object.equals() method in
* that the equals() method generally looks at both the
* object identity (location in memory) and the object state
* (data).
- * <P>
+ * <p/>
*
* @param epr The object to compare with
* @return TRUE if this object is equivalent with the specified object
* that is, key fields match
* FALSE, otherwise
*/
- public boolean isEquivalent(EndpointReference epr)
- {
+ public boolean isEquivalent(EndpointReference epr) {
// NOTE: the input object is expected to exist (ie, be non-null)
- if ((this.name != null) && (epr.getName() != null))
- {
- if (!this.name.equals(epr.getName()))
- {
+ if ((this.name != null) && (epr.getName() != null)) {
+ if (!this.name.equals(epr.getName())) {
return false;
}
- }
- else if ((this.name == null) && (epr.getName() == null))
- {
+ } else if ((this.name == null) && (epr.getName() == null)) {
// continue
- }
- else
- {
+ } else {
// mismatch
return false;
}
- if ((this.address != null) && (epr.getAddress() != null))
- {
- if (!this.address.equals(epr.getAddress()))
- {
+ if ((this.address != null) && (epr.getAddress() != null)) {
+ if (!this.address.equals(epr.getAddress())) {
return false;
}
- }
- else if ((this.address == null) && (epr.getAddress() == null))
- {
+ } else if ((this.address == null) && (epr.getAddress() == null)) {
// continue
- }
- else
- {
+ } else {
// mismatch
return false;
}
@@ -476,10 +467,8 @@
ArrayList eprMetaData = epr.getMetaData();
- if ( (this.metaData != null) && (eprMetaData != null) )
- {
- if (!this.metaData.equals(eprMetaData))
- {
+ 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
@@ -489,25 +478,18 @@
return false;
}
- }
- else if ((this.metaData == null) && (eprMetaData == null))
- {
+ } else if ((this.metaData == null) && (eprMetaData == null)) {
// keep going
- }
- else
- {
+ } else {
// one of the lists is null
return false;
}
-
ArrayList eprExtensibleElements = epr.getExtensibleElements();
- if ( (this.extensibleElements != null) && (eprExtensibleElements != null) )
- {
- if (!this.extensibleElements.equals(eprExtensibleElements))
- {
+ 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
@@ -517,25 +499,18 @@
return false;
}
- }
- else if ((this.extensibleElements == null) && (eprExtensibleElements == null))
- {
+ } else if ((this.extensibleElements == null) && (eprExtensibleElements == null)) {
// keep going
- }
- else
- {
+ } else {
// one of the lists is null
return false;
}
-
ArrayList eprAttributes = epr.getAttributes();
- if ( (this.attributes != null) && (eprAttributes != null) )
- {
- if (!this.attributes.equals(eprAttributes))
- {
+ 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
@@ -545,13 +520,9 @@
return false;
}
- }
- else if ((this.attributes == null) && (eprAttributes == null))
- {
+ } else if ((this.attributes == null) && (eprAttributes == null)) {
// keep going
- }
- else
- {
+ } else {
// one of the lists is null
return false;
}
@@ -570,17 +541,14 @@
* (at least in some cases.)
*/
private void writeObject(java.io.ObjectOutputStream out)
- throws IOException
- {
+ throws IOException {
OMElement om = EndpointReferenceHelper.toOM(OMAbstractFactory.getOMFactory(), this, new QName("urn:axis2","omepr","ser"), AddressingConstants.Final.WSA_NAMESPACE);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try
- {
+ try {
om.serialize(baos);
}
- catch (javax.xml.stream.XMLStreamException e)
- {
+ catch (javax.xml.stream.XMLStreamException e) {
throw (IOException)(new IOException("Unable to serialize the EPR")).initCause(e);
}
out.writeInt(baos.size());
@@ -591,24 +559,21 @@
* Read the EPR to the specified InputStream.
*/
private void readObject(java.io.ObjectInputStream in)
- throws IOException, ClassNotFoundException
- {
+ throws IOException, ClassNotFoundException {
int numBytes = in.readInt();
byte[] serBytes = new byte[numBytes];
in.read(serBytes, 0, numBytes);
ByteArrayInputStream bais = new ByteArrayInputStream(serBytes);
- try
- {
+ try {
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)
- {
+ catch (javax.xml.stream.XMLStreamException e) {
throw (IOException)(new IOException("Unable to deserialize the EPR")).initCause(e);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java Sun Feb 25 12:14:38 2007
@@ -15,16 +15,6 @@
*/
package org.apache.axis2.addressing;
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.io.ByteArrayInputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -38,11 +28,19 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* The methods in this class are used to process {@link EndpointReference} objects
* according to the rules of the 2005/08 (Final) and 2004/08 (submission) WS-Addressing
* specifications.
- *
*/
public class EndpointReferenceHelper {
@@ -78,12 +76,10 @@
if (log.isDebugEnabled()){
log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Submission.WSA_NAMESPACE);
}
- }
- else {
+ } else {
throw new AxisFault("Unable to locate an address element for the endpoint reference type.");
}
- }
- else {
+ } else {
OMElement address = eprOMElement.getFirstChildWithName((QName) finalQNames.get(AddressingConstants.EPR_ADDRESS));
if (address != null) {
@@ -93,8 +89,7 @@
if (log.isDebugEnabled()){
log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Final.WSA_NAMESPACE);
}
- }
- else {
+ } else {
throw new AxisFault("Unable to locate an address element for the endpoint reference type.");
}
}
@@ -145,8 +140,7 @@
if (log.isDebugEnabled()){
log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Final.WSA_NAMESPACE);
}
- }
- else {
+ } else {
address = eprOMElement.getFirstChildWithName((QName) submissionQNames.get(AddressingConstants.EPR_ADDRESS));
if (address != null) {
@@ -156,8 +150,7 @@
if (log.isDebugEnabled()){
log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Submission.WSA_NAMESPACE);
}
- }
- else {
+ } else {
throw new AxisFault("Unable to locate an address element for the endpoint reference type.");
}
}
@@ -292,15 +285,13 @@
addressAttributes.add(attribute);
}
epr.setAddressAttributes(addressAttributes);
- }
- else if (map.get(AddressingConstants.EPR_REFERENCE_PARAMETERS).equals(qname)) {
+ } else if (map.get(AddressingConstants.EPR_REFERENCE_PARAMETERS).equals(qname)) {
Iterator iterator = eprChildElement.getChildElements();
while (iterator.hasNext()) {
OMElement element = (OMElement) iterator.next();
epr.addReferenceParameter(element);
}
- }
- else if (isFinalAddressingNamespace &&
+ } else if (isFinalAddressingNamespace &&
map.get(AddressingConstants.Final.WSA_METADATA).equals(qname)) {
Iterator iterator = eprChildElement.getChildElements();
while (iterator.hasNext()) {
@@ -314,8 +305,7 @@
metadataAttributes.add(attribute);
}
epr.setMetadataAttributes(metadataAttributes);
- }
- else if (!isFinalAddressingNamespace &&
+ } else if (!isFinalAddressingNamespace &&
map.get(AddressingConstants.Submission.EPR_REFERENCE_PROPERTIES).equals(qname)) {
// since we have the model for WS-Final, we don't have a place to keep this reference properties.
// The only compatible place is reference properties
@@ -324,8 +314,7 @@
OMElement element = (OMElement) iterator.next();
epr.addReferenceParameter(element);
}
- }
- else {
+ } else {
epr.addExtensibleElement(eprChildElement);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/RelatesTo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/RelatesTo.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/RelatesTo.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/RelatesTo.java Sun Feb 25 12:14:38 2007
@@ -17,16 +17,16 @@
package org.apache.axis2.addressing;
+import org.apache.axis2.util.ObjectStateUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.ArrayList;
-import org.apache.axis2.util.ObjectStateUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Class RelatesTo
*/
@@ -78,7 +78,6 @@
/**
* Constructor RelatesTo
- *
*/
public RelatesTo() {
}
@@ -163,15 +162,13 @@
/**
* Save the contents of this object.
- * <p>
+ * <p/>
* NOTE: Transient fields and static fields are not saved.
*
* @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
// write out contents of this object
// NOTES: For each item, where appropriate,
@@ -214,18 +211,16 @@
/**
* Restore the contents of the object that was
* previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
* as it was written. Some data will need to be validated when
* resurrected.
*
* @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// serialization version ID
long suid = in.readLong();
@@ -233,14 +228,12 @@
int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_REVID);
}
@@ -261,12 +254,9 @@
// ArrayList extensibilityAttributes
ArrayList tmpAL2 = ObjectStateUtils.readArrayList(in, "RelatesTo.extensibilityAttributes");
- if (tmpAL2 != null)
- {
+ if (tmpAL2 != null) {
extensibilityAttributes = new ArrayList(tmpAL2);
- }
- else
- {
+ } else {
extensibilityAttributes = null;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11ActionHelper.java Sun Feb 25 12:14:38 2007
@@ -15,7 +15,9 @@
*/
package org.apache.axis2.addressing.wsdl;
-import java.util.List;
+import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.wsdl.Definition;
import javax.wsdl.Fault;
@@ -25,10 +27,7 @@
import javax.wsdl.PortType;
import javax.wsdl.extensions.AttributeExtensible;
import javax.xml.namespace.QName;
-
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.List;
/**
* The WSDL11ActionHelper provides 3 static methods to determine the correct wsa:Action value from
@@ -45,6 +44,7 @@
/**
* getActionFromInputElement
+ *
* @param def the wsdl:definitions which contains the wsdl:portType
* @param wsdl4jPortType the wsdl:portType which contains the wsdl:operation
* @param op the wsdl:operation which contains the input element
@@ -62,6 +62,7 @@
/**
* getActionFromOutputElement
+ *
* @param def the wsdl:definitions which contains the wsdl:portType
* @param wsdl4jPortType the wsdl:portType which contains the wsdl:operation
* @param op the wsdl:operation which contains the output element
@@ -79,6 +80,7 @@
/**
* getActionFromFaultElement
+ *
* @param def the wsdl:definitions which contains the wsdl:portType
* @param wsdl4jPortType the wsdl:portType which contains the wsdl:operation
* @param op the wsdl:operation which contains the fault element
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java Sun Feb 25 12:14:38 2007
@@ -15,6 +15,9 @@
*/
package org.apache.axis2.addressing.wsdl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.wsdl.Definition;
import javax.wsdl.Fault;
import javax.wsdl.Input;
@@ -23,9 +26,6 @@
import javax.wsdl.Output;
import javax.wsdl.PortType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Generates a wsa:Action value using the Default Action Pattern defined at
* http://www.w3.org/TR/2006/WD-ws-addr-wsdl-20060216/#defactionwsdl11
@@ -45,7 +45,7 @@
/**
* Generate the Action for an Input using the Default Action Pattern
- *
+ * <p/>
* Pattern is defined as [target namespace][delimiter][port type name][delimiter][input name]
*
* @param def is required to obtain the targetNamespace
@@ -165,7 +165,7 @@
/**
* Generate the Action for an Output using the Default Action Pattern
- *
+ * <p/>
* Pattern is defined as [target namespace][delimiter][port type name][delimiter][output name]
*
* @param def is required to obtain the targetNamespace
@@ -285,7 +285,7 @@
/**
* Generate the Action for a Fault using the Default Action Pattern
- *
+ * <p/>
* Pattern is defined as [target namespace][delimiter][port type name][delimiter][operation name][delimiter]Fault[delimiter][fault name]
*
* @param def is required to obtain the targetNamespace
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/OMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/OMBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/OMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/builder/OMBuilder.java Sun Feb 25 12:14:38 2007
@@ -1,10 +1,10 @@
package org.apache.axis2.builder;
-import java.io.InputStream;
-
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
+
+import java.io.InputStream;
public interface OMBuilder {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java Sun Feb 25 12:14:38 2007
@@ -20,7 +20,11 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.ClientUtils;
import org.apache.axis2.description.TransportOutDescription;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Sun Feb 25 12:14:38 2007
@@ -18,12 +18,28 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.*;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.context.*;
-import org.apache.axis2.description.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.context.ServiceGroupContext;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.OutInAxisOperation;
+import org.apache.axis2.description.OutOnlyAxisOperation;
+import org.apache.axis2.description.RobustOutOnlyAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.i18n.Messages;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java Sun Feb 25 12:14:38 2007
@@ -129,8 +129,7 @@
* and then append the addressFromBinding string to available address
*
* @param _operationClient
- * @param addressFromBinding
- * return existing address
+ * @param addressFromBinding return existing address
*/
@@ -154,6 +153,7 @@
/**
* sets the epr of the service client to given value
+ *
* @param address
*/
@@ -186,6 +186,7 @@
/**
* sets the propertykey and propertyValue as a pair to operation client
+ *
* @param operationClient
* @param propertyKey
* @param propertyValue
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java Sun Feb 25 12:14:38 2007
@@ -27,12 +27,11 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-
-import javax.xml.namespace.QName;
public class WSDLBasedPolicyProcessor {
private HashMap ns2modules = new HashMap();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java Sun Feb 25 12:14:38 2007
@@ -17,15 +17,15 @@
package org.apache.axis2.context;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.cluster.ClusterManager;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
/**
* This is the top most level of the Context hierarchy and is a bag of properties.
*/
@@ -116,15 +116,13 @@
* @param props The table of properties to copy
*/
public void mergeProperties(Map props) {
- if (props != null)
- {
+ if (props != null) {
Iterator iterator = props.keySet().iterator();
while (iterator.hasNext()) {
Object key = iterator.next();
- if (this.properties == null)
- {
+ if (this.properties == null) {
this.properties = new HashMap();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Sun Feb 25 12:14:38 2007
@@ -33,7 +33,12 @@
import java.io.File;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
/**
* This contains all the configuration information for Axis2.
@@ -67,8 +72,9 @@
this.axisConfiguration = axisConfiguration;
initConfigContextTimeout(axisConfiguration);
- if (axisConfiguration.getClusterManager()!=null)
+ if (axisConfiguration.getClusterManager() != null) {
initCluster();
+ }
}
private void initConfigContextTimeout(AxisConfiguration axisConfiguration) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java Sun Feb 25 12:14:38 2007
@@ -1,9 +1,9 @@
package org.apache.axis2.context;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.AxisOperation;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Sun Feb 25 12:14:38 2007
@@ -1172,11 +1172,12 @@
public void setAxisService(AxisService axisService) {
this.axisService = axisService;
- if (this.axisService != null)
+ if (this.axisService != null) {
this.axisServiceGroup = (AxisServiceGroup) this.axisService.getParent();
- else
+ } else {
this.axisServiceGroup = null;
}
+ }
/*
* note setAxisServiceGroup() does not verify that the service is associated with the service group!
@@ -1617,6 +1618,7 @@
/**
* Access the DataHandler of the attachment contained in the map corresponding to the given
* content ID. Returns "NULL" if a attachment cannot be found by the given content ID.
+ *
* @param contentID :
* Content ID of the MIME attachment
* @return Data handler of the attachment
@@ -1631,6 +1633,7 @@
/**
* Removes the attachment with the given content ID from the Attachments Map
* Do nothing if a attachment cannot be found by the given content ID.
+ *
* @param contentID of the attachment
*/
public void removeAttachment(String contentID) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContextConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContextConstants.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContextConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContextConstants.java Sun Feb 25 12:14:38 2007
@@ -18,13 +18,19 @@
public interface MessageContextConstants {
- /** @deprecated please use org.apache.axis2.Constants.Configuration.TRANSPORT_URL **/
+ /**
+ * @deprecated please use org.apache.axis2.Constants.Configuration.TRANSPORT_URL *
+ */
public static final String TRANSPORT_URL = "TransportURL";
- /** @deprecated please use org.apache.axis2.transport.http.HTTPConstants.CHUNKED **/
+ /**
+ * @deprecated please use org.apache.axis2.transport.http.HTTPConstants.CHUNKED *
+ */
public static final String CHUNKED="__CHUNKED__";
- /** @deprecated please use org.apache.axis2.transport.http.HTTPConstants.HTTP_PROTOCOL_VERSION **/
+ /**
+ * @deprecated please use org.apache.axis2.transport.http.HTTPConstants.HTTP_PROTOCOL_VERSION *
+ */
public static final String HTTP_PROTOCOL_VERSION = "__HTTP_PROTOCOL_VERSION__";
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Sun Feb 25 12:14:38 2007
@@ -17,17 +17,6 @@
package org.apache.axis2.context;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
@@ -38,6 +27,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
/**
* An OperationContext represents a running "instance" of an operation, which is
* represented by an AxisOperation object. This concept is needed to allow
@@ -246,12 +245,9 @@
* @return Returns parent ServiceContext's parent EngineContext.
*/
public ConfigurationContext getConfigurationContext() {
- if (parent != null)
- {
+ if (parent != null) {
return ((ServiceContext) parent).getConfigurationContext();
- }
- else
- {
+ } else {
return null;
}
}
@@ -310,7 +306,7 @@
/**
* Save the contents of this object.
- * <p>
+ * <p/>
* NOTE: Transient fields and static fields are not saved.
* Also, objects that represent "static" data are
* not saved, except for enough information to be
@@ -318,11 +314,9 @@
* context is re-constituted.
*
* @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
//---------------------------------------------------------
// in order to handle future changes to the message
// context definition, be sure to maintain the
@@ -353,8 +347,7 @@
HashMap tmpHashMap = null;
- if ((tmpMap != null) && (!tmpMap.isEmpty()))
- {
+ if ((tmpMap != null) && (!tmpMap.isEmpty())) {
tmpHashMap = new HashMap(tmpMap);
}
@@ -367,12 +360,9 @@
String axisOpMarker = logCorrelationIDString+".axisOperation";
ObjectStateUtils.writeString(out, axisOpMarker, axisOpMarker);
- if (axisOperation == null)
- {
+ if (axisOperation == null) {
out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
- }
- else
- {
+ } else {
out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
metaAxisOperation = new MetaDataEntry(axisOperation.getClass().getName(), axisOperation.getName().toString());
ObjectStateUtils.writeObject(out, metaAxisOperation, logCorrelationIDString+".metaAxisOperation");
@@ -386,12 +376,9 @@
AxisService axisService = (AxisService) axisOperation.getParent();
- if (axisService == null)
- {
+ if (axisService == null) {
out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
- }
- else
- {
+ } else {
out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
ObjectStateUtils.writeObject(out, metaAxisService, logCorrelationIDString+".metaAxisService");
@@ -422,8 +409,7 @@
// first deal with the original messageContexts table
HashMap tmpMsgCtxMap = null;
- if ((messageContexts != null) && (!messageContexts.isEmpty()))
- {
+ if ((messageContexts != null) && (!messageContexts.isEmpty())) {
// create a table of the non-isolated message contexts
workingSet = new HashMap();
tmpMsgCtxMap = new HashMap();
@@ -431,8 +417,7 @@
Set keySet = messageContexts.keySet();
Iterator itKeys = keySet.iterator();
- while (itKeys.hasNext())
- {
+ while (itKeys.hasNext()) {
// expect the key to be a string
String keyObj = (String) itKeys.next();
@@ -442,21 +427,16 @@
boolean addToWorkingSet = true;
// check to see if this message context was isolated
- if (isolatedMessageContexts != null)
- {
- if (!isolatedMessageContexts.isEmpty())
- {
+ if (isolatedMessageContexts != null) {
+ if (!isolatedMessageContexts.isEmpty()) {
// see if the message context was previously isolated
MessageContext valueIsolated = (MessageContext) isolatedMessageContexts.get(keyObj);
- if (valueIsolated != null)
- {
+ if (valueIsolated != null) {
String idIsol = valueIsolated.getMessageID();
- if (idIsol != null)
- {
- if (idIsol.equals(value.getMessageID()))
- {
+ if (idIsol != null) {
+ if (idIsol.equals(value.getMessageID())) {
// don't add to working set
addToWorkingSet = false;
}
@@ -465,8 +445,7 @@
}
}
- if (addToWorkingSet)
- {
+ if (addToWorkingSet) {
// put the meta data entry in the list
workingSet.put(keyObj,value);
}
@@ -478,8 +457,7 @@
Set keySet2 = workingSet.keySet();
Iterator itKeys2 = keySet2.iterator();
- while (itKeys2.hasNext())
- {
+ while (itKeys2.hasNext()) {
// expect the key to be a string
String keyObj2 = (String) itKeys2.next();
@@ -514,18 +492,16 @@
/**
* Restore the contents of the object that was previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
* as it was written. Some data will need to be validated when
* resurrected.
*
* @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// set the flag to indicate that the message context is being
// reconstituted and will need to have certain object references
// to be reconciled with the current engine setup
@@ -545,14 +521,12 @@
int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_REVID);
}
@@ -580,8 +554,7 @@
HashMap tmpHashMap = ObjectStateUtils.readHashMap(in,"OperationContext.properties");
properties = new HashMap();
- if (tmpHashMap != null)
- {
+ if (tmpHashMap != null) {
setProperties(tmpHashMap);
}
@@ -597,12 +570,9 @@
boolean metaAxisOperationIsActive = in.readBoolean();
- if (metaAxisOperationIsActive == ObjectStateUtils.ACTIVE_OBJECT)
- {
+ if (metaAxisOperationIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
metaAxisOperation = (MetaDataEntry) ObjectStateUtils.readObject(in, "OperationContext.metaAxisOperation");
- }
- else
- {
+ } else {
metaAxisOperation = null;
}
@@ -613,12 +583,9 @@
boolean metaAxisServiceIsActive = in.readBoolean();
- if (metaAxisServiceIsActive == ObjectStateUtils.ACTIVE_OBJECT)
- {
+ if (metaAxisServiceIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
metaAxisService = (MetaDataEntry) ObjectStateUtils.readObject(in, "OperationContext.metaAxisService");
- }
- else
- {
+ } else {
metaAxisService = null;
}
@@ -663,11 +630,9 @@
*
* @param cc The configuration context object representing the active configuration
*/
- public void activate(ConfigurationContext cc)
- {
+ public void activate(ConfigurationContext cc) {
// see if there's any work to do
- if (!needsToBeReconciled)
- {
+ if (!needsToBeReconciled) {
// return quick
return;
}
@@ -679,20 +644,15 @@
// We previously saved metaAxisService; restore it
AxisService axisService = null;
- if (metaAxisService != null)
- {
+ if (metaAxisService != null) {
axisService = ObjectStateUtils.findService(axisConfig, metaAxisService.getClassName(), metaAxisService.getQNameAsString());
}
// We previously saved metaAxisOperation; restore it
- if (metaAxisOperation != null)
- {
- if (axisService != null)
- {
+ if (metaAxisOperation != null) {
+ if (axisService != null) {
this.axisOperation = ObjectStateUtils.findOperation(axisService, metaAxisOperation.getClassName(), metaAxisOperation.getQName());
- }
- else
- {
+ } else {
this.axisOperation = ObjectStateUtils.findOperation(axisConfig, metaAxisOperation.getClassName(), metaAxisOperation.getQName());
}
}
@@ -700,8 +660,7 @@
// the parent ServiceContext object was saved
// either use the restored object or sync up with
// an existing ServiceContext object
- if (metaParent != null)
- {
+ if (metaParent != null) {
// find out if a copy of the ServiceContext object exists on this
// engine where this OperationContext is being restored/activated
// if so, use that object instead of the restored object
@@ -715,34 +674,28 @@
// first look for the ServiceContext via the ServiceContextGroup
ServiceGroupContext sgc = cc.getServiceGroupContext(groupName);
- if (sgc != null)
- {
+ if (sgc != null) {
existingSC = sgc.findServiceContext(serviceName);
}
- if (existingSC == null)
- {
+ if (existingSC == null) {
// we couldn't find the ServiceContext via the ServiceContextGroup
// try via the set of existing operation contexts
OperationContext existingOC = cc.findOperationContext(getOperationName(), serviceName, groupName);
- if (existingOC != null)
- {
+ if (existingOC != null) {
existingSC = (ServiceContext) existingOC.getParent();
}
}
- if (existingSC == null)
- {
+ if (existingSC == null) {
// could not find an existing ServiceContext
// use the restored object
metaParent.activate(cc);
// set parent
this.setParent(metaParent);
- }
- else
- {
+ } else {
// switch over to the existing object
this.setParent(existingSC);
@@ -756,9 +709,7 @@
// is important to be restored.
metaParent.putContextProperties(existingSC,true);
}
- }
- else
- {
+ } else {
// set parent to null
this.setParent(metaParent);
}
@@ -768,12 +719,9 @@
ServiceContext serv = getServiceContext();
ConfigurationContext activeCC ;
- if (serv != null)
- {
+ if (serv != null) {
activeCC = serv.getConfigurationContext();
- }
- else
- {
+ } else {
activeCC = cc;
}
@@ -795,13 +743,11 @@
// to call this operation context object so we don't
// need to handle the metaMessagecontextMap table here
- if ((workingSet != null) && (!workingSet.isEmpty()))
- {
+ if ((workingSet != null) && (!workingSet.isEmpty())) {
Set keySet = workingSet.keySet();
Iterator itKeys = keySet.iterator();
- while (itKeys.hasNext())
- {
+ while (itKeys.hasNext()) {
// expect the key to be a string
String keyObj = (String) itKeys.next();
@@ -809,8 +755,7 @@
MessageContext value = (MessageContext) workingSet.get((Object)keyObj);
// activate that object
- if (value != null)
- {
+ if (value != null) {
// trace point
log.trace(logCorrelationIDString+":activate(): key ["+keyObj+"] message id ["+value.getMessageID()+"]");
@@ -818,8 +763,7 @@
value.activateWithOperationContext(this);
suppressWarnings = false;
- if (messageContexts == null)
- {
+ if (messageContexts == null) {
messageContexts = new HashMap();
}
}
@@ -844,30 +788,26 @@
* saving the entire message context object,
* just setup some metadata about the message
* context.
- * <P>
+ * <p/>
* Note: this will remove the specified
* message context object from the message context
* table.
*
* @param mc The message context object
*/
- public void isolateMessageContext(MessageContext mc)
- {
- if (mc == null)
- {
+ public void isolateMessageContext(MessageContext mc) {
+ if (mc == null) {
return;
}
- if ((messageContexts == null) || (messageContexts.isEmpty()))
- {
+ if ((messageContexts == null) || (messageContexts.isEmpty())) {
return;
}
// get the message ID from the message context
String messageID = mc.getMessageID();
- if (messageID == null)
- {
+ if (messageID == null) {
// can't locate it without identification
return;
}
@@ -875,24 +815,20 @@
Iterator it = messageContexts.keySet().iterator();
- while (it.hasNext())
- {
+ while (it.hasNext()) {
// get the key
Object keyObj = it.next();
// get the value associated with that key
MessageContext value = (MessageContext) messageContexts.get(keyObj);
- if (value != null)
- {
+ if (value != null) {
String valueID = value.getMessageID();
- if ((valueID != null) && valueID.equals(messageID))
- {
+ if ((valueID != null) && valueID.equals(messageID)) {
// found the input message context in our table
- if (metaMessageContextMap == null)
- {
+ if (metaMessageContextMap == null) {
metaMessageContextMap = new HashMap();
}
@@ -915,8 +851,7 @@
// messageContexts.remove(keyObj);
// put the original entry in the temporary list
- if (isolatedMessageContexts == null)
- {
+ if (isolatedMessageContexts == null) {
isolatedMessageContexts = new HashMap();
}
@@ -943,26 +878,22 @@
*
* @param msg The message context object
*/
- public void restoreMessageContext(MessageContext msg)
- {
+ public void restoreMessageContext(MessageContext msg) {
// see if the activation has been done
- if (needsToBeReconciled)
- {
+ if (needsToBeReconciled) {
// nope, need to do the activation first
log.trace(logCorrelationIDString+":restoreMessageContext(): *** WARNING : need to invoke activate() prior to restoring the MessageContext to the list.");
return;
}
- if (msg == null)
- {
+ if (msg == null) {
return;
}
String msgID = msg.getMessageID();
- if (msgID == null)
- {
+ if (msgID == null) {
// can't identify message context
log.trace(logCorrelationIDString+":restoreMessageContext(): *** WARNING : MessageContext does not have a message ID.");
return;
@@ -972,27 +903,22 @@
// the specified message context object matches any
// of the metadata entries.
- if ((metaMessageContextMap != null) && (!metaMessageContextMap.isEmpty()))
- {
+ if ((metaMessageContextMap != null) && (!metaMessageContextMap.isEmpty())) {
Iterator itMeta = metaMessageContextMap.keySet().iterator();
- while (itMeta.hasNext())
- {
+ while (itMeta.hasNext()) {
String keyM = (String) itMeta.next();
MetaDataEntry valueM = (MetaDataEntry) metaMessageContextMap.get(keyM);
String valueM_ID ;
- if (valueM != null)
- {
+ if (valueM != null) {
valueM_ID = valueM.getQNameAsString();
- if (msgID.equals(valueM_ID))
- {
+ if (msgID.equals(valueM_ID)) {
String label = valueM.getExtraName();
- if (messageContexts == null)
- {
+ if (messageContexts == null) {
messageContexts = new HashMap();
}
@@ -1008,26 +934,21 @@
}
}
}
- }
- else
+ } else
// see if we can put the msg directly in the messageContexts table
- if ((messageContexts != null) && (!messageContexts.isEmpty()))
- {
+ if ((messageContexts != null) && (!messageContexts.isEmpty())) {
Iterator itList = messageContexts.keySet().iterator();
- while (itList.hasNext())
- {
+ while (itList.hasNext()) {
String key = (String) itList.next();
MessageContext value = (MessageContext) messageContexts.get(key);
String valueID ;
- if (value != null)
- {
+ if (value != null) {
valueID = value.getMessageID();
- if (msgID.equals(valueID))
- {
+ if (msgID.equals(valueID)) {
// update the entry
messageContexts.put(key, msg);
}
@@ -1042,15 +963,12 @@
*
* @return The name String
*/
- public String getOperationName()
- {
+ public String getOperationName() {
String opName = null;
- if (axisOperation != null)
- {
+ if (axisOperation != null) {
QName qname = axisOperation.getName();
- if (qname != null)
- {
+ if (qname != null) {
opName = qname.toString();
}
}
@@ -1063,19 +981,16 @@
*
* @return The name String
*/
- public String getServiceName()
- {
+ public String getServiceName() {
String srvName = null;
ServiceContext sc = (ServiceContext) getParent();
- if (sc == null)
- {
+ if (sc == null) {
sc = metaParent;
}
- if (sc != null)
- {
+ if (sc != null) {
srvName = sc.getName();
}
@@ -1087,19 +1002,16 @@
*
* @return The name String
*/
- public String getServiceGroupName()
- {
+ public String getServiceGroupName() {
String srvGroupName = null;
ServiceContext sc = (ServiceContext) getParent();
- if (sc == null)
- {
+ if (sc == null) {
sc = metaParent;
}
- if (sc != null)
- {
+ if (sc != null) {
srvGroupName = sc.getGroupName();
}
@@ -1111,29 +1023,26 @@
* Compares key parts of the state from the current instance of
* this class with the specified instance to see if they are
* equivalent.
- * <P>
+ * <p/>
* This differs from the java.lang.Object.equals() method in
* that the equals() method generally looks at both the
* object identity (location in memory) and the object state
* (data).
- * <P>
+ * <p/>
*
* @param ctx The object to compare with
* @return TRUE if this object is equivalent with the specified object
* that is, key fields match
* FALSE, otherwise
*/
- public boolean isEquivalent(OperationContext ctx)
- {
+ public boolean isEquivalent(OperationContext ctx) {
// NOTE: the input object is expected to exist (ie, be non-null)
- if (this.isComplete != ctx.isComplete())
- {
+ if (this.isComplete != ctx.isComplete()) {
return false;
}
- if (!this.axisOperation.equals(ctx.getAxisOperation()))
- {
+ if (!this.axisOperation.equals(ctx.getAxisOperation())) {
return false;
}
@@ -1152,8 +1061,7 @@
* for this object instance. It is suitable for matching related log
* entries.
*/
- public String getLogCorrelationIDString()
- {
+ public String getLogCorrelationIDString() {
return logCorrelationIDString;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java Sun Feb 25 12:14:38 2007
@@ -18,9 +18,9 @@
package org.apache.axis2.context;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.wsdl.WSDLConstants;
/**
* This is the factory for OperationContext.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java Sun Feb 25 12:14:38 2007
@@ -23,7 +23,7 @@
/**
* An interface for use by a message handler to allow
* it to save and restore any message-specific data.
- * <P>
+ * <p/>
* A handler can have message-specific data that
* needs to be associated the message being processed.
* The handler can keep this message-specific data
@@ -41,12 +41,12 @@
/**
* This method is invoked when the MessageContext object is being saved.
- *
+ * <p/>
* Implementors are expected to iterate through the data objects they wish
* to save and return it in a ByteArrayOutputStream. This data will
* later be passed to the implementor's deserializeSelfManagedData method when
* the data object is to be restored.
- *
+ * <p/>
* The data being saved may be the data stored by the implementor
* in the MessageContext object's SelfManagedData list and may include
* additional information such as the implementor's fields.
@@ -58,20 +58,20 @@
* @return The saved data in the output stream. Note that the
* format of the data in the output stream is defined
* by the implementor.
- * @exception IOException
+ * @throws IOException
*/
public ByteArrayOutputStream serializeSelfManagedData(MessageContext mc) throws IOException;
/**
* This method is invoked when the MessageContext object is being restored.
- *
+ * <p/>
* Implementors will receive the data they had previously saved in the
* serializeSelfManagedData() method. Implementors are responsible for
* reconstituting their message-specific data.
*
* @param data ByteArrayInputStream consisting of the data that this handler had previously saved
* @param mc the MessageContext object being restored
- * @exception IOException
+ * @throws IOException
*/
public void deserializeSelfManagedData(ByteArrayInputStream data, MessageContext mc) throws IOException;
@@ -79,7 +79,7 @@
/**
* This method is invoked when the MessageContext object is being restored and
* after the deserializeSelfManagedData() method.
- *
+ * <p/>
* Implementors use this method to re-establish transient message-specific data,
* particularly if the implementor did not save any user data in the
* serializeSelfManagedData() method.
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org