svn commit: r1051621 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ tools/common/src/main/java/org/apache/cxf/tools/common/

[sergeyb]

Author: sergeyb
Date: Tue Dec 21 19:24:25 2010
New Revision: 1051621

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

........
  r1051613 | sergeyb | 2010-12-21 19:02:00 +0000 (Tue, 21 Dec 2010) | 1 line
  
  Fixing some tests on Windows
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
    
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
    
cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 21 19:24:25 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613

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

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java?rev=1051621&r1=1051620&r2=1051621&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
 Tue Dec 21 19:24:25 2010
@@ -836,10 +836,11 @@ public class JAXBElementProviderTest ext
     }
     
     @Test
-    public void testSetSchemasFromDisk() {
+    public void testSetSchemasFromDisk() throws Exception {
         JAXBElementProvider provider = new JAXBElementProvider();
         List<String> locations = new ArrayList<String>();
-        String loc = 
getClass().getClassLoader().getResource("test.xsd").getFile();
+        String loc = 
getClass().getClassLoader().getResource("test.xsd").toURI().getPath();
+        
         locations.add(loc);
         provider.setSchemas(locations);
         Schema s = provider.getSchema();

Modified: 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java?rev=1051621&r1=1051620&r2=1051621&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
 Tue Dec 21 19:24:25 2010
@@ -456,7 +456,8 @@ public class JAXRSMultipartTest extends 
     @Test
     public void testUploadImageFromForm2() throws Exception {
         File file = 
-            new 
File(getClass().getResource("/org/apache/cxf/systest/jaxrs/resources/java.jpg").getFile());
+            new 
File(getClass().getResource("/org/apache/cxf/systest/jaxrs/resources/java.jpg")
+                               .toURI().getPath());
         String address = "http://localhost:"; + PORT + 
"/bookstore/books/formimage2";
         WebClient client = WebClient.create(address);
         HTTPConduit conduit = WebClient.getConfig(client).getHttpConduit();

Modified: 
cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=1051621&r1=1051620&r2=1051621&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
 Tue Dec 21 19:24:25 2010
@@ -121,7 +121,7 @@ public class ProcessorTestBase extends A
     }
 
     protected String getLocation(String wsdlFile) throws URISyntaxException {
-        return getClass().getResource(wsdlFile).toString();
+        return getClass().getResource(wsdlFile).toURI().toString();
     }
 
     protected File getResource(String wsdlFile) throws URISyntaxException {