Author: heiko.braun(a)jboss.com Date: 2007-04-13 07:23:45 -0400 (Fri, 13 Apr 2007) New Revision: 2829 Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java Log: Suppress port-component-ref's without SEI declaration Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-04-13 06:25:37 UTC (rev 2828) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-04-13 11:23:45 UTC (rev 2829) @@ -233,7 +233,7 @@ } catch (Exception ex) { - log.error("Cannot create service", ex); + log.error("Cannot create service", ex); throw ex; } } Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-04-13 06:25:37 UTC (rev 2828) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-04-13 11:23:45 UTC (rev 2829) @@ -23,14 +23,14 @@ // $Id$ -import java.util.Iterator; - -import javax.xml.namespace.QName; - +import org.jboss.logging.Logger; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.xb.QNameBuilder; import org.w3c.dom.Element; +import javax.xml.namespace.QName; +import java.util.Iterator; + /** * The metdata data from service-ref element in web.xml, ejb-jar.xml, and * application-client.xml. @@ -39,6 +39,8 @@ */ public class ServiceRefMetaDataParser { + private static final Logger log = Logger.getLogger(ServiceRefMetaDataParser.class); + public void importStandardXml(Element root, UnifiedServiceRefMetaData sref) { sref.setServiceRefName(getElementContent(root, "service-ref-name")); @@ -84,16 +86,16 @@ Element pcrefElement = (Element)iterator.next(); String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface"); String portNameString = getOptionalElementContent(pcrefElement, "port-qname"); - QName portName = portNameString!=null ? QName.valueOf(portNameString) : null; // TODO: unifiy QName parsing + QName portName = portNameString!=null ? QName.valueOf(portNameString) : null; // TODO: unify QName parsing UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName); - /*if (pcref == null) + if (pcref == null && seiName!=null) { // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml + // if it has at least a SEI declared pcref = new UnifiedPortComponentRefMetaData(sref); - pcref.importStandardXml(pcrefElement); sref.addPortComponentRef(pcref); - } */ + } if(pcref!=null) pcref.importJBossXml(pcrefElement); @@ -110,7 +112,6 @@ } } - public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref) { pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface")); @@ -119,6 +120,9 @@ public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref) { + // update or set SEI. It may be null when no std. DD is used. + pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface")); + // Look for call-property elements Iterator iterator = DOMUtils.getChildElements(root, "call-property"); while (iterator.hasNext()) Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-13 06:25:37 UTC (rev 2828) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-13 11:23:45 UTC (rev 2829) @@ -123,7 +123,11 @@ if (targetPCRef == null) { log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]"); - addPortComponentRef(pcref); + if(seiName!=null) + addPortComponentRef(pcref); + else + log.warn("Ingore port component ref without SEI declaration: " + pcref); + targetPCRef = pcref; }