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 he...@apache.org on 2004/06/14 10:28:58 UTC
cvs commit: ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers WebDDParser.java ServiceReferanceParser.java
hemapani 2004/06/14 01:28:58
Modified: contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers
WebDDParser.java ServiceReferanceParser.java
Log:
fixed the testcases and correct genarate() to generate()
Revision Changes Path
1.3 +4 -14 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java
Index: WebDDParser.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebDDParser.java 23 May 2004 15:53:26 -0000 1.2
+++ WebDDParser.java 14 Jun 2004 08:28:58 -0000 1.3
@@ -59,12 +59,11 @@
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.crimson.tree.TextNode;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
+import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
@@ -101,26 +100,17 @@
if(sevlele.getLength()>0){
Element serv = (Element)sevlele.item(0);
NodeList servName = serv.getElementsByTagName("servlet-class");
- servletClass = getElementValue(servName.item(0));
+ servletClass = Utils.getElementValue(servName.item(0));
servName = serv.getElementsByTagName("servlet-name");
- servletName = getElementValue(servName.item(0));
+ servletName = Utils.getElementValue(servName.item(0));
}
} catch (Exception e) {
throw GenerationFault.createGenerationFault(e);
}
}
- public String getElementValue(Node node){
- NodeList nodes = node.getChildNodes();
- for(int i = 0;i<nodes.getLength();i++){
- Node temp = nodes.item(i);
- if(temp instanceof TextNode){
- return ((TextNode)temp).getNodeValue();
- }
- }
- return null;
- }
+
/**
* @return
*/
1.2 +6 -16 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java
Index: ServiceReferanceParser.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceReferanceParser.java 23 May 2004 15:53:26 -0000 1.1
+++ ServiceReferanceParser.java 14 Jun 2004 08:28:58 -0000 1.2
@@ -59,10 +59,10 @@
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.crimson.tree.TextNode;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.client.ServiceReferanceImpl;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.client.interfaces.ServiceReferance;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
+import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -101,7 +101,7 @@
else
throw new GenerationFault("No service Referance in the file");
} catch (Exception e) {
- throw new GenerationFault(e);
+ throw GenerationFault.createGenerationFault(e);
}
}
/**
@@ -134,35 +134,25 @@
NodeList sevlele = root.getElementsByTagName("service-ref-name");
if(sevlele.getLength()>0){
- ref.setServicerefName(getElementValue(sevlele.item(0)));
+ ref.setServicerefName(Utils.getElementValue(sevlele.item(0)));
}
sevlele = root.getElementsByTagName("service-interface");
if(sevlele.getLength()>0){
- ref.setServiceInterface(getElementValue(sevlele.item(0)));
+ ref.setServiceInterface(Utils.getElementValue(sevlele.item(0)));
}
sevlele = root.getElementsByTagName("wsdl-file");
if(sevlele.getLength()>0){
- ref.setWsdlFile(getElementValue(sevlele.item(0)));
+ ref.setWsdlFile(Utils.getElementValue(sevlele.item(0)));
}
sevlele = root.getElementsByTagName("jaxrpc-mapping-file");
if(sevlele.getLength()>0){
- ref.setJaxrpcmappingFile(getElementValue(sevlele.item(0)));
+ ref.setJaxrpcmappingFile(Utils.getElementValue(sevlele.item(0)));
}
}
- public String getElementValue(Node node){
- NodeList nodes = node.getChildNodes();
- for(int i = 0;i<nodes.getLength();i++){
- Node temp = nodes.item(i);
- if(temp instanceof TextNode){
- return ((TextNode)temp).getNodeValue();
- }
- }
- return null;
- }
/**
* @return
*/