[prev in list] [next in list] [prev in thread] [next in thread]
List: axis-dev
Subject: cvs commit: xml-axis/java/src/org/apache/axis/transport/http AxisServlet.java HTTPDispatchHandler.ja
From: dug () apache ! org
Date: 2001-02-21 1:07:22
[Download RAW message or body]
dug 01/02/20 17:07:22
Modified: java/samples/misc TestClient.java
java/samples/stock testit.cmd testit.sh
java/src/org/apache/axis MessageContext.java
java/src/org/apache/axis/client AdminClient.java
HTTPCall.java HTTPMessage.java
TransportRoutingClient.java
java/src/org/apache/axis/handlers DebugHandler.java
EchoHandler.java LogHandler.java
MsgDispatchHandler.java RPCDispatchHandler.java
java/src/org/apache/axis/transport/http AxisServlet.java
HTTPDispatchHandler.java
Log:
input->request output->response
Revision Changes Path
1.2 +2 -2 xml-axis/java/samples/misc/TestClient.java
Index: TestClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/misc/TestClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestClient.java 2001/02/17 16:44:01 1.1
+++ TestClient.java 2001/02/21 01:07:20 1.2
@@ -96,9 +96,9 @@
System.out.println( "Request:\n" + msg );
- msgContext.setIncomingMessage( inMsg );
+ msgContext.setRequestMessage( inMsg );
hMsg.invoke( msgContext );
- outMsg = msgContext.getOutgoingMessage();
+ outMsg = msgContext.getResponseMessage();
System.out.println( "Response:\n" + outMsg.getAs( "String" ) );
}
1.2 +4 -4 xml-axis/java/samples/stock/testit.cmd
Index: testit.cmd
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/testit.cmd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testit.cmd 2001/02/09 12:17:38 1.1
+++ testit.cmd 2001/02/21 01:07:20 1.2
@@ -5,16 +5,16 @@
java org.apache.axis.client.AdminClient deploy.xml
echo These next 2 should work...
-java samples.stock.GetQuote -uuser1 -wpass1 XXX
+java samples.stock.GetQuote -uuser1 -ppass1 XXX
java samples.stock.GetQuote -uuser2 XXX
echo The rest of these should fail... (nicely of course)
java samples.stock.GetQuote XXX
-java samples.stock.GetQuote -uuser1 -wpass2 XXX
-java samples.stock.GetQuote -uuser3 -wpass3 XXX
+java samples.stock.GetQuote -uuser1 -ppass2 XXX
+java samples.stock.GetQuote -uuser3 -ppass3 XXX
echo This should work but print debug info on the client and server
-java samples.stock.GetQuote -d -uuser1 -wpass1 XXX
+java samples.stock.GetQuote -d -uuser1 -ppass1 XXX
echo Now undeploy everything
java org.apache.axis.client.AdminClient undeploy.xml
1.2 +4 -4 xml-axis/java/samples/stock/testit.sh
Index: testit.sh
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/testit.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testit.sh 2001/02/09 12:17:38 1.1
+++ testit.sh 2001/02/21 01:07:20 1.2
@@ -5,16 +5,16 @@
java org.apache.axis.client.AdminClient deploy.xml
echo These next 2 should work...
-java samples.stock.GetQuote -uuser1 -wpass1 XXX
+java samples.stock.GetQuote -uuser1 -ppass1 XXX
java samples.stock.GetQuote -uuser2 XXX
echo The rest of these should fail... (nicely of course)
java samples.stock.GetQuote XXX
-java samples.stock.GetQuote -uuser1 -wpass2 XXX
-java samples.stock.GetQuote -uuser3 -wpass3 XXX
+java samples.stock.GetQuote -uuser1 -ppass2 XXX
+java samples.stock.GetQuote -uuser3 -ppass3 XXX
echo This should work but print debug info on the client and server
-java samples.stock.GetQuote -d -uuser1 -wpass1 XXX
+java samples.stock.GetQuote -d -uuser1 -ppass1 XXX
rem Now undeploy everything
java org.apache.axis.client.AdminClient undeploy.xml
1.11 +5 -5 xml-axis/java/src/org/apache/axis/MessageContext.java
Index: MessageContext.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MessageContext.java 2001/02/18 19:13:21 1.10
+++ MessageContext.java 2001/02/21 01:07:20 1.11
@@ -108,32 +108,32 @@
public MessageContext() {}
public MessageContext( Message inMsg ) {
- setIncomingMessage( inMsg );
+ setRequestMessage( inMsg );
}
/**
* Placeholder.
*/
- public Message getIncomingMessage() {
+ public Message getRequestMessage() {
return inMessage ;
};
/**
* Placeholder.
*/
- public void setIncomingMessage(Message inMsg) {
+ public void setRequestMessage(Message inMsg) {
inMessage = inMsg ;
};
/**
* Placeholder.
*/
- public Message getOutgoingMessage() { return outMessage ; }
+ public Message getResponseMessage() { return outMessage ; }
/**
* Placeholder.
*/
- public void setOutgoingMessage(Message inMsg) {
+ public void setResponseMessage(Message inMsg) {
outMessage = inMsg ;
};
1.10 +2 -2 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AdminClient.java 2001/02/12 00:53:10 1.9
+++ AdminClient.java 2001/02/21 01:07:21 1.10
@@ -125,11 +125,11 @@
MessageContext msgContext = new MessageContext();
Message inMsg = new Message( input, "InputStream" );
Message outMsg = null ;
- msgContext.setIncomingMessage( inMsg );
+ msgContext.setRequestMessage( inMsg );
hMsg.invoke( msgContext );
- outMsg = msgContext.getOutgoingMessage();
+ outMsg = msgContext.getResponseMessage();
input.close();
System.err.println( outMsg.getAs( "String" ) );
}
1.12 +1 -1 xml-axis/java/src/org/apache/axis/client/HTTPCall.java
Index: HTTPCall.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/HTTPCall.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HTTPCall.java 2001/02/17 16:44:02 1.11
+++ HTTPCall.java 2001/02/21 01:07:21 1.12
@@ -164,7 +164,7 @@
throw (AxisFault) e ;
}
- resMsg = msgContext.getOutgoingMessage();
+ resMsg = msgContext.getResponseMessage();
Document doc = (Document) resMsg.getAs("Document");
body = new RPCBody( doc.getDocumentElement() );
resArgs = body.getArgs();
1.10 +3 -3 xml-axis/java/src/org/apache/axis/client/HTTPMessage.java
Index: HTTPMessage.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/HTTPMessage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HTTPMessage.java 2001/02/17 18:02:17 1.9
+++ HTTPMessage.java 2001/02/21 01:07:21 1.10
@@ -135,7 +135,7 @@
public void invoke( MessageContext mc ) throws AxisFault {
Debug.Print( 1, "Enter: HTTPMessage.invoke" );
- Message inMsg = mc.getIncomingMessage();
+ Message inMsg = mc.getRequestMessage();
SOAPEnvelope reqEnv = null ;
@@ -188,11 +188,11 @@
throw fault ;
}
- Message resMsg = msgContext.getOutgoingMessage();
+ Message resMsg = msgContext.getResponseMessage();
SOAPEnvelope resEnv = (SOAPEnvelope) resMsg.getAs( "SOAPEnvelope" );
SOAPBody resBody = resEnv.getFirstBody();
- mc.setOutgoingMessage( new Message(resBody.getAsDocument(), "Document") );
+ mc.setResponseMessage( new Message(resBody.getAsDocument(), "Document") );
Debug.Print( 1, "Exit: HTTPMessage.invoke" );
}
1.6 +2 -2 xml-axis/java/src/org/apache/axis/client/TransportRoutingClient.java
Index: TransportRoutingClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/TransportRoutingClient.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TransportRoutingClient.java 2001/02/17 18:02:17 1.5
+++ TransportRoutingClient.java 2001/02/21 01:07:21 1.6
@@ -92,7 +92,7 @@
SimpleAxisEngine engine = new SimpleAxisEngine();
MessageContext msgContext = new MessageContext();
Message message = new Message(msg, "String");
- msgContext.setIncomingMessage(message);
+ msgContext.setRequestMessage(message);
/** The transport is http.
*/
@@ -106,7 +106,7 @@
engine.init();
engine.invoke(msgContext);
- System.out.println(msgContext.getOutgoingMessage().getAs("String"));
+ System.out.println(msgContext.getResponseMessage().getAs("String"));
}
catch( Exception e ) {
e.printStackTrace();
1.5 +1 -1 xml-axis/java/src/org/apache/axis/handlers/DebugHandler.java
Index: DebugHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/DebugHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DebugHandler.java 2001/02/20 14:24:52 1.4
+++ DebugHandler.java 2001/02/21 01:07:21 1.5
@@ -72,7 +72,7 @@
public void invoke(MessageContext msgContext) throws AxisFault {
Debug.Print( 1, "Enter: DebugHandler::invoke" );
try {
- Message msg = msgContext.getIncomingMessage();
+ Message msg = msgContext.getRequestMessage();
SOAPEnvelope env = (SOAPEnvelope) msg.getAs( "SOAPEnvelope" );
Vector headers = null ;
1.12 +2 -2 xml-axis/java/src/org/apache/axis/handlers/EchoHandler.java
Index: EchoHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/EchoHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EchoHandler.java 2001/02/10 04:39:55 1.11
+++ EchoHandler.java 2001/02/21 01:07:21 1.12
@@ -68,9 +68,9 @@
public void invoke(MessageContext msgContext) throws AxisFault {
Debug.Print( 1, "Enter: EchoHandler::invoke" );
try {
- Message msg = msgContext.getIncomingMessage();
+ Message msg = msgContext.getRequestMessage();
SOAPEnvelope env = (SOAPEnvelope) msg.getAs( "SOAPEnvelope" );
- msgContext.setOutgoingMessage( new Message( env, "SOAPEnvelope" ) );
+ msgContext.setResponseMessage( new Message( env, "SOAPEnvelope" ) );
}
catch( Exception e ) {
Debug.Print( 1, e );
1.10 +2 -2 xml-axis/java/src/org/apache/axis/handlers/LogHandler.java
Index: LogHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/LogHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LogHandler.java 2001/02/10 04:39:55 1.9
+++ LogHandler.java 2001/02/21 01:07:21 1.10
@@ -73,8 +73,8 @@
FileWriter fw = new FileWriter( "axis.log", true );
PrintWriter pw = new PrintWriter( fw );
- Message inMsg = msgContext.getIncomingMessage();
- Message outMsg = msgContext.getOutgoingMessage();
+ Message inMsg = msgContext.getRequestMessage();
+ Message outMsg = msgContext.getResponseMessage();
pw.println( "=======================================================" );
pw.println( "= " + ( new Time(System.currentTimeMillis()) ).toString() );
1.6 +3 -3 xml-axis/java/src/org/apache/axis/handlers/MsgDispatchHandler.java
Index: MsgDispatchHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/MsgDispatchHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MsgDispatchHandler.java 2001/02/20 22:51:29 1.5
+++ MsgDispatchHandler.java 2001/02/21 01:07:21 1.6
@@ -72,7 +72,7 @@
public class MsgDispatchHandler extends BasicHandler {
/**
* This is pretty much a pass-thru to the util.Admin tool. This will just
- * take the incoming xml file and call the Admin processing.
+ * take the Request xml file and call the Admin processing.
*/
public void invoke(MessageContext msgContext) throws AxisFault {
Debug.Print( 1, "Enter: MsgDispatcherHandler::invoke" );
@@ -97,7 +97,7 @@
Class[] argClasses = new Class[2];
Object[] argObjects = new Object[2];
- Message reqMsg = msgContext.getIncomingMessage();
+ Message reqMsg = msgContext.getRequestMessage();
SOAPEnvelope reqEnv = (SOAPEnvelope) reqMsg.getAs("SOAPEnvelope");
SOAPBody reqBody = reqEnv.getFirstBody();
@@ -113,7 +113,7 @@
SOAPBody resBody = new SOAPBody( retDoc );
SOAPEnvelope resEnv = new SOAPEnvelope( resBody );
Message resMsg = new Message( resEnv, "SOAPEnvelope" );
- msgContext.setOutgoingMessage( resMsg );
+ msgContext.setResponseMessage( resMsg );
}
catch( Exception exp ) {
exp.printStackTrace();
1.14 +2 -2 xml-axis/java/src/org/apache/axis/handlers/RPCDispatchHandler.java
Index: RPCDispatchHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/RPCDispatchHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RPCDispatchHandler.java 2001/02/20 22:51:29 1.13
+++ RPCDispatchHandler.java 2001/02/21 01:07:22 1.14
@@ -88,7 +88,7 @@
AxisClassLoader cl = new AxisClassLoader();
Class cls = cl.loadClass(clsName);
Object obj = cls.newInstance();
- Message inMsg = msgContext.getIncomingMessage();
+ Message inMsg = msgContext.getRequestMessage();
SOAPEnvelope env = (SOAPEnvelope) inMsg.getAs("SOAPEnvelope");
Vector bodies = env.getAsRPCBody();
SOAPEnvelope resEnv = null ;
@@ -134,7 +134,7 @@
}
Message outMsg = new Message( resEnv, "SOAPEnvelope" );
- msgContext.setOutgoingMessage( outMsg );
+ msgContext.setResponseMessage( outMsg );
}
catch( Exception e ) {
Debug.Print( 1, e );
1.7 +5 -5 xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxisServlet.java 2001/02/18 19:13:22 1.6
+++ AxisServlet.java 2001/02/21 01:07:22 1.7
@@ -99,7 +99,7 @@
}
}
- /* Place the incoming message in the MessagContext object - notice */
+ /* Place the Request message in the MessagContext object - notice */
/* that we just leave it as a 'ServletRequest' object and let the */
/* Message processing routine convert it - we don't do it since we */
/* don't know how it's going to be used - perhaps it might not */
@@ -113,7 +113,7 @@
msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST, req );
msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETRESPONSE, res );
- msgContext.setIncomingMessage( msg );
+ msgContext.setRequestMessage( msg );
/** Set the target which tells the engine where to dispatch. In the
* real world, this would probably be gotten from the servlet
@@ -123,7 +123,7 @@
/* Save the SOAPAction header in the MessageContext bag - this will */
/* be used to tell the Axis Engine which service is being invoked. */
- /* This will save us the trouble of having to parse the incoming */
+ /* This will save us the trouble of having to parse the Request */
/* message - although we will need to double-check later on that */
/* the SOAPAction header does in fact match the URI in the body. */
/* (is this last stmt true???) */
@@ -176,12 +176,12 @@
res.setStatus( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
if ( !(e instanceof AxisFault) )
e = new AxisFault( e );
- msgContext.setOutgoingMessage( new Message(e, "AxisFault") );
+ msgContext.setResponseMessage( new Message(e, "AxisFault") );
}
/* Send it back along the wire... */
/***********************************/
- msg = msgContext.getOutgoingMessage();
+ msg = msgContext.getResponseMessage();
res.setContentType( "text/xml" );
res.getWriter().println( msg != null ? msg.getAs("String") : "No data" );
}
1.3 +2 -2 xml-axis/java/src/org/apache/axis/transport/http/HTTPDispatchHandler.java
Index: HTTPDispatchHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPDispatchHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTTPDispatchHandler.java 2001/02/16 22:50:42 1.2
+++ HTTPDispatchHandler.java 2001/02/21 01:07:22 1.3
@@ -96,7 +96,7 @@
Socket sock = null ;
sock = new Socket( host, port );
- reqEnv = (String) msgContext.getIncomingMessage().getAs("String");
+ reqEnv = (String) msgContext.getRequestMessage().getAs("String");
OutputStream out = sock.getOutputStream();
InputStream inp = sock.getInputStream();
@@ -176,7 +176,7 @@
parser.parse( new InputSource( inp ) );
outMsg = new Message( parser.getDocument(), "Document" );
- msgContext.setOutgoingMessage( outMsg );
+ msgContext.setResponseMessage( outMsg );
if ( Debug.DebugOn(2) ) {
Debug.Print( 2, "XML received:" );
Message m = new Message( parser.getDocument(), "Document" );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic