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 de...@apache.org on 2006/03/21 14:40:49 UTC
svn commit: r387525 - in /webservices/axis2/trunk/java/modules:
common/src/org/apache/axis2/i18n/ core/src/org/apache/axis2/context/
core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/transport/
core/src/org/apache/axis2/transport/http/ co...
Author: deepal
Date: Tue Mar 21 05:40:47 2006
New Revision: 387525
URL: http://svn.apache.org/viewcvs?rev=387525&view=rev
Log:
fixed
505
506
503
Modified:
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.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/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties?rev=387525&r1=387524&r2=387525&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties Tue Mar 21 05:40:47 2006
@@ -112,7 +112,7 @@
typemappingnotimpl=Type mapping has not been implemented yet
beanmappingnotimpl=Bean mapping has not been implemented yet
modulenotfound={0} module is invalid or has not been deployed
-badparaagu=bad parameter arguments
+badparaagu=bad parameter arguments name can not be null : {0}
badlistagu=bad listener arguments
invalidhandlerdif=Handler cannot have both name and ref {0}
thisshouldbeimplment=This should be implemented {0}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java?rev=387525&r1=387524&r2=387525&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java Tue Mar 21 05:40:47 2006
@@ -39,11 +39,13 @@
private transient AxisService axisService;
private ServiceGroupContext serviceGroupContext;
+ private ConfigurationContext configContext;
public ServiceContext(AxisService serviceConfig, ServiceGroupContext serviceGroupContext) {
super(serviceGroupContext);
this.serviceGroupContext = serviceGroupContext;
this.axisService = serviceConfig;
+ this.configContext =(ConfigurationContext) parent.getParent();
}
public OperationContext createOperationContext(QName name) {
@@ -57,7 +59,7 @@
}
public ConfigurationContext getConfigurationContext() {
- return (ConfigurationContext) parent.getParent();
+ return configContext;
}
public ServiceGroupContext getServiceGroupContext() {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=387525&r1=387524&r2=387525&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Tue Mar 21 05:40:47 2006
@@ -329,7 +329,8 @@
OMAttribute paramName = parameterElement.getAttribute(new QName(ATTRIBUTE_NAME));
if (paramName == null) {
throw new DeploymentException(
- Messages.getMessage(DeploymentErrorMsgs.BAD_PARAMETER_ARGUMENT));
+ Messages.getMessage(DeploymentErrorMsgs.BAD_PARAMETER_ARGUMENT,
+ parameterElement.toString()));
}
parameter.setName(paramName.getAttributeValue());
// setting parameter Value (the chiled elemnt of the parameter)
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java?rev=387525&r1=387524&r2=387525&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 Tue Mar 21 05:40:47 2006
@@ -60,11 +60,11 @@
return createSOAPMessage(msgContext, inStream, soapNamespaceURI);
}
- private static SOAPEnvelope createSOAPMessage(MessageContext msgContext, InputStream inStream,
+ public static SOAPEnvelope createSOAPMessage(MessageContext msgContext, InputStream inStream,
String soapNamespaceURI)
throws AxisFault {
try {
- Object contentType = null;
+ Object contentType ;
OperationContext opContext = msgContext.getOperationContext();
if (opContext != null) {
@@ -73,8 +73,8 @@
throw new AxisFault(Messages.getMessage("cannotBeNullOperationContext"));
}
- StAXBuilder builder = null;
- SOAPEnvelope envelope = null;
+ StAXBuilder builder;
+ SOAPEnvelope envelope ;
String charSetEnc =
(String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
@@ -161,8 +161,8 @@
public static StAXBuilder selectBuilderForMIME(MessageContext msgContext, InputStream inStream,
String contentTypeString)
- throws OMException, XMLStreamException, FactoryConfigurationError,
- UnsupportedEncodingException {
+ throws OMException, XMLStreamException, FactoryConfigurationError
+ {
StAXBuilder builder = null;
Parameter parameter_cache_attachment =
msgContext.getParameter(Constants.Configuration.CACHE_ATTACHMENTS);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=387525&r1=387524&r2=387525&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 Tue Mar 21 05:40:47 2006
@@ -40,7 +40,6 @@
import javax.xml.stream.XMLStreamReader;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.util.Iterator;
import java.util.Map;
@@ -109,10 +108,7 @@
return false;
}
- boolean envelopeContainsOptimise =
- HTTPTransportUtils.checkEnvelopeForOptimise(msgContext.getEnvelope());
-
- return enableMTOM && envelopeContainsOptimise;
+ return HTTPTransportUtils.checkEnvelopeForOptimise(msgContext.getEnvelope());
}
public static boolean processHTTPGetRequest(MessageContext msgContext, InputStream in,
@@ -282,8 +278,6 @@
} catch (XMLStreamException e) {
throw new AxisFault(e);
} catch (FactoryConfigurationError e) {
- throw new AxisFault(e);
- } catch (UnsupportedEncodingException e) {
throw new AxisFault(e);
} finally {
if ((msgContext.getEnvelope() == null) && !soap11) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java?rev=387525&r1=387524&r2=387525&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 Tue Mar 21 05:40:47 2006
@@ -168,8 +168,6 @@
throw new AxisFault(e);
} catch (FactoryConfigurationError e) {
throw new AxisFault(e);
- } catch (UnsupportedEncodingException e) {
- throw new AxisFault(e);
} finally {
if ((msgContext.getEnvelope() == null) && !soap11) {
msgContext.setEnvelope(new SOAP12Factory().createSOAPEnvelope());
@@ -181,7 +179,7 @@
* This is where the incoming message is processed.
*/
public void run() {
- InputStream in = null;
+ InputStream in ;
try {
@@ -204,7 +202,7 @@
// if the incoming message has a contentType set,
// pass it to my new Message
- String contentType = null;
+ String contentType ;
try {
contentType = message.getStringProperty("contentType");
@@ -217,7 +215,7 @@
// if the incoming message has a contentType set,
// pass it to my new Message
- String soapAction = null;
+ String soapAction ;
try {
soapAction = message.getStringProperty("SOAPAction");