August 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7993 - in stack/native: tags and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-08-01 12:43:35 -0400 (Fri, 01 Aug 2008) New Revision: 7993 Added: stack/native/tags/jbossws-native-2.0.1.SP2_CP03/ Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/ Log: [JBPAPP-1043] Release and upgrade to JBossWS 2.0.1.SP2_CP03. Copied: stack/native/tags/jbossws-native-2.0.1.SP2_CP03 (from rev 7992, stack/native/branches/jbossws-native-2.0.1.SP2_CP03)

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7992 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: metadata/umdm and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-08-01 12:31:13 -0400 (Fri, 01 Aug 2008) New Revision: 7992 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/Constants.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: [JBWS-2207] Adding option for eagerly initialize the JAXBContext cache Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/Constants.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/Constants.java 2008-08-01 16:29:11 UTC (rev 7991) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/Constants.java 2008-08-01 16:31:13 UTC (rev 7992) @@ -323,4 +323,6 @@ static final String WSDL20_PATTERN_OUT_OPT_IN = "http://www.w3.org/2004/08/wsdl/out-opt-in"; static final String ASYNC_METHOD_SUFFIX = "Async"; + + static final String EAGER_INITIALIZE_JAXB_CONTEXT_CACHE = "org.jboss.ws.eagerInitializeJAXBContextCache"; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-08-01 16:29:11 UTC (rev 7991) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-08-01 16:31:13 UTC (rev 7992) @@ -37,6 +37,7 @@ import java.util.Set; import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.bind.JAXBContext; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.ws.WebServiceFeature; @@ -540,6 +541,7 @@ eagerInitializeOperations(); eagerInitializeTypes(); eagerInitializeAccessors(); + eagerInitializeJAXBContextCache(); } private void eagerInitializeOperations() @@ -673,7 +675,32 @@ if (retParam != null) createAccessor(retParam, jaxbCtx); } + } + + private void eagerInitializeJAXBContextCache() + { + //initialize jaxb context cache + if ("true".equalsIgnoreCase(System.getProperty(Constants.EAGER_INITIALIZE_JAXB_CONTEXT_CACHE))) + { + log.debug("Initializing JAXBContext cache..."); + BindingCustomization bindingCustomization = null; + if(this instanceof ServerEndpointMetaData) + { + bindingCustomization = ((ServerEndpointMetaData)this).getEndpoint().getAttachment(BindingCustomization.class); + } + try + { + Class[] classes = getRegisteredTypes().toArray(new Class[0]); + JAXBContext context = JAXBContextFactory.newInstance().createContext(classes, bindingCustomization); + jaxbCache.add(classes, context); + } + catch (Exception e) + { + //ignore + } + } + } private void createAccessor(ParameterMetaData paramMetaData, JAXBRIContext jaxbCtx) {

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7991 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: soap and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-08-01 12:29:11 -0400 (Fri, 01 Aug 2008) New Revision: 7991 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java Log: [JBWS-2270] Re-use JAXBContext whenever possible Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2008-08-01 16:22:44 UTC (rev 7990) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2008-08-01 16:29:11 UTC (rev 7991) @@ -21,18 +21,6 @@ */ package org.jboss.ws.core.jaxws; -import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.TypeMappingImpl; -import org.jboss.ws.core.binding.ComplexTypeDeserializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.binding.BindingCustomization; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Unmarshaller; @@ -40,6 +28,14 @@ import javax.xml.transform.Source; import javax.xml.ws.WebServiceException; +import org.jboss.logging.Logger; +import org.jboss.ws.core.binding.BindingException; +import org.jboss.ws.core.binding.ComplexTypeDeserializer; +import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.ws.core.binding.TypeMappingImpl; +import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; +import org.jboss.wsf.spi.binding.BindingCustomization; + /** * A Deserializer that can handle complex types by delegating to JAXB. * Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2008-08-01 16:22:44 UTC (rev 7990) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2008-08-01 16:29:11 UTC (rev 7991) @@ -21,14 +21,8 @@ */ package org.jboss.ws.core.jaxws; -import org.jboss.logging.Logger; -import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.ComplexTypeSerializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.binding.BufferedStreamResult; -import org.jboss.wsf.spi.binding.BindingCustomization; -import org.w3c.dom.NamedNodeMap; +import java.util.Arrays; +import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; @@ -38,6 +32,15 @@ import javax.xml.transform.Result; import javax.xml.ws.WebServiceException; +import org.jboss.logging.Logger; +import org.jboss.ws.core.binding.BindingException; +import org.jboss.ws.core.binding.BufferedStreamResult; +import org.jboss.ws.core.binding.ComplexTypeSerializer; +import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; +import org.jboss.wsf.spi.binding.BindingCustomization; +import org.w3c.dom.NamedNodeMap; + /** * A Serializer that can handle complex types by delegating to JAXB. * @@ -61,11 +64,9 @@ Result result = null; try { - // The serialization context contains the base type, which is needed for JAXB to marshall xsi:type correctly. - // This should be more efficient and accurate than searching the type mapping Class expectedType = serContext.getJavaType(); - Class actualType = value.getClass(); - Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; + Class[] types = getClassesForContextCreation(serContext, value); + JAXBContext jaxbContext = getJAXBContext(types); Marshaller marshaller = jaxbContext.createMarshaller(); @@ -87,8 +88,28 @@ return result; } - + /** + * Selects the array of classes to use to create the JAXBContext, as + * using the array of types registered for the current endpoint saves time. + * + * @param serContext + * @param value + * @return + */ + private Class[] getClassesForContextCreation(SerializationContext serContext, Object value) + { + // The serialization context contains the base type, which is needed for JAXB to marshall xsi:type correctly. + // This should be more efficient and accurate than searching the type mapping + Class expectedType = serContext.getJavaType(); + Class actualType = value.getClass(); + Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; + Class[] registeredTypes = (Class[])serContext.getProperty(SerializationContextJAXWS.JAXB_CONTEXT_TYPES); + List<Class> typesList = Arrays.asList(registeredTypes); + return typesList.containsAll(Arrays.asList(types)) ? registeredTypes : types; + } + + /** * Retrieve JAXBContext from cache or create new one and cache it. * @param types * @return JAXBContext Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2008-08-01 16:22:44 UTC (rev 7990) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2008-08-01 16:29:11 UTC (rev 7991) @@ -22,6 +22,7 @@ package org.jboss.ws.core.soap; import java.lang.reflect.Method; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.transform.Result; @@ -36,6 +37,9 @@ import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.NullValueSerializer; +import org.jboss.ws.core.jaxws.SerializationContextJAXWS; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.wsf.common.JavaUtils; /** @@ -139,6 +143,10 @@ SerializationContext serContext = msgContext.getSerializationContext(); serContext.setJavaType(javaType); + ParameterMetaData pmd = container.getParamMetaData(); + OperationMetaData opMetaData = pmd.getOperationMetaData(); + List<Class> registeredTypes = opMetaData.getEndpointMetaData().getRegisteredTypes(); + serContext.setProperty(SerializationContextJAXWS.JAXB_CONTEXT_TYPES, registeredTypes.toArray(new Class[0])); TypeMappingImpl typeMapping = serContext.getTypeMapping(); XMLFragment xmlFragment = null;

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7990 - stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/main/java/org/jboss/ws/core/server.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-08-01 12:22:44 -0400 (Fri, 01 Aug 2008) New Revision: 7990 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java Log: [JBPAPP-1034] Incorrect schema file url for nested wsdls. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-08-01 15:38:35 UTC (rev 7989) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-08-01 16:22:44 UTC (rev 7990) @@ -136,6 +136,8 @@ if (resPath != null && resPath.indexOf("/") > 0) { String resParent = resPath.substring(0, resPath.lastIndexOf("/")); + + // replace parent traversal, results in resParent == null when successfully executed while (orgLocation.startsWith("../") && resParent != null) { if (resParent.indexOf("/") > 0) @@ -151,6 +153,10 @@ resParent = null; } } + + // no parent traversal happend + if(resParent!=null) + newResourcePath = resParent +"/"+ orgLocation; } String reqPath = reqURL.getPath();

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7989 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test: resources/tools/enums and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-08-01 11:38:35 -0400 (Fri, 01 Aug 2008) New Revision: 7989 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService.wsdl Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService14.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService15.wsdl Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java Log: [JBPAPP-960] Fix testcase org.jboss.test.ws.tools.enums.EnumTestCase. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-08-01 15:06:07 UTC (rev 7988) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-08-01 15:38:35 UTC (rev 7989) @@ -48,16 +48,7 @@ String[] args= new String[]{"-dest", "tools/enums", "-config", config}; new WSTools().generate(args); - Element exp; - if (hasJDK15()) - { - exp = DOMUtils.parse(new FileInputStream("resources/tools/enums/EnumService15.wsdl")); - } - else - { - exp = DOMUtils.parse(new FileInputStream("resources/tools/enums/EnumService14.wsdl")); - } - + Element exp = DOMUtils.parse(new FileInputStream("resources/tools/enums/EnumService.wsdl")); Element was = DOMUtils.parse(new FileInputStream("tools/enums/wsdl/EnumService.wsdl")); assertEquals(exp, was); } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService.wsdl (from rev 7937, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/enums/EnumService.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService.wsdl 2008-08-01 15:38:35 UTC (rev 7989) @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='EnumService' targetNamespace='http://org.jboss.ws/enum' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/enum/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/enum' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.ws/enum/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/enum/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <simpleType name='EyeColor'> + <restriction base='string'> + <enumeration value='green'/> + <enumeration value='blue'/> + <enumeration value='hazel'/> + <enumeration value='brown'/> + </restriction> + </simpleType> + <simpleType name='PlanetMass'> + <restriction base='double'> + <enumeration value='3.303E23'/> + <enumeration value='4.869E24'/> + <enumeration value='5.976E24'/> + <enumeration value='6.421E23'/> + <enumeration value='1.9E27'/> + <enumeration value='5.688E26'/> + <enumeration value='8.686E25'/> + <enumeration value='1.0239999999999999E26'/> + <enumeration value='1.2700000000000001E22'/> + </restriction> + </simpleType> + <simpleType name='PlanetRadius'> + <restriction base='decimal'> + <enumeration value='2439700'/> + <enumeration value='6051800'/> + <enumeration value='6378140'/> + <enumeration value='3397200'/> + <enumeration value='71492000'/> + <enumeration value='60268000'/> + <enumeration value='25559000'/> + <enumeration value='24746000'/> + <enumeration value='1137000'/> + </restriction> + </simpleType> + </schema> + </types> + <message name='EnumEndpoint_echoEnum' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='EyeColor_1' type='ns1:EyeColor'/> + </message> + <message name='EnumEndpoint_echoEnumResponse'> + <part name='result' type='ns1:EyeColor'/> + </message> + <message name='EnumEndpoint_echoPlanetMass'> + <part name='PlanetMass_1' type='ns1:PlanetMass'/> + </message> + <message name='EnumEndpoint_echoPlanetMassResponse'> + <part name='result' type='ns1:PlanetMass'/> + </message> + <message name='EnumEndpoint_echoPlanetRadius'> + <part name='PlanetRadius_1' type='ns1:PlanetRadius'/> + </message> + <message name='EnumEndpoint_echoPlanetRadiusResponse'> + <part name='result' type='ns1:PlanetMass'/> + </message> + <portType name='EnumEndpoint'> + <operation name='echoEnum' parameterOrder='EyeColor_1'> + <input message='tns:EnumEndpoint_echoEnum'/> + <output message='tns:EnumEndpoint_echoEnumResponse'/> + </operation> + <operation name='echoPlanetMass' parameterOrder='PlanetMass_1'> + <input message='tns:EnumEndpoint_echoPlanetMass'/> + <output message='tns:EnumEndpoint_echoPlanetMassResponse'/> + </operation> + <operation name='echoPlanetRadius' parameterOrder='PlanetRadius_1'> + <input message='tns:EnumEndpoint_echoPlanetRadius'/> + <output message='tns:EnumEndpoint_echoPlanetRadiusResponse'/> + </operation> + </portType> + <binding name='EnumEndpointBinding' type='tns:EnumEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoEnum'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> + </output> + </operation> + <operation name='echoPlanetMass'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> + </output> + </operation> + <operation name='echoPlanetRadius'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> + </output> + </operation> + </binding> + <service name='EnumService'> + <port binding='tns:EnumEndpointBinding' name='EnumEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService14.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService14.wsdl 2008-08-01 15:06:07 UTC (rev 7988) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService14.wsdl 2008-08-01 15:38:35 UTC (rev 7989) @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='EnumService' targetNamespace='http://org.jboss.ws/enum' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/enum/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/enum' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.ws/enum/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/enum/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <simpleType name='EyeColor'> - <restriction base='string'> - <enumeration value='green'/> - <enumeration value='blue'/> - <enumeration value='hazel'/> - <enumeration value='brown'/> - </restriction> - </simpleType> - <simpleType name='PlanetMass'> - <restriction base='double'> - <enumeration value='3.303E23'/> - <enumeration value='4.869E24'/> - <enumeration value='5.976E24'/> - <enumeration value='6.421E23'/> - <enumeration value='1.9E27'/> - <enumeration value='5.688E26'/> - <enumeration value='8.686E25'/> - <enumeration value='1.0239999999999999E26'/> - <enumeration value='1.2700000000000001E22'/> - </restriction> - </simpleType> - <simpleType name='PlanetRadius'> - <restriction base='decimal'> - <enumeration value='2439700'/> - <enumeration value='6051800'/> - <enumeration value='6378140'/> - <enumeration value='3397200'/> - <enumeration value='71492000'/> - <enumeration value='60268000'/> - <enumeration value='25559000'/> - <enumeration value='24746000'/> - <enumeration value='1137000'/> - </restriction> - </simpleType> - </schema> - </types> - <message name='EnumEndpoint_echoEnum'> - <part name='EyeColor_1' type='ns1:EyeColor'/> - </message> - <message name='EnumEndpoint_echoEnumResponse'> - <part name='result' type='ns1:EyeColor'/> - </message> - <message name='EnumEndpoint_echoPlanetMass'> - <part name='PlanetMass_1' type='ns1:PlanetMass'/> - </message> - <message name='EnumEndpoint_echoPlanetMassResponse'> - <part name='result' type='ns1:PlanetMass'/> - </message> - <message name='EnumEndpoint_echoPlanetRadius'> - <part name='PlanetRadius_1' type='ns1:PlanetRadius'/> - </message> - <message name='EnumEndpoint_echoPlanetRadiusResponse'> - <part name='result' type='ns1:PlanetMass'/> - </message> - <portType name='EnumEndpoint'> - <operation name='echoEnum' parameterOrder='EyeColor_1'> - <input message='tns:EnumEndpoint_echoEnum'/> - <output message='tns:EnumEndpoint_echoEnumResponse'/> - </operation> - <operation name='echoPlanetMass' parameterOrder='PlanetMass_1'> - <input message='tns:EnumEndpoint_echoPlanetMass'/> - <output message='tns:EnumEndpoint_echoPlanetMassResponse'/> - </operation> - <operation name='echoPlanetRadius' parameterOrder='PlanetRadius_1'> - <input message='tns:EnumEndpoint_echoPlanetRadius'/> - <output message='tns:EnumEndpoint_echoPlanetRadiusResponse'/> - </operation> - </portType> - <binding name='EnumEndpointBinding' type='tns:EnumEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoEnum'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </output> - </operation> - <operation name='echoPlanetMass'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </output> - </operation> - <operation name='echoPlanetRadius'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </output> - </operation> - </binding> - <service name='EnumService'> - <port binding='tns:EnumEndpointBinding' name='EnumEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService15.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService15.wsdl 2008-08-01 15:06:07 UTC (rev 7988) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03/src/test/resources/tools/enums/EnumService15.wsdl 2008-08-01 15:38:35 UTC (rev 7989) @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='EnumService' targetNamespace='http://org.jboss.ws/enum' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/enum/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/enum' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.ws/enum/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.ws/enum/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <simpleType name='EyeColor'> - <restriction base='string'> - <enumeration value='green'/> - <enumeration value='blue'/> - <enumeration value='hazel'/> - <enumeration value='brown'/> - </restriction> - </simpleType> - <simpleType name='PlanetMass'> - <restriction base='double'> - <enumeration value='3.303E23'/> - <enumeration value='4.869E24'/> - <enumeration value='5.976E24'/> - <enumeration value='6.421E23'/> - <enumeration value='1.9E27'/> - <enumeration value='5.688E26'/> - <enumeration value='8.686E25'/> - <enumeration value='1.0239999999999999E26'/> - <enumeration value='1.2700000000000001E22'/> - </restriction> - </simpleType> - <simpleType name='PlanetRadius'> - <restriction base='decimal'> - <enumeration value='2.4397E+6'/> - <enumeration value='6.0518E+6'/> - <enumeration value='6.37814E+6'/> - <enumeration value='3.3972E+6'/> - <enumeration value='7.1492E+7'/> - <enumeration value='6.0268E+7'/> - <enumeration value='2.5559E+7'/> - <enumeration value='2.4746E+7'/> - <enumeration value='1.137E+6'/> - </restriction> - </simpleType> - </schema> - </types> - <message name='EnumEndpoint_echoEnum'> - <part name='EyeColor_1' type='ns1:EyeColor'/> - </message> - <message name='EnumEndpoint_echoEnumResponse'> - <part name='result' type='ns1:EyeColor'/> - </message> - <message name='EnumEndpoint_echoPlanetMass'> - <part name='PlanetMass_1' type='ns1:PlanetMass'/> - </message> - <message name='EnumEndpoint_echoPlanetMassResponse'> - <part name='result' type='ns1:PlanetMass'/> - </message> - <message name='EnumEndpoint_echoPlanetRadius'> - <part name='PlanetRadius_1' type='ns1:PlanetRadius'/> - </message> - <message name='EnumEndpoint_echoPlanetRadiusResponse'> - <part name='result' type='ns1:PlanetMass'/> - </message> - <portType name='EnumEndpoint'> - <operation name='echoEnum' parameterOrder='EyeColor_1'> - <input message='tns:EnumEndpoint_echoEnum'/> - <output message='tns:EnumEndpoint_echoEnumResponse'/> - </operation> - <operation name='echoPlanetMass' parameterOrder='PlanetMass_1'> - <input message='tns:EnumEndpoint_echoPlanetMass'/> - <output message='tns:EnumEndpoint_echoPlanetMassResponse'/> - </operation> - <operation name='echoPlanetRadius' parameterOrder='PlanetRadius_1'> - <input message='tns:EnumEndpoint_echoPlanetRadius'/> - <output message='tns:EnumEndpoint_echoPlanetRadiusResponse'/> - </operation> - </portType> - <binding name='EnumEndpointBinding' type='tns:EnumEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoEnum'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </output> - </operation> - <operation name='echoPlanetMass'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </output> - </operation> - <operation name='echoPlanetRadius'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/enum' use='literal'/> - </output> - </operation> - </binding> - <service name='EnumService'> - <port binding='tns:EnumEndpointBinding' name='EnumEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7988 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-08-01 11:06:07 -0400 (Fri, 01 Aug 2008) New Revision: 7988 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java Log: [JBPAPP-1034] Incorrect schema file url for nested wsdls. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-08-01 14:51:14 UTC (rev 7987) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-08-01 15:06:07 UTC (rev 7988) @@ -136,6 +136,8 @@ if (resPath != null && resPath.indexOf("/") > 0) { String resParent = resPath.substring(0, resPath.lastIndexOf("/")); + + // replace parent traversal, results in resParent == null when successfully executed while (orgLocation.startsWith("../") && resParent != null) { if (resParent.indexOf("/") > 0) @@ -151,6 +153,10 @@ resParent = null; } } + + // no parent traversal happend + if(resParent!=null) + newResourcePath = resParent +"/"+ orgLocation; } String reqPath = reqURL.getPath();

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7987 - stack/native/branches/jbossws-native-2.0.1.SP2_CP03.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-08-01 10:51:14 -0400 (Fri, 01 Aug 2008) New Revision: 7987 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/version.properties Log: [JBPAPP-1043] Set release version. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03/version.properties 2008-08-01 14:43:21 UTC (rev 7986) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03/version.properties 2008-08-01 14:51:14 UTC (rev 7987) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.SP2_CP02 -repository.id=2.0.1.SP2_CP02 +version.id=2.0.1.SP2_CP03 +repository.id=2.0.1.SP2_CP03 implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7986 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-08-01 10:43:21 -0400 (Fri, 01 Aug 2008) New Revision: 7986 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03/ Log: [JBPAPP-1043] Release for CP03 Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03 (from rev 7985, stack/native/tags/jbossws-native-2.0.1.SP2_CP02)

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7985 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-08-01 09:04:28 -0400 (Fri, 01 Aug 2008) New Revision: 7985 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java Log: [JBWS-2216] let security constraint defining url pattern /* to match all endpoints Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2008-08-01 06:41:29 UTC (rev 7984) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2008-08-01 13:04:28 UTC (rev 7985) @@ -263,7 +263,7 @@ { for (String currentUrlPattern : currentCollection.getUrlPatterns()) { - if (urlPattern.equals(currentUrlPattern)) + if (urlPattern.equals(currentUrlPattern) || "/*".equals(currentUrlPattern)) { transportGuarantee = currentSecurity.getTransportGuarantee(); }

16 years, 4 months

1
0
0 / 0

JBossWS SVN: r7984 - common/trunk/src/main/java/org/jboss/wsf/common.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-08-01 02:41:29 -0400 (Fri, 01 Aug 2008) New Revision: 7984 Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java Log: remove useless SVN metadata, users will have to use svn info command instead Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2008-07-31 16:08:52 UTC (rev 7983) +++ common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2008-08-01 06:41:29 UTC (rev 7984) @@ -55,8 +55,6 @@ */ package org.jboss.wsf.common; -// $Id$ - import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter;

16 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2008