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 du...@apache.org on 2001/03/03 02:07:05 UTC
cvs commit: xml-axis/java/src/org/apache/axis/utils Admin.java Options.java
dug 01/03/02 17:07:05
Modified: java/samples/stock StockQuoteService.java
StockQuoteService.jws
java/src/org/apache/axis Message.java
java/src/org/apache/axis/client HTTPMessage.java
java/src/org/apache/axis/handlers MsgDispatchHandler.java
RPCDispatchHandler.java
java/src/org/apache/axis/message SOAPBody.java
SOAPEnvelope.java
java/src/org/apache/axis/transport/http
HTTPDispatchHandler.java
java/src/org/apache/axis/utils Admin.java Options.java
Log:
Minor fixes, more debugging stuff.
Revision Changes Path
1.7 +4 -2 xml-axis/java/samples/stock/StockQuoteService.java
Index: StockQuoteService.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/StockQuoteService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StockQuoteService.java 2001/03/02 20:02:22 1.6
+++ StockQuoteService.java 2001/03/03 01:07:04 1.7
@@ -61,6 +61,7 @@
import org.jdom.* ;
import org.jdom.input.SAXBuilder ;
+import org.jdom.output.XMLOutputter ;
/**
* See \samples\stock\readme for info.
@@ -81,9 +82,10 @@
SAXBuilder parser = new SAXBuilder();
- Document doc = parser.build( url );
+ Document doc = parser.build( url );
+ Element elem = doc.getRootElement();
+ elem = elem.getChild( "stock_quote" );
- Element elem = doc.getRootElement ();
List list = elem.getChildren( "price" );
elem = (Element) list.get( 0 );
1.3 +3 -2 xml-axis/java/samples/stock/StockQuoteService.jws
Index: StockQuoteService.jws
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/StockQuoteService.jws,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StockQuoteService.jws 2001/03/02 20:02:25 1.2
+++ StockQuoteService.jws 2001/03/03 01:07:04 1.3
@@ -79,9 +79,10 @@
SAXBuilder parser = new SAXBuilder();
- Document doc = parser.build( url );
+ Document doc = parser.build( url );
+ Element elem = doc.getRootElement();
+ elem = elem.getChild( "stock_quote" );
- Element elem = doc.getRootElement ();
List list = elem.getChildren( "price" );
elem = (Element) list.get( 0 );
1.12 +23 -23 xml-axis/java/src/org/apache/axis/Message.java
Index: Message.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Message.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Message.java 2001/03/02 20:02:52 1.11
+++ Message.java 2001/03/03 01:07:04 1.12
@@ -84,7 +84,7 @@
* Just something to us working...
*/
public Message(Object origMsg, String form) {
- Debug.Print( 1, "Enter Message ctor, form: " + form );
+ Debug.Print( 2, "Enter Message ctor, form: " + form );
originalMessage = origMsg ;
currentMessage = origMsg ;
currentForm = form ;
@@ -103,7 +103,7 @@
}
public void setCurrentMessage(Object currMsg, String form) {
- Debug.Print( 1, "Setting current message form to: " + form );
+ Debug.Print( 2, "Setting current message form to: " + form );
currentMessage = currMsg ;
currentForm = form ;
}
@@ -112,8 +112,8 @@
// now I need something quick...
public Object getAs( String desiredType ) {
- Debug.Print( 1, "Enter: Message::getAs(" +desiredType+ ")" );
- Debug.Print( 1, " current form: " + currentForm );
+ Debug.Print( 2, "Enter: Message::getAs(" +desiredType+ ")" );
+ Debug.Print( 2, " current form: " + currentForm );
if ( currentForm.equals( desiredType ) ) return( currentMessage );
if ( desiredType.equals( "Bytes" )) return( getAsBytes() );
@@ -126,9 +126,9 @@
}
private byte[] getAsBytes() {
- Debug.Print( 1, "Enter: Message::getAsByes" );
+ Debug.Print( 2, "Enter: Message::getAsByes" );
if ( currentForm.equals("Bytes") ) {
- Debug.Print( 1, "Exit: Message::getAsByes" );
+ Debug.Print( 2, "Exit: Message::getAsByes" );
return( (byte[]) currentMessage );
}
@@ -139,13 +139,13 @@
byte[] buf = new byte[ inp.available() ];
inp.read( buf );
setCurrentMessage( buf, "Bytes" );
- Debug.Print( 1, "Exit: Message::getAsByes" );
+ Debug.Print( 2, "Exit: Message::getAsByes" );
return( (byte[]) currentMessage );
}
catch( Exception e ) {
e.printStackTrace( System.err );
}
- Debug.Print( 1, "Exit: Message::getAsByes" );
+ Debug.Print( 2, "Exit: Message::getAsByes" );
return( null );
}
@@ -155,7 +155,7 @@
byte[] buf = new byte[req.getContentLength()];
req.getInputStream().read( buf );
setCurrentMessage( buf, "Bytes" );
- Debug.Print( 1, "Exit: Message::getAsBytes" );
+ Debug.Print( 2, "Exit: Message::getAsBytes" );
return( (byte[]) currentMessage );
}
catch( Exception e ) {
@@ -170,19 +170,19 @@
if ( currentForm.equals("String") ) {
setCurrentMessage( ((String)currentMessage).getBytes(), "Bytes" );
- Debug.Print( 1, "Exit: Message::getAsBytes" );
+ Debug.Print( 2, "Exit: Message::getAsBytes" );
return( (byte[]) currentMessage );
}
System.err.println("Can't convert " + currentForm + " to Bytes" );
- Debug.Print( 1, "Exit: Message::getAsBytes" );
+ Debug.Print( 2, "Exit: Message::getAsBytes" );
return( null );
}
private String getAsString() {
- Debug.Print( 1, "Enter: Message::getAsString" );
+ Debug.Print( 2, "Enter: Message::getAsString" );
if ( currentForm.equals("String") ) {
- Debug.Print( 1, "Exit: Message::getAsString" );
+ Debug.Print( 2, "Exit: Message::getAsString" );
return( (String) currentMessage );
}
@@ -194,7 +194,7 @@
if ( currentForm.equals("Bytes") ) {
setCurrentMessage( new String((byte[]) currentMessage), "String" );
- Debug.Print( 1, "Exit: Message::getAsString" );
+ Debug.Print( 2, "Exit: Message::getAsString" );
return( (String) currentMessage );
}
@@ -216,12 +216,12 @@
}
System.err.println("Can't convert " + currentForm + " to String" );
- Debug.Print( 1, "Exit: Message::getAsString" );
+ Debug.Print( 2, "Exit: Message::getAsString" );
return( null );
}
private Document getAsDocument() {
- Debug.Print( 1, "Enter: Message::getAsDocument" );
+ Debug.Print( 2, "Enter: Message::getAsDocument" );
if ( currentForm.equals("Document") ) return( (Document) currentMessage );
SAXBuilder parser = new SAXBuilder();
@@ -259,40 +259,40 @@
env.addBody( body );
setCurrentMessage( env.getAsXML(), "Document" );
- Debug.Print( 1, "Exit: Message::getAsDocument" );
+ Debug.Print( 2, "Exit: Message::getAsDocument" );
return( (Document) currentMessage );
}
else if ( currentForm.equals("SOAPEnvelope") ) {
SOAPEnvelope env = (SOAPEnvelope) currentMessage ;
setCurrentMessage( env.getAsXML(), "Document" );
- Debug.Print( 1, "Exit: Message::getAsDocument" );
+ Debug.Print( 2, "Exit: Message::getAsDocument" );
return( (Document) currentMessage );
}
else {
System.err.println("Can't convert " + currentForm + " to Document" );
- Debug.Print( 1, "Exit: Message::getAsDocument" );
+ Debug.Print( 2, "Exit: Message::getAsDocument" );
return( null );
}
setCurrentMessage( parser.build( reader ), "Document" );
- Debug.Print( 1, "Exit: Message::getAsDocument" );
+ Debug.Print( 2, "Exit: Message::getAsDocument" );
return( (Document) currentMessage );
}
catch( Exception e ) {
e.printStackTrace( System.err );
}
- Debug.Print( 1, "Exit: Message::getAsDocument" );
+ Debug.Print( 2, "Exit: Message::getAsDocument" );
return( null );
}
private SOAPEnvelope getAsSOAPEnvelope() {
- Debug.Print( 1, "Enter: Message::getAsSOAPEnvelope" );
+ Debug.Print( 2, "Enter: Message::getAsSOAPEnvelope" );
if ( currentForm.equals("SOAPEnvelope") )
return( (SOAPEnvelope) currentMessage );
getAsDocument();
setCurrentMessage( new SOAPEnvelope( (Document) currentMessage ),
"SOAPEnvelope" );
- Debug.Print( 1, "Exit: Message::getAsSOAPEnvelope" );
+ Debug.Print( 2, "Exit: Message::getAsSOAPEnvelope" );
return( (SOAPEnvelope) currentMessage );
}
1.12 +2 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HTTPMessage.java 2001/03/02 20:03:12 1.11
+++ HTTPMessage.java 2001/03/03 01:07:04 1.12
@@ -188,8 +188,9 @@
Message resMsg = msgContext.getResponseMessage();
SOAPEnvelope resEnv = (SOAPEnvelope) resMsg.getAs( "SOAPEnvelope" );
SOAPBody resBody = resEnv.getFirstBody();
+ Document doc = new Document( resBody.getAsXML() );
- mc.setResponseMessage( new Message(resBody.getAsDocument(), "Document") );
+ mc.setResponseMessage( new Message(doc, "Document") );
Debug.Print( 1, "Exit: HTTPMessage.invoke" );
}
1.8 +3 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MsgDispatchHandler.java 2001/03/02 20:03:31 1.7
+++ MsgDispatchHandler.java 2001/03/03 01:07:04 1.8
@@ -99,11 +99,12 @@
Message reqMsg = msgContext.getRequestMessage();
SOAPEnvelope reqEnv = (SOAPEnvelope) reqMsg.getAs("SOAPEnvelope");
SOAPBody reqBody = reqEnv.getFirstBody();
+ Document doc = new Document( reqBody.getAsXML() );
argClasses[0] = cl.loadClass("org.apache.axis.MessageContext");
argClasses[1] = cl.loadClass("org.jdom.Document");
- argObjects[0] = (Object) msgContext ;
- argObjects[1] = (Object) reqBody.getAsDocument();
+ argObjects[0] = msgContext ;
+ argObjects[1] = doc ;
Method method = cls.getMethod( methodName, argClasses );
1.16 +3 -0 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RPCDispatchHandler.java 2001/03/02 20:03:37 1.15
+++ RPCDispatchHandler.java 2001/03/03 01:07:04 1.16
@@ -108,11 +108,14 @@
"Service name=" + methodName,
null, null ); // Should they??
+ Debug.Print( 2, "There are " + args.size() + " arg(s)" );
Class[] argClasses = new Class[ args.size() ];
Object[] argValues = new Object[ args.size()];
for ( i = 0 ; i < args.size() ; i++ ) {
argClasses[i] = cl.loadClass("java.lang.String") ;
argValues[i] = ((RPCArg)args.get(i)).getValue() ; // only String 4now
+ Debug.Print( 2, " class: " + argClasses[i] );
+ Debug.Print( 2, " value: " + argValues[i].toString() );
}
Method method = cls.getMethod( mName, argClasses );
1.10 +0 -4 xml-axis/java/src/org/apache/axis/message/SOAPBody.java
Index: SOAPBody.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPBody.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SOAPBody.java 2001/03/02 20:04:01 1.9
+++ SOAPBody.java 2001/03/03 01:07:05 1.10
@@ -92,8 +92,4 @@
return( root );
}
- public Document getAsDocument() {
- return( new Document(root) );
- }
-
};
1.12 +22 -22 xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java
Index: SOAPEnvelope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SOAPEnvelope.java 2001/03/02 20:04:04 1.11
+++ SOAPEnvelope.java 2001/03/03 01:07:05 1.12
@@ -84,8 +84,9 @@
}
public void setEnvelope(Element elem) {
- List list ;
- int i ;
+ List list ;
+ Element e ;
+ int i ;
if ( elem == null ) {
prefix = null ;
@@ -93,22 +94,20 @@
body = null ;
return ;
}
- list = elem.getChildren( Constants.ELEM_HEADER, elem.getNamespace());
- if ( list != null && list.size() > 0 ) {
- Element h = (Element) list.get(0);
- // list = h.getChildren();
- list = h.getChildren();
+
+ e = elem.getChild( Constants.ELEM_HEADER, elem.getNamespace() );
+ if ( e != null ) {
+ list = e.getChildren();
for ( i = 0 ; i < list.size() ; i++ ) {
- h = (Element) list.get(i);
+ Element h = (Element) list.get(i);
if ( headers == null ) headers = new Vector();
headers.add( new SOAPHeader( h ) );
}
}
- list = elem.getChildren( Constants.ELEM_BODY, elem.getNamespace() );
- if ( list != null && list.size() > 0 ) {
- Element h = (Element) list.get(0);
- list = h.getChildren();
+ e = elem.getChild( Constants.ELEM_BODY, elem.getNamespace() );
+ if ( e != null ) {
+ list = e.getChildren();
if ( list != null ) {
for ( i = 0 ; i < list.size() ; i++ ) {
Object n = list.get(i);
@@ -177,32 +176,33 @@
public Document getAsXML() {
Document doc = null ;
- Element elem ;
+ Element root ;
int i ;
- elem = new Element( Constants.ELEM_ENVELOPE, Constants.NSPREFIX_SOAP_ENV,
+ root = new Element( Constants.ELEM_ENVELOPE, Constants.NSPREFIX_SOAP_ENV,
Constants.URI_SOAP_ENV );
- doc = new Document( elem );
+ doc = new Document( root );
if ( headers != null && headers.size() > 0 ) {
- Element root = new Element( Constants.ELEM_HEADER,
+ Element elem = new Element( Constants.ELEM_HEADER,
Constants.NSPREFIX_SOAP_ENV,
Constants.URI_SOAP_ENV );
- elem.addContent( root );
+ root.addContent( elem );
for ( i = 0 ; i < headers.size() ; i++ ) {
SOAPHeader h = (SOAPHeader) headers.get(i);
- root.addContent( h.getAsXML() );
+ elem.addContent( h.getAsXML() );
}
}
if ( body != null ) {
- Element root = new Element( Constants.ELEM_BODY,
+ Element elem = new Element( Constants.ELEM_BODY,
Constants.NSPREFIX_SOAP_ENV,
Constants.URI_SOAP_ENV );
- elem.addContent( root );
+ root.addContent( elem );
for ( i = 0 ; i < body.size() ; i++ ) {
Element bod = ((SOAPBody)body.get(i)).getAsXML();
- bod = (Element) bod.clone();
- root.addContent( bod );
+ if ( bod.getDocument() != null )
+ bod = (Element) bod.clone();
+ elem.addContent( bod );
}
}
return( doc );
1.5 +5 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HTTPDispatchHandler.java 2001/03/02 20:04:33 1.4
+++ HTTPDispatchHandler.java 2001/03/03 01:07:05 1.5
@@ -125,8 +125,8 @@
out.write( reqEnv.getBytes() );
Debug.Print( 1, "XML sent:" );
- Debug.Print( 1, header );
- Debug.Print( 1, reqEnv );
+ Debug.Print( 1, "---------------------------------------------------");
+ Debug.Print( 1, header + reqEnv );
byte lastB=0, b ;
int len = 0 ;
@@ -176,10 +176,9 @@
Document doc = parser.build(inp);
outMsg = new Message( doc, "Document" );
msgContext.setResponseMessage( outMsg );
- if ( Debug.DebugOn(2) ) {
- Debug.Print( 2, "XML received:" );
- Debug.Print( 2, (new XMLOutputter()).outputString(doc) );
- }
+ Debug.Print( 1, "\nXML received:" );
+ Debug.Print( 1, "---------------------------------------------------");
+ Debug.Print( 1, (new XMLOutputter()).outputString(doc) );
}
inp.close();
1.15 +0 -1 xml-axis/java/src/org/apache/axis/utils/Admin.java
Index: Admin.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Admin.java 2001/03/02 20:04:49 1.14
+++ Admin.java 2001/03/03 01:07:05 1.15
@@ -129,7 +129,6 @@
for ( int loop = 0 ; loop < list.size() ; loop++ ) {
Object node = list.get(loop);
Element elem = (Element) node ;
- // if ( elem.getNodeType != ELEMENT_NODE ) continue ;
String type = elem.getName();
String name = elem.getAttributeValue( "name" );
1.3 +1 -1 xml-axis/java/src/org/apache/axis/utils/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Options.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Options.java 2001/02/20 18:52:43 1.2
+++ Options.java 2001/03/03 01:07:05 1.3
@@ -72,7 +72,7 @@
// SOASS (Start of Axis Specific Stuff)
String host ; // -h also -l (url)
- String port ; // -p
+ String port ; // -o
String servlet ; // -s
String user ; // -u