[jbossws-commits] JBossWS SVN: r1393 - in branches/jbossws-1.0: . src/main/java/org/jboss/ws/binding src/main/java/org/jboss/ws/common src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/integration/jboss src/main/java/org/jboss/ws/jaxrpc src/main/java/org/jboss/ws/metadata src/main/java/org/jboss/ws/metadata/wsdl src/main/java/org/jboss/ws/server src/main/java/org/jboss/ws/soap

Author: thomas.diesler(a)jboss.com Date: 2006-11-05 14:10:40 -0500 (Sun, 05 Nov 2006) New Revision: 1393 Modified: branches/jbossws-1.0/ant.properties.example branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointInvokerJSE.java branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java Log: Fix jbossas testsuite regressions. Message style parameters should not cause a wrapped endpoint to become bare Modified: branches/jbossws-1.0/ant.properties.example =================================================================== --- branches/jbossws-1.0/ant.properties.example 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/ant.properties.example 2006-11-05 19:10:40 UTC (rev 1393) @@ -4,6 +4,7 @@ # Required JBoss Home #jboss.jdk15.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 +#jboss.jdk15.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 # Optional JBoss Home #jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -118,7 +118,7 @@ ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); paramValue = syncEndpointInputParam(paramMetaData, paramValue); - if(opMetaData.isDocumentWrapped() && paramMetaData.isInHeader() == false) + if(opMetaData.isDocumentWrapped() && paramMetaData.isMessageType() == false && paramMetaData.isInHeader() == false) { List<Object> objList = Arrays.asList((Object[])paramValue); objPayload.addAll(objList); @@ -226,7 +226,7 @@ } else if (paramValue instanceof SOAPContentElement) { - // For xsd:anyType we return the SOAPElement + // For type other than xsd:anyType we return the object value if (xmlType.getLocalPart().equals("anyType") == false) { SOAPContentElement soapElement = (SOAPContentElement)paramValue; @@ -329,7 +329,7 @@ Method method = opMetaData.getJavaMethod(); Class[] targetParameterTypes = method.getParameterTypes(); - if (opMetaData.isDocumentWrapped()) + if (opMetaData.isDocumentWrapped() && paramMetaData.isMessageType() == false) { // Unwrap the request parameters if (paramMetaData.isInHeader() == false) Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonClient.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -365,7 +365,7 @@ if (retMetaData != null) { retValue = epInv.getReturnValue(); - if (opMetaData.isDocumentWrapped()) + if (opMetaData.isDocumentWrapped() && retMetaData.isMessageType() == false) retValue = ParameterWrapping.unwrapResponseParameter(opMetaData, retValue); if (JavaUtils.isPrimitive(retMetaData.getJavaType())) Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -23,6 +23,9 @@ //$Id: JSR109MetaDataBuilder.java 740 2006-08-14 08:07:47Z thomas.diesler(a)jboss.com $ +import java.util.ArrayList; +import java.util.List; + import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.wsdl.Message; import javax.wsdl.Part; @@ -435,9 +438,14 @@ throw new WSException("Cannot obtain java type mapping for: " + xmlType); // Check if we need to wrap the parameters - boolean isWrapParameters = (seiMethodMapping != null ? seiMethodMapping.isWrappedElement() : false); - log.trace("isWrapParameters based on wrapped-element: " + isWrapParameters); - if (isWrapParameters == false && seiMethodMapping != null) + boolean isWrappedElement = (seiMethodMapping != null ? seiMethodMapping.isWrappedElement() : false); + log.trace("Method mapping wrapped-element: " + isWrappedElement); + if (isWrappedElement == true) + epMetaData.setParameterStyle(ParameterStyle.WRAPPED); + + boolean isMessageType = false; + boolean isWrappedParameter = isWrappedElement; + if (isWrappedParameter == false && seiMethodMapping != null) { MethodParamPartsMapping[] partsMappings = seiMethodMapping.getMethodParamPartsMappings(); if (partsMappings.length > 0) @@ -446,6 +454,8 @@ for (MethodParamPartsMapping partsMapping : partsMappings) { String paramTypeName = partsMapping.getParamType(); + isMessageType = ParameterMetaData.isMessageType(paramTypeName); + if (paramTypeName.equals(javaTypeName)) { matchingPartFound = true; @@ -474,19 +484,21 @@ } } } - isWrapParameters = (matchingPartFound == false); - log.trace("isWrapParameters based on matching parts: " + isWrapParameters); + isWrappedParameter = (matchingPartFound == false); + log.trace("isWrapParameters based on matching parts: " + isWrappedParameter); } } + + if (isWrappedElement == false && isMessageType == false) + epMetaData.setParameterStyle(isWrappedParameter ? ParameterStyle.WRAPPED : ParameterStyle.BARE); ParameterMetaData inMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); setupAttachmentParameter(opInput, inMetaData); - epMetaData.setParameterStyle(isWrapParameters ? ParameterStyle.WRAPPED : ParameterStyle.BARE); inMetaData.setInHeader(opInput.getProperty(Constants.WSDL_PROPERTY_APPLICATION_DATA) != null); opMetaData.addParameter(inMetaData); - // Set the variable names - if (opMetaData.isDocumentWrapped()) + // Set the wrapped variable names + if (opMetaData.isDocumentWrapped() && inMetaData.isMessageType() == false) { if (seiMethodMapping == null) throw new IllegalArgumentException("Cannot wrap parameters without SEI method mapping"); @@ -547,8 +559,8 @@ setupAttachmentParameter(opOutput, retMetaData); - // Set the variable names - if (opMetaData.getParameterStyle() == ParameterStyle.WRAPPED) + // Set the wrapped variable names + if (opMetaData.isDocumentWrapped() && retMetaData.isMessageType() == false) { if (seiMethodMapping == null) throw new IllegalArgumentException("Cannot wrap parameters without SEI method mapping"); @@ -556,7 +568,7 @@ ServiceEndpointInterfaceMapping seiMapping = seiMethodMapping.getServiceEndpointInterfaceMapping(); JavaWsdlMapping javaWsdlMapping = seiMapping.getJavaWsdlMapping(); JavaXmlTypeMapping javaXmlTypeMapping = javaWsdlMapping.getTypeMappingForQName(xmlType); - if (typeMapping == null) + if (javaXmlTypeMapping == null) throw new WSException("Cannot obtain java/xml type mapping for: " + xmlType); for (VariableMapping varMapping : javaXmlTypeMapping.getVariableMappings()) Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -33,6 +33,7 @@ import org.jboss.ws.common.CommonBinding; import org.jboss.ws.common.CommonBindingProvider; import org.jboss.ws.common.CommonMessageContext; +import org.jboss.ws.jaxrpc.SOAPFaultExceptionHelper; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.HandlerMetaData.HandlerType; @@ -109,10 +110,19 @@ } catch (Exception ex) { - // call the fault handlers - boolean handlersPass = callback.callFaultHandlerChain(HandlerType.POST, ex); - handlersPass = handlersPass && callback.callFaultHandlerChain(HandlerType.ENDPOINT, ex); - + try + { + SOAPMessage faultMessage = SOAPFaultExceptionHelper.exceptionToFaultMessage(ex); + msgContext.setSOAPMessage(faultMessage); + + // call the fault handlers + boolean handlersPass = callback.callFaultHandlerChain(HandlerType.POST, ex); + handlersPass = handlersPass && callback.callFaultHandlerChain(HandlerType.ENDPOINT, ex); + } + catch (Exception subEx) + { + log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx); + } throw ex; } finally Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -236,28 +236,28 @@ /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ public boolean callRequestHandlerChain(HandlerType type) { - if (type != HandlerType.PRE) + if (type == HandlerType.PRE) + return true; + else return handlerDelegate.callRequestHandlerChain(seInfo, type); - else - return true; } /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ public boolean callResponseHandlerChain(HandlerType type) { - if (type != HandlerType.PRE) + if (type == HandlerType.PRE) + return true; + else return handlerDelegate.callResponseHandlerChain(seInfo, type); - else - return true; } /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ public boolean callFaultHandlerChain(HandlerType type, Exception ex) { - if (type != HandlerType.PRE) + if (type == HandlerType.PRE) + return true; + else return handlerDelegate.callFaultHandlerChain(seInfo, type, ex); - else - return true; } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -142,13 +142,20 @@ ParameterMetaData paramMetaData = opMetaData.getReturnParameter(); Class resStructType = paramMetaData.getJavaType(); - + log.debug("matchResponseParameters: " + resStructType.getName()); try { boolean pass = (returnType == void.class); if (pass == false) { + // The return paramter is the wrapper bean + // See: org.jboss.test.webservice.jbws718.JBWS718TestCase + if (JavaUtils.isAssignableFrom(returnType, resStructType)) + pass = true; + } + if (pass == false) + { try { resStructType.getConstructor(new Class[] { returnType }); @@ -189,6 +196,18 @@ List<String> varNames = paramMetaData.getWrappedVariables(); Class reqStructType = paramMetaData.getJavaType(); + // Message types can be wrapped + if (paramMetaData.isMessageType()) + { + if (inParams == null || inParams.length == 0) + return null; + + if (inParams.length > 1) + throw new IllegalStateException("Wrapped message parameter cannot have multiple parts"); + + return inParams[0]; + } + log.debug("wrapRequestParameters: " + reqStructType.getName()); try { @@ -303,6 +322,10 @@ List<String> varNames = paramMetaData.getWrappedVariables(); Class resStructType = paramMetaData.getJavaType(); + // Message types can be wrapped + if (paramMetaData.isMessageType()) + return outParam; + if (outParam != null && outParam.getClass() == resStructType) { log.debug("Response parameter already wrapped" + resStructType.getName()); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -169,9 +169,12 @@ { tmpMethod = method; - if (epMetaData.getServiceMetaData().getUnifiedMetaData().isEagerInitialized()) + UnifiedMetaData wsMetaData = epMetaData.getServiceMetaData().getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized()) { - log.warn("Loading java method after eager initialization"); + if (UnifiedMetaData.isFinalRelease() == false) + log.warn("Loading java method after eager initialization", new IllegalStateException()); + javaMethod = method; } @@ -242,6 +245,10 @@ } } } + + // if (log.isTraceEnabled()) + log.debug("Synchronized java method:\n" + method + "\nwith: " + toString()); + return isJavaMethod; } @@ -550,7 +557,7 @@ { errMsg.append("\n" + method); } - errMsg.append(this.toString()); + errMsg.append("\n" + toString()); throw new IllegalStateException(errMsg.toString()); } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -70,6 +70,13 @@ private boolean soapArrayParam; private QName soapArrayCompType; + private static final List<String> messageTypes = new ArrayList<String>(); + static + { + messageTypes.add("javax.xml.soap.SOAPElement"); + messageTypes.add("org.w3c.dom.Element"); + } + public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, QName xmlType, String javaTypeName) { this.xmlName = xmlName; @@ -122,6 +129,11 @@ public void setJavaTypeName(String typeName) { + // Warn if this is called after eager initialization + UnifiedMetaData wsMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized() && UnifiedMetaData.isFinalRelease() == false) + log.warn("Set java type name after eager initialization", new IllegalStateException()); + javaTypeName = typeName; javaType = null; } @@ -139,9 +151,10 @@ ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); tmpJavaType = JavaUtils.loadJavaType(javaTypeName, loader); - if (opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().isEagerInitialized()) + UnifiedMetaData wsMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData(); + if (wsMetaData.isEagerInitialized()) { - log.warn("Loading java type after eager initialization"); + // This should not happen, see the warning in setJavaTypeName javaType = tmpJavaType; } } @@ -253,6 +266,16 @@ { this.soapArrayCompType = xmlType; } + + public boolean isMessageType() + { + return messageTypes.contains(javaTypeName); + } + + public static boolean isMessageType(String javaTypeName) + { + return messageTypes.contains(javaTypeName); + } /** Converts a proprietary JBossWS attachment xml type to the MIME type that it represents. */ @@ -278,9 +301,11 @@ public void eagerInitialize() { TypesMetaData typesMetaData = getOperationMetaData().getEndpointMetaData().getServiceMetaData().getTypesMetaData(); - if (getOperationMetaData().isDocumentWrapped() && typesMetaData.getTypeMappingByXMLType(xmlType) == null) + if (getOperationMetaData().isDocumentWrapped() && isMessageType() == false) { - ParameterWrapping.generateWrapper(this, true); + TypeMappingMetaData tmMetaData = typesMetaData.getTypeMappingByXMLType(xmlType); + if (tmMetaData == null) + ParameterWrapping.generateWrapper(this, true); } javaType = getJavaType(); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -59,7 +59,7 @@ // The implementation version private static String implementationVersion; // True if this is a final release - private static boolean isDevRelease; + private static boolean isFinalRelease; // Map<String, WSDLDefinitions> the wsdl-file to the wsdl Document // Note the same wsdl can be used in multiple webservice descriptions Map<String, WSDLDefinitions> wsdlMap = new HashMap<String, WSDLDefinitions>(); @@ -186,15 +186,15 @@ if (implementationVersion == null) { implementationVersion = ServiceEndpointManager.class.getPackage().getImplementationVersion(); - isDevRelease = new StringTokenizer(implementationVersion).nextToken().endsWith(".DEV"); + isFinalRelease = new StringTokenizer(implementationVersion).nextToken().endsWith(".GA"); } return implementationVersion; } - public static boolean isDevRelease() + public static boolean isFinalRelease() { getImplementationVersion(); - return isDevRelease; + return isFinalRelease; } public String toString() Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -354,7 +354,7 @@ // <xsd:import namespace="http://org.jboss.webservice/example/types" schemaLocation="Hello.xsd"/> // <xsd:import namespace="http://org.jboss.webservice/example/types/arrays/org/jboss/test/webservice/admindevel" schemaLocation="subdir/HelloArr.xsd"/> // </xsd:schema> - if (targetNS.length() == 0) + if (targetNS == null) { log.trace("Schema element without target namespace in: " + wsdlLoc); } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -49,7 +49,6 @@ import org.jboss.ws.metadata.ServerEndpointMetaData; import org.jboss.ws.metadata.HandlerMetaData.HandlerType; import org.jboss.ws.soap.MessageContextAssociation; -import org.jboss.ws.soap.SOAPBodyImpl; import org.jboss.ws.soap.SOAPMessageImpl; import org.jboss.ws.utils.JavaUtils; @@ -180,9 +179,9 @@ msgContext.setSOAPMessage(faultMessage); // call the handler chain - boolean handlersPass = handlerDelegate.callFaultHandlerChain(seInfo, HandlerType.POST, ex); - handlersPass = handlersPass && handlerDelegate.callFaultHandlerChain(seInfo, HandlerType.ENDPOINT, ex); - handlersPass = handlersPass && handlerDelegate.callFaultHandlerChain(seInfo, HandlerType.PRE, ex); + boolean handlersPass = callFaultHandlerChain(seInfo, HandlerType.POST, ex); + handlersPass = handlersPass && callFaultHandlerChain(seInfo, HandlerType.ENDPOINT, ex); + handlersPass = handlersPass && callFaultHandlerChain(seInfo, HandlerType.PRE, ex); } catch (Exception subEx) { Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointInvokerJSE.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointInvokerJSE.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointInvokerJSE.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -33,10 +33,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.binding.EndpointInvocation; -import org.jboss.ws.common.CommonMessageContext; import org.jboss.ws.jaxrpc.ServletEndpointContextImpl; import org.jboss.ws.metadata.ServerEndpointMetaData; -import org.jboss.ws.soap.MessageContextAssociation; /** * Handles invocations on JSE endpoints. @@ -85,8 +83,6 @@ log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); try { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - Class implClass = seiImpl.getClass(); Method seiMethod = epInv.getJavaMethod(); Method implMethod = getImplMethod(implClass, seiMethod); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-11-05 19:06:05 UTC (rev 1392) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-11-05 19:10:40 UTC (rev 1393) @@ -812,9 +812,8 @@ expandingToDOM = true; // DOM expansion should only happen when a handler accesses the DOM API. - // We do not allow DOM expansion on a dev release. CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - if (msgContext != null && UnifiedMetaData.isDevRelease()) + if (msgContext != null && !UnifiedMetaData.isFinalRelease()) { Boolean allowExpand = (Boolean)msgContext.getProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); if (Boolean.TRUE.equals(allowExpand) == false)