- Processor-commits - mailman.cloud.codelutin.com

r369 - trunk/nuiton-processor/src/main/java/org/nuiton/processor
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: tchemit Date: 2011-01-20 08:31:34 +0100 (Thu, 20 Jan 2011) New Revision: 369 Url: http://nuiton.org/repositories/revision/processor/369 Log: Evolution #1212: Add usefull methods in ProcessorUtil Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-20 07:24:57 UTC (rev 368) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-20 07:31:34 UTC (rev 369) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.filters.DefaultFilter; import org.nuiton.processor.filters.Filter; import java.io.File; @@ -245,4 +246,106 @@ doProcess(processor, in, out, DEFAULT_ENCODING); } + /** + * To extract all content inside the header and footer. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ + public static class FragmentExtractor extends DefaultFilter { + + /** Logger. */ + static protected final Log log = + LogFactory.getLog(FragmentExtractor.class); + + protected String header; + + protected String footer; + + protected boolean verbose; + + public FragmentExtractor(String header, String footer) { + this.header = header; + this.footer = footer; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + protected String performInFilter(String ch) { + if (verbose || log.isInfoEnabled()) { + log.info("Detected key " + ch); + } + return ch + "\n"; + } + + @Override + protected String performOutFilter(String ch) { + return EMPTY_STRING; + } + + @Override + protected String getHeader() { + return header; + } + + @Override + protected String getFooter() { + return footer; + } + } + + /** + * To remove all content inside the header and footer. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ + public static class FragmentRemover extends DefaultFilter { + + /** Logger. */ + static private final Log log = + LogFactory.getLog(FragmentRemover.class); + + protected String header; + + protected String footer; + + protected boolean verbose; + + public FragmentRemover(String header, String footer) { + this.header = header; + this.footer = footer; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + protected String performInFilter(String ch) { + if (verbose || log.isInfoEnabled()) { + log.info("Will remove " + ch); + } + return EMPTY_STRING; + } + + @Override + protected String performOutFilter(String ch) { + return ch; + } + + @Override + protected String getHeader() { + return header; + } + + @Override + protected String getFooter() { + return footer; + } + } + }

1 0

r368 - in trunk/nuiton-processor/src: main/java/org/nuiton/processor main/java/org/nuiton/processor/filters test/java/org/nuiton/processor test/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

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(a)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(a)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(a)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)); + } }

1 0

r367 - trunk/nuiton-processor/src/main/java/org/nuiton/processor
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: tchemit Date: 2011-01-20 08:24:37 +0100 (Thu, 20 Jan 2011) New Revision: 367 Url: http://nuiton.org/repositories/revision/processor/367 Log: Evolution #1212: Add usefull methods in ProcessorUtil Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-04 17:18:10 UTC (rev 366) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2011-01-20 07:24:37 UTC (rev 367) @@ -33,7 +33,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.OutputStreamWriter; /** @@ -128,6 +130,7 @@ * @since 1.0.3 * @deprecated since 1.0.4, prefer use the {@link #doProcess(Processor, String, String, String)}. */ + @Deprecated public static void doProcess(Processor processor, String in, String out) throws IOException { doProcess(processor, new File(in), new File(out), DEFAULT_ENCODING); @@ -167,8 +170,65 @@ } } + /** + * Launch the process of the given {@code processor} to the given streams. + * + * @param processor the processor to launch + * @param in the input file + * @param out the output file + * @param encoding encoding to use to read and write files. + * @throws IOException if any problems while processing file + * @since 1.1 + */ + public static void doProcess(Processor processor, + InputStream in, + OutputStream out, + String encoding) throws IOException { + InputStreamReader input = new InputStreamReader(in, encoding); + try { + OutputStreamWriter output = new OutputStreamWriter(out, encoding); + try { + processor.process(input, output); + } catch (IOException eee) { + if (log.isErrorEnabled()) { + log.error( + "Error while processing file " + in + " to " + out + + " with processor " + processor, eee); + } + throw eee; + } finally { + output.close(); + } + } finally { + input.close(); + } + } /** + * Launch the process of the given {@code processor} to the given readers. + * + * @param processor the processor to launch + * @param in the input file + * @param out the output file + * @throws IOException if any problems while processing file + * @since 1.1 + */ + public static void doProcess(Processor processor, + InputStreamReader in, + OutputStreamWriter out) throws IOException { + try { + processor.process(in, out); + } catch (IOException eee) { + if (log.isErrorEnabled()) { + log.error( + "Error while processing file " + in + " to " + out + + " with processor " + processor, eee); + } + throw eee; + } + } + + /** * Launch the process of the given {@code processor} to the given files using * the system default encoding. *

1 0

r366 - in trunk/nuiton-processor: . src/main/java/org/nuiton/processor src/main/java/org/nuiton/processor/filters
by bpoussin＠users.nuiton.org 04 Jan '11

04 Jan '11

Author: bpoussin Date: 2011-01-04 18:18:10 +0100 (Tue, 04 Jan 2011) New Revision: 366 Url: http://nuiton.org/repositories/revision/processor/366 Log: Evolution #1197: It will be useful, if we can know the current line number in Filter Modified: trunk/nuiton-processor/pom.xml trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/pom.xml 2011-01-04 17:18:10 UTC (rev 366) @@ -90,6 +90,17 @@  <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> <testResources> <testResource> <directory>src/test/resources</directory> Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,10 +37,16 @@ * par : */ package org.nuiton.processor; -import org.nuiton.processor.filters.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.LineNumberReader; +import java.io.Reader; +import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.filters.Filter; +import org.nuiton.processor.filters.NoActionFilter; /** * This class is a generic sources processor given @@ -76,7 +82,7 @@ } protected BufferedReader getReader(Reader externalInput) { - BufferedReader result = new BufferedReader(externalInput); + LineNumberReader result = new LineNumberReader(externalInput); for (Filter anInputFilter : inputFilter) { result = new ProcessorReader(result, anInputFilter); } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,20 +37,20 @@ * par : */ package org.nuiton.processor; -import java.io.BufferedReader; import java.io.IOException; +import java.io.LineNumberReader; import java.io.StringReader; import org.nuiton.processor.filters.Filter; /** - * TODO doc. + * ProcessorReader is used in conjonction with filter to change source data * * @author poussin */ -public class ProcessorReader extends BufferedReader { +public class ProcessorReader extends LineNumberReader { - protected BufferedReader input; + protected LineNumberReader input; protected Filter filter; protected String lineSeparator; @@ -58,17 +58,41 @@ super(new StringReader("")); } - public ProcessorReader(BufferedReader input, Filter filter) { + /** + * Override to send call to input + * @return + */ + @Override + public int getLineNumber() { + return input.getLineNumber(); + } + + /** + * Override to send call to input + */ + @Override + public void setLineNumber(int lineNumber) { + input.setLineNumber(lineNumber); + } + + public ProcessorReader(LineNumberReader input, Filter filter) { this(); setInput(input); - this.filter = filter; + setFilter(filter); lineSeparator = System.getProperty("line.separator"); } - public void setInput(BufferedReader input) { + public void setInput(LineNumberReader input) { this.input = input; } + public void setFilter(Filter filter) { + this.filter = filter; + if (filter != null) { + filter.setReader(this); + } + } + @Override public boolean markSupported() { return false; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2011-01-04 17:18:10 UTC (rev 366) @@ -35,13 +35,15 @@ * Mise a jour: $Date$ par : */ package org.nuiton.processor.filters; +import java.io.LineNumberReader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * A common astract filter. + * A common astract filter. This classe offer getLineNumber method to know + * line number currently read from source reader. * - * Implements the methods : + * You must implements the methods : * <ul> * <li>{@link #getHeader()}</li> * <li>{@link #getFooter()}</li> @@ -58,6 +60,8 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(DefaultFilter.class); + protected LineNumberReader reader = null; + /** * le buffer interne pour conserve ce qui n'a pas encore été écrit */ @@ -102,6 +106,23 @@ abstract protected String getFooter(); @Override + public void setReader(LineNumberReader reader) { + this.reader = reader; + } + + /** + * Return line currently read in source reader + * @return line number or -1 if no reader available + */ + public int getLineNumber() { + int result = -1; + if (reader != null) { + result = reader.getLineNumber(); + } + return result; + } + + @Override public String parse(String input) { int matchingIndex; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,8 +37,11 @@ * par : */ package org.nuiton.processor.filters; +import java.io.LineNumberReader; + /** - * TODO doc + * Filter use to change data in reader. Filter instance must be used in only + * one ProcessorReader in same time * * @author poussin */ @@ -47,6 +50,12 @@ String EMPTY_STRING = ""; /** + * set reader used with this filter + * @param reader + */ + void setReader(LineNumberReader reader); + + /** * * @param input la chaine de caractère à processer * @return la chaine processée Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2010-11-21 14:30:50 UTC (rev 365) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2011-01-04 17:18:10 UTC (rev 366) @@ -37,6 +37,8 @@ * par : */ package org.nuiton.processor.filters; +import java.io.LineNumberReader; + /** * This filter does nothing on input. * @@ -44,6 +46,10 @@ public class NoActionFilter implements Filter { @Override + public void setReader(LineNumberReader reader) { + } + + @Override public String parse(String input) { return input; }

1 0

r365 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:30:50 +0100 (Sun, 21 Nov 2010) New Revision: 365 Url: http://nuiton.org/repositories/revision/processor/365 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 11:32:43 UTC (rev 364) +++ trunk/pom.xml 2010-11-21 14:30:50 UTC (rev 365) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <artifactId>processor</artifactId>

1 0

r364 - in trunk: . ant-processor-task/src/license maven-processor-plugin/src/license
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 12:32:43 +0100 (Fri, 19 Nov 2010) New Revision: 364 Url: http://nuiton.org/repositories/revision/processor/364 Log: regenerate thrid-party with m-license-p 3.0 + reuse ibraries version from mavenpom Modified: trunk/ant-processor-task/src/license/THIRD-PARTY.properties trunk/maven-processor-plugin/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/ant-processor-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-processor-task/src/license/THIRD-PARTY.properties 2010-11-11 17:08:46 UTC (rev 363) +++ trunk/ant-processor-task/src/license/THIRD-PARTY.properties 2010-11-19 11:32:43 UTC (rev 364) @@ -9,6 +9,6 @@ # Please fill the missing licenses for dependencies : # # -#Thu Nov 11 16:02:21 CET 2010 -org.apache.ant--ant--1.8.0=The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.8.0=The Apache Software License, Version 2.0 +#Fri Nov 19 12:31:48 CET 2010 +org.apache.ant--ant--1.8.0--jar=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0--jar=The Apache Software License, Version 2.0 Modified: trunk/maven-processor-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-processor-plugin/src/license/THIRD-PARTY.properties 2010-11-11 17:08:46 UTC (rev 363) +++ trunk/maven-processor-plugin/src/license/THIRD-PARTY.properties 2010-11-19 11:32:43 UTC (rev 364) @@ -1,14 +1,16 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 # - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:54:47 CEST 2010 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +#Fri Nov 19 12:31:40 CET 2010 +classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 17:08:46 UTC (rev 363) +++ trunk/pom.xml 2010-11-19 11:32:43 UTC (rev 364) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <artifactId>processor</artifactId> @@ -49,12 +49,6 @@ <dependencies> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helperPluginVersion}</version> @@ -137,7 +131,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.8.0</version> + <version>${antVersion}</version> <scope>compile</scope> </dependency> @@ -218,13 +212,6 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.2</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${mavenVersion}</version> @@ -238,12 +225,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - </dependencies> </dependencyManagement> @@ -264,12 +245,6 @@ <properties>  <projectId>processor</projectId> - -  - <helperPluginVersion>1.2.9</helperPluginVersion> - -  - <mavenVersion>2.2.1</mavenVersion> </properties>

1 0

r363 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 18:08:46 +0100 (Thu, 11 Nov 2010) New Revision: 363 Url: http://nuiton.org/repositories/revision/processor/363 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/ant-processor-task/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/maven-processor-plugin/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/nuiton-processor/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 17:08:45 UTC (rev 362) +++ trunk/pom.xml 2010-11-11 17:08:46 UTC (rev 363) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.0.4</version> + <version>1.1-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -280,11 +280,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4 + scm:svn:http://svn.nuiton.org/svn/processor/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.0.4</url> + <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> <build>

1 0

r362 - tags
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 18:08:45 +0100 (Thu, 11 Nov 2010) New Revision: 362 Url: http://nuiton.org/repositories/revision/processor/362 Log: [maven-release-plugin] copy for tag processor-1.0.4 Added: tags/processor-1.0.4/

1 0

r361 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 18:08:42 +0100 (Thu, 11 Nov 2010) New Revision: 361 Url: http://nuiton.org/repositories/revision/processor/361 Log: [maven-release-plugin] prepare release processor-1.0.4 Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/ant-processor-task/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -24,16 +24,14 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/maven-processor-plugin/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/nuiton-processor/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 16:48:24 UTC (rev 360) +++ trunk/pom.xml 2010-11-11 17:08:42 UTC (rev 361) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4</version> <modules> <module>nuiton-processor</module> @@ -282,11 +280,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk + scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.0.4 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.0.4</url> </scm> <build>

1 0

r360 - trunk
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 17:48:24 +0100 (Thu, 11 Nov 2010) New Revision: 360 Url: http://nuiton.org/repositories/revision/processor/360 Log: use m-helper-plugin stable version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 15:40:20 UTC (rev 359) +++ trunk/pom.xml 2010-11-11 16:48:24 UTC (rev 360) @@ -268,7 +268,7 @@ <projectId>processor</projectId>  - <helperPluginVersion>1.2.9-SNAPSHOT</helperPluginVersion> + <helperPluginVersion>1.2.9</helperPluginVersion>  <mavenVersion>2.2.1</mavenVersion>

1 0