Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 98927 invoked from network); 2 Apr 2011 12:03:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Apr 2011 12:03:57 -0000 Received: (qmail 34164 invoked by uid 500); 2 Apr 2011 12:03:57 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 34116 invoked by uid 500); 2 Apr 2011 12:03:57 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 34109 invoked by uid 99); 2 Apr 2011 12:03:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2011 12:03:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2011 12:03:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5FC542388962; Sat, 2 Apr 2011 12:03:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1088012 - /geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java Date: Sat, 02 Apr 2011 12:03:33 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110402120333.5FC542388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xuhaihong Date: Sat Apr 2 12:03:33 2011 New Revision: 1088012 URL: http://svn.apache.org/viewvc?rev=1088012&view=rev Log: WSDescriptorParser is only used for Axis deployer, so once wsdl-file and jaxrpc-mapping-file are not found, we should ignore this configuration entry, as this entry should be for JAX-WS Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java?rev=1088012&r1=1088011&r2=1088012&view=diff ============================================================================== --- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java (original) +++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java Sat Apr 2 12:03:33 2011 @@ -34,9 +34,7 @@ import java.util.zip.ZipEntry; import javax.wsdl.Definition; import javax.wsdl.Operation; -import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.rpc.handler.HandlerInfo; import javax.xml.rpc.holders.BigDecimalHolder; import javax.xml.rpc.holders.BigIntegerHolder; @@ -59,10 +57,9 @@ import javax.xml.rpc.holders.QNameHolder import javax.xml.rpc.holders.ShortHolder; import javax.xml.rpc.holders.ShortWrapperHolder; import javax.xml.rpc.holders.StringHolder; + import org.apache.geronimo.common.DeploymentException; -import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil; import org.apache.geronimo.kernel.ClassLoading; -import org.apache.geronimo.schema.SchemaConversionUtils; import org.apache.openejb.jee.ExceptionMapping; import org.apache.openejb.jee.Handler; import org.apache.openejb.jee.JavaWsdlMapping; @@ -75,17 +72,16 @@ import org.apache.openejb.jee.ServiceEnd import org.apache.openejb.jee.ServiceImplBean; import org.apache.openejb.jee.WebserviceDescription; import org.apache.openejb.jee.Webservices; -import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.XmlException; -import org.apache.xmlbeans.XmlObject; import org.osgi.framework.Bundle; -import org.xml.sax.SAXException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @version $Rev$ $Date$ */ public class WSDescriptorParser { + private static final Logger logger = LoggerFactory.getLogger(WSDescriptorParser.class); public static JavaWsdlMapping readJaxrpcMapping(JarFile moduleFile, URI jaxrpcMappingURI) throws DeploymentException { String jaxrpcMappingPath = jaxrpcMappingURI.toString(); @@ -300,8 +296,14 @@ public class WSDescriptorParser { Collection webserviceDescriptions = webservices.getWebserviceDescription(); SharedPortInfo sharedPortInfo; for (WebserviceDescription webserviceDescription : webserviceDescriptions) { + if (webserviceDescription.getWsdlFile() == null || webserviceDescription.getJaxrpcMappingFile() == null) { + if(logger.isDebugEnabled()) { + logger.debug("This entry " + webserviceDescription.getDescription() + "should be a JAX-WS configuration, it will be ignored by JAX-RPC builder"); + } + continue; + } String wsdlLocation = webserviceDescription.getWsdlFile().trim(); - String jaxrpcMappingFile = webserviceDescription.getJaxrpcMappingFile() == null ? "" : webserviceDescription.getJaxrpcMappingFile().trim(); + String jaxrpcMappingFile = webserviceDescription.getJaxrpcMappingFile().trim(); sharedPortInfo = new SharedPortInfo(wsdlLocation, jaxrpcMappingFile,