You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/10/21 13:12:56 UTC
svn commit: r1709796 - in /webservices/wss4j/trunk/integration: pom.xml
src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
Author: coheigea
Date: Wed Oct 21 11:12:56 2015
New Revision: 1709796
URL: http://svn.apache.org/viewvc?rev=1709796&view=rev
Log:
Removing commons.io dep where it is no longer required
Modified:
webservices/wss4j/trunk/integration/pom.xml
webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
Modified: webservices/wss4j/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/pom.xml?rev=1709796&r1=1709795&r2=1709796&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/pom.xml (original)
+++ webservices/wss4j/trunk/integration/pom.xml Wed Oct 21 11:12:56 2015
@@ -147,12 +147,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java?rev=1709796&r1=1709795&r2=1709796&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java (original)
+++ webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java Wed Oct 21 11:12:56 2015
@@ -21,9 +21,10 @@ package org.apache.wss4j.integration.tes
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
@@ -43,7 +44,6 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.io.IOUtils;
import org.apache.directory.server.annotations.CreateKdcServer;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
@@ -189,19 +189,14 @@ public class KerberosTest extends Abstra
}
// Read in krb5.conf and substitute in the correct port
- File f = new File(basedir + "/src/test/resources/kerberos/krb5.conf");
- File f2 = new File(basedir + "/target/test-classes/kerberos/krb5.conf");
-
- try (FileInputStream inputStream = new FileInputStream(f);
- FileOutputStream outputStream = new FileOutputStream(f2)) {
- String content = IOUtils.toString(inputStream, "UTF-8");
- inputStream.close();
- content = content.replaceAll("port", "" + super.getKdcServer().getTransports()[0].getPort());
+ Path path = FileSystems.getDefault().getPath(basedir, "/src/test/resources/kerberos/krb5.conf");
+ String content = new String(Files.readAllBytes(path), "UTF-8");
+ content = content.replaceAll("port", "" + super.getKdcServer().getTransports()[0].getPort());
- IOUtils.write(content, outputStream, "UTF-8");
- }
+ Path path2 = FileSystems.getDefault().getPath(basedir, "/target/test-classes/kerberos/krb5.conf");
+ Files.write(path2, content.getBytes());
- System.setProperty("java.security.krb5.conf", f2.getPath());
+ System.setProperty("java.security.krb5.conf", path2.toString());
portUpdated = true;
}