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 ch...@apache.org on 2005/08/01 06:43:16 UTC
svn commit: r226739 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis2/transport/
core/src/org/apache/axis2/transport/http/
samples/test/org/apache/axis2/engine/ xml/src/org/apache/axis2/om/impl/
xml/src/org/apache/axis2/soap/impl/llom/
Author: chinthaka
Date: Sun Jul 31 21:42:17 2005
New Revision: 226739
URL: http://svn.apache.org/viewcvs?rev=226739&view=rev
Log:
Fixing the build
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java?rev=226739&r1=226738&r2=226739&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java Sun Jul 31 21:42:17 2005
@@ -135,8 +135,8 @@
//Pick the char set encoding from the msgContext
String charSetEnc = (String) msgContext
.getProperty(MessageContext.CHARACTER_SET_ENCODING);
- omOutput.setOutputStream(out, msgContext.isDoingMTOM(),
- charSetEnc);
+ omOutput.setOutputStream(out, msgContext.isDoingMTOM());
+ omOutput.setCharSetEncoding(charSetEnc);
outputMessage.serialize(omOutput);
omOutput.flush();
out.flush();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=226739&r1=226738&r2=226739&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Sun Jul 31 21:42:17 2005
@@ -100,7 +100,8 @@
.getProperty(MessageContext.TRANSPORT_OUT);
String charSetEnc = (String)msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
- omOutput.setOutputStream(out, false,charSetEnc);
+ omOutput.setOutputStream(out, false);
+ omOutput.setCharSetEncoding(charSetEnc);
dataOut.serialize(omOutput);
}
@@ -204,7 +205,8 @@
public void writeRequest(OutputStream out) throws IOException{
try {
if (chuncked || doingMTOM) {
- omOutput.setOutputStream(out, doingMTOM, charSetEnc);
+ omOutput.setOutputStream(out, doingMTOM);
+ omOutput.setCharSetEncoding(charSetEnc);
element.serialize(omOutput);
omOutput.flush();
out.flush();
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=226739&r1=226738&r2=226739&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java Sun Jul 31 21:42:17 2005
@@ -46,8 +46,7 @@
public class FaultHandlingTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
-// + (UtilServer.TESTING_PORT)
- + ("5556")
+ + (UtilServer.TESTING_PORT)
+ "/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
private QName operationName = new QName("echoOMElement");
@@ -162,7 +161,6 @@
protected void tearDown() throws Exception {
UtilServer.stop();
- inOutMEPClient.close();
}
}
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=226739&r1=226738&r2=226739&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java Sun Jul 31 21:42:17 2005
@@ -50,8 +50,7 @@
private static final String ADDRESS = "http://127.0.0.1:" +
- ("5556") +
-// (UtilServer.TESTING_PORT) +
+ (UtilServer.TESTING_PORT) +
"/axis/services/" + SERVICE_NAME + "/" + OPERATION_NAME;
// private static final String ADDRESS = "http://127.0.0.1:8080/axis/services/" + SERVICE_NAME;
private EndpointReference targetEPR = new EndpointReference(ADDRESS);
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java?rev=226739&r1=226738&r2=226739&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java Sun Jul 31 21:42:17 2005
@@ -40,14 +40,15 @@
private String mimeBoundary = null;
private String rootContentId = null;
private int nextid = 0;
-
+ private String xmlVersion = "1.0";
+
/**
* Field DEFAULT_CHAR_SET_ENCODING specifies the default
* character encoding scheme to be used
*/
private static final String DEFAULT_CHAR_SET_ENCODING = "utf-8";
- private String charSetEncoding;
+ private String charSetEncoding = DEFAULT_CHAR_SET_ENCODING;
public OMOutputImpl() {
}
@@ -66,28 +67,14 @@
*/
public OMOutputImpl(OutputStream outStream, boolean doOptimize)
throws XMLStreamException, FactoryConfigurationError {
- setOutputStream(outStream, doOptimize, DEFAULT_CHAR_SET_ENCODING);
+ setOutputStream(outStream, doOptimize);
}
- /**
- *
- * @param outStream
- * @param doOptimize
- * @param charSetEncoding
- * @throws XMLStreamException
- * @throws FactoryConfigurationError
- */
- public OMOutputImpl(OutputStream outStream, boolean doOptimize, String charSetEncoding)
- throws XMLStreamException, FactoryConfigurationError {
- setOutputStream(outStream, doOptimize, charSetEncoding);
- this.charSetEncoding = charSetEncoding;
- }
- public void setOutputStream(OutputStream outStream, boolean doOptimize,
- String charSetEncoding) throws XMLStreamException,
+
+ public void setOutputStream(OutputStream outStream, boolean doOptimize) throws XMLStreamException,
FactoryConfigurationError {
- this.charSetEncoding = charSetEncoding;
this.doOptimize = doOptimize;
this.outStream = outStream;
@@ -165,7 +152,19 @@
* @return
*/
public String getCharSetEncoding() {
- return (this.charSetEncoding == null) ? DEFAULT_CHAR_SET_ENCODING
- : this.charSetEncoding;
+ return this.charSetEncoding;
}
+
+ public void setCharSetEncoding(String charSetEncoding) {
+ this.charSetEncoding = charSetEncoding;
+ }
+
+ public String getXmlVersion() {
+ return xmlVersion;
+ }
+
+ public void setXmlVersion(String xmlVersion) {
+ this.xmlVersion = xmlVersion;
+ }
+
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java?rev=226739&r1=226738&r2=226739&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java Sun Jul 31 21:42:17 2005
@@ -16,12 +16,14 @@
package org.apache.axis2.soap.impl.llom;
import org.apache.axis2.om.*;
+import org.apache.axis2.om.impl.OMOutputImpl;
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
/**
* Class SOAPEnvelopeImpl
@@ -61,7 +63,7 @@
}
public void addChild(OMNode child) {
- if ((child instanceof OMElement) &&!(child instanceof SOAPHeader || child instanceof SOAPBody)) {
+ if ((child instanceof OMElement) && !(child instanceof SOAPHeader || child instanceof SOAPBody)) {
throw new SOAPProcessingException("SOAP Envelope can not have children other than SOAP Header and Body", SOAP12Constants.FAULT_CODE_SENDER);
} else {
super.addChild(child);
@@ -115,5 +117,11 @@
protected void checkParent(OMElement parent) throws SOAPProcessingException {
// here do nothing as SOAPEnvelope doesn't have a parent !!!
+ }
+
+ protected void serialize(OMOutputImpl omOutput, boolean cache) throws XMLStreamException {
+// omOutput.getXmlStreamWriter().writeStartDocument(omOutput.getCharSetEncoding(),
+// omOutput.getXmlVersion());
+ super.serialize(omOutput, cache);
}
}