[jbossws-commits] JBossWS SVN: r17547 - in stack/native/tags/jbossws-native-3.1.2.SP15: modules/core and 2 other directories.

Author: klape Date: 2013-05-10 17:08:23 -0400 (Fri, 10 May 2013) New Revision: 17547 Modified: stack/native/tags/jbossws-native-3.1.2.SP15/ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/ Log: [JBPAPP-10740] merging fix for customer issue Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15 ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2:17030 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579 /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946 /stack/native/trunk:12502,13992,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2:17030,17321 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579 /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946 /stack/native/trunk:12502,13992,14157,14160,14181,14183,14842 Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2/modules/core:17030 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946 /stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2/modules/core:17030,17321 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946 /stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842 Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-05-10 20:25:52 UTC (rev 17546) +++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-05-10 21:08:23 UTC (rev 17547) @@ -459,13 +459,18 @@ serviceMetaData.setWsdlLocation(wsdlFile.toURL()); } + private File computeTempWsdlFile(ServiceMetaData serviceMetaData, File dir, String wsdlName) throws IOException { File wsdlFile = null; try { - byte[] deploymentName = serviceMetaData.getUnifiedMetaData().getDeploymentName().getBytes("UTF-8"); - String deploymentNameHash = toHexString(MessageDigest.getInstance("MD5").digest(deploymentName)); + //JBPAPP-10625 - Use both namespaceURI and deploymentName to create a unique file name for each endpoint. + String namespaceURI = serviceMetaData.getServiceName().getNamespaceURI(); + String deploymentName = serviceMetaData.getUnifiedMetaData().getDeploymentName(); + byte[] uniqueName = (namespaceURI+deploymentName).getBytes("UTF-8"); + + String deploymentNameHash = toHexString(MessageDigest.getInstance("MD5").digest(uniqueName)); wsdlFile = new File(dir + File.separator + wsdlName + "_" + deploymentNameHash + ".wsdl"); } catch(NoSuchAlgorithmException ex) Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:17030 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946 /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:17030,17321 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946 /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842