Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1e11ca832 -> 866935dce


Write out kerberos ports to different files per-test


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/866935dc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/866935dc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/866935dc

Branch: refs/heads/3.0.x-fixes
Commit: 866935dcebda0e462759c2b24f1719b897d17908
Parents: 1e11ca8
Author: Colm O hEigeartaigh <[email protected]>
Authored: Thu Dec 18 11:27:44 2014 +0000
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Thu Dec 18 11:31:52 2014 +0000

----------------------------------------------------------------------
 .../cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 2 +-
 .../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java     | 2 +-
 .../apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/866935dc/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
----------------------------------------------------------------------
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index 0aef664..6ffb9fb 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -119,7 +119,7 @@ public class JAXRSKerberosBookTest extends 
AbstractLdapTestUnit {
             inputStream.close();
             content = content.replaceAll("port", "" + 
super.getKdcServer().getTransports()[0].getPort());
             
-            File f2 = new File(basedir + "/target/test-classes/krb5.conf");
+            File f2 = new File(basedir + 
"/target/test-classes/jaxrs.krb5.conf");
             FileOutputStream outputStream = new FileOutputStream(f2);
             IOUtils.write(content, outputStream, "UTF-8");
             outputStream.close();

http://git-wip-us.apache.org/repos/asf/cxf/blob/866935dc/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
----------------------------------------------------------------------
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index b613270..1373f43 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -132,7 +132,7 @@ public class KerberosTokenTest extends AbstractLdapTestUnit 
{
             inputStream.close();
             content = content.replaceAll("port", "" + 
super.getKdcServer().getTransports()[0].getPort());
             
-            File f2 = new File(basedir + "/target/test-classes/krb5.conf");
+            File f2 = new File(basedir + 
"/target/test-classes/wssec.kerberos.krb5.conf");
             FileOutputStream outputStream = new FileOutputStream(f2);
             IOUtils.write(content, outputStream, "UTF-8");
             outputStream.close();

http://git-wip-us.apache.org/repos/asf/cxf/blob/866935dc/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
----------------------------------------------------------------------
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index df18e8f..684006e 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -125,7 +125,7 @@ public class SpnegoTokenTest extends AbstractLdapTestUnit {
             inputStream.close();
             content = content.replaceAll("port", "" + 
super.getKdcServer().getTransports()[0].getPort());
             
-            File f2 = new File(basedir + "/target/test-classes/krb5.conf");
+            File f2 = new File(basedir + 
"/target/test-classes/wssec.spnego.krb5.conf");
             FileOutputStream outputStream = new FileOutputStream(f2);
             IOUtils.write(content, outputStream, "UTF-8");
             outputStream.close();

Reply via email to