Author: alessio.soldano(a)jboss.com Date: 2010-11-30 10:22:11 -0500 (Tue, 30 Nov 2010) New Revision: 13368 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1090/webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/metadatafixture/webservices.xml Log: [JBWS-3169] Updating native stack to use the new parsing of webservices.xml + fixing 2 testscases to expect jsr 109 v.1.2 namespace Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2010-11-30 15:19:40 UTC (rev 13367) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/WebservicesXMLCreatorImpl.java 2010-11-30 15:22:11 UTC (rev 13368) @@ -38,10 +38,6 @@ import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; -import org.jboss.xb.binding.JBossXBException; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; import org.w3c.dom.Element; /** @@ -132,11 +128,9 @@ InputStream wsXmlStream = new FileInputStream(wsXmlFile); try { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(wsXmlFile.toURL()); - existingWebservices = (WebservicesMetaData)unmarshaller.unmarshal(wsXmlStream, factory, null); + existingWebservices = WebservicesFactory.parse(wsXmlStream, wsXmlFile.toURI().toURL()); } - catch (JBossXBException e) + catch (Exception e) { throw new WSException("Could not unmarshal existing webservices descriptor: " + wsXmlFile, e); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2010-11-30 15:19:40 UTC (rev 13367) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2010-11-30 15:22:11 UTC (rev 13368) @@ -31,9 +31,6 @@ import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; /** * Tets webservice.xml additions that are related to JAX-WS @@ -52,9 +49,7 @@ InputStream is = webservicesURL.openStream(); try { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(webservicesURL); - webservices = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null); + webservices = WebservicesFactory.parse(is, webservicesURL); } finally { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2010-11-30 15:19:40 UTC (rev 13367) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2010-11-30 15:22:11 UTC (rev 13368) @@ -33,9 +33,6 @@ import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.common.DOMUtils; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; import org.w3c.dom.Element; /** @@ -54,9 +51,7 @@ InputStream is = webservicesURL.openStream(); try { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(webservicesURL); - webservices = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null); + webservices = WebservicesFactory.parse(is); } finally { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1090/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1090/webservices.xml 2010-11-30 15:19:40 UTC (rev 13367) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1090/webservices.xml 2010-11-30 15:22:11 UTC (rev 13368) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" +<webservices xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" + version="1.2"> <webservice-description> <webservice-description-name>HelloWsService</webservice-description-name> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/metadatafixture/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/metadatafixture/webservices.xml 2010-11-30 15:19:40 UTC (rev 13367) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/metadatafixture/webservices.xml 2010-11-30 15:22:11 UTC (rev 13368) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <webservices - xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" + version="1.2"> <webservice-description> <webservice-description-name>HelloWsService</webservice-description-name>