cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1055606 - in /cxf/branches/2.3.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
Date Wed, 05 Jan 2011 19:48:21 GMT
Author: sergeyb
Date: Wed Jan  5 19:48:20 2011
New Revision: 1055606

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

........
  r1055582 | sergeyb | 2011-01-05 19:01:20 +0000 (Wed, 05 Jan 2011) | 1 line
  
  Attempting to fix a test 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/BookLoginModule.java
    cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java

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

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/BookLoginModule.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java?rev=1055606&r1=1055605&r2=1055606&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java
(original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookLoginModule.java
Wed Jan  5 19:48:20 2011
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.systest.jaxrs.security;
 
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,8 +36,13 @@ public class BookLoginModule implements 
     
     public BookLoginModule() {
         module = new PropertyFileLoginModule();
-        fileResource = getClass()
-            .getResource("/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties").getFile();
+        try {
+            fileResource = getClass()
+                .getResource("/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties")
+                .toURI().getPath();
+        } catch (URISyntaxException ex) {
+            throw new RuntimeException(ex);
+        }
     }
     
     public boolean abort() throws LoginException {

Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java?rev=1055606&r1=1055605&r2=1055606&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
(original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
Wed Jan  5 19:48:20 2011
@@ -35,7 +35,7 @@ public class JAXRSJaasSecurityTest exten
     @BeforeClass
     public static void startServers() throws Exception {
         String jaasConfig = JAXRSJaasSecurityTest.class
-            .getResource("/org/apache/cxf/systest/jaxrs/security/jaas.cfg").getFile();
+            .getResource("/org/apache/cxf/systest/jaxrs/security/jaas.cfg").toURI().getPath();
         assertTrue("server did not launch correctly", 
                    launchServer(BookServerJaasSecurity.class,
                                 Collections.singletonMap("java.security.auth.login.config",




Mime
View raw message