You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/07/27 23:26:14 UTC
svn commit: r426253 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
core/src/org/apache/axis2/ core/src/org/apache/axis2/addressing/
core/src/org/apache/axis2/context/ core/src/org/apache/axis2/descripti...
Author: dims
Date: Thu Jul 27 14:26:12 2006
New Revision: 426253
URL: http://svn.apache.org/viewvc?rev=426253&view=rev
Log:
- Trying to bring some order into the chaos of the setProperty/getProperty keys.
- Deprecated the old keys and introduced new ones as shown in table below.
- The string value of the new is same as the old key, so old code should work as-is.
- Fixed one reference of new HTTPTransportProperties().new xyx()
Generic Constants MessageContextConstants.TRANSPORT_URL org.apache.axis2.Constants.Configuration.TRANSPORT_URL
Generic Constants MessageContext.CHARACTER_SET_ENCODING org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING
Generic Constants Constants.Configuration.ENABLE_MTOM org.apache.axis2.Constants.Configuration.ENABLE_MTOM
Addressing Constants AddressingConstants.WS_ADDRESSING_VERSION org.apache.axis2.addressing.AddressingConstants.WS_ADDRESSING_VERSION
Addressing Constants AddressingConstants.REPLACE_ADDRESSING_HEADERS org.apache.axis2.addressing.AddressingConstants.REPLACE_ADDRESSING_HEADERS
Addressing Constants Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES org.apache.axis2.addressing.AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES
HTTP Constants MessageContextConstants.CHUNKED org.apache.axis2.transport.http.HTTPConstants.CHUNKED
HTTP Constants HTTPConstants.NTLM_AUTHENTICATION org.apache.axis2.transport.http.HTTPConstants.NTLM_AUTHENTICATION
HTTP Constants HTTPConstants.PROXY org.apache.axis2.transport.http.HTTPConstants.PROXY
HTTP Constants HTTPConstants.BASIC_AUTHENTICATION org.apache.axis2.transport.http.HTTPConstants.BASIC_AUTHENTICATION
HTTP Constants HTTPConstants.SO_TIMEOUT org.apache.axis2.transport.http.HTTPConstants.SO_TIMEOUT
HTTP Constants HTTPConstants.CONNECTION_TIMEOUT org.apache.axis2.transport.http.HTTPConstants.CONNECTION_TIMEOUT
HTTP Constants HTTPConstants.USER_AGENT org.apache.axis2.transport.http.HTTPConstants.USER_AGENT
HTTP Constants HTTPConstants.MC_GZIP_REQUEST org.apache.axis2.transport.http.HTTPConstants.MC_GZIP_REQUEST
HTTP Constants Constants.COOKIE_STRING org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING
HTTP Constants MessageContextConstants.HTTP_PROTOCOL_VERSION org.apache.axis2.transport.http.HTTPConstants.HTTP_PROTOCOL_VERSION
HTTP Constants HTTPConstants.HTTP_HEADERS org.apache.axis2.transport.http.HTTPConstants.HTTP_HEADERS
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/RESTUtil.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/AxisController.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java
webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Thu Jul 27 14:26:12 2006
@@ -63,7 +63,7 @@
}
// if there are not headers put a flag to disable addressing temporary
if (header == null) {
- msgContext.setProperty(Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.TRUE);
+ msgContext.setProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.TRUE);
return;
}
@@ -75,14 +75,14 @@
addressingHeaders = header.getHeaderBlocksWithNSURI(namespace);
if (addressingHeaders != null && addressingHeaders.size() > 0) {
msgContext.setProperty(WS_ADDRESSING_VERSION, namespace);
- msgContext.setProperty(Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
+ msgContext.setProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
addressingNSObject = ((OMElement) addressingHeaders.get(0)).findNamespace(namespace, "");
if(log.isDebugEnabled()) {
log.debug(addressingVersion + " Headers present in the SOAP message. Starting to process ...");
}
extractAddressingInformation(header, msgContext, addressingHeaders, namespace);
} else {
- msgContext.setProperty(Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.TRUE);
+ msgContext.setProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.TRUE);
if(log.isDebugEnabled()) {
log.debug("No Headers present corresponding to " + addressingVersion);
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Thu Jul 27 14:26:12 2006
@@ -51,12 +51,12 @@
// it should be able to disable addressing by some one.
Boolean
- property = (Boolean) msgContext.getProperty(Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
+ property = (Boolean) msgContext.getProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
if (property == null && msgContext.getOperationContext() != null) {
// check in the IN message context, if available
MessageContext inMsgCtxt = msgContext.getOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inMsgCtxt != null) {
- property = (Boolean) inMsgCtxt.getProperty(Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
+ property = (Boolean) inMsgCtxt.getProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
}
}
if (property != null && property.booleanValue()) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Thu Jul 27 14:26:12 2006
@@ -188,7 +188,7 @@
public static final String FAULT_INFORMATION_FOR_HEADERS = "FaultHeaders";
- //to set and get the property from service context
+ /** @deprecated Please use org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING */
public static final String COOKIE_STRING = "Cookie";
public static final String SESSION_COOKIE = "axis_session";
@@ -216,10 +216,6 @@
public static final String CONFIG_CONTEXT_TIMOUT_INTERVAL = "ConfigContextTimeoutInterval";
- // 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 TRANSPORT_IN_URL = "TransportInURL";
public static final String URL_PARAMETER_LIST = "URLParameterList";
@@ -227,5 +223,16 @@
public static final String SEND_STACKTRACE_DETAILS_WITH_FAULTS = "sendStacktraceDetailsWithFaults";
public static final String DRILL_DOWN_TO_ROOT_CAUSE_FOR_FAULT_REASON = "drillDownToRootCauseForFaultReason";
+
+ // this will contain the keys of all the properties that will be in the message context
+ public static final String TRANSPORT_URL = "TransportURL";
+
+ /** @deprecated please use org.apache.axis2.addressing.AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES */
+ public static final String DISABLE_ADDRESSING_FOR_OUT_MESSAGES = "disableAddressingForOutMessages";
+
+ /**
+ * Field CHARACTER_SET_ENCODING
+ */
+ public static final String CHARACTER_SET_ENCODING = "CHARACTER_SET_ENCODING";
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java Thu Jul 27 14:26:12 2006
@@ -64,6 +64,10 @@
// 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 interface Final {
// ====================== Addressing 1.0 Final Version Constants ====================
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Thu Jul 27 14:26:12 2006
@@ -19,6 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.Parameter;
@@ -178,7 +179,7 @@
}
if (sessionContext != null) {
// when you come here operation context MUST already been assigned to the message context
- serviceContext.setProperty(Constants.COOKIE_STRING, sessionContext.getCookieID());
+ serviceContext.setProperty(HTTPConstants.COOKIE_STRING, sessionContext.getCookieID());
}
messageContext.getOperationContext().setParent(serviceContext);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Thu Jul 27 14:26:12 2006
@@ -68,6 +68,7 @@
/**
* Field CHARACTER_SET_ENCODING
+ * @deprecated please use org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING
*/
public static final String CHARACTER_SET_ENCODING = "CHARACTER_SET_ENCODING";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContextConstants.java Thu Jul 27 14:26:12 2006
@@ -18,8 +18,13 @@
public interface MessageContextConstants {
- // this will contain the keys of all the properties that will be in the message context
+ /** @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 **/
public static final String CHUNKED="__CHUNKED__";
- String HTTP_PROTOCOL_VERSION = "__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/core/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java Thu Jul 27 14:26:12 2006
@@ -21,7 +21,6 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.i18n.Messages;
@@ -38,7 +37,7 @@
public static synchronized TransportOutDescription inferOutTransport(AxisConfiguration ac,
EndpointReference epr,
MessageContext msgctx) throws AxisFault {
- String transportURI = (String) msgctx.getProperty(MessageContextConstants.TRANSPORT_URL);
+ String transportURI = (String) msgctx.getProperty(Constants.Configuration.TRANSPORT_URL);
if (transportURI != null && !"".equals(transportURI)) {
int index = transportURI.indexOf(':');
String transport = (index > 0) ? transportURI.substring(0, index) : null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Thu Jul 27 14:26:12 2006
@@ -184,8 +184,8 @@
new RelatesTo(
processingContext.getOptions().getMessageId(),
AddressingConstants.Final.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
- faultContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
- processingContext.getProperty(MessageContext.CHARACTER_SET_ENCODING));
+ faultContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
+ processingContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
// register the fault message context
if (processingContext.getAxisOperation() != null && processingContext.getOperationContext() != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java Thu Jul 27 14:26:12 2006
@@ -143,7 +143,7 @@
// Pick the char set encoding from the msgContext
String charSetEnc =
- (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
format.setDoOptimize(msgContext.isDoingMTOM());
format.setCharSetEncoding(charSetEnc);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java Thu Jul 27 14:26:12 2006
@@ -39,7 +39,6 @@
import org.apache.axis2.transport.http.HTTPConstants;
import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.BufferedReader;
@@ -83,10 +82,10 @@
StAXBuilder builder;
SOAPEnvelope envelope ;
String charSetEnc =
- (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
if (charSetEnc == null) {
- charSetEnc = (String) opContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ charSetEnc = (String) opContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
}
if (charSetEnc == null) {
@@ -217,7 +216,7 @@
throw new XMLStreamException(e);
}
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, charSetEncoding);
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, charSetEncoding);
/*
* put a reference to Attachments in to the message context
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Thu Jul 27 14:26:12 2006
@@ -222,7 +222,7 @@
}
} else if (charsetEnc != null) {
if (opContext != null) {
- opContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ opContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
charsetEnc.getValue()); // change to the value, which is text/xml or application/xml+soap
}
}
@@ -254,7 +254,7 @@
}
if (sessionCookie != null) {
- msgContext.getServiceContext().setProperty(Constants.COOKIE_STRING, sessionCookie);
+ msgContext.getServiceContext().setProperty(HTTPConstants.COOKIE_STRING, sessionCookie);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Thu Jul 27 14:26:12 2006
@@ -149,7 +149,7 @@
msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
res.setContentType("text/xml; charset="
- + msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING));
+ + msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
if ((contextWritten == null) || !Constants.VALUE_TRUE.equals(contextWritten)) {
res.setStatus(HttpServletResponse.SC_ACCEPTED);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Thu Jul 27 14:26:12 2006
@@ -25,7 +25,6 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportOutDescription;
@@ -139,7 +138,7 @@
OMOutputFormat format = new OMOutputFormat();
String charSetEnc =
(String) msgContext
- .getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ .getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
if (charSetEnc != null) {
format.setCharSetEncoding(charSetEnc);
@@ -148,7 +147,7 @@
if (opctx != null) {
charSetEnc = (String) opctx
- .getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ .getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
}
}
@@ -170,7 +169,7 @@
EndpointReference epr = null;
String transportURL =
(String) msgContext
- .getProperty(MessageContextConstants.TRANSPORT_URL);
+ .getProperty(Constants.Configuration.TRANSPORT_URL);
if (transportURL != null) {
epr = new EndpointReference(transportURL);
@@ -283,13 +282,13 @@
} else {
sender = new RESTSender();
}
- if (msgContext.getProperty(MessageContextConstants.CHUNKED) != null) {
+ if (msgContext.getProperty(HTTPConstants.CHUNKED) != null) {
chunked = Constants.VALUE_TRUE.equals(msgContext.getProperty(
- MessageContextConstants.CHUNKED));
+ HTTPConstants.CHUNKED));
}
- if (msgContext.getProperty(MessageContextConstants.HTTP_PROTOCOL_VERSION) != null) {
- httpVersion = (String) msgContext.getProperty(MessageContextConstants.HTTP_PROTOCOL_VERSION);
+ if (msgContext.getProperty(HTTPConstants.HTTP_PROTOCOL_VERSION) != null) {
+ httpVersion = (String) msgContext.getProperty(HTTPConstants.HTTP_PROTOCOL_VERSION);
}
// Following order needed to be preserved because,
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java Thu Jul 27 14:26:12 2006
@@ -447,6 +447,10 @@
* up by the sender while sending the request
*/
public static final String HTTP_HEADERS = "HTTP_HEADERS";
+ public static final String CHUNKED="__CHUNKED__";
+ public static final String HTTP_PROTOCOL_VERSION = "__HTTP_PROTOCOL_VERSION__";
+ //to set and get the property from service context
+ public static final String COOKIE_STRING = "Cookie";
/**
* Method getBytes.
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Thu Jul 27 14:26:12 2006
@@ -193,7 +193,7 @@
MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
MessageContext.DEFAULT_CHAR_SET_ENCODING);
} else {
@@ -204,7 +204,7 @@
charSetEnc);
// Setting the value in msgCtx
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, charSetEnc);
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, charSetEnc);
}
if (contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) > -1) {
@@ -252,7 +252,7 @@
MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
MessageContext.DEFAULT_CHAR_SET_ENCODING);
builder = new StAXSOAPModelBuilder(
xmlreader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
@@ -263,7 +263,7 @@
if ((charsetEncoding != null) && !"".equals(charsetEncoding)
&& ! charsetEncoding.equalsIgnoreCase((String) msgContext.getProperty(
- MessageContext.CHARACTER_SET_ENCODING))) {
+ Constants.Configuration.CHARACTER_SET_ENCODING))) {
String faultCode;
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java Thu Jul 27 14:26:12 2006
@@ -149,7 +149,7 @@
// Serialization as "application/x-www-form-urlencoded"
String charEncoding =
- (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
// Default encoding scheme
if (charEncoding == null) {
@@ -205,7 +205,7 @@
}
String charEncoding =
- (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
if (charEncoding == null) {
charEncoding = MessageContext.DEFAULT_CHAR_SET_ENCODING;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java Thu Jul 27 14:26:12 2006
@@ -52,7 +52,7 @@
PostMethod postMethod = new PostMethod(url.toString());
String charEncoding =
- (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
if (charEncoding == null) {
charEncoding = MessageContext.DEFAULT_CHAR_SET_ENCODING;
@@ -77,7 +77,7 @@
} else {
}
//setting the coolie in the out path
- Object cookieString = msgContext.getProperty(Constants.COOKIE_STRING);
+ Object cookieString = msgContext.getProperty(HTTPConstants.COOKIE_STRING);
if (cookieString != null) {
StringBuffer buffer = new StringBuffer();
buffer.append(Constants.SESSION_COOKIE);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java Thu Jul 27 14:26:12 2006
@@ -36,6 +36,7 @@
import javax.xml.namespace.QName;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.SessionContext;
@@ -153,7 +154,7 @@
msgContext.setConfigurationContext(this.configurationContext);
- String sessionKey = (String) this.httpcontext.getAttribute(Constants.COOKIE_STRING);
+ String sessionKey = (String) this.httpcontext.getAttribute(HTTPConstants.COOKIE_STRING);
if (this.configurationContext.getAxisConfiguration().isManageTransportSession()) {
SessionContext sessionContext = this.sessionManager.getSessionContext(sessionKey);
msgContext.setSessionContext(sessionContext);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java Thu Jul 27 14:26:12 2006
@@ -62,7 +62,7 @@
}
}
}
- context.setAttribute(Constants.COOKIE_STRING, sessionCookie);
+ context.setAttribute(HTTPConstants.COOKIE_STRING, sessionCookie);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java Thu Jul 27 14:26:12 2006
@@ -55,10 +55,10 @@
String sessionCookie = null;
MessageContext msgctx = (MessageContext) context.getAttribute(AxisParams.MESSAGE_CONTEXT);
if (msgctx != null) {
- sessionCookie = (String) msgctx.getProperty(Constants.COOKIE_STRING);
+ sessionCookie = (String) msgctx.getProperty(HTTPConstants.COOKIE_STRING);
}
if (sessionCookie == null) {
- sessionCookie = (String) context.getAttribute(Constants.COOKIE_STRING);
+ sessionCookie = (String) context.getAttribute(HTTPConstants.COOKIE_STRING);
}
if (sessionCookie != null) {
CharArrayBuffer buffer = new CharArrayBuffer(sessionCookie.length() + 40);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/RESTUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/RESTUtil.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/RESTUtil.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/RESTUtil.java Thu Jul 27 14:26:12 2006
@@ -24,6 +24,7 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.HTTPConstants;
+import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisMessage;
@@ -183,7 +184,7 @@
xmlreader = StAXUtils.createXMLStreamReader(inputStream, MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
- msgCtxt.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgCtxt.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
MessageContext.DEFAULT_CHAR_SET_ENCODING);
} else {
@@ -194,7 +195,7 @@
charSetEnc);
// Setting the value in msgCtx
- msgCtxt.setProperty(MessageContext.CHARACTER_SET_ENCODING, charSetEnc);
+ msgCtxt.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, charSetEnc);
}
OMNodeEx documentElement = (OMNodeEx)new StAXOMBuilder(xmlreader).getDocumentElement();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java Thu Jul 27 14:26:12 2006
@@ -65,7 +65,7 @@
msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
response.setContentType("text/xml; charset="
- + msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING));
+ + msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
if ((contextWritten == null) || !Constants.VALUE_TRUE.equals(contextWritten)) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java Thu Jul 27 14:26:12 2006
@@ -27,7 +27,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.handlers.AbstractHandler;
@@ -202,7 +201,7 @@
}
String endpointAddress = (String) msgContext
- .getProperty(MessageContextConstants.TRANSPORT_URL);
+ .getProperty(Constants.Configuration.TRANSPORT_URL);
if (endpointAddress == null &&
msgContext.getTo() != null &&
!AddressingConstants.Submission.WSA_ANONYMOUS_URL
@@ -440,7 +439,7 @@
// Pick the char set encoding from the msgContext
String charSetEnc =
- (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
format.setDoOptimize(msgContext.isDoingMTOM());
format.setCharSetEncoding(charSetEnc);
@@ -458,7 +457,7 @@
OMOutputFormat format = new OMOutputFormat();
String soapActionString = getSOAPAction(msgCtx);
String charSetEnc =
- (String) msgCtx.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgCtx.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
if (charSetEnc != null) {
format.setCharSetEncoding(charSetEnc);
@@ -466,7 +465,7 @@
OperationContext opctx = msgCtx.getOperationContext();
if (opctx != null) {
- charSetEnc = (String) opctx.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ charSetEnc = (String) opctx.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java Thu Jul 27 14:26:12 2006
@@ -97,7 +97,7 @@
MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
MessageContext.DEFAULT_CHAR_SET_ENCODING);
} else {
@@ -108,7 +108,7 @@
charSetEnc);
// Setting the value in msgCtx
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, charSetEnc);
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, charSetEnc);
}
if (contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) > -1) {
@@ -133,7 +133,7 @@
if ((charsetEncoding != null) && !"".equals(charsetEncoding)
&& !((String) msgContext.getProperty(
- MessageContext.CHARACTER_SET_ENCODING)).equalsIgnoreCase(charsetEncoding)) {
+ Constants.Configuration.CHARACTER_SET_ENCODING)).equalsIgnoreCase(charsetEncoding)) {
String faultCode;
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java Thu Jul 27 14:26:12 2006
@@ -25,6 +25,7 @@
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -82,7 +83,7 @@
// In mail char set is what is being used. Charset encoding is not what is expected here.
String charSet =
- (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
+ (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
if (charSet == null) {
charSet = MailSrvConstants.DEFAULT_CHAR_SET;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java Thu Jul 27 14:26:12 2006
@@ -25,7 +25,6 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.TransportInDescription;
@@ -37,10 +36,8 @@
import org.apache.commons.logging.LogFactory;
import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
@@ -80,7 +77,7 @@
msgContext.setTransportOut(transportOut);
msgContext.setServerSide(true);
msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
mimeMessage.getEncoding());
String soapAction = getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION);
if (soapAction == null){
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java Thu Jul 27 14:26:12 2006
@@ -27,8 +27,6 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -37,7 +35,6 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
@@ -84,7 +81,7 @@
msgContext.setServerSide(true);
msgContext.setProperty(MailSrvConstants.CONTENT_TYPE, mimeMessage.getContentType());
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
mimeMessage.getEncoding());
String soapAction = getMailHeader(MailSrvConstants.HEADER_SOAP_ACTION, mimeMessage);
if (soapAction == null){
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSSender.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSSender.java Thu Jul 27 14:26:12 2006
@@ -22,7 +22,6 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.transport.TransportSender;
@@ -54,7 +53,7 @@
// is there a transport url? which may be different from the WS-A To..
targetAddress = (String) msgContext.getProperty(
- MessageContextConstants.TRANSPORT_URL);
+ Constants.Configuration.TRANSPORT_URL);
if (targetAddress != null) {
transportInfo = new JMSOutTransportInfo(targetAddress);
@@ -217,7 +216,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
OMOutputFormat format = new OMOutputFormat();
format.setCharSetEncoding(
- getProperty(msgContext, MessageContext.CHARACTER_SET_ENCODING));
+ getProperty(msgContext, Constants.Configuration.CHARACTER_SET_ENCODING));
format.setDoOptimize(msgContext.isDoingMTOM());
try {
msgElement.serializeAndConsume(baos, format);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java Thu Jul 27 14:26:12 2006
@@ -205,7 +205,7 @@
OMOutputFormat format = new OMOutputFormat();
String soapActionString = getSOAPAction(msgCtx);
String charSetEnc = (String) msgCtx.getProperty(
- MessageContext.CHARACTER_SET_ENCODING);
+ Constants.Configuration.CHARACTER_SET_ENCODING);
if (charSetEnc != null) {
format.setCharSetEncoding(charSetEnc);
@@ -213,7 +213,7 @@
OperationContext opctx = msgCtx.getOperationContext();
if (opctx != null) {
charSetEnc = (String) opctx.getProperty(
- MessageContext.CHARACTER_SET_ENCODING);
+ Constants.Configuration.CHARACTER_SET_ENCODING);
}
}
@@ -309,7 +309,7 @@
MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
MessageContext.DEFAULT_CHAR_SET_ENCODING);
} else {
@@ -318,7 +318,7 @@
xmlreader = StAXUtils.createXMLStreamReader(in, charSetEnc);
// Setting the value in msgCtx
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, charSetEnc);
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, charSetEnc);
}
if (contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) > -1) {
@@ -340,7 +340,7 @@
MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
- msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
MessageContext.DEFAULT_CHAR_SET_ENCODING);
builder = new StAXSOAPModelBuilder(
xmlreader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
@@ -349,7 +349,7 @@
String charEncOfMessage = builder.getDocument().getCharsetEncoding();
String charEncOfTransport = ((String) msgContext.getProperty(
- MessageContext.CHARACTER_SET_ENCODING));
+ Constants.Configuration.CHARACTER_SET_ENCODING));
if (charEncOfMessage != null &&
!(charEncOfMessage.trim().length() == 0) &&
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Thu Jul 27 14:26:12 2006
@@ -100,8 +100,8 @@
inMessageContext.getProperty(Constants.OUT_TRANSPORT_INFO));
// Setting the charater set encoding
- newmsgCtx.setProperty(MessageContext.CHARACTER_SET_ENCODING,
- inMessageContext.getProperty(MessageContext.CHARACTER_SET_ENCODING));
+ newmsgCtx.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
+ inMessageContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
newmsgCtx.setDoingREST(inMessageContext.isDoingREST());
newmsgCtx.setDoingMTOM(inMessageContext.isDoingMTOM());
newmsgCtx.setServerSide(inMessageContext.isServerSide());
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java Thu Jul 27 14:26:12 2006
@@ -18,12 +18,12 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAP12Constants;
import test.interop.util.BodyElements;
@@ -50,7 +50,7 @@
options.setTo(targetEPR);
options.setProperty(Constants.Configuration.ENABLE_MTOM,
Constants.VALUE_TRUE);
- options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setProperty(HTTPConstants.CHUNKED, Constants.VALUE_FALSE);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java Thu Jul 27 14:26:12 2006
@@ -18,12 +18,12 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAP12Constants;
import test.interop.util.BodyElements;
@@ -45,7 +45,7 @@
public void runTest(boolean optimized) throws Exception {
Options options = new Options();
options.setTo(targetEPR);
- options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setProperty(HTTPConstants.CHUNKED, Constants.VALUE_FALSE);
options.setProperty(Constants.Configuration.ENABLE_MTOM,
Constants.VALUE_TRUE);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java Thu Jul 27 14:26:12 2006
@@ -19,10 +19,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.MessageContextConstants;
import test.interop.sun.round4.simple.util.SunGroupHClientUtil;
public class EchoBlockingClient {
@@ -36,7 +36,7 @@
options.setExceptionToBeThrownOnSOAPFault(false);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setAction(soapAction);
- options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setProperty(HTTPConstants.CHUNKED, Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/SunClient.java Thu Jul 27 14:26:12 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
@@ -27,7 +28,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
import java.net.URL;
@@ -42,7 +42,7 @@
url = new URL(epUrl);
Options options = new Options();
- options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setProperty(HTTPConstants.CHUNKED, Constants.VALUE_FALSE);
options.setTo(new EndpointReference(url.toString()));
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setAction(soapAction);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java Thu Jul 27 14:26:12 2006
@@ -16,7 +16,6 @@
package org.apache.axis2.engine;
-import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.axiom.om.OMAbstractFactory;
@@ -29,7 +28,6 @@
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
@@ -81,7 +79,7 @@
payload.addChild(text);
Options options = new Options();
- options.setProperty(MessageContext.CHARACTER_SET_ENCODING, "utf-16");
+ options.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, "utf-16");
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java Thu Jul 27 14:26:12 2006
@@ -79,7 +79,7 @@
/**
* Proxy setting in runtime
*/
- HttpTransportProperties.ProxyProperties proxyproperties = new HttpTransportProperties().new ProxyProperties();
+ HttpTransportProperties.ProxyProperties proxyproperties = new HttpTransportProperties.ProxyProperties();
proxyproperties.setProxyName("localhost");
proxyproperties.setProxyPort(5555);
proxyproperties.setDomain("anonymous");
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Thu Jul 27 14:26:12 2006
@@ -18,7 +18,6 @@
//todo
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;
import org.apache.axiom.om.OMElement;
@@ -32,7 +31,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.util.TestConstants;
@@ -164,7 +162,7 @@
Options options = new Options();
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- options.setProperty(MessageContextConstants.HTTP_PROTOCOL_VERSION, HTTPConstants.HEADER_PROTOCOL_10);
+ options.setProperty(HTTPConstants.HTTP_PROTOCOL_VERSION, HTTPConstants.HEADER_PROTOCOL_10);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Thu Jul 27 14:26:12 2006
@@ -111,7 +111,7 @@
Options options = new Options();
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- options.setProperty(MessageContext.CHARACTER_SET_ENCODING, MessageContext.UTF_16);
+ options.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, MessageContext.UTF_16);
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/AxisController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/AxisController.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/AxisController.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/AxisController.java Thu Jul 27 14:26:12 2006
@@ -37,6 +37,7 @@
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ServiceContext;
@@ -375,11 +376,11 @@
value = value.toString();
}
else if (key.equals(Constants.QOS_WSADDRESSING_ENABLE)) {
- key = org.apache.axis2.Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES;
+ key = AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES;
value = !(Boolean) value;
}
serviceClient.getOptions().setProperty(key, value);
}
}
-}
+}
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java Thu Jul 27 14:26:12 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -79,7 +80,7 @@
options.setAction("http://soap.amazon.com");
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setProperty(
- org.apache.axis2.context.MessageContextConstants.CHUNKED,
+ HTTPConstants.CHUNKED,
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java Thu Jul 27 14:26:12 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -65,7 +66,7 @@
options.setTo(new EndpointReference(url));
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setProperty(
- org.apache.axis2.context.MessageContextConstants.CHUNKED,
+ HTTPConstants.CHUNKED,
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java Thu Jul 27 14:26:12 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -65,7 +66,7 @@
options.setTo(new EndpointReference(url));
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setProperty(
- org.apache.axis2.context.MessageContextConstants.CHUNKED,
+ HTTPConstants.CHUNKED,
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java Thu Jul 27 14:26:12 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -63,7 +64,7 @@
options.setTo(new EndpointReference(url));
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setProperty(
- org.apache.axis2.context.MessageContextConstants.CHUNKED,
+ HTTPConstants.CHUNKED,
org.apache.axis2.Constants.VALUE_FALSE);
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java Thu Jul 27 14:26:12 2006
@@ -18,12 +18,12 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.OutInAxisOperation;
import sample.google.common.util.PropertyLoader;
@@ -94,7 +94,7 @@
}
Options options = new Options();
- options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setProperty(HTTPConstants.CHUNKED, Constants.VALUE_FALSE);
options.setTo(
new EndpointReference(url.toString()));
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java?rev=426253&r1=426252&r2=426253&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java Thu Jul 27 14:26:12 2006
@@ -24,12 +24,12 @@
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.client.async.AsyncResult;
import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.context.MessageContextConstants;
import sample.google.common.util.PropertyLoader;
import javax.xml.namespace.QName;
@@ -93,7 +93,7 @@
Options options = new Options();
options.setTo(new EndpointReference(url.toString()));
- options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setProperty(HTTPConstants.CHUNKED, Constants.VALUE_FALSE);
try {
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
@@ -122,7 +122,7 @@
Options options = new Options();
options.setTo(new EndpointReference(url.toString()));
- options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setProperty(HTTPConstants.CHUNKED, Constants.VALUE_FALSE);
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org