Author: tchemit Date: 2012-06-29 01:39:49 +0200 (Fri, 29 Jun 2012) New Revision: 2350 Url: http://nuiton.org/repositories/revision/jaxx/2350 Log: refs #1645: Updates to nuiton-utils 2.5 Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-06-28 23:39:21 UTC (rev 2349) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-06-28 23:39:49 UTC (rev 2350) @@ -25,8 +25,8 @@ package org.nuiton.jaxx.plugin; +import org.apache.commons.io.FileUtils; import org.nuiton.plugin.VelocityTemplateGenerator; -import org.nuiton.util.FileUtil; import org.nuiton.util.SortedProperties; import java.io.File; @@ -303,7 +303,7 @@ boolean exist = f.exists(); if (exist) { // check if there is a autoremoveLine in content - String content = FileUtil.readAsString(f); + String content = FileUtils.readFileToString( f ); if (!content.contains(AUTOREMOVE_LINE)) { // no regenerate marker detected, so skip this file if (isVerbose()) { @@ -333,7 +333,7 @@ if (file.exists()) { // check the autoremove line presence - String content = FileUtil.readAsString(file); + String content = FileUtils.readFileToString(file); if (!content.contains(AUTOREMOVE_LINE)) { // no regenerate marker detected, so skip this file if (isVerbose()) { Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-06-28 23:39:21 UTC (rev 2349) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-06-28 23:39:49 UTC (rev 2350) @@ -30,9 +30,8 @@ import jaxx.compiler.JAXXEngine; import jaxx.compiler.decorators.DefaultCompiledObjectDecorator; import jaxx.runtime.context.DefaultJAXXContext; -import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.io.FileUtils; import org.nuiton.plugin.AbstractMojoTest; -import org.nuiton.util.FileUtil; import java.io.File; import java.io.IOException; @@ -86,7 +85,7 @@ } assertTrue("generated file " + f + " was not found...", f.exists()); - String content = FileUtil.readAsString(f); + String content = FileUtils.readFileToString( f ); String errorMessage = required ? "could not find the pattern : " : "should not have found pattern :"; assertEquals(errorMessage + pattern + " in file " + f, required, content.contains(pattern));