Author: tchemit Date: 2011-01-20 08:24:57 +0100 (Thu, 20 Jan 2011) New Revision: 368 Url: http://nuiton.org/repositories/revision/processor/368 Log: Evolution #1211: Deprecates some classes moved in I18n or m-license-plugin project Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-20 07:24:57 UTC (rev 368) @@ -56,8 +56,10 @@ import java.util.logging.Logger; /** - * + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in I18n project. Will be remove soon. */ +@Deprecated public class I18nExtractor { protected I18nFilter filter = new I18nFilter(); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-20 07:24:57 UTC (rev 368) @@ -35,7 +35,10 @@ * * @author tchemit <chemit@codelutin.com> * @see LicenseFilter + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in maven-license-plugin project. Will be remove soon. */ +@Deprecated public class LicenseProcessor extends Processor { protected LicenseFilter licenseFilter; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2011-01-20 07:24:57 UTC (rev 368) @@ -41,6 +41,11 @@ import java.util.regex.Pattern; +/** + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in I18n project. Will be remove soon. + */ +@Deprecated public class I18nFilter extends DefaultFilter { // I18nFilter private String header = "_\\(\\s*\""; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2011-01-20 07:24:57 UTC (rev 368) @@ -35,7 +35,11 @@ * valide selon le header - footer... * * @author tchemit <chemit@codelutin.com> + * + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in maven-license-plugin project. Will be remove soon. */ +@Deprecated public class LicenseFilter extends DefaultFilter { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-20 07:24:57 UTC (rev 368) @@ -43,7 +43,9 @@ /** * * @author fdesbois + * @deprecated since 1.1, Please do not make a framework from one test... Will be removed soon and not replaced, */ +@Deprecated public abstract class CommonTest { protected static File basedir; Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-20 07:24:57 UTC (rev 368) @@ -43,7 +43,10 @@ * * @author tchemit <chemit@codelutin.com> * @since 1.0.1 + * @deprecated since 1.1, will not be replaced in this project, but you can find + * it in maven-license-plugin project. Will be remove soon. */ +@Deprecated public class LicenseProcessorTest { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2011-01-20 07:24:37 UTC (rev 367) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2011-01-20 07:24:57 UTC (rev 368) @@ -27,24 +27,37 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.util.IOUtil; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.processor.CommonTest; import org.nuiton.processor.Processor; import org.nuiton.processor.ProcessorUtil; +import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; /** @author fdesbois */ -public class StringFilterTest extends CommonTest { +public class StringFilterTest { static private final Log log = LogFactory.getLog(StringFilterTest.class); + protected static File basedir; + protected static File testdir; + @BeforeClass public static void initClass() throws Exception { - CommonTest.initClass(); + basedir = getBasedir(); + testdir = getFile(basedir, "target", "test-classes", "org", "nuiton", + "processor", "result"); + boolean b = testdir.exists() || testdir.mkdirs(); + if (!b) { + throw new IOException("Could not create directory : "+testdir); + } } @Test @@ -83,4 +96,56 @@ String content = readAsString(out, encoding); return content; } + + static public String readAsString(File file, + String encoding) throws IOException { + FileInputStream inf = new FileInputStream(file); + BufferedReader in = + new BufferedReader(new InputStreamReader(inf, encoding)); + try { + return IOUtil.toString(in); + } finally { + in.close(); + } + } + + public static File getFile(File base, String... paths) { + StringBuilder buffer = new StringBuilder(); + for (String path : paths) { + buffer.append(File.separator).append(path); + } + File f = new File(base, buffer.substring(1)); + return f; + } + + public static File getBasedir() { + String basedirPath = System.getProperty("basedir"); + + if (basedirPath == null) { + basedirPath = new File("").getAbsolutePath(); + } + + return new File(basedirPath); + } + + protected void checkPattern(String pattern, + boolean required, + File f, + String encoding) throws IOException { + + if (log.isDebugEnabled()) { + log.debug("check generated file " + f); + } + + Assert.assertTrue("generated file " + f + " was not found...", + f.exists() + ); + + String content = readAsString(f, encoding); + + String errorMessage = required ? "could not find the pattern : " : + "should not have found pattern :"; + Assert.assertEquals(errorMessage + pattern + " in file " + f, + required, content.contains(pattern)); + } }