Author: thomas.diesler(a)jboss.com Date: 2006-10-16 09:15:18 -0400 (Mon, 16 Oct 2006) New Revision: 1226 Modified: trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml Log: Update to beans-deployer_2_0.xsd Prevent NPE on on fault with no xmlType Modified: trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-16 13:15:18 UTC (rev 1226) @@ -60,6 +60,7 @@ import org.jboss.ws.metadata.FaultMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ServerEndpointMetaData; +import org.jboss.ws.metadata.TypeMappingMetaData; import org.jboss.ws.metadata.TypesMetaData; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; @@ -253,8 +254,15 @@ QName xmlType = wsdlFault.getXmlType(); String javaTypeName = null; - if (typesMetaData.getTypeMappingByXMLType(xmlType) != null) - javaTypeName = typesMetaData.getTypeMappingByXMLType(xmlType).getJavaTypeName(); + if (xmlType == null) + { + log.warn("Cannot obtain fault type for element: " + xmlName); + xmlType = xmlName; + } + + TypeMappingMetaData tmMetaData = typesMetaData.getTypeMappingByXMLType(xmlType); + if (tmMetaData != null) + javaTypeName = tmMetaData.getJavaTypeName(); if (javaTypeName == null) { Modified: trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-10-16 10:40:10 UTC (rev 1225) +++ trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-10-16 13:15:18 UTC (rev 1226) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"> + xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> <bean name="ServiceEndpointManager" class="org.jboss.ws.server.ServiceEndpointManager"> <!--