svn commit: r595101 - in /incubator/cxf/branches/2.0.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java

[dkulp]

Author: dkulp
Date: Wed Nov 14 14:37:31 2007
New Revision: 595101

URL: http://svn.apache.org/viewvc?rev=595101&view=rev
Log:
Merged revisions 595068 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r595068 | dkulp | 2007-11-14 16:24:38 -0500 (Wed, 14 Nov 2007) | 2 lines
  
  Fix potential test issue that relied on a specific classpath ordering that 
seems to fail in maven 2.0.8-SNAPSHOTS
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?rev=595101&r1=595100&r2=595101&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
 Wed Nov 14 14:37:31 2007
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11;
 
+import java.io.File;
 import java.util.Iterator;
 import java.util.List;
 import javax.wsdl.Definition;
@@ -134,11 +135,13 @@
 
     // tests the error case described in JIRA CXF-556
     @Test
-    public void testCustomizationWhereURINotAnExactStringMatch() {
+    public void testCustomizationWhereURINotAnExactStringMatch() throws 
Exception  {
         // set up a URI with ./../wsdl11/hello_world.wsdl instead of
         // ./hello_world.wsdl
+
         env.put(ToolConstants.CFG_WSDLURL,
-            getClass().getResource(".").toString() + 
"../wsdl11/resources/hello_world.wsdl");
+            new 
File(getClass().getResource("JAXWSDefinitionBuilderTest.class").toURI())
+                .getParentFile().getParent() + 
"/wsdl11/resources/hello_world.wsdl");
         env.put(ToolConstants.CFG_BINDING,
             getClass().getResource("resources/cxf556_binding.xml").toString());