Author: richard.opalka(a)jboss.com Date: 2010-02-26 09:05:48 -0500 (Fri, 26 Feb 2010) New Revision: 11692 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt stack/native/trunk/pom.xml Log: [JBWS-2917] using patched xalan + dependencies cleanup Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2010-02-26 12:36:15 UTC (rev 11691) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2010-02-26 14:05:48 UTC (rev 11692) @@ -115,10 +115,10 @@ private static void assertNamespaces(final Element e) { String myNamespace = e.lookupNamespaceURI(MY_PREFIX); - assertNotNull("namespace is null for prefix " + MY_PREFIX + ", isn't xalan in endorsed directory?", myNamespace); + assertNotNull("namespace is null for prefix " + MY_PREFIX + ", are you using our patched xalan?", myNamespace); assertEquals("namespace mismatch", myNamespace, MY_NS); String wsamNamespace = e.lookupNamespaceURI(WSAM_PREFIX); - assertNotNull("namespace is null for prefix " + WSAM_PREFIX + ", isn't xalan in endorsed directory?", wsamNamespace); + assertNotNull("namespace is null for prefix " + WSAM_PREFIX + ", are you using our patched xalan?", wsamNamespace); assertEquals("namespace mismatch", wsamNamespace, WSAM_NS); } } Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2010-02-26 12:36:15 UTC (rev 11691) +++ stack/native/trunk/modules/testsuite/pom.xml 2010-02-26 14:05:48 UTC (rev 11692) @@ -41,10 +41,6 @@ <artifactId>jbossws-framework</artifactId> </dependency> <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </dependency> - <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-26 12:36:15 UTC (rev 11691) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-26 14:05:48 UTC (rev 11692) @@ -6,10 +6,3 @@ # [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails org/jboss/test/ws/jaxws/jbws2718/** - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/** -org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2010-02-26 12:36:15 UTC (rev 11691) +++ stack/native/trunk/pom.xml 2010-02-26 14:05:48 UTC (rev 11692) @@ -79,8 +79,7 @@ <wscommons.policy.version>1.0</wscommons.policy.version> <wsdl4j.version>1.6.1</wsdl4j.version> <xmlsec.version>1.4.3</xmlsec.version> - <xalan.version>2.7.0</xalan.version> - <xerces.version>2.8.1</xerces.version> + <xerces.version>2.9.1</xerces.version> </properties> <!-- DependencyManagement --> @@ -404,11 +403,6 @@ <version>${wsdl4j.version}</version> </dependency> <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>${xalan.version}</version> - </dependency> - <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>${xerces.version}</version>