- Maven-helper-plugin-commits - mailman.cloud.codelutin.com

r554 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 28 Aug '09

28 Aug '09

Author: tchemit Date: 2009-08-28 11:50:36 +0200 (Fri, 28 Aug 2009) New Revision: 554 Added: trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java Log: adding template velocity launcher Added: trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java =================================================================== --- trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java 2009-08-28 09:50:36 UTC (rev 554) @@ -0,0 +1,164 @@ +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License" ); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.nuiton.util; + +import java.io.File; +import java.io.FileWriter; +import java.io.Writer; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Iterator; +import java.util.Properties; + +import org.apache.maven.project.MavenProject; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; + +/** + * Generator of template base on velocity. + * + * @author chemit + * @since 1.3 + * + */ +public class VelocityTemplateGenerator { + + protected VelocityEngine engine; + protected final MavenProject mavenProject; + protected Template velocityTemplate; + + public VelocityTemplateGenerator(MavenProject mavenProject, URL template) throws URISyntaxException { + + if (mavenProject == null) { + throw new IllegalArgumentException("mavenProject must not be null"); + } + + if (template == null) { + throw new IllegalArgumentException("template must not be null"); + } + + this.mavenProject = mavenProject; + + Properties props = new Properties(); + + String templateName; + + if (template.toURI().isOpaque()) { + + // template is in a jar + + props = new Properties(); + props.setProperty("resource.loader", "jar"); + props.setProperty("jar.resource.loader.description", "Jar resource loader for default webstart templates"); + props.setProperty("jar.resource.loader.class", "org.apache.velocity.runtime.resource.loader.JarResourceLoader"); + + // obtain the jar url + + String url = template.toString(); + int i = url.indexOf("!"); + templateName = url.substring(i + 2); + + props.setProperty("jar.resource.loader.path", url.substring(0, i + 2)); + + } else { + + File f = new File(template.getFile()); + templateName = f.getName(); + + //props.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogSystem"); + props.setProperty("file.resource.loader.path", f.getParent()); + } + + try { + engine = new VelocityEngine(); + //engine.setProperty("runtime.log.logsystem", new NullLogSystem()); + engine.init(props); + } catch (Exception e) { + IllegalArgumentException iae = new IllegalArgumentException("Could not initialise Velocity"); + iae.initCause(e); + throw iae; + } + + try { + this.velocityTemplate = engine.getTemplate(templateName); + } catch (Exception e) { + IllegalArgumentException iae = + new IllegalArgumentException("Could not load the template file from '" + template + "'"); + iae.initCause(e); + throw iae; + } + } + + public void generate(Properties context, Writer writer) throws Exception { + + VelocityContext vcontext = new VelocityContext(); + + // Note: properties that contain dots will not be properly parsed by Velocity. Should we replace dots with underscores ? + addPropertiesToContext(System.getProperties(), vcontext); + + addPropertiesToContext(mavenProject.getProperties(), vcontext); + addPropertiesToContext(context, vcontext); + + vcontext.put("project", mavenProject.getModel()); + + try { + velocityTemplate.merge(vcontext, writer); + writer.flush(); + } catch (Exception e) { + throw new Exception("Could not generate the template " + velocityTemplate.getName() + ": " + e.getMessage(), e); + } finally { + writer.close(); + } + } + + public void generate(Properties context, File outputFile) throws Exception { + + + VelocityContext vcontext = new VelocityContext(); + + // Note: properties that contain dots will not be properly parsed by Velocity. Should we replace dots with underscores ? + addPropertiesToContext(System.getProperties(), vcontext); + + addPropertiesToContext(mavenProject.getProperties(), vcontext); + addPropertiesToContext(context, vcontext); + + vcontext.put("project", mavenProject.getModel()); + + vcontext.put("outputFile", outputFile.getName()); + + FileWriter writer = new FileWriter(outputFile); + + try { + velocityTemplate.merge(vcontext, writer); + writer.flush(); + } catch (Exception e) { + throw new Exception("Could not generate the template " + velocityTemplate.getName() + ": " + e.getMessage(), e); + } finally { + writer.close(); + } + } + + protected void addPropertiesToContext(Properties properties, VelocityContext context) { + + for (Iterator<?> iter = properties.keySet().iterator(); iter.hasNext();) { + String key = (String) iter.next(); + Object value = properties.get(key); + context.put(key, value); + } + + } +} Property changes on: trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r553 - trunk/src/main/java/org/nuiton/license/plugin
by tchemit＠users.nuiton.org 27 Aug '09

27 Aug '09

Author: tchemit Date: 2009-08-27 16:13:04 +0200 (Thu, 27 Aug 2009) New Revision: 553 Modified: trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java Log: can use add-license plugin for all pom types Modified: trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java 2009-08-26 20:12:58 UTC (rev 552) +++ trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java 2009-08-27 14:13:04 UTC (rev 553) @@ -105,8 +105,10 @@ */ protected boolean verbose; /** - * Un flag pour farie une copie nommé dans META-INF (prefixe avec le nom de l'artifact). + * Un flag pour faire une copie nommée dans META-INF (prefixe avec le nom de l'artifact). * + * Cette option n'est utilisable que sur des modules avec un class-path (pas pour un pom) + * * @parameter expression="${helper.copyToMETA_INF}" default-value="false" * @since 1.0.0 */ @@ -124,9 +126,14 @@ super("all files are up-to-date."); } + protected boolean hasClassPath() { + return !("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())); + } + @Override protected boolean ensurePackaging() { - return project != null && ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())); + return false; +// return project != null && ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())); } boolean doGenerate; @@ -141,16 +148,12 @@ doGenerate = !isFileNewerThanPomFile(licenseFile); } - //if (doGenerate) { - // acquire license LicenseFactory factory = LicenseFactory.newInstance(extraResolver); license = factory.revolv(licenseName); - //} - if (licenseFilename == null || licenseFilename.isEmpty()) { licenseFilename = licenseName; } @@ -182,16 +185,17 @@ copyFile(licenseContent, licenseFile, encoding); } - // copy LICENSE.txt to classpath - File target = new File(outputDirectory, licenseFile.getName()); + if (hasClassPath()) { + // copy LICENSE.txt to classpath + File target = new File(outputDirectory, licenseFile.getName()); - copyFile(licenseFile, target); + copyFile(licenseFile, target); - if (copyToMETA_INF) { - copyFile(licenseFile, new File(outputDirectory, "META-INF" + File.separator + project.getArtifactId() + "-" + licenseFile.getName())); + if (copyToMETA_INF) { + copyFile(licenseFile, new File(outputDirectory, "META-INF" + File.separator + project.getArtifactId() + "-" + licenseFile.getName())); + } + addResourceDir(outputDirectory.getAbsolutePath()); } - addResourceDir(outputDirectory.getAbsolutePath()); - } public File getLicenseFile() {

1 0

r552 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org 26 Aug '09

26 Aug '09

Author: tchemit Date: 2009-08-26 22:12:58 +0200 (Wed, 26 Aug 2009) New Revision: 552 Modified: trunk/src/main/java/org/nuiton/util/PluginIOContext.java trunk/src/test/java/org/nuiton/util/JaxxFileUpdaterTest.java Log: add license header Modified: trunk/src/main/java/org/nuiton/util/PluginIOContext.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PluginIOContext.java 2009-08-22 21:40:34 UTC (rev 551) +++ trunk/src/main/java/org/nuiton/util/PluginIOContext.java 2009-08-26 20:12:58 UTC (rev 552) @@ -1,3 +1,21 @@ +/** + * *##% Maven helper plugin + * Copyright (C) 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>. ##%* + */ package org.nuiton.util; import java.io.File; Modified: trunk/src/test/java/org/nuiton/util/JaxxFileUpdaterTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/JaxxFileUpdaterTest.java 2009-08-22 21:40:34 UTC (rev 551) +++ trunk/src/test/java/org/nuiton/util/JaxxFileUpdaterTest.java 2009-08-26 20:12:58 UTC (rev 552) @@ -139,4 +139,4 @@ // java file is now up to date (rename method does not affect lasmodified property on a file) assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); } -} \ No newline at end of file +}

1 0

r551 - trunk
by tchemit＠users.nuiton.org 22 Aug '09

22 Aug '09

Author: tchemit Date: 2009-08-22 23:40:34 +0200 (Sat, 22 Aug 2009) New Revision: 551 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-22 21:40:31 UTC (rev 550) +++ trunk/pom.xml 2009-08-22 21:40:34 UTC (rev 551) @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <dependencies> @@ -432,9 +432,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> </scm> <issueManagement>

1 0

r550 - in tags: . maven-helper-plugin-1.0.1
by tchemit＠users.nuiton.org 22 Aug '09

22 Aug '09

Author: tchemit Date: 2009-08-22 23:40:31 +0200 (Sat, 22 Aug 2009) New Revision: 550 Added: tags/maven-helper-plugin-1.0.1/ Log: [maven-scm] copy for tag maven-helper-plugin-1.0.1 Property changes on: tags/maven-helper-plugin-1.0.1 ___________________________________________________________________ Added: svn:ignore + target Added: svn:mergeinfo +

1 0

r549 - trunk
by tchemit＠users.nuiton.org 22 Aug '09

22 Aug '09

Author: tchemit Date: 2009-08-22 23:40:26 +0200 (Sat, 22 Aug 2009) New Revision: 549 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release maven-helper-plugin-1.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-22 21:11:21 UTC (rev 548) +++ trunk/pom.xml 2009-08-22 21:40:26 UTC (rev 549) @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <dependencies> @@ -432,9 +432,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> </scm> <issueManagement>

1 0

r548 - in trunk: . src/main/java/org/nuiton/license src/test/java/org/nuiton/license
by tchemit＠users.nuiton.org 22 Aug '09

22 Aug '09

Author: tchemit Date: 2009-08-22 23:11:21 +0200 (Sat, 22 Aug 2009) New Revision: 548 Removed: trunk/src/main/java/org/nuiton/license/LicenseGenerator.java trunk/src/main/java/org/nuiton/license/LicenseGeneratorFactory.java trunk/src/test/java/org/nuiton/license/LicenseGeneratorFactoryTest.java Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java trunk/src/main/java/org/nuiton/license/LicenseResolver.java Log: remove Deprecated code (moved in maven-licence-plugin) Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-08-22 16:16:15 UTC (rev 547) +++ trunk/changelog.txt 2009-08-22 21:11:21 UTC (rev 548) @@ -5,7 +5,6 @@ * Initial release * fork from previous project (org.codelutin:maven-license-switcher-plugin) - * deprecate LicenseGenerator and LicenseGeneratorFactory -- chemit -- mer 03 17:02:04 CET 2009 Modified: trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java =================================================================== --- trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java 2009-08-22 16:16:15 UTC (rev 547) +++ trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java 2009-08-22 21:11:21 UTC (rev 548) @@ -37,7 +37,7 @@ */ public class JarLicenseResolver extends LicenseResolver { - protected static final Log log = LogFactory.getLog(JarLicenseResolver.class); + private static final Log log = LogFactory.getLog(JarLicenseResolver.class); public JarLicenseResolver() { super(acquireBaseURL()); Deleted: trunk/src/main/java/org/nuiton/license/LicenseGenerator.java =================================================================== --- trunk/src/main/java/org/nuiton/license/LicenseGenerator.java 2009-08-22 16:16:15 UTC (rev 547) +++ trunk/src/main/java/org/nuiton/license/LicenseGenerator.java 2009-08-22 21:11:21 UTC (rev 548) @@ -1,34 +0,0 @@ -/** - * *##% Maven helper plugin - * Copyright (C) 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>. ##%* - */ -package org.nuiton.license; - -/** - * A simple Contract to generate a new header for a given type of file - * - * @author chemit - * @deprecated since 1.0.0, this class is renamed to HeaderGenerator and - * moved to project maven-license-plugin. - * - */ -@Deprecated -public interface LicenseGenerator { - - String getHeader(String licenseHeaderContent); - -} Deleted: trunk/src/main/java/org/nuiton/license/LicenseGeneratorFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/license/LicenseGeneratorFactory.java 2009-08-22 16:16:15 UTC (rev 547) +++ trunk/src/main/java/org/nuiton/license/LicenseGeneratorFactory.java 2009-08-22 21:11:21 UTC (rev 548) @@ -1,93 +0,0 @@ -/** - * *##% Maven helper plugin - * Copyright (C) 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>. ##%* - */ -package org.nuiton.license; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * A factory of {@link LicenseGenerator} - * - * @author chemit - * @deprecated since 1.0.0, no more use (LicenseGenerator is no more in this project...) - */ -@Deprecated -public class LicenseGeneratorFactory { - - public static class LicenceGeneratorContext { - - File src; - String[] files; - - public LicenceGeneratorContext(File src, String[] files) { - this.src = src; - this.files = files; - } - - public File getSrc() { - return src; - } - - public String[] getFiles() { - return files; - } - - public void setSrc(File src) { - this.src = src; - } - - public void setFiles(String[] files) { - this.files = files; - } - - } - - protected static Map<LicenseGenerator, List<String>> availableGenerator; - - public static Map<LicenseGenerator, List<String>> getAvailableGenerator() { - if (availableGenerator == null) { - availableGenerator = new HashMap<LicenseGenerator, List<String>>(); - } - return availableGenerator; - } - - public static List<String> getGeneratorMatchers(LicenseGenerator generator) { - List<String> result = null; - if (availableGenerator != null) { - result = availableGenerator.get(generator); - if (result == null) { - // add a new empty list in cache - result = new ArrayList<String>(); - availableGenerator.put(generator, result); - } - } - return result; - } - - public static void addGenerator(LicenseGenerator generator, String matcher) { - List<String> matchers = getGeneratorMatchers(generator); - if (matcher.isEmpty() || !matcher.contains(matcher)) { - matchers.add(matcher); - } - } - -} Modified: trunk/src/main/java/org/nuiton/license/LicenseResolver.java =================================================================== --- trunk/src/main/java/org/nuiton/license/LicenseResolver.java 2009-08-22 16:16:15 UTC (rev 547) +++ trunk/src/main/java/org/nuiton/license/LicenseResolver.java 2009-08-22 21:11:21 UTC (rev 548) @@ -47,7 +47,7 @@ */ public class LicenseResolver { - protected static final Log log = LogFactory.getLog(LicenseResolver.class); + private static final Log log = LogFactory.getLog(LicenseResolver.class); /** * BaseURL Deleted: trunk/src/test/java/org/nuiton/license/LicenseGeneratorFactoryTest.java =================================================================== --- trunk/src/test/java/org/nuiton/license/LicenseGeneratorFactoryTest.java 2009-08-22 16:16:15 UTC (rev 547) +++ trunk/src/test/java/org/nuiton/license/LicenseGeneratorFactoryTest.java 2009-08-22 21:11:21 UTC (rev 548) @@ -1,52 +0,0 @@ -/** - * *##% Maven helper plugin - * Copyright (C) 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>. ##%* - */ -package org.nuiton.license; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** @author chemit */ -public class LicenseGeneratorFactoryTest { - - @Before - public void setUp() { - // Add your code here - } - - @After - public void tearDown() { - // Add your code here - } - - @Test - public void testGetAvailableGenerator() { - // Add your code here - } - - @Test - public void testGetGeneratorMatchers() { - // Add your code here - } - - @Test - public void testAddGenerator() { - // Add your code here - } -}

1 0

r547 - in trunk: . src/site src/site/apt
by tchemit＠users.nuiton.org 22 Aug '09

22 Aug '09

Author: tchemit Date: 2009-08-22 18:16:15 +0200 (Sat, 22 Aug 2009) New Revision: 547 Added: trunk/src/site/apt/ trunk/src/site/apt/Todo.apt trunk/src/site/apt/index.apt Modified: trunk/pom.xml trunk/src/site/site.xml Log: do not use jrst in this module Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-22 16:16:12 UTC (rev 546) +++ trunk/pom.xml 2009-08-22 16:16:15 UTC (rev 547) @@ -100,7 +100,6 @@ <description>Plugin d'aide pour les projets nuiton</description> <inceptionYear>2009</inceptionYear> <url>http://maven-site.nuiton.org/${project.artifactId}</url> -  <organization> <name>CodeLutin</name> @@ -324,13 +323,6 @@ <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>1.0.2-rc-1</version> - </dependency> - </dependencies> </plugin> <plugin> @@ -355,7 +347,6 @@ see http://maven.apache.org/plugins/maven-project-info-reports-plugin --> <plugin> -  <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.1.2</version> </plugin> Copied: trunk/src/site/apt/Todo.apt (from rev 543, trunk/src/site/rst/Todo.rst) =================================================================== --- trunk/src/site/apt/Todo.apt (rev 0) +++ trunk/src/site/apt/Todo.apt 2009-08-22 16:16:15 UTC (rev 547) @@ -0,0 +1,8 @@ +---- +TODO +---- +---- +2009-08-22 +---- + + Any idea ? Property changes on: trunk/src/site/apt/Todo.apt ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/src/site/apt/index.apt (from rev 543, trunk/src/site/rst/index.rst) =================================================================== --- trunk/src/site/apt/index.apt (rev 0) +++ trunk/src/site/apt/index.apt 2009-08-22 16:16:15 UTC (rev 547) @@ -0,0 +1,46 @@ +---- +Introduction +---- +---- +2009-08-22 +---- + + <<TODO>> Update this documentation + +Maven helper Plugin + + This project helps to build project on the {{{http://www.nuiton.org} nuiton}} platform. + + There is three ways of using this toolbox : + + * The plugin way : the project offers some plugins (see Plugin overview) + + * The plugin toolkit : a very small framework to create new plugins (see Plugin toolkit overview) + + * The test toolkit : usefull classes to make new tests (see Test toolkit overview) + +Plugin overview + + The plugin has the following goals: + + * {{{add-license-mojo.html} helper:add-license}} add license file and third-party files to classpath (generate them if necessary). + + * {{{add-third-party-mojo.html} helper:add-third-party}} write the licenses of all third-party libraries used in project. + + * {{{help-mojo.html} helper:help}} display help about the plugin (goals, usage). + + * {{{available-licenses-mojo.html} helper:available-licenses}} display the known licenses of the plugin. + + * {{{runJava-mojo.html} helper:runJava}} run a java main class. + +Plugin toolkit overview + + see javadoc. + + <<A faire>> + +est toolkit overview + + see test-javadoc. + + <<A faire>> Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-22 16:16:12 UTC (rev 546) +++ trunk/src/site/site.xml 2009-08-22 16:16:15 UTC (rev 547) @@ -21,8 +21,6 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> </poweredBy> <body> @@ -50,6 +48,10 @@ </item> </menu> + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + <menu name="Téléchargement"> <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" name="Librairie (jar)"/>

1 0

r546 - trunk/src/site
by tchemit＠users.nuiton.org 22 Aug '09

22 Aug '09

Author: tchemit Date: 2009-08-22 18:16:12 +0200 (Sat, 22 Aug 2009) New Revision: 546 Removed: trunk/src/site/rst/ Log: do not use jrst in this module

1 0

r545 - in trunk: . src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 22 Aug '09

22 Aug '09

Author: tchemit Date: 2009-08-22 09:18:39 +0200 (Sat, 22 Aug 2009) New Revision: 545 Added: trunk/src/main/java/org/nuiton/util/PluginIOContext.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/util/PluginHelper.java Log: adding PluginIOContext and some usefull methods on it (copyFiles, expandFiles,...) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-18 14:57:22 UTC (rev 544) +++ trunk/pom.xml 2009-08-22 07:18:39 UTC (rev 545) @@ -37,7 +37,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.5</version> + <version>1.5.15</version>  </dependency> Modified: trunk/src/main/java/org/nuiton/util/PluginHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PluginHelper.java 2009-08-18 14:57:22 UTC (rev 544) +++ trunk/src/main/java/org/nuiton/util/PluginHelper.java 2009-08-22 07:18:39 UTC (rev 545) @@ -32,6 +32,7 @@ import java.io.OutputStreamWriter; import java.nio.channels.FileChannel; import java.text.MessageFormat; +import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.List; @@ -41,8 +42,11 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.Vector; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.apache.maven.model.Resource; import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.io.RawInputStreamFacade; @@ -363,4 +367,105 @@ FileUtils.copyStreamToFile(facade, destFile); } + + public static List<File> getIncludedFiles(File dir, String[] includes, String[] excludes) { + DirectoryScanner ds = new DirectoryScanner(); + List<File> result = new ArrayList<File>(); + ds.setBasedir(dir); + if (includes != null) { + ds.setIncludes(includes); + } + if (excludes != null) { + + ds.setExcludes(excludes); + } + ds.addDefaultExcludes(); + ds.scan(); + for (String file : ds.getIncludedFiles()) { + File in = new File(dir, file); + result.add(in); + } + return result; + } + + public static void copyFiles(File src, File dst, String[] includes, String[] excludes, boolean overwrite) throws IOException { + PluginIOContext c = new PluginIOContext(); + c.setInput(src); + c.setOutput(dst); + copyFiles(c, includes, excludes, overwrite); + } + + public static void copyFiles(PluginIOContext p, String[] includes, String[] excludes, boolean overwrite) throws IOException { + DirectoryScanner ds = new DirectoryScanner(); + + + for (File input : p.getInputs()) { + ds.setBasedir(input); + if (includes != null) { + ds.setIncludes(includes); + } + if (excludes != null) { + + ds.setExcludes(excludes); + } + ds.addDefaultExcludes(); + ds.scan(); + for (String file : ds.getIncludedFiles()) { + File in = new File(input, file); + File out = new File(p.getOutput(), file); + if (overwrite) { + FileUtils.copyFile(in, out); + } else { + FileUtils.copyFileIfModified(in, out); + } + } + } + } + + public static void expandFiles(PluginIOContext p, String[] includes, String[] excludes, String[] zipIncludes, boolean overwrite) throws IOException { + + DirectoryScanner ds = new DirectoryScanner(); + + for (File input : p.getInputs()) { + ds.setBasedir(input); + if (includes != null) { + ds.setIncludes(includes); + } + if (excludes != null) { + + ds.setExcludes(excludes); + } + ds.addDefaultExcludes(); + ds.scan(); + for (String file : ds.getIncludedFiles()) { + File in = new File(input, file); + File out = new File(p.getOutput(), file).getParentFile(); + expandFile(in, out, zipIncludes, overwrite); + } + } + } + + public static void expandFile(File src, File dst, String[] includes, boolean overwrite) throws IOException { +// System.out.println("expandFile src:" + src + " to " + dst); + ZipFile zipFile = new ZipFile(src); + Enumeration<? extends ZipEntry> entries = zipFile.entries(); + while (entries.hasMoreElements()) { + ZipEntry nextElement = entries.nextElement(); + String name = nextElement.getName(); +// System.out.println("name : " + name); + for (String include : includes) { + if (DirectoryScanner.match(include, name)) { + System.out.println("matching name : " + name + " with pattern " + include); + File dstFile = new File(dst, name); + if (overwrite || !dstFile.exists() || nextElement.getTime() > dstFile.lastModified()) { + System.out.println("will expand : " + name + " to " + dstFile); + InputStream inputStream = zipFile.getInputStream(nextElement); + FileOutputStream outStream = new FileOutputStream(dstFile); + IOUtil.copy(inputStream, outStream, 2048); + } + + } + } + } + } } Added: trunk/src/main/java/org/nuiton/util/PluginIOContext.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PluginIOContext.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/PluginIOContext.java 2009-08-22 07:18:39 UTC (rev 545) @@ -0,0 +1,40 @@ +package org.nuiton.util; + +import java.io.File; + +/** + * Une classe pour définir les entrées-sortie d'un plugin. + * + * En entrée, on peut avoir un ou plusieurs répertoires ({@link #inputs}. + * <p/> + * En sortie, on ne peut avoir qu'un seul répertoire ({@link #output}. + * + * + * @author chemit + * @since 1.0.1 + */ +public class PluginIOContext { + + File[] inputs; + File output; + + public File[] getInputs() { + return inputs; + } + + public File getOutput() { + return output; + } + + public void setInput(File input) { + this.inputs = new File[]{input}; + } + + public void setInputs(File[] inputs) { + this.inputs = inputs; + } + + public void setOutput(File output) { + this.output = output; + } +} Property changes on: trunk/src/main/java/org/nuiton/util/PluginIOContext.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0