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

r378 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:58:21 +0100 (Thu, 03 Feb 2011) New Revision: 378 Url: http://nuiton.org/repositories/revision/processor/378 Log: [maven-release-plugin] prepare release processor-1.2 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 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/ant-processor-task/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/maven-processor-plugin/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/nuiton-processor/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <modules> <module>nuiton-processor</module> @@ -259,11 +259,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.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk + scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.2</url> </scm> </project>

1 0

r377 - in trunk/nuiton-processor/src: main/java/org/nuiton/processor main/java/org/nuiton/processor/filters test/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:40:42 +0100 (Thu, 03 Feb 2011) New Revision: 377 Url: http://nuiton.org/repositories/revision/processor/377 Log: Evolution #1281: Clean code Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 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/ActiveLogsCodeFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -40,6 +40,7 @@ import org.nuiton.processor.filters.GeneratorTemplatesFilter; +import java.io.Console; import java.io.IOException; public class GeneratorTemplatesProcessor extends Processor { @@ -62,22 +63,11 @@ ProcessorUtil.doProcess(processor, filein, fileout, encoding); } - /** - * @param filein the source file to process - * @param fileout the output file to generate - * @throws IOException if any io problems while processing - * @deprecated since 1.0.4, prefer use {@link #process(String, String, String)}. - */ - @Deprecated - static public void process(String filein, String fileout) throws IOException { - process(filein, fileout, ProcessorUtil.DEFAULT_ENCODING); -// Processor processor = new GeneratorTemplatesProcessor(); -// ProcessorUtil.doProcess(processor, filein, fileout); - } - public static void main(String[] args) throws IOException { + String eol = System.getProperty("line.separator"); + Console console = System.console(); if (args.length < 2) { - System.out.println("Give source and destination file"); + console.printf("Give source and destination file" + eol); System.exit(1); } else { process(args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -42,6 +42,8 @@ import org.nuiton.processor.filters.ActiveLogsCodeFilter; import org.nuiton.processor.filters.RemoveLogsCodeFilter; +import java.io.Console; + /* * This class is a processor for source logs */ @@ -56,18 +58,6 @@ NoLogsCode } -// /** Type of actions */ -// protected static class Action {} -// -// /** Do nothing */ -// public final static Action NoAction = new Action(); -// -// /** Active logs in output. This is the default action */ -// public final static Action Logs = new Action(); -// -// /** Remove logs in output */ -// public final static Action NoLogsCode = new Action(); - public LogsProcessor(Action action) { switch (action) { @@ -84,63 +74,32 @@ setInputFilter(new RemoveLogsCodeFilter()); break; } -// if (NoAction.equals(action)) { -// // No action is the default filter in Processor -// } else if (NoLogsCode.equals(action)) { -// setInputFilter(new RemoveLogsCodeFilter()); -// } else { -// // Go for logs -// setInputFilter(new ActiveLogsCodeFilter()); -// } } public static void main(String[] args) throws Exception { + Console console = System.console(); + String eol = System.getProperty("line.separator"); if (args.length < 2) { - System.out.println("Give source and destination file, then action"); - System.out.println("Action may be remove or active (default is no action)"); + console.printf("Give source and destination file, then action" + eol); + console.printf("Action may be remove or active (default is no action)" + eol); return; -// System.exit(0); } Action action = Action.NoAction; if (args.length > 2) { if (args[2].equals(REMOVE_ACTION)) { action = Action.NoLogsCode; - System.out.println("Removing logs code"); + console.printf("Removing logs code" + eol); } else if (args[2].equals(ACTIVE_ACTION)) { action = Action.Logs; - System.out.println("Setting logs active"); + console.printf("Setting logs active" + eol); } } if (action == Action.NoAction) { - System.out.println("No action taken"); + console.printf("No action taken" + eol); } LogsProcessor processor = new LogsProcessor(action); ProcessorUtil.doProcess(processor, args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); -// if (args.length > 2) { -// if (args[2].equals(REMOVE_ACTION)) { -// processor = new LogsProcessor(Action.NoLogsCode); -// System.out.println("Removing logs code"); -// } else if (args[2].equals(ACTIVE_ACTION)) { -// processor = new LogsProcessor(Action.Logs); -// System.out.println("Setting logs active"); -// } else { -// processor = new LogsProcessor(Action.NoAction); -// System.out.println("No action taken"); -// } -// FileReader input = new FileReader(args[0]); -// FileWriter output = new FileWriter(args[1]); -// try { -// processor.process(input, output); -// } catch (IOException eee) { -// Logger logger = -// Logger.getLogger("org.nuiton.processor.LogsProcessor."); -// logger.severe("Error during log processing: "+eee); -// } finally { -// input.close(); -// output.close(); -// } -// } } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -41,6 +41,7 @@ import org.nuiton.processor.filters.OptimisationFilter; +import java.io.Console; import java.io.IOException; public class OptimisationProcessor extends Processor { // OptimisationProcessor @@ -61,25 +62,20 @@ ProcessorUtil.doProcess(processor, filein, fileout, encoding); } - /** - * @param filein source to process - * @param fileout result to write - * @throws IOException if any io problem while processing - * @deprecated since 1.0.4, prefer use {@link #process(String, String, String)} - */ - @Deprecated - static public void process(String filein, String fileout) throws IOException { - process(filein, fileout, ProcessorUtil.DEFAULT_ENCODING); -// Processor processor = new OptimisationProcessor(); -// ProcessorUtil.doProcess(processor, filein, fileout); - } - public static void main(String[] args) throws IOException { - if (args.length < 2) { - System.out.println("Give source and destination file"); - System.exit(1); - } else { - process(args[0], args[1]); + String eol = System.getProperty("line.separator"); + Console console = System.console(); + int length = args.length; + switch (length) { + case 0: + case 1: + console.printf("Give source and destination file (and optional encoding)" + eol); + break; + case 2: + process(args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); + break; + case 3: + process(args[0], args[1], args[2]); } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -37,21 +37,21 @@ * par : */ package org.nuiton.processor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.filters.Filter; +import org.nuiton.processor.filters.NoActionFilter; + 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 * a reader class name and a writer class name. - * */ public class Processor { @@ -89,10 +89,10 @@ return result; } - /** + /** * Process all available data. * - * @param externalInput the reader + * @param externalInput the reader * @param externalOutput the writer * @throws IOException if any pb */ Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2011-02-03 10:40:42 UTC (rev 377) @@ -37,12 +37,12 @@ * par : */ package org.nuiton.processor; +import org.nuiton.processor.filters.Filter; + import java.io.IOException; import java.io.LineNumberReader; import java.io.StringReader; -import org.nuiton.processor.filters.Filter; - /** * ProcessorReader is used in conjonction with filter to change source data * @@ -51,7 +51,9 @@ public class ProcessorReader extends LineNumberReader { protected LineNumberReader input; + protected Filter filter; + protected String lineSeparator; protected ProcessorReader() { @@ -59,17 +61,16 @@ } /** - * Override to send call to input - * @return + * Override to send call to input. + * + * @return the actual line number. */ @Override public int getLineNumber() { return input.getLineNumber(); } - /** - * Override to send call to input - */ + /** Override to send call to input */ @Override public void setLineNumber(int lineNumber) { input.setLineNumber(lineNumber); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -45,31 +45,33 @@ public class ActiveLogsCodeFilter extends LogsFilter { /** - * methode appele lorsqu'on a la chaine entiere entre le header - * et le footer. - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ + * methode appele lorsqu'on a la chaine entiere entre le header + * et le footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ @Override - protected String performInFilter(String ch){ + protected String performInFilter(String ch) { // Logs must be performed within a try{...}catch{} bloc return - "try {\n" + - ch + - "} catch (Exception logsE) {\n" + - " System.err.println(\"Error in Logging instructions\");\n" + - " logsE.printStackTrace();\n" + - "}"; + "try {\n" + + ch + + "} catch (Exception logsE) {\n" + + " System.err.println(\"Error in Logging instructions\");\n" + + " logsE.printStackTrace();\n" + + "}"; } /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ @Override - protected String performOutFilter(String ch){ + protected String performOutFilter(String ch) { return ch; } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -45,6 +45,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.io.Console; + /* * Classe principale du filtre de génération. Ce filtre recherche tout ce qu'il * y a entre les tag /*{ et }*/ a l'interieur de ces tags un autre filtre @@ -76,8 +78,11 @@ LogFactory.getLog(GeneratorTemplatesFilter.class); protected boolean passEmptyLine; + protected boolean writeParentheses; + protected String writeString; + protected GeneratorTemplatesFilterIn inFilter; public GeneratorTemplatesFilter() { @@ -87,50 +92,51 @@ inFilter = new GeneratorTemplatesFilterIn(this); } - public String getWriteString(){ + public String getWriteString() { return writeString; } /** * methode appele lorsqu'on a la chaine entiere entre le header * et le footer. + * * @param ch la chaine trouve * @return ce qu'il faut ecrire dans le fichier de sortie */ - protected String performInFilter(String ch){ - if(ch.matches("generator option: *passEmptyLine *= *(true|false)")){ + protected String performInFilter(String ch) { + if (ch.matches("generator option: *passEmptyLine *= *(true|false)")) { passEmptyLine = - "true".equalsIgnoreCase(ch.substring(ch.length()-4)); + "true".equalsIgnoreCase(ch.substring(ch.length() - 4)); return EMPTY_STRING; - }else if(ch.matches("generator option: *writeString *= *.*")){ + } else if (ch.matches("generator option: *writeString *= *.*")) { writeString = - ch.replaceAll("generator option: *writeString *= *(.*)", "$1"); + ch.replaceAll("generator option: *writeString *= *(.*)", "$1"); return EMPTY_STRING; - }else if(ch.matches("generator option: *parentheses *= *(true|false)")){ + } else if (ch.matches("generator option: *parentheses *= *(true|false)")) { writeParentheses = - "true".equalsIgnoreCase(ch.substring(ch.length()-4)); + "true".equalsIgnoreCase(ch.substring(ch.length() - 4)); return EMPTY_STRING; - }else{ - if (passEmptyLine && ch.length() > 0){ + } else { + if (passEmptyLine && ch.length() > 0) { // suppression des premieres et dernieres lignes si elles sont vides - String [] all = ch.split("\n"); - if (all.length > 0){ + String[] all = ch.split("\n"); + if (all.length > 0) { // si la derniere ne match que des blancs - if(all[all.length-1].matches("\\s*")){ - int len = ch.length()-all[all.length-1].length()-1; - ch = ch.substring(0, Math.max(len,0)); + if (all[all.length - 1].matches("\\s*")) { + int len = ch.length() - all[all.length - 1].length() - 1; + ch = ch.substring(0, Math.max(len, 0)); } // suppression de la 1er ligne si elle est vide - if(all[0].matches("\\s*")){ - int len = all[0].length()+1; - ch = ch.substring(Math.min(ch.length(),len)); + if (all[0].matches("\\s*")) { + int len = all[0].length() + 1; + ch = ch.substring(Math.min(ch.length(), len)); } } } String resultInFilter = inFilter.parse(ch) + inFilter.flush(); - + String result = getWriteString(); if (writeParentheses) { result += "("; @@ -150,6 +156,7 @@ /** * methode appele lorsqu'on a la chaine entiere a l'exterieur du * header/footer + * * @param ch la chaine trouve * @return ce qu'il faut ecrire dans le fichier de sortie */ @@ -169,12 +176,14 @@ } public static void main(String[] args) { - Filter filter = new GeneratorTemplatesFilter(); - String res = filter.parse(" public void generatePackageStatement(Writer output, ObjectModelClassifier clazz) throws IOException {\n/*{\n package <%=clazz.getPackageName()%>.persistence.jdo; \n}*/ }"); - System.out.println(res); - res = filter.flush(); - System.out.println(res); - } + String eol = System.getProperty("line.separator"); + Console console = System.console(); + Filter filter = new GeneratorTemplatesFilter(); + String res = filter.parse(" public void generatePackageStatement(Writer output, ObjectModelClassifier clazz) throws IOException {\n/*{\n package <%=clazz.getPackageName()%>.persistence.jdo; \n}*/ }"); + console.printf(res + eol); + res = filter.flush(); + console.printf(res + eol); + } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java 2011-02-03 10:40:42 UTC (rev 377) @@ -51,13 +51,13 @@ * ({@link GeneratorTemplatesFilterIn}) est * utilisé pour générer les tags <% %>, <%= %> et *). * <ul> - * <li>/*[ et ]*/ est remplacer par + "..." pour chaque + * <li>/*[ et ]*/ est remplacer par + "..." pour chaque * ligne et les " sont coté</li> - * <li><% %></li> - * <li><%= %></li> - * <li>*) permet de fermer un commentaire sans le fermer réeellement, cela - * permet au éditeur faisant une analyse du code de continuer a fonctionner - * ce tag est remplacé par son equivalent */ après génération.</li> + * <li><% %></li> + * <li><%= %></li> + * <li>*) permet de fermer un commentaire sans le fermer réeellement, cela + * permet au éditeur faisant une analyse du code de continuer a fonctionner + * ce tag est remplacé par son equivalent */ après génération.</li> * </ul> * Vous pouvez modifier le comportement du processor en mettant des options * Une option est incluse dans le tag et est de la forme Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java 2011-02-03 10:40:42 UTC (rev 377) @@ -49,13 +49,14 @@ private static final Log log = LogFactory.getLog(GeneratorTemplatesFilterIn.class); - + GeneratorTemplatesFilter parent; - protected String beginParenthese = ""; - protected String endParenthese = ""; + protected String beginParenthese = EMPTY_STRING; + protected String endParenthese = EMPTY_STRING; + public GeneratorTemplatesFilterIn(GeneratorTemplatesFilter parent) { this.parent = parent; } @@ -64,8 +65,7 @@ * méthode appelée lorsqu'on a la chaîne entière entre le header et le * footer. * - * @param ch - * la chaîne trouvé + * @param ch la chaîne trouvé * @return ce qu'il faut écrire dans le fichier de sortie */ @Override @@ -74,8 +74,8 @@ beginParenthese = "("; endParenthese = ");"; } else { - beginParenthese = ""; - endParenthese = ""; + beginParenthese = EMPTY_STRING; + endParenthese = EMPTY_STRING; } if (ch.startsWith("=")) { return "\"+" + ch.substring(1) + "+\""; @@ -86,6 +86,7 @@ /** * Converti les fin de commentaire *) en fin normal de commentraire + * * @param ch la chaine a convertir * @return la chaine convertie */ @@ -98,8 +99,7 @@ * methode appele lorsqu'on a la chaine entiere a l'exterieur du * header/footer * - * @param ch - * la chaine trouve + * @param ch la chaine trouve * @return ce qu'il faut ecrire dans le fichier de sortie */ @Override @@ -108,13 +108,13 @@ beginParenthese = "("; endParenthese = ");"; } else { - beginParenthese = ""; - endParenthese = ""; + beginParenthese = EMPTY_STRING; + endParenthese = EMPTY_STRING; } String result = convertEndComment(ch).replaceAll("\"", "\\\\\"") .replaceAll("(\r\n|\n|\r)", - "\\\\n\"" + endParenthese + "\n" + - parent.getWriteString() + beginParenthese + "\""); + "\\\\n\"" + endParenthese + "\n" + + parent.getWriteString() + beginParenthese + "\""); // it's important that \r\n is first in regexp. return result; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -44,13 +44,15 @@ */ public abstract class LogsFilter extends DefaultFilter { - private String header = "/*"+"#"; - private String footer = "#"+"*/"; + private String header = "/*" + "#"; - protected String getHeader(){ + private String footer = "#" + "*/"; + + protected String getHeader() { return header; } - protected String getFooter(){ + + protected String getFooter() { return footer; } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -42,36 +42,39 @@ public class OptimisationFilter extends DefaultFilter { // OptimisationFilter public OptimisationFilter() { - } private String header = "/*%"; + private String footer = "%*/"; - protected String getHeader(){ + protected String getHeader() { return header; } - protected String getFooter(){ + + protected String getFooter() { return footer; } /** - * methode appele lorsqu'on a la chaine entiere entre le header - * et le footer. - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performInFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere entre le header + * et le footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performInFilter(String ch) { return ch; } /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performOutFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performOutFilter(String ch) { return EMPTY_STRING; } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -45,22 +45,24 @@ public class RemoveLogsCodeFilter extends LogsFilter { /** - * methode appele lorsqu'on a la chaine entiere entre le header - * et le footer. - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performInFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere entre le header + * et le footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performInFilter(String ch) { return EMPTY_STRING; } /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performOutFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performOutFilter(String ch) { return ch; } 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-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2011-02-03 10:40:42 UTC (rev 377) @@ -47,6 +47,7 @@ static private final Log log = LogFactory.getLog(StringFilterTest.class); protected static File basedir; + protected static File testdir; @BeforeClass @@ -56,7 +57,7 @@ "processor", "result"); boolean b = testdir.exists() || testdir.mkdirs(); if (!b) { - throw new IOException("Could not create directory : "+testdir); + throw new IOException("Could not create directory : " + testdir); } } @@ -77,7 +78,7 @@ checkPattern("+\" int i = 0;\\n\"", true, out, encoding); fileName = "StringFilterTest_1.java2"; resource = getClass().getResource(fileName); - in = new File(resource.toURI()).getAbsolutePath(); + in = new File(resource.toURI()).getAbsolutePath(); out = getFile(testdir, fileName); content = process(processor, in, out, encoding); if (log.isDebugEnabled()) {

1 0

r376 - in trunk: . nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:26:18 +0100 (Thu, 03 Feb 2011) New Revision: 376 Url: http://nuiton.org/repositories/revision/processor/376 Log: remove redundant initializer clean pom Evolution #1280: Stay on jdk 1.5 (some projects need it) Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java trunk/pom.xml 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 2011-01-31 08:11:58 UTC (rev 375) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2011-02-03 10:26:18 UTC (rev 376) @@ -60,7 +60,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(DefaultFilter.class); - protected LineNumberReader reader = null; + protected LineNumberReader reader; /** * le buffer interne pour conserve ce qui n'a pas encore été écrit Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-31 08:11:58 UTC (rev 375) +++ trunk/pom.xml 2011-02-03 10:26:18 UTC (rev 376) @@ -245,6 +245,10 @@ <properties>  <projectId>processor</projectId> + +  + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> </properties> @@ -262,21 +266,4 @@ <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> - <build> - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/THIRD-PARTY.properties</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </project>

1 0

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

31 Jan '11

Author: tchemit Date: 2011-01-31 09:11:58 +0100 (Mon, 31 Jan 2011) New Revision: 375 Url: http://nuiton.org/repositories/revision/processor/375 Log: Evolution #1274: Remove deprecated api Removed: 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 Deleted: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,190 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - - -/* * - * I18nExtractor.java - * - * Created: Aug 16, 2004 - * - * @author Cédric Pineau <pineau(a)codelutin.com> - * @version $Revision$ - * - * Last update : $Date$ - * by : */ - -package org.nuiton.processor; - -import org.nuiton.processor.filters.I18nFilter; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -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(); - - protected Map<String, List<String>> store = - new HashMap<String, List<String>>(); - - /** - * Process input file to target. - * - * @param srcFiles source files - * @param outputFile target file - * @param encoding encoding used to read and write files - * @throws IOException if any io problems - * @since 1.0.4 - */ - public void extract(File[] srcFiles, File outputFile, String encoding) throws IOException { - PrintWriter writer = new PrintWriter( - new BufferedWriter( - new OutputStreamWriter( - new FileOutputStream(outputFile), encoding))); - try { - for (File srcFile : srcFiles) { - processFile(srcFile, encoding); - } - - for (Object o : store.keySet()) { - String i18nString = (String) o; - List<?> locations = store.get(i18nString); - for (Object location1 : locations) { - String location = (String) location1; - writer.println("# " + location); - } - writer.println(i18nString + "="); - } - } finally { - writer.close(); - } - } - - /** - * @param srcFiles source files - * @param outputFile target file - * @throws IOException if any io problems - * @deprecated since 1.0.4, prefer use the {@link #extract(File[], File, String)} - */ - @Deprecated - public void extract(File[] srcFiles, File outputFile) throws IOException { - extract(srcFiles, outputFile, "UTF-8"); -// PrintWriter writer = new PrintWriter( -// new BufferedWriter( -// new OutputStreamWriter( -// new FileOutputStream(outputFile), "UTF-8"))); -// try { -// for (File srcFile : srcFiles) { -// processFile(srcFile); -// } -// -// for (Object o : store.keySet()) { -// String i18nString = (String) o; -// List<?> locations = store.get(i18nString); -// for (Object location1 : locations) { -// String location = (String) location1; -// writer.println("# " + location); -// } -// writer.println(i18nString + "="); -// } -// } finally { -// writer.close(); -// } - } - - protected void processFile(File srcFile, String encoding) throws IOException { - LineNumberReader lnr = new LineNumberReader( - new InputStreamReader(new FileInputStream(srcFile), encoding)); - try { - while (lnr.ready()) { - String line = lnr.readLine(); - int lineNumber = lnr.getLineNumber(); - processLine(line, srcFile, lineNumber); - } - } finally { - lnr.close(); - } - } - - protected void processLine(String line, File srcFile, int lineNumber) { - String i18nStringsSet = filter.parse(line); - if (I18nFilter.EMPTY_STRING.equals(i18nStringsSet)) { - // Found a set of i18n Strings, split it. - String[] i18nStrings = i18nStringsSet.split("="); - for (String i18nString : i18nStrings) { - List<String> locations = store.get(i18nString); - if (locations == null) { - locations = new ArrayList<String>(); - store.put(i18nString, locations); - } - locations.add(srcFile.getPath() + "(" + lineNumber + ")"); - } - } - } - - public static void main(String[] args) { - Logger logger = Logger.getLogger("org.nuiton.processor.I18nExtractor."); - - if (args.length < 2) { - logger.log(Level.SEVERE, - "Please give at least sources and destination file"); - System.exit(0); - } else if (args.length > 2) { - File[] sources = new File[args.length - 1]; - for (int i = 0; i < args.length - 1; i++) { - sources[i] = new File(args[i]); - } - File destination = new File(args[args.length - 1]); - try { - String encoding = ProcessorUtil.DEFAULT_ENCODING; - logger.log(Level.INFO, "Will use system encoding " + encoding); - new I18nExtractor().extract(sources, destination, encoding); - } catch (IOException eee) { - - logger.log(Level.SEVERE, - "Error during i18n extraction : " + eee, eee); - } - } - - } -} Deleted: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,81 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.processor; - -import org.nuiton.processor.filters.LicenseFilter; - -import java.io.File; -import java.io.IOException; - -/** - * This class is a processor of source header. - * - * @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; - - public LicenseProcessor(String header) { - licenseFilter = new LicenseFilter(header); - setInputFilter(licenseFilter); - } - - public LicenseFilter getLicenceFilter() { - return licenseFilter; - } - - /** - * Process input file to target. - * - * @param filein source file - * @param fileout target file - * @param encoding encoding used to read and write files - * @throws IOException if any io problems - * @since 1.0.4 - */ - public void process(File filein, File fileout, String encoding) throws IOException { - ProcessorUtil.doProcess(this, filein, fileout, encoding); - } - - /** - * Process input file to target. - * - * @param filein source file - * @param fileout target file - * @throws IOException if any io problems - * @deprecated since 1.0.4, prefer use the method {@link #process(File, File, String)} - */ - @Deprecated - public void process(File filein, File fileout) throws IOException { - process(filein, fileout, ProcessorUtil.DEFAULT_ENCODING); - } -} - Deleted: 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-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,164 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - - -/******************************************************************************* - * I18nFilter.java - * - * Created: Sun Sep 1 2002 - * - * @author <poussin(a)codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Mise a jour: $Date$ par : */ - -package org.nuiton.processor.filters; - -import java.util.regex.Matcher; -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*\""; - private String footer = "\"\\s*(\$|,|\\+|$)"; - - private Pattern headerPattern = Pattern.compile(getHeader()); - - private Pattern footerPattern = Pattern.compile(getFooter()); - - private Matcher matcher; - - protected void setFooter(String footer) { - this.footer = footer; - } - - protected void setHeader(String header) { - this.header = header; - } - - @Override - protected String getHeader() { - return header; - } - - @Override - protected String getFooter() { - return footer; - } - - @Override - public int getMatchIndexFor(String input, String sequence) { - int index = NOT_FOUND; - - setMatcher(null); - if (sequence.equals(getHeader())) { - setMatcher(getHeaderPattern().matcher(input)); - } else if (sequence.equals(getFooter())){ - setMatcher(getFooterPattern().matcher(input)); - } - if (getMatcher() != null) { - try { - getMatcher().find(); - index = getMatcher().start(); - } catch (RuntimeException e) {} - } - - return index; - } - - @Override - public int getMatchLengthFor(String sequence) { - int length = NOT_FOUND; - - try { - length = getMatcher().end()-getMatcher().start(); - } catch (RuntimeException e) {} - - return length; - } - - /** - * methode appele lorsqu'on a la chaine entiere entre le header et le - * footer. - * - * @param ch - * la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performInFilter(String ch) { - return ch.replaceAll("\"\\s*\\+\\s*\"","") + "="; - } - - @Override - public String performHeaderFooterFilter(String ch) { - return ch.substring(ch.indexOf('"')+1, ch.lastIndexOf('"')); - } - - /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * - * @param ch - * la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performOutFilter(String ch) { - return EMPTY_STRING; - } - - /** - * @return Returns the footerPattern. - */ - protected Pattern getFooterPattern() { - return footerPattern; - } - /** - * @return Returns the headerPattern. - */ - protected Pattern getHeaderPattern() { - return headerPattern; - } - /** - * @return Returns the matcher. - */ - protected Matcher getMatcher() { - return matcher; - } - /** - * @param matcher The matcher to set. - */ - protected void setMatcher(Matcher matcher) { - this.matcher = matcher; - } -} // I18nFilter Deleted: 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-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,131 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.processor.filters; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Un filtre pour remplacer la license d'un fichier source java. - * <p/> - * fixme : il faut ne pas autoriser le process de fichier java qui ne sont pas - * 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(\"...\"); */ - static private final Log log = LogFactory.getLog(LicenseFilter.class); - - public static final String HEADER = "*" + "#" + "#" + "%"; - - public static final String FOOTER = "#" + "#" + "%" + "*"; - - /** - * la licence a insere dans le header du fichier source. Ce header est - * formatte en commentaire (chaque ligne commence par un ' * ', sauf pour - * la premiere et derniere ligne). - */ - protected String licenseHeader; - - /** flag pour indiquer si la licence a ete trouvee entre le header et - * le footer */ - protected boolean touched; - - /** flag pour indiquer si on a rencontree le header du filtre */ - protected boolean detectHeader; - - public LicenseFilter(String licenseHeader) { - this.licenseHeader = " " + licenseHeader + " "; - } - - @Override - protected String performInFilter(String ch) { - if (log.isDebugEnabled()) { - log.debug(ch); - } - if (touched) { - // on autorise pas deux process de la licence dans un fichier java - throw new IllegalStateException("Can only have one license " + - "processor open tag " + HEADER); - } - if (getMatchIndexFor(ch, HEADER) == NOT_FOUND) { - // on est bien dans la license, on peut effectuer le changement - touched = true; - return HEADER + licenseHeader + FOOTER; - } - // ce cas arrive lorsque l'on a parcouru tout le fichier avec detection - // de la balise header mais sans balise footer - // et on arrive dans cette methode dans le flush du filter - return ch; - } - - @Override - protected String performOutFilter(String ch) { - if (log.isDebugEnabled()) { - log.debug(ch); - } - return ch; - } - - @Override - protected String getHeader() { - return HEADER; - } - - @Override - protected String getFooter() { - return FOOTER; - } - - @Override - protected void changeState(State newState) { - super.changeState(newState); - if (newState == State.SEARCH_FOOTER) { - // on a decouvert un header - detectHeader = true; - } - } - - public boolean wasTouched() { - return touched; - } - - public boolean isDetectHeader() { - return detectHeader; - } - - public void reset() { - touched = false; - detectHeader = false; - state = State.SEARCH_HEADER; - } -} Deleted: trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/CommonTest.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,118 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.nuiton.processor; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.plexus.util.IOUtil; -import org.junit.Assert; - -/** - * - * @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; - protected static File testdir; - - static private final Log log = LogFactory.getLog(CommonTest.class); - - //@BeforeClass - public static void initClass() throws Exception { - 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); - } - } - - 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)); - } - - public static 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); - } -} Deleted: trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-27 08:54:00 UTC (rev 374) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2011-01-31 08:11:58 UTC (rev 375) @@ -1,158 +0,0 @@ -/* - * #%L - * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.processor; - - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.plexus.util.IOUtil; -import org.junit.BeforeClass; - -import org.junit.Assert; -import org.junit.Test; - -/** - * - * @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(\"...\"); */ - static private final Log log = LogFactory.getLog(LicenseProcessorTest.class); - static File basedir; - static File testdir; - - public static final String UTF_8 = "utf-8"; - - @BeforeClass - public static void initClass() throws Exception { - 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 - public void testProcessor() throws IOException { - - File in = getFile(basedir, "target", - "test-classes", "org", "nuiton", - "processor", "LicenseProcessorTest.java2"); - File out = getFile(testdir, in.getName()); - LicenseProcessor processor = new LicenseProcessor("my license"); - processor.process(in, out, UTF_8); - String content = readAsString(out, UTF_8); - if (log.isDebugEnabled()) { - log.debug("output : " + out); - log.debug(content); - } - checkPattern("// MUST BE THERE!", true, out); - checkPattern("my license", false, out); - } - - @Test - public void testProcessor2() throws IOException { - - File in = getFile(basedir, "target", "test-classes", "org", "nuiton", - "processor", "LicenseProcessorTest_1.java2"); - File out = new File(testdir, in.getName()); - LicenseProcessor processor = new LicenseProcessor("my license"); - processor.process(in, out,UTF_8); - String content = readAsString(out, UTF_8); - if (log.isDebugEnabled()) { - log.debug("output : " + out); - log.debug(content); - } - checkPattern("// MUST BE THERE!", true, out); - checkPattern("my license", true, out); - } - - protected void checkPattern(String pattern, - boolean required, - File f) 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, UTF_8); - - String errorMessage = required ? - "could not find the pattern : " : - "should not have found pattern :"; - Assert.assertEquals(errorMessage + pattern + " in file " + f, - required, - content.contains(pattern) - ); - } - - 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); - } -}

1 0

r374 - trunk
by tchemit＠users.nuiton.org 27 Jan '11

27 Jan '11

Author: tchemit Date: 2011-01-27 09:54:00 +0100 (Thu, 27 Jan 2011) New Revision: 374 Url: http://nuiton.org/repositories/revision/processor/374 Log: Update mavenpom4redmineAndCentral to 2.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-23 17:31:08 UTC (rev 373) +++ trunk/pom.xml 2011-01-27 08:54:00 UTC (rev 374) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>processor</artifactId>

1 0

r373 - trunk
by tchemit＠users.nuiton.org 23 Jan '11

23 Jan '11

Author: tchemit Date: 2011-01-23 18:31:08 +0100 (Sun, 23 Jan 2011) New Revision: 373 Url: http://nuiton.org/repositories/revision/processor/373 Log: Updates to mavenpom 2.4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-21 10:30:54 UTC (rev 372) +++ trunk/pom.xml 2011-01-23 17:31:08 UTC (rev 373) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <artifactId>processor</artifactId>

1 0

r372 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 21 Jan '11

21 Jan '11

Author: tchemit Date: 2011-01-21 11:30:54 +0100 (Fri, 21 Jan 2011) New Revision: 372 Url: http://nuiton.org/repositories/revision/processor/372 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 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/ant-processor-task/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/maven-processor-plugin/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/nuiton-processor/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-21 10:30:52 UTC (rev 371) +++ trunk/pom.xml 2011-01-21 10:30:54 UTC (rev 372) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> <modules> <module>nuiton-processor</module> @@ -255,11 +255,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.1 + scm:svn:http://svn.nuiton.org/svn/processor/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.1</url> + <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> <build>

1 0

r371 - tags
by tchemit＠users.nuiton.org 21 Jan '11

21 Jan '11

Author: tchemit Date: 2011-01-21 11:30:52 +0100 (Fri, 21 Jan 2011) New Revision: 371 Url: http://nuiton.org/repositories/revision/processor/371 Log: [maven-release-plugin] copy for tag processor-1.1 Added: tags/processor-1.1/

1 0

r370 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 21 Jan '11

21 Jan '11

Author: tchemit Date: 2011-01-21 11:30:50 +0100 (Fri, 21 Jan 2011) New Revision: 370 Url: http://nuiton.org/repositories/revision/processor/370 Log: [maven-release-plugin] prepare release processor-1.1 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 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/ant-processor-task/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/maven-processor-plugin/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/nuiton-processor/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-20 07:31:34 UTC (rev 369) +++ trunk/pom.xml 2011-01-21 10:30:50 UTC (rev 370) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <modules> <module>nuiton-processor</module> @@ -255,11 +255,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.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk + scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.1</url> </scm> <build>

1 0

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