You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2016/03/08 08:38:39 UTC
svn commit: r1734027 - in /directory/studio/trunk: ./ eclipse-trgt-platform/
eclipse-trgt-platform/template/ features/rcp.feature/ plugins/ldapservers/
plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/
tests/test.integration.co...
Author: seelmann
Date: Tue Mar 8 07:38:39 2016
New Revision: 1734027
URL: http://svn.apache.org/viewvc?rev=1734027&view=rev
Log:
Remove commons.io dependency
Modified:
directory/studio/trunk/eclipse-trgt-platform/pom-first.xml
directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
directory/studio/trunk/features/rcp.feature/feature.xml
directory/studio/trunk/plugins/ldapservers/pom-first.xml
directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java
directory/studio/trunk/pom.xml
directory/studio/trunk/tests/test.integration.core/pom-first.xml
directory/studio/trunk/tests/test.integration.ui/pom-first.xml
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/PreferencesTest.java
Modified: directory/studio/trunk/eclipse-trgt-platform/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/eclipse-trgt-platform/pom-first.xml?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/eclipse-trgt-platform/pom-first.xml (original)
+++ directory/studio/trunk/eclipse-trgt-platform/pom-first.xml Tue Mar 8 07:38:39 2016
@@ -57,12 +57,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${org.apache.commons.io.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${org.apache.commons.lang.version}</version>
Modified: directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
URL: http://svn.apache.org/viewvc/directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template (original)
+++ directory/studio/trunk/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template Tue Mar 8 07:38:39 2016
@@ -19,7 +19,7 @@
@author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
-->
<?pde version="3.8"?>
-<target name="Apache Directory Studio Platform" sequenceNumber="246">
+<target name="Apache Directory Studio Platform" sequenceNumber="253">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -32,7 +32,6 @@
<!-- Commons jars -->
<unit id="org.apache.commons.codec" version="${org.apache.commons.codec.bundleversion}"/>
<unit id="org.apache.commons.collections" version="${org.apache.commons.collections.bundleversion}"/>
- <unit id="org.apache.commons.io" version="${org.apache.commons.io.bundleversion}"/>
<unit id="org.apache.commons.lang" version="${org.apache.commons.lang.bundleversion}"/>
<unit id="org.apache.commons.pool" version="${org.apache.commons.pool.bundleversion}"/>
Modified: directory/studio/trunk/features/rcp.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/rcp.feature/feature.xml?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/features/rcp.feature/feature.xml (original)
+++ directory/studio/trunk/features/rcp.feature/feature.xml Tue Mar 8 07:38:39 2016
@@ -225,13 +225,6 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.commons.io"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.commons.lang"
download-size="0"
install-size="0"
Modified: directory/studio/trunk/plugins/ldapservers/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/pom-first.xml?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/pom-first.xml (original)
+++ directory/studio/trunk/plugins/ldapservers/pom-first.xml Tue Mar 8 07:38:39 2016
@@ -54,7 +54,6 @@
<Import-Package>
org.apache.commons.collections.map,
- org.apache.commons.io,
org.apache.mina.util,
org.dom4j,
org.dom4j.io,
@@ -62,6 +61,7 @@
</Import-Package>
<Require-Bundle>
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
org.apache.directory.studio.connection.core,
Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersManager.java Tue Mar 8 07:38:39 2016
@@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.io.FileUtils;
+import org.apache.directory.api.util.FileUtils;
import org.apache.directory.studio.common.ui.CommonUIUtils;
import org.apache.directory.studio.ldapservers.model.LdapServer;
import org.eclipse.core.runtime.IPath;
Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Tue Mar 8 07:38:39 2016
@@ -79,8 +79,6 @@
<org.apache.commons.codec.bundleversion>1.10.0</org.apache.commons.codec.bundleversion>
<org.apache.commons.collections.version>3.2.2</org.apache.commons.collections.version>
<org.apache.commons.collections.bundleversion>3.2.2</org.apache.commons.collections.bundleversion>
- <org.apache.commons.io.version>2.4</org.apache.commons.io.version>
- <org.apache.commons.io.bundleversion>2.4.0</org.apache.commons.io.bundleversion>
<org.apache.commons.lang.version>2.6</org.apache.commons.lang.version>
<org.apache.commons.lang.bundleversion>2.6.0</org.apache.commons.lang.bundleversion>
<org.apache.commons.pool.version>1.6</org.apache.commons.pool.version>
Modified: directory/studio/trunk/tests/test.integration.core/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.core/pom-first.xml?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.core/pom-first.xml (original)
+++ directory/studio/trunk/tests/test.integration.core/pom-first.xml Tue Mar 8 07:38:39 2016
@@ -67,7 +67,6 @@
org.eclipse.ui</Require-Bundle>
<Import-Package>org.apache.commons.lang,
- org.apache.commons.io,
org.apache.commons.codec.digest,
org.apache.http.conn.ssl,
org.dom4j,
Modified: directory/studio/trunk/tests/test.integration.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom-first.xml?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom-first.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom-first.xml Tue Mar 8 07:38:39 2016
@@ -102,7 +102,6 @@
org.eclipse.ui</Require-Bundle>
<Import-Package>org.apache.commons.lang,
- org.apache.commons.io,
org.apache.commons.codec.digest,
org.apache.http.conn.ssl,
org.apache.log4j,
Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java Tue Mar 8 07:38:39 2016
@@ -28,10 +28,11 @@ import static org.junit.Assert.assertTru
import java.io.File;
import java.io.InputStream;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.List;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
+import org.apache.directory.api.util.FileUtils;
+import org.apache.directory.api.util.IOUtils;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
@@ -117,7 +118,7 @@ public class ImportExportTest extends Ab
wizardBot.clickFinishButton();
wizardBot.waitTillExportFinished( file, 200 ); // is actually 217 bytes
- List<String> lines = FileUtils.readLines( new File( file ) );
+ List<String> lines = FileUtils.readLines( new File( file ), StandardCharsets.UTF_8 );
// verify that the first line of exported LDIF is "version: 1"
assertEquals( "LDIF must start with version: 1", lines.get( 0 ), "version: 1" );
// verify that the third line of exported LDIF is the Base64 encoded DN
@@ -170,7 +171,7 @@ public class ImportExportTest extends Ab
wizardBot.waitTillExportFinished( file, 500 ); // is actually 542 bytes
// verify that exported DSML contains the Base64 encoded DN
- String content = FileUtils.readFileToString( new File( file ), "UTF-8" );
+ String content = FileUtils.readFileToString( new File( file ), StandardCharsets.UTF_8 );
assertTrue( "DSML must contain DN with umlaut.",
content.contains( "dn=\"cn=Wolfgang K\u00f6lbel,ou=users,ou=system\"" ) );
@@ -220,7 +221,7 @@ public class ImportExportTest extends Ab
URL url = Platform.getInstanceLocation().getURL();
String file = url.getFile() + "ImportContextEntry.ldif";
String data = "dn:dc=example,dc=com\nobjectClass:top\nobjectClass:domain\ndc:example\n\n";
- FileUtils.writeStringToFile( new File( file ), data );
+ FileUtils.writeStringToFile( new File( file ), data, StandardCharsets.UTF_8, false );
ImportWizardBot importWizardBot = browserViewBot.openImportLdifWizard();
importWizardBot.typeFile( file );
importWizardBot.clickFinishButton();
@@ -244,8 +245,8 @@ public class ImportExportTest extends Ab
URL url = Platform.getInstanceLocation().getURL();
String destFile = url.getFile() + "ImportDontUpdateUiTest.ldif";
InputStream is = getClass().getResourceAsStream( "ImportExportTest_ImportDontUpdateUI.ldif" );
- String ldifContent = IOUtils.toString( is );
- FileUtils.writeStringToFile( new File( destFile ), ldifContent );
+ String ldifContent = IOUtils.toString( is, StandardCharsets.UTF_8 );
+ FileUtils.writeStringToFile( new File( destFile ), ldifContent, StandardCharsets.UTF_8, false );
browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "ou=users" );
browserViewBot.expandEntry( "DIT", "Root DSE", "ou=system", "ou=users" );
@@ -288,7 +289,7 @@ public class ImportExportTest extends Ab
wizardBot.clickFinishButton();
wizardBot.waitTillExportFinished( file, 80 ); // is actually 86 bytes
- List<String> lines = FileUtils.readLines( new File( file ) );
+ List<String> lines = FileUtils.readLines( new File( file ), StandardCharsets.UTF_8 );
// verify that the first line is header
assertEquals( "dn,cn,description", lines.get( 0 ) );
// verify that the second line is actual content and the formula is prefixed with an apostrophe
Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/PreferencesTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/PreferencesTest.java?rev=1734027&r1=1734026&r2=1734027&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/PreferencesTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/PreferencesTest.java Tue Mar 8 07:38:39 2016
@@ -26,9 +26,10 @@ import static org.junit.Assert.assertTru
import java.io.File;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.List;
-import org.apache.commons.io.FileUtils;
+import org.apache.directory.api.util.FileUtils;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.studio.test.integration.ui.bots.CertificateValidationPreferencePageBot;
import org.apache.directory.studio.test.integration.ui.bots.PreferencesBot;
@@ -96,7 +97,7 @@ public class PreferencesTest extends Abs
// click OK, this should write the property to the file
preferencesBot.clickOkButton();
assertTrue( file.exists() );
- List<String> lines = FileUtils.readLines( file );
+ List<String> lines = FileUtils.readLines( file, StandardCharsets.UTF_8 );
assertTrue( lines.contains( "validateCertificates=false" ) );
// open dialog again, check that certificate validation checkbox is not selected