[jbossws-commits] JBossWS SVN: r2665 - in branches/jbossws-1.2.1: jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2007-03-22 17:25:38 -0400 (Thu, 22 Mar 2007) New Revision: 2665 Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java Log: Determine service-ref type without loading the SI Fix wsdlpublish test case Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java =================================================================== --- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-22 18:56:39 UTC (rev 2664) +++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-22 21:25:38 UTC (rev 2665) @@ -24,8 +24,6 @@ // $Id$ import java.lang.reflect.AnnotatedElement; -import java.net.URL; -import java.net.URLClassLoader; import javax.naming.Context; import javax.naming.NamingException; @@ -107,30 +105,42 @@ String serviceRefType = serviceRef.getServiceRefType(); if (serviceRefType != null || serviceRef.getAnnotatedElement() != null) return Type.JAXWS; - + + // The mapping-file is JAXRPC specific + if (serviceRef.getMappingFile() != null) + return Type.JAXRPC; + String siName = serviceRef.getServiceInterface(); if (siName == null) throw new IllegalStateException("<service-interface> cannot be null"); + if (siName.equals("javax.xml.rpc.Service")) + return Type.JAXRPC; + + log.info("Cannot determine service-ref type, assuming JAXWS"); + return Type.JAXWS; + + /* + * Loading the SI like this might not work for webapp clients. + * ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); URL rootURL = serviceRef.getVfsRoot().toURL(); URLClassLoader loader = new URLClassLoader(new URL[] {rootURL}, ctxLoader); - Class siClass; try { - siClass = loader.loadClass(siName); + Class siClass = loader.loadClass(siName); + if (javax.xml.ws.Service.class.isAssignableFrom(siClass)) + return Type.JAXWS; + else if (javax.xml.rpc.Service.class.isAssignableFrom(siClass)) + return Type.JAXRPC; + else + throw new IllegalStateException("Illegal service interface: " + siName); } catch (ClassNotFoundException e) { - throw new NamingException("Cannot load <service-interface>: " + siName); + throw new IllegalStateException("Cannot load <service-interface>: " + siName); } - - if (javax.xml.ws.Service.class.isAssignableFrom(siClass)) - return Type.JAXWS; - else if (javax.xml.rpc.Service.class.isAssignableFrom(siClass)) - return Type.JAXRPC; - else - throw new IllegalStateException("Illegal service interface: " + siName); + */ } } Modified: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-03-22 18:56:39 UTC (rev 2664) +++ branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-03-22 21:25:38 UTC (rev 2665) @@ -53,6 +53,6 @@ WSException.rethrow(ex); } - return portType.getLocalPart(); + return portType.toString(); } }