openamf/src/java/org/openamf/invoker WebServiceInvoker.java,1.12,1.13

Update of /cvsroot/openamf/openamf/src/java/org/openamf/invoker
In directory sc8-pr-cvs1:/tmp/cvs-serv31596/src/java/org/openamf/invoker

Modified Files:
	WebServiceInvoker.java 
Log Message:


Index: WebServiceInvoker.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/invoker/WebServiceInvoker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** WebServiceInvoker.java	2 May 2003 15:41:21 -0000	1.12
--- WebServiceInvoker.java	3 May 2003 04:12:56 -0000	1.13
***************
*** 55,61 ****
  
  			Class bindingClass =
! 				loadWSClass("Stub", webservicesDir, packageFolder);
  			Class locatorClass =
! 				loadWSClass("Locator", webservicesDir, packageFolder);
  
  			String endpoint = getEndPoint(locatorClass);
--- 55,67 ----
  
  			Class bindingClass =
! 				loadWSClass(
! 					org.apache.axis.client.Stub.class,
! 					webservicesDir,
! 					packageFolder);
  			Class locatorClass =
! 				loadWSClass(
! 					org.apache.axis.client.Service.class,
! 					webservicesDir,
! 					packageFolder);
  
  			String endpoint = getEndPoint(locatorClass);
***************
*** 114,123 ****
  
  	private Class loadWSClass(
! 		String classType,
  		String webservicesDir,
  		String packageFolder)
  		throws ClassNotFoundException {
  
! 		Class wsClass = null;
  
  		File classDir = new File(webservicesDir + "/" + packageFolder + "/");
--- 120,129 ----
  
  	private Class loadWSClass(
! 		Class classType,
  		String webservicesDir,
  		String packageFolder)
  		throws ClassNotFoundException {
  
! 		Class wsClass = java.lang.Object.class;
  
  		File classDir = new File(webservicesDir + "/" + packageFolder + "/");
***************
*** 127,146 ****
  
  		for (int i = 0; i < fileList.length; ++i) {
- 			String temp = fileList[i];
- 			if (temp.indexOf(".class") == -1) {
- 				continue;
- 			}
  
! 			if (temp.indexOf(classType) != -1) {
! 				fileName = packageFolder + "." + temp;
! 			}
! 		}
  
! 		fileName = fileName.substring(0, fileName.lastIndexOf('.'));
  
! 		log.debug("fileName=" + fileName);
  
! 		wsClass =
! 			Thread.currentThread().getContextClassLoader().loadClass(fileName);
  
  		return wsClass;
--- 133,153 ----
  
  		for (int i = 0; i < fileList.length; ++i) {
  
! 			fileName = fileList[i];
! 			if (fileName.indexOf(".class") == -1)
! 				continue;
  
! 			fileName = fileName.substring(0, fileName.lastIndexOf('.'));
  
! 			wsClass =
! 				Thread.currentThread().getContextClassLoader().loadClass(
! 					packageFolder + "." + fileName);
  
! 			Class sc = wsClass.getSuperclass();
! 			if (sc != null)
! 				continue;
! 			if (sc.equals(classType))
! 				break;
! 		}
  
  		return wsClass;




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf