July 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16514 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-23 09:34:14 -0400 (Mon, 23 Jul 2012) New Revision: 16514 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/ Log: removing Native specific test

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16513 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-23 07:39:22 -0400 (Mon, 23 Jul 2012) New Revision: 16513 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-2397] removing obsolete JBossWS Native specific test Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-23 11:34:46 UTC (rev 16512) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-23 11:39:22 UTC (rev 16513) @@ -635,9 +635,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> @@ -705,9 +702,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude> @@ -765,9 +759,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> @@ -825,9 +816,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16512 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-23 07:34:46 -0400 (Mon, 23 Jul 2012) New Revision: 16512 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1797/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1797/ Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2397] removing obsolete JBossWS Native specific test Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-07-20 18:54:15 UTC (rev 16511) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-07-23 11:34:46 UTC (rev 16512) @@ -402,14 +402,6 @@ </classes> </war> -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1797/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1797/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class" /> - </classes> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1798/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes">

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16511 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-07-20 14:54:15 -0400 (Fri, 20 Jul 2012) New Revision: 16511 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java Log: [JBPAPP-9545] Improve error message for bad class names in @WebService.endpointInterface Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-07-20 17:00:44 UTC (rev 16510) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-07-20 18:54:15 UTC (rev 16511) @@ -293,7 +293,7 @@ } } - private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, String linkName) throws ClassNotFoundException, IOException + private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, String linkName) throws IOException { WebService anWebService = sepClass.getAnnotation(WebService.class); WebServiceProvider anWebServiceProvider = sepClass.getAnnotation(WebServiceProvider.class); @@ -332,7 +332,18 @@ if(null == runtimeClassLoader) throw new IllegalArgumentException("Runtime loader cannot be null"); - seiClass = runtimeClassLoader.loadClass(seiName); + try + { + seiClass = runtimeClassLoader.loadClass(seiName); + } + catch(ClassNotFoundException cnfe) + { + String msg = "Cannot find class \"" + cnfe.getMessage() + "\" specified in @WebService.endpointInterface."; + if(cnfe.getMessage() != null && (!cnfe.getMessage().contains("."))) + msg += " Did you use the fully qualified class name?"; + throw new WSException(msg); + } + WebService seiAnnotation = seiClass.getAnnotation(WebService.class); if (seiAnnotation == null)

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16510 - in stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542: modules/core and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-07-20 13:00:44 -0400 (Fri, 20 Jul 2012) New Revision: 16510 Modified: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/testsuite/native-tests/ Log: [JBPAPP-9542] Change temporary WSDL and XSD file names in JBossWS Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542 ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /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:16504 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /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/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /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:16504 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /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/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-07-20 16:38:34 UTC (rev 16509) +++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-07-20 17:00:44 UTC (rev 16510) @@ -26,6 +26,9 @@ import java.io.PrintStream; import java.io.Writer; import java.net.URL; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.math.BigInteger; import javax.jws.HandlerChain; import javax.jws.WebService; @@ -398,10 +401,11 @@ } } - private void writeWsdl(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, EndpointMetaData epMetaData) throws IOException + private void writeWsdl(final ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, EndpointMetaData epMetaData) throws IOException { // The RI uses upper case, and the TCK expects it, so we just mimic this even though we don't really have to String wsdlName = ToolsUtils.firstLetterUpperCase(serviceMetaData.getServiceName().getLocalPart()); + // Ensure that types are only in the interface qname wsdlDefinitions.getWsdlTypes().setNamespace(epMetaData.getPortTypeName().getNamespaceURI()); @@ -415,8 +419,7 @@ else { dir = IOUtils.createTempDirectory(); - wsdlFile = File.createTempFile(wsdlName, ".wsdl", dir); - wsdlFile.deleteOnExit(); + wsdlFile = computeTempWsdlFile(serviceMetaData, dir, wsdlName); } message(wsdlFile.getName()); @@ -431,8 +434,7 @@ } else { - file = File.createTempFile(suggestedFile, ".wsdl", dir); - file.deleteOnExit(); + file = computeTempWsdlFile(serviceMetaData, dir, suggestedFile); } actualFile = file.getName(); message(actualFile); @@ -446,6 +448,35 @@ 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)); + wsdlFile = new File(dir + File.separator + wsdlName + "_" + deploymentNameHash + ".wsdl"); + } + catch(NoSuchAlgorithmException ex) + { + if(log.isTraceEnabled()) + log.trace("MD5 has of deployment name failed for WSDL file name. Falling back to File.createTempFile()", ex); + else + log.debug("MD5 has of deployment name failed for WSDL file name. Falling back to File.createTempFile()"); + + wsdlFile = File.createTempFile(wsdlName, ".wsdl", dir); + } + + wsdlFile.deleteOnExit(); + return wsdlFile; + } + + private String toHexString(byte[] hash) + { + BigInteger bi = new BigInteger(1, hash); + return String.format("%0" + (hash.length << 1) + "x", bi); + } + private void message(String msg) { if (messageStream != null) Modified: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2012-07-20 16:38:34 UTC (rev 16509) +++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2012-07-20 17:00:44 UTC (rev 16510) @@ -27,6 +27,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.math.BigInteger; import javax.xml.namespace.QName; @@ -508,7 +513,7 @@ /** Get the temp file for a given namespace */ - public static File getSchemaTempFile(String targetNS) throws IOException + public static File getSchemaTempFile(String targetNS, String fileName) throws IOException { if (targetNS.length() == 0) throw new IllegalArgumentException("Invalid null target namespace"); @@ -521,7 +526,8 @@ try { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + File tmpDir = serverConfig.getServerTempDir(); tmpdir = serverConfig.getServerTempDir(); tmpdir = new File(tmpdir.getCanonicalPath() + "/jbossws"); tmpdir.mkdirs(); @@ -537,9 +543,35 @@ fname = fname.replace('?', '_'); fname = fname.replace('#', '_'); - return File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir); + File file = null; + try + { + String fileNameHash = toHexString(MessageDigest.getInstance("MD5").digest(fileName.getBytes("UTF-8"))); + if(tmpdir == null) + { + tmpdir = (File) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() + { + return new File(System.getProperty("java.io.tmpdir")); + } + }); + } + file = new File(tmpdir + File.separator + "JBossWS_" + fname + "_" + fileNameHash + ".xsd"); + } + catch(NoSuchAlgorithmException noAlgEx) + { + file = File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir); + } + + return file; } + private static String toHexString(byte[] hash) + { + BigInteger bi = new BigInteger(1, hash); + return String.format("%0" + (hash.length << 1) + "x", bi); + } + /** * Get the TargetNamespace from the schema model */ Modified: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-07-20 16:38:34 UTC (rev 16509) +++ stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-07-20 17:00:44 UTC (rev 16510) @@ -544,14 +544,14 @@ { log.trace("processSchemaInclude: [targetNS=" + targetNS + ",parentURL=" + wsdlLoc + "]"); - tmpFile = SchemaUtils.getSchemaTempFile(targetNS); + tmpFile = SchemaUtils.getSchemaTempFile(targetNS, getFileName(wsdlLoc)); tempFiles.add(tmpFile); publishedLocations.put(wsdlLoc, tmpFile.toURL()); } else { - tmpFile = SchemaUtils.getSchemaTempFile("no_namespace"); + tmpFile = SchemaUtils.getSchemaTempFile("no_namespace", getFileName(wsdlLoc)); tempFiles.add(tmpFile); publishedLocations.put(wsdlLoc, tmpFile.toURL()); @@ -600,6 +600,22 @@ handleSchemaImports(schemaEl, wsdlLoc); } + private String getFileName(URL url) + { + String query = url.getQuery(); + if(query != null) + { + if(query.contains("=")) + { + return query.split("=")[1]; + } + } + + String exUrl = url.toExternalForm(); + String[] paths = exUrl.split("/"); + return paths[paths.length-1]; + } + private void handleSchemaImports(Element schemaEl, URL parentURL) throws WSDLException, IOException { if (parentURL == null) Property changes on: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/modules/testsuite/native-tests ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /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:16504 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /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

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16509 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2012-07-20 12:38:34 -0400 (Fri, 20 Jul 2012) New Revision: 16509 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3446] Enabling tests Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-20 11:52:03 UTC (rev 16508) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-20 16:38:34 UTC (rev 16509) @@ -753,10 +753,6 @@ <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <excludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> @@ -817,10 +813,6 @@ <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <excludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16508 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-20 07:52:03 -0400 (Fri, 20 Jul 2012) New Revision: 16508 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java Log: fix compilation issues Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2012-07-20 11:51:45 UTC (rev 16507) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2012-07-20 11:52:03 UTC (rev 16508) @@ -542,28 +542,28 @@ fname = fname.replace(':', '_'); fname = fname.replace('?', '_'); fname = fname.replace('#', '_'); - + File file = null; - try + if (fileName != null) { - String fileNameHash = toHexString(MessageDigest.getInstance("MD5").digest(fileName.getBytes("UTF-8"))); - if(tmpdir == null) + try { - tmpdir = (File) AccessController.doPrivileged(new PrivilegedAction() { - public Object run() - { - return new File(System.getProperty("java.io.tmpdir")); - } - }); + String fileNameHash = toHexString(MessageDigest.getInstance("MD5").digest(fileName.getBytes("UTF-8"))); + if(tmpdir == null) + { + tmpdir = (File) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() + { + return new File(System.getProperty("java.io.tmpdir")); + } + }); + } + return new File(tmpdir + File.separator + "JBossWS_" + fname + "_" + fileNameHash + ".xsd"); } - file = new File(tmpdir + File.separator + "JBossWS_" + fname + "_" + fileNameHash + ".xsd"); + catch(NoSuchAlgorithmException ignore) {} } - catch(NoSuchAlgorithmException noAlgEx) - { - file = File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir); - } - return file; + return File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir); } private static String toHexString(byte[] hash) Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java 2012-07-20 11:51:45 UTC (rev 16507) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java 2012-07-20 11:52:03 UTC (rev 16508) @@ -89,7 +89,7 @@ log.trace("serialize:\n" + xsdString); // Write updated xsd file - File xsdFile = SchemaUtils.getSchemaTempFile(ns); + File xsdFile = SchemaUtils.getSchemaTempFile(ns, null); FileWriter writer = new FileWriter(xsdFile); try {

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16507 - stack/native/branches/jbossws-native-3.1.2.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-20 07:51:45 -0400 (Fri, 20 Jul 2012) New Revision: 16507 Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml Log: sync. dependency with EAP 513 Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-07-19 22:27:46 UTC (rev 16506) +++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-07-20 11:51:45 UTC (rev 16507) @@ -74,7 +74,7 @@ <woodstox.version>3.2.9</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xmlsec.version>1.5.1</xmlsec.version> - <xalan.version>2.7.1.patch02</xalan.version> + <xalan.version>2.7.1-patch-05</xalan.version> <xerces.version>2.9.1</xerces.version> </properties>

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16506 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-07-19 18:27:46 -0400 (Thu, 19 Jul 2012) New Revision: 16506 Added: stack/native/branches/jbossws-native-3.1.2.SP11_JBPAPP-9542/ Log: creating one off branch

11 years, 9 months

1
0
0 / 0

JBossWS SVN: r16505 - framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-07-19 12:24:39 -0400 (Thu, 19 Jul 2012) New Revision: 16505 Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java Log: [JBPAPP-8052] WSProviderPlugin.testClassLoader() doesn't work on Mac OS X Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2012-07-19 15:48:22 UTC (rev 16504) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2012-07-19 16:24:39 UTC (rev 16505) @@ -260,17 +260,32 @@ public void testClassLoader() throws Exception { // Work around the sure jre settings - String javaHome = System.getProperty("java.home"); - String jdkHome = javaHome.substring(0, javaHome.indexOf(FS + "jre")); + String javaHome = System.getProperty("java.home"); + boolean isMacOs = System.getProperty("os.name").equals("Mac OS X"); + String targetDir = createResourceFile("").getParent(); - String targetDir = createResourceFile("").getParent(); - URLClassLoader loader = new URLClassLoader( - new URL[] + URL[] urls = null; + if(isMacOs) + { + urls = new URL[] { new URL("file:"+targetDir+FS+"test-libs" + FS + "jaxws-classloading-service.jar"), new URL("file:"+targetDir+FS+"test-libs" + FS + "jaxws-classloading-types.jar"), + }; + } + else + { + String jdkHome = javaHome.substring(0, javaHome.indexOf(FS + "jre")); + urls = new URL[] + { + new URL("file:"+targetDir+FS+"test-libs" + FS + "jaxws-classloading-service.jar"), + new URL("file:"+targetDir+FS+"test-libs" + FS + "jaxws-classloading-types.jar"), new URL("file:"+jdkHome+FS+"lib" + FS + "tools.jar") - }, + }; + } + + URLClassLoader loader = new URLClassLoader( + urls, getArtefactClassLoader() );

11 years, 9 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 July 2012