Author: heiko.braun(a)jboss.com Date: 2007-03-30 12:46:50 -0400 (Fri, 30 Mar 2007) New Revision: 2731 Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java Log: Fix DD overrides (webservices12) Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-03-30 13:23:09 UTC (rev 2730) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-03-30 16:46:50 UTC (rev 2731) @@ -32,6 +32,9 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.SessionContainer; +import org.jboss.ejb3.metamodel.EnterpriseBean; +import org.jboss.ejb3.metamodel.SessionEnterpriseBean; +import org.jboss.ejb3.metamodel.Ejb3PortComponent; import org.jboss.ejb3.mdb.MessagingContainer; import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; @@ -93,6 +96,28 @@ { ubmd.setEjbName(container.getEjbName()); ubmd.setEjbClass(container.getBeanClassName()); + + EnterpriseBean dd = container.getXml(); + if(dd!=null && (dd instanceof SessionEnterpriseBean)) + { + SessionEnterpriseBean sessionDD = (SessionEnterpriseBean)dd; + + // TODO: How do we deal with this? + if(sessionDD.getPortComponents().size()>1) + throw new IllegalArgumentException("TODO: Cannot handle more than one port-component per bean"); + + for(Ejb3PortComponent portComp : sessionDD.getPortComponents()) + { + UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData(); + ejbPortComp.setPortComponentName(portComp.getPortComponentName()); + ejbPortComp.setPortComponentURI(portComp.getPortComponentURI()); + ejbPortComp.setAuthMethod(portComp.getAuthMethod()); + ejbPortComp.setTransportGuarantee(portComp.getTransportGuarantee()); + ejbPortComp.setSecureWSDLAccess(portComp.getSecureWSDLAccess()); + + ubmd.setPortComponent(ejbPortComp); + } + } } return ubmd; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-03-30 13:23:09 UTC (rev 2730) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-03-30 16:46:50 UTC (rev 2731) @@ -103,7 +103,10 @@ } else if (localName.equals("service-qname")) { - ref.setServiceQName(QName.valueOf(value)); + if(value.indexOf("{") != -1) + ref.setServiceQName(QName.valueOf(value)); + else + ref.setServiceQName(navigator.resolveQName(value)); } /* JBoss properties */ Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-30 13:23:09 UTC (rev 2730) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-30 16:46:50 UTC (rev 2731) @@ -203,6 +203,10 @@ { epMetaData.getProperties().put(stubProp.getPropName(), stubProp.getPropValue()); } + + // process port-component-uri + + } } 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-03-30 13:23:09 UTC (rev 2730) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-03-30 16:46:50 UTC (rev 2731) @@ -84,7 +84,7 @@ 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; + QName portName = portNameString!=null ? QName.valueOf(portNameString) : null; // TODO: unifiy QName parsing UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName); /*if (pcref == null)