Author: sergeyb
Date: Wed Jan  5 21:34:25 2011
New Revision: 1055651

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

........
  r1055649 | sergeyb | 2011-01-05 21:25:28 +0000 (Wed, 05 Jan 2011) | 1 line
  
  Another update to make tests passing on Windows
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  5 21:34:25 2011
@@ -1 +1 @@
-/cxf/trunk:1055184,1055554,1055566,1055582
+/cxf/trunk:1055184,1055554,1055566,1055582,1055649

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

Modified: 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java?rev=1055651&r1=1055650&r2=1055651&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
 Wed Jan  5 21:34:25 2011
@@ -38,7 +38,7 @@ public class BookServerSimpleSecurity ex
         URL resource = getClass()
             
.getResource("/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties");
         LoginService realm = 
-            new HashLoginService("BookStoreRealm", resource.toString());
+            new HashLoginService("BookStoreRealm", resource.toURI().getPath());
         server.addBean(realm);
     }
     


Reply via email to