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

r276 - in trunk: . maven-processor-plugin/src/main/java/org/nuiton/processor/plugin
by tchemit＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: tchemit Date: 2009-09-29 13:39:53 +0200 (Tue, 29 Sep 2009) New Revision: 276 Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java trunk/pom.xml Log: use maven-helper-plugin 1.1.0 Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-09-27 20:14:22 UTC (rev 275) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-09-29 11:39:53 UTC (rev 276) @@ -29,7 +29,7 @@ import org.nuiton.plugin.AbstractPlugin; import org.nuiton.processor.Processor; import org.nuiton.processor.ProcessorUtil; -import org.nuiton.util.MirroredFileUpdater; +import org.nuiton.io.MirroredFileUpdater; /** * Maven2 plugin for Nuiton Processor. @@ -145,11 +145,6 @@ } @Override - protected boolean ensurePackaging() { - return false; - } - - @Override public MavenProject getProject() { return project; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-27 20:14:22 UTC (rev 275) +++ trunk/pom.xml 2009-09-29 11:39:53 UTC (rev 276) @@ -262,8 +262,9 @@ <properties>  <projectId>processor</projectId> - - <helper.includeAttached>false</helper.includeAttached> +  + <helper.version>1.1.0-SNAPSHOT</helper.version> +  </properties> <build>

1 0

r275 - trunk
by tchemit＠users.nuiton.org 27 Sep '09

27 Sep '09

Author: tchemit Date: 2009-09-27 22:14:22 +0200 (Sun, 27 Sep 2009) New Revision: 275 Modified: trunk/pom.xml Log: first test in this project! Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-27 20:11:26 UTC (rev 274) +++ trunk/pom.xml 2009-09-27 20:14:22 UTC (rev 275) @@ -235,8 +235,13 @@ <version>${maven.version}</version> <scope>provided</scope> </dependency> - + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.9</version> + </dependency> + </dependencies> </dependencyManagement>

1 0

r274 - in trunk/nuiton-processor: . src src/test src/test/java src/test/java/org src/test/java/org/nuiton src/test/java/org/nuiton/processor src/test/resources src/test/resources/org src/test/resources/org/nuiton src/test/resources/org/nuiton/processor
by tchemit＠users.nuiton.org 27 Sep '09

27 Sep '09

Author: tchemit Date: 2009-09-27 22:11:26 +0200 (Sun, 27 Sep 2009) New Revision: 274 Added: trunk/nuiton-processor/src/test/ trunk/nuiton-processor/src/test/java/ trunk/nuiton-processor/src/test/java/org/ trunk/nuiton-processor/src/test/java/org/nuiton/ trunk/nuiton-processor/src/test/java/org/nuiton/processor/ trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java trunk/nuiton-processor/src/test/resources/ trunk/nuiton-processor/src/test/resources/log4j.properties trunk/nuiton-processor/src/test/resources/org/ trunk/nuiton-processor/src/test/resources/org/nuiton/ trunk/nuiton-processor/src/test/resources/org/nuiton/processor/ trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest.java2 trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest_1.java2 Modified: trunk/nuiton-processor/pom.xml Log: first test in this project! Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2009-09-27 19:43:08 UTC (rev 273) +++ trunk/nuiton-processor/pom.xml 2009-09-27 20:11:26 UTC (rev 274) @@ -22,7 +22,23 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <scope>test</scope> + </dependency> </dependencies>  @@ -44,7 +60,8 @@ <properties>  <redmine.releaseFiles>target/${project.artifactId}-${project.version}-deps.zip, - target/${project.artifactId}-${project.version}-full.zip</redmine.releaseFiles> + target/${project.artifactId}-${project.version}-full.zip + </redmine.releaseFiles> </properties>  Added: trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java (rev 0) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java 2009-09-27 20:11:26 UTC (rev 274) @@ -0,0 +1,138 @@ +package org.nuiton.processor; + +/* + * *##% + * Maven License Plugin + * Copyright (C) 2008 - 2009 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>. + * ##%* + */ +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.Before; +import org.junit.BeforeClass; + +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Test; + +/** + * + * @author chemit + * @since 1.0.1 + */ +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; + + @BeforeClass + public static void initClass() throws Exception { + basedir = getBasedir(); + testdir = getFile(basedir, "target", "test-classes", "org", "nuiton", "processor", "result"); + testdir.mkdirs(); + } + + @AfterClass + public static void afterClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + } + + @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); + 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); + 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); + } +} Property changes on: trunk/nuiton-processor/src/test/java/org/nuiton/processor/LicenseProcessorTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/nuiton-processor/src/test/resources/log4j.properties =================================================================== --- trunk/nuiton-processor/src/test/resources/log4j.properties (rev 0) +++ trunk/nuiton-processor/src/test/resources/log4j.properties 2009-09-27 20:11:26 UTC (rev 274) @@ -0,0 +1,11 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level + +log4j.logger.org.nuiton=INFO +log4j.logger.org.nuiton.processor=INFO Added: trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest.java2 =================================================================== --- trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest.java2 (rev 0) +++ trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest.java2 2009-09-27 20:11:26 UTC (rev 274) @@ -0,0 +1,10 @@ +/** + * *##% YO + * ##% yy + */ + +public class LicenceProcessorTest { + + +// MUST BE THERE! +} \ No newline at end of file Added: trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest_1.java2 =================================================================== --- trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest_1.java2 (rev 0) +++ trunk/nuiton-processor/src/test/resources/org/nuiton/processor/LicenseProcessorTest_1.java2 2009-09-27 20:11:26 UTC (rev 274) @@ -0,0 +1,10 @@ +/** + * *##% YO + * ##%* yy + */ + +public class LicenceProcessorTest { + + +// MUST BE THERE! +} \ No newline at end of file

1 0

r273 - trunk/nuiton-processor/src/main/java/org/nuiton/processor
by tchemit＠users.nuiton.org 27 Sep '09

27 Sep '09

Author: tchemit Date: 2009-09-27 21:43:08 +0200 (Sun, 27 Sep 2009) New Revision: 273 Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java Log: add javadoc Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2009-09-27 19:35:24 UTC (rev 272) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2009-09-27 19:43:08 UTC (rev 273) @@ -27,8 +27,14 @@ import java.io.FileWriter; import java.io.IOException; -/** @author chemit */ -public class LicenseProcessor extends org.nuiton.processor.Processor { +/** + * This class is a processor of source header. + * + * @author chemit + * + * @see LicenseFilter + */ +public class LicenseProcessor extends Processor { protected LicenseFilter licenseFilter;

1 0

r272 - trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 27 Sep '09

27 Sep '09

Author: tchemit Date: 2009-09-27 21:35:24 +0200 (Sun, 27 Sep 2009) New Revision: 272 Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java Log: add override annotation + use equals instead of == on String 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 2009-09-26 02:16:12 UTC (rev 271) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2009-09-27 19:35:24 UTC (rev 272) @@ -53,22 +53,25 @@ this.header = header; } + @Override protected String getHeader() { return header; } + @Override protected String getFooter() { return footer; } private Matcher matcher = null; + @Override public int getMatchIndexFor(String input, String sequence) { int index = NOT_FOUND; setMatcher(null); - if (sequence == getHeader()) { + if (sequence.equals(getHeader())) { setMatcher(getHeaderPattern().matcher(input)); - } else if (sequence == getFooter()){ + } else if (sequence.equals(getFooter())){ setMatcher(getFooterPattern().matcher(input)); } if (getMatcher() != null) { @@ -81,6 +84,7 @@ return index; } + @Override public int getMatchLengthFor(String sequence) { int length = NOT_FOUND; @@ -99,10 +103,12 @@ * 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('"')); } @@ -115,6 +121,7 @@ * la chaine trouve * @return ce qu'il faut ecrire dans le fichier de sortie */ + @Override protected String performOutFilter(String ch) { return EMPTY_STRING; }

1 0

r271 - in trunk: . maven-processor-plugin maven-processor-plugin/src/main/java/org/nuiton/processor/plugin nuiton-processor
by tchemit＠users.nuiton.org 26 Sep '09

26 Sep '09

Author: tchemit Date: 2009-09-26 04:16:12 +0200 (Sat, 26 Sep 2009) New Revision: 271 Modified: trunk/maven-processor-plugin/pom.xml trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java trunk/nuiton-processor/pom.xml trunk/pom.xml Log: - bump junit, mavenpom versions - fix javadoc plexus javadoc annotation (in plugin module) - improve dependencies (exclude a lot from maven-helper-plugin) - use new mojo api from maven-helper-plugin Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2009-09-03 18:05:51 UTC (rev 270) +++ trunk/maven-processor-plugin/pom.xml 2009-09-26 02:16:12 UTC (rev 271) @@ -97,6 +97,187 @@ </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + </execution> + </executions> + + </plugin> + </plugins> + + </pluginManagement> </build> @@ -106,6 +287,176 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + </plugin> </plugins> </reporting> Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-09-03 18:05:51 UTC (rev 270) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-09-26 02:16:12 UTC (rev 271) @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.maven.project.MavenProject; -import org.nuiton.AbstractPlugin; +import org.nuiton.plugin.AbstractPlugin; import org.nuiton.processor.Processor; import org.nuiton.processor.ProcessorUtil; import org.nuiton.util.MirroredFileUpdater; Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2009-09-03 18:05:51 UTC (rev 270) +++ trunk/nuiton-processor/pom.xml 2009-09-26 02:16:12 UTC (rev 271) @@ -41,6 +41,12 @@ <packaging>jar</packaging> + <properties> +  + <redmine.releaseFiles>target/${project.artifactId}-${project.version}-deps.zip, + target/${project.artifactId}-${project.version}-full.zip</redmine.releaseFiles> + </properties> +    @@ -62,7 +68,7 @@ <executions> <execution> <id>create-assemblies</id> - <phase>verify</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 18:05:51 UTC (rev 270) +++ trunk/pom.xml 2009-09-26 02:16:12 UTC (rev 271) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>processor</artifactId> @@ -35,6 +35,83 @@ <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + + + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + + </exclusions> </dependency>  @@ -60,12 +137,88 @@ <version>${helper.version}</version> <scope>test</scope> <classifier>tests</classifier> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + + </exclusions> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency> @@ -104,7 +257,8 @@ <properties>  <projectId>processor</projectId> - + + <helper.includeAttached>false</helper.includeAttached> </properties> <build>

1 0

r270 - in trunk: . maven-processor-plugin src/site
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 20:05:51 +0200 (Thu, 03 Sep 2009) New Revision: 270 Modified: trunk/changelog.txt trunk/maven-processor-plugin/pom.xml trunk/pom.xml trunk/src/site/site.xml Log: - bump versions - prepare changelog - clean site Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-08-29 16:53:36 UTC (rev 269) +++ trunk/changelog.txt 2009-09-03 18:05:51 UTC (rev 270) @@ -1,3 +1,8 @@ +1.0.1 200909?? + + +-- chemit -- Thu, 03 Sep 2009 18:51:54 +0200 + 1.0.0 tchemit 20090822 * initial nuiton release Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2009-08-29 16:53:36 UTC (rev 269) +++ trunk/maven-processor-plugin/pom.xml 2009-09-03 18:05:51 UTC (rev 270) @@ -72,20 +72,7 @@  <name>Nuiton processor maven plugin</name> <inceptionYear>2006</inceptionYear> - -  - <contributors> - <contributor> - <name>Julien Ruchaud</name> - <email>ruchaud(a)codelutin.com</email> - <organization>Code Lutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - </contributors> - +    Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-29 16:53:36 UTC (rev 269) +++ trunk/pom.xml 2009-09-03 18:05:51 UTC (rev 270) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <artifactId>processor</artifactId> Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-29 16:53:36 UTC (rev 269) +++ trunk/src/site/site.xml 2009-09-03 18:05:51 UTC (rev 270) @@ -1,24 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> </poweredBy>

1 0