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 he...@apache.org on 2004/06/14 10:28:21 UTC
cvs commit: ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl AxisEmitterBasedJaxRpcMapperContext.java MiscInfoImpl.java
hemapani 2004/06/14 01:28:21
Modified: contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/wsdl/impl
AxisWSDLContext.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/interfaces
WSCFHandler.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server
WSCFHandlerImpl.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/client
ServiceReferanceImpl.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl
AxisEmitterBasedJaxRpcMapperContext.java
MiscInfoImpl.java
Log:
fixed the testcases
Revision Changes Path
1.7 +3 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/wsdl/impl/AxisWSDLContext.java
Index: AxisWSDLContext.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/wsdl/impl/AxisWSDLContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxisWSDLContext.java 27 May 2004 15:30:49 -0000 1.6
+++ AxisWSDLContext.java 14 Jun 2004 08:28:21 -0000 1.7
@@ -96,6 +96,7 @@
private HashMap bindings;
private HashMap portetypes;
private HashMap ports;
+ private boolean verbose = false;
public AxisWSDLContext(SymbolTable axisSymbltable) {
this.symbolTable = axisSymbltable;
@@ -217,7 +218,8 @@
* @see org.apache.geronimo.ews.ws4j2ee.context.wsdl.WSDLContext#getPort()
*/
public PortEntry getPort(QName name) {
- log.info("getting port type "+name);
+ if(verbose)
+ log.info("getting port type "+name);
Object obj = this.ports.get(name);
//when Symbol table populates the URI of the port is given as ""
//so we have to cheat
1.4 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/interfaces/WSCFHandler.java
Index: WSCFHandler.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/interfaces/WSCFHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSCFHandler.java 19 Feb 2004 10:32:05 -0000 1.3
+++ WSCFHandler.java 14 Jun 2004 08:28:21 -0000 1.4
@@ -105,7 +105,7 @@
* Gets the soap headers of the handler element
* @return soap-headers
*/
- public String[] getSoapHeader();
+ public WSCFSOAPHeader[] getSoapHeader();
/**
* Gets the soap roles of the handler element
1.5 +12 -5 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/WSCFHandlerImpl.java
Index: WSCFHandlerImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/WSCFHandlerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSCFHandlerImpl.java 19 Feb 2004 10:32:05 -0000 1.4
+++ WSCFHandlerImpl.java 14 Jun 2004 08:28:21 -0000 1.5
@@ -61,6 +61,7 @@
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFConstants;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFHandler;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFInitParam;
+import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFSOAPHeader;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.jaxb.DescriptionType;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.jaxb.DisplayNameType;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.jaxb.IconType;
@@ -171,7 +172,7 @@
list = jaxbHandler.getSoapRole();
for(int i=0; i < list.size(); i++){
- this.soapHeader.add(((StringImpl)list.get(i)).getValue());
+ this.soapRole.add(((StringImpl)list.get(i)).getValue());
}
}
@@ -293,9 +294,12 @@
* Gets the soap headers of the handler element
* @return soap-headers
*/
- public String[] getSoapHeader() {
- String[] soapheader = new String[this.soapHeader.size()];
- this.soapHeader.toArray(soapheader);
+ public WSCFSOAPHeader[] getSoapHeader() {
+ WSCFSOAPHeader[] soapheader = new WSCFSOAPHeader[this.soapHeader.size()];
+ int size = soapHeader.size();
+ for(int i = 0;i<size;i++){
+ soapheader[i] = ((WSCFSOAPHeader)soapHeader.get(i));
+ }
return soapheader;
}
@@ -305,7 +309,10 @@
*/
public String[] getSoapRole() {
String[] soaprole = new String[this.soapRole.size()];
- this.soapRole.toArray(soaprole);
+ int size = soapRole.size();
+ for(int i = 0;i<size;i++){
+ soaprole[i] = (String)soapRole.get(i);
+ }
return soaprole;
}
1.2 +84 -84 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/client/ServiceReferanceImpl.java
Index: ServiceReferanceImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/client/ServiceReferanceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceReferanceImpl.java 23 May 2004 15:53:24 -0000 1.1
+++ ServiceReferanceImpl.java 14 Jun 2004 08:28:21 -0000 1.2
@@ -69,93 +69,93 @@
*/
private Vector handlers = new Vector();
- /**
- * @return
- */
- public String getJaxrpcmappingFile() {
- return jaxrpcmappingFile;
- }
-
- /**
- * @return
- */
- public QName getServcieQName() {
- return servcieQName;
- }
-
- /**
- * @return
- */
- public String getServiceInterface() {
- return serviceInterface;
- }
-
- /**
- * @return
- */
- public String getServicerefName() {
- return servicerefName;
- }
-
- /**
- * @return
- */
- public String getWsdlFile() {
- return wsdlFile;
- }
-
- /**
- * @param string
- */
- public void setJaxrpcmappingFile(String string) {
- jaxrpcmappingFile = string;
- }
-
- /**
- * @param name
- */
- public void setServcieQName(QName name) {
- servcieQName = name;
- }
-
- /**
- * @param string
- */
- public void setServiceInterface(String string) {
- serviceInterface = string;
- }
-
- /**
- * @param string
- */
- public void setServicerefName(String string) {
- servicerefName = string;
- }
-
- /**
- * @param string
- */
- public void setWsdlFile(String string) {
- wsdlFile = string;
- }
-
- /* (non-Javadoc)
- * @see org.apache.geronimo.ews.ws4j2ee.context.webservices.client.interfaces.ServiceReferance#addHandler(org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFHandler)
- */
- public void addHandler(WSCFHandler handler) {
- this.handlers.add(handler);
-
- }
-
- /* (non-Javadoc)
- * @see org.apache.geronimo.ews.ws4j2ee.context.webservices.client.interfaces.ServiceReferance#getHandlers()
- */
- public WSCFHandler[] getHandlers() {
+ /**
+ * @return
+ */
+ public String getJaxrpcmappingFile() {
+ return jaxrpcmappingFile;
+ }
+
+ /**
+ * @return
+ */
+ public QName getServcieQName() {
+ return servcieQName;
+ }
+
+ /**
+ * @return
+ */
+ public String getServiceInterface() {
+ return serviceInterface;
+ }
+
+ /**
+ * @return
+ */
+ public String getServicerefName() {
+ return servicerefName;
+ }
+
+ /**
+ * @return
+ */
+ public String getWsdlFile() {
+ return wsdlFile;
+ }
+
+ /**
+ * @param string
+ */
+ public void setJaxrpcmappingFile(String string) {
+ jaxrpcmappingFile = string;
+ }
+
+ /**
+ * @param name
+ */
+ public void setServcieQName(QName name) {
+ servcieQName = name;
+ }
+
+ /**
+ * @param string
+ */
+ public void setServiceInterface(String string) {
+ serviceInterface = string;
+ }
+
+ /**
+ * @param string
+ */
+ public void setServicerefName(String string) {
+ servicerefName = string;
+ }
+
+ /**
+ * @param string
+ */
+ public void setWsdlFile(String string) {
+ wsdlFile = string;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ews.ws4j2ee.context.webservices.client.interfaces.ServiceReferance#addHandler(org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFHandler)
+ */
+ public void addHandler(WSCFHandler handler) {
+ this.handlers.add(handler);
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ews.ws4j2ee.context.webservices.client.interfaces.ServiceReferance#getHandlers()
+ */
+ public WSCFHandler[] getHandlers() {
WSCFHandler[] wscfhandlers = new WSCFHandler[handlers.size()];
for(int i = 0;i<wscfhandlers.length;i++){
wscfhandlers[i] = (WSCFHandler)handlers.get(i);
}
- return null;
- }
+ return wscfhandlers;
+ }
}
1.9 +27 -7 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl/AxisEmitterBasedJaxRpcMapperContext.java
Index: AxisEmitterBasedJaxRpcMapperContext.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl/AxisEmitterBasedJaxRpcMapperContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AxisEmitterBasedJaxRpcMapperContext.java 10 Jun 2004 11:35:19 -0000 1.8
+++ AxisEmitterBasedJaxRpcMapperContext.java 14 Jun 2004 08:28:21 -0000 1.9
@@ -98,6 +98,7 @@
import org.apache.geronimo.ews.ws4j2ee.context.JaxRpcMapperContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.UnrecoverableGenerationFault;
+import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
/**
* This class wrap the JAXRPCMapper and only expose a interface to
@@ -246,15 +247,34 @@
//set the package name
FullyQualifiedClassType packagename = objFactory.createFullyQualifiedClassType();
String pkg = (String) packages.next();
- if(pkg.equals(j2eewscontext.getMiscInfo().getJaxrpcSEI())){
+ String jaxrpcsei = j2eewscontext.getMiscInfo().getJaxrpcSEI();
+ if(pkg == null){
+ //TODO this is temporrary work around to make sure
+ //the mapping is defined.
+ String pkgName = Utils.getPackageNameFromQuallifiedName(jaxrpcsei);
+ String val = (String)map.get(pkgName);
+ if(val == null){
+ val = Utils.javapkgToURI(pkgName);
+ packagename.setValue(pkgName);
+ pkgmap.setPackageType(packagename);
+ //set the namespace URI
+ XsdAnyURIType nsuri = objFactory.createXsdAnyURIType();
+ nsuri.setValue(val);
+ pkgmap.setNamespaceURI(nsuri);
+ }else{
+ continue;
+ }
+ }else if(pkg.equals(jaxrpcsei)){
continue;
+ }else{
+ packagename.setValue(pkg);
+ pkgmap.setPackageType(packagename);
+ //set the namespace URI
+ XsdAnyURIType nsuri = objFactory.createXsdAnyURIType();
+ nsuri.setValue((String) map.get(pkg));
+ pkgmap.setNamespaceURI(nsuri);
+
}
- packagename.setValue(pkg);
- pkgmap.setPackageType(packagename);
- //set the namespace URI
- XsdAnyURIType nsuri = objFactory.createXsdAnyURIType();
- nsuri.setValue((String) map.get(pkg));
- pkgmap.setNamespaceURI(nsuri);
//done :) add the package type
jaxrpcmap.getPackageMapping().add(pkgmap);
}
1.9 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java
Index: MiscInfoImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MiscInfoImpl.java 10 Jun 2004 11:35:19 -0000 1.8
+++ MiscInfoImpl.java 14 Jun 2004 08:28:21 -0000 1.9
@@ -98,7 +98,7 @@
private String ejbName = null;
private String axisSEI;
private ArrayList operations;
- private boolean verbose = true;
+ private boolean verbose = false;
private String wsConfFileLocation;
private String wsdlFile;
private String jaxrpcfile;