You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2003/10/21 05:09:23 UTC
cvs commit: ws-axis/java/test/message TestSOAPEnvelope.java
gdaniels 2003/10/20 20:09:23
Modified: java/src/org/apache/axis/message MessageElement.java
SOAPBodyElement.java
java/src/org/apache/axis/transport/http
SimpleAxisServer.java SimpleAxisWorker.java
java/src/org/apache/axis/handlers/soap SOAPService.java
java/test/message TestSOAPEnvelope.java
Log:
Various little changes made at the WS-ReliableMessaging
interop summit.
* Respect the current setting for sendXsiTypes when
serializing a MessageElement, instead of always
making it true.
* Allow setting/getting a SimpleAxisServer's engine
configuration.
* Allow null response message in SimpleAxisWorker,
which lets us just return a 200 with no content for
one-way operations.
* Disambiguate SOAPHeaderElement constructor in
TestSOAPEnvelope.
* Remove some redundant casts.
Revision Changes Path
1.157 +1 -1 ws-axis/java/src/org/apache/axis/message/MessageElement.java
Index: MessageElement.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/MessageElement.java,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- MessageElement.java 8 Jul 2003 18:27:58 -0000 1.156
+++ MessageElement.java 21 Oct 2003 03:09:22 -0000 1.157
@@ -939,7 +939,7 @@
if (objectValue != null) {
context.serialize(new QName(namespaceURI, name),
attributes,
- objectValue, null, false, Boolean.TRUE);
+ objectValue, null, false, null);
return;
}
1.29 +1 -1 ws-axis/java/src/org/apache/axis/message/SOAPBodyElement.java
Index: SOAPBodyElement.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/SOAPBodyElement.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SOAPBodyElement.java 22 Apr 2003 19:35:16 -0000 1.28
+++ SOAPBodyElement.java 21 Oct 2003 03:09:22 -0000 1.29
@@ -125,7 +125,7 @@
}
try {
// cast to force exception if wrong type
- super.setParentElement((SOAPBody)parent);
+ super.setParentElement(parent);
} catch (Throwable t) {
throw new SOAPException(t);
}
1.81 +17 -2 ws-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
Index: SimpleAxisServer.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- SimpleAxisServer.java 12 Jul 2003 22:13:00 -0000 1.80
+++ SimpleAxisServer.java 21 Oct 2003 03:09:22 -0000 1.81
@@ -63,6 +63,8 @@
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.Options;
import org.apache.axis.collections.LRUMap;
+import org.apache.axis.EngineConfiguration;
+import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
import org.apache.commons.logging.Log;
import java.net.MalformedURLException;
@@ -153,6 +155,14 @@
return doThreads ;
}
+ public EngineConfiguration getMyConfig() {
+ return myConfig;
+ }
+
+ public void setMyConfig(EngineConfiguration myConfig) {
+ this.myConfig = myConfig;
+ }
+
protected Session createSession(String cooky) {
// is there a session already?
@@ -177,9 +187,14 @@
// Axis server (shared between instances)
private static AxisServer myAxisServer = null;
- public static synchronized AxisServer getAxisServer() {
+ private EngineConfiguration myConfig = null;
+
+ public synchronized AxisServer getAxisServer() {
if (myAxisServer == null) {
- myAxisServer = new AxisServer();
+ if (myConfig == null) {
+ myConfig = EngineConfigurationFactoryFinder.newFactory().getServerEngineConfig();
+ }
+ myAxisServer = new AxisServer(myConfig);
}
return myAxisServer;
}
1.26 +2 -5 ws-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java
Index: SimpleAxisWorker.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SimpleAxisWorker.java 12 Jul 2003 22:13:00 -0000 1.25
+++ SimpleAxisWorker.java 21 Oct 2003 03:09:22 -0000 1.26
@@ -436,10 +436,6 @@
// Retrieve the response from Axis
responseMsg = msgContext.getResponseMessage();
- if (responseMsg == null) {
- throw new AxisFault(Messages.getMessage("nullResponse00"));
- }
-
} catch (Exception e) {
AxisFault af;
if (e instanceof AxisFault) {
@@ -500,7 +496,8 @@
}
out.write(SEPARATOR);
- responseMsg.writeTo(out);
+ if (responseMsg != null)
+ responseMsg.writeTo(out);
// out.write(response);
out.flush();
} catch (Exception e) {
1.107 +1 -1 ws-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
Index: SOAPService.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- SOAPService.java 5 Sep 2003 17:58:58 -0000 1.106
+++ SOAPService.java 21 Oct 2003 03:09:22 -0000 1.107
@@ -543,7 +543,7 @@
Message message = new Message(env);
message.setMessageType(Message.RESPONSE);
msgContext.setResponseMessage(message);
- throw new AxisFault(e.getMessage());
+ throw AxisFault.makeFault(e);
}
}
}
1.7 +3 -5 ws-axis/java/test/message/TestSOAPEnvelope.java
Index: TestSOAPEnvelope.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/message/TestSOAPEnvelope.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestSOAPEnvelope.java 22 Apr 2003 19:36:53 -0000 1.6
+++ TestSOAPEnvelope.java 21 Oct 2003 03:09:22 -0000 1.7
@@ -104,8 +104,7 @@
SOAPHeader h2 = env.addHeader();
assertTrue("null created header", h2 != null);
assertEquals("wrong header retrieved", h2, env.getHeader());
- assertEquals("header parent incorrect", env,
- (SOAPEnvelope)h2.getParentElement());
+ assertEquals("header parent incorrect", env, h2.getParentElement());
try {
env.addHeader();
assertTrue("second header added", false);
@@ -122,8 +121,7 @@
SOAPBody b2 = env.addBody();
assertTrue("null created body", b2 != null);
assertEquals("wrong body retrieved", b2, env.getBody());
- assertEquals("body parent incorrect", env,
- (SOAPEnvelope)b2.getParentElement());
+ assertEquals("body parent incorrect", env, b2.getParentElement());
try {
env.addBody();
assertTrue("second body added", false);
@@ -145,7 +143,7 @@
// Test for bug 14574
public void testNullpointerInHeader() throws Exception{
org.apache.axis.message.SOAPEnvelope env=new org.apache.axis.message.SOAPEnvelope();
- SOAPHeaderElement hdr=new SOAPHeaderElement(null,"testHeader");
+ SOAPHeaderElement hdr=new SOAPHeaderElement("", "testHeader");
env.addHeader(hdr);
Message msg=new Message(env);
SOAPHeaderElement she = msg.getSOAPEnvelope().getHeaderByName(null,"testHeader");