November 2008 - Eugene-commits - mailman.cloud.codelutin.com

[Lutingenerator-commits] r381 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org 26 Nov '08

26 Nov '08

Author: chatellier Date: 2008-11-26 11:55:27 +0000 (Wed, 26 Nov 2008) New Revision: 381 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: Suppression de l'ajout du r?\195?\169pertoire de g?\195?\169n?\195?\169ration dans les sources de test Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-19 10:12:16 UTC (rev 380) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-26 11:55:27 UTC (rev 381) @@ -184,18 +184,7 @@ project.addResource(resources); } - // Ajout aussi dans le classpath des tests - // car si la generation s'effectue en phase : generate-test-sources - // il ne trouve pas les fichiers générés - if (!project.getTestCompileSourceRoots().contains(destDirGen.getPath())) { - getLog().info("add test compile source root : " + destDirGen); - project.addTestCompileSourceRoot(destDirGen.getPath()); - Resource resources = new Resource(); - resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("add test resource root :" + resources); - project.addTestResource(resources); - } + } protected ClassLoader fixClassLoader(File dirToAdd) throws MojoExecutionException {

1 0

[Lutingenerator-commits] r380 - maven-generator-plugin/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 10:12:16 +0000 (Wed, 19 Nov 2008) New Revision: 380 Modified: maven-generator-plugin/trunk/src/main/resources/log4j.properties Log: Switch to INFO il all org.codelutin category Modified: maven-generator-plugin/trunk/src/main/resources/log4j.properties =================================================================== --- maven-generator-plugin/trunk/src/main/resources/log4j.properties 2008-11-18 16:57:57 UTC (rev 379) +++ maven-generator-plugin/trunk/src/main/resources/log4j.properties 2008-11-19 10:12:16 UTC (rev 380) @@ -5,4 +5,4 @@ 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.codelutin.generator=INFO +log4j.logger.org.codelutin=INFO

1 0

[Lutingenerator-commits] r379 - lutingenerator/trunk/src/main/resources maven-generator-plugin/trunk/src/main/resources
by chemit＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chemit Date: 2008-11-18 16:57:57 +0000 (Tue, 18 Nov 2008) New Revision: 379 Added: maven-generator-plugin/trunk/src/main/resources/log4j.properties Removed: lutingenerator/trunk/src/main/resources/log4j.properties Log: prefer put logger in plugin to avoid confusing logger definition in real runtime application Deleted: lutingenerator/trunk/src/main/resources/log4j.properties =================================================================== --- lutingenerator/trunk/src/main/resources/log4j.properties 2008-11-18 16:29:54 UTC (rev 378) +++ lutingenerator/trunk/src/main/resources/log4j.properties 2008-11-18 16:57:57 UTC (rev 379) @@ -1,8 +0,0 @@ -# Global logging configuration -log4j.rootLogger=WARN, 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.codelutin.generator=INFO Added: maven-generator-plugin/trunk/src/main/resources/log4j.properties =================================================================== --- maven-generator-plugin/trunk/src/main/resources/log4j.properties (rev 0) +++ maven-generator-plugin/trunk/src/main/resources/log4j.properties 2008-11-18 16:57:57 UTC (rev 379) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, 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.codelutin.generator=INFO

1 0

[Lutingenerator-commits] r378 - lutingenerator/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 16:29:54 +0000 (Tue, 18 Nov 2008) New Revision: 378 Added: lutingenerator/trunk/src/main/resources/log4j.properties Log: Xerces generation won't work if there is no log4j.properties :( Added: lutingenerator/trunk/src/main/resources/log4j.properties =================================================================== --- lutingenerator/trunk/src/main/resources/log4j.properties (rev 0) +++ lutingenerator/trunk/src/main/resources/log4j.properties 2008-11-18 16:29:54 UTC (rev 378) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, 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.codelutin.generator=INFO

1 0

[Lutingenerator-commits] r377 - lutingenerator/trunk maven-generator-plugin/trunk
by chemit＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chemit Date: 2008-11-18 14:10:57 +0000 (Tue, 18 Nov 2008) New Revision: 377 Modified: lutingenerator/trunk/changelog lutingenerator/trunk/pom.xml maven-generator-plugin/trunk/changelog maven-generator-plugin/trunk/pom.xml Log: use lutinproject 3.1 Modified: lutingenerator/trunk/changelog =================================================================== --- lutingenerator/trunk/changelog 2008-11-18 13:55:46 UTC (rev 376) +++ lutingenerator/trunk/changelog 2008-11-18 14:10:57 UTC (rev 377) @@ -1,4 +1,5 @@ 0.62 chemit 200811?? + * 20081118 [chemit] use lutinproject 3.1 * 20081117 [chemit] : GeneratorTask can have a dedicated classLoader to be used to instanciate generator implementations 0.61 chatellier 20081114 Modified: lutingenerator/trunk/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2008-11-18 13:55:46 UTC (rev 376) +++ lutingenerator/trunk/pom.xml 2008-11-18 14:10:57 UTC (rev 377) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.0</version> + <version>3.1</version> </parent> <artifactId>lutingenerator</artifactId> Modified: maven-generator-plugin/trunk/changelog =================================================================== --- maven-generator-plugin/trunk/changelog 2008-11-18 13:55:46 UTC (rev 376) +++ maven-generator-plugin/trunk/changelog 2008-11-18 14:10:57 UTC (rev 377) @@ -1,4 +1,5 @@ 0.62 chemit 200811?? + * 20081118 [chemit] use lutinproject 3.1 * 20081117 [chemit] - add extraClassPathDirectory parameter to can specify an extra directory to add in classLoader - bump lutingenerator version Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-11-18 13:55:46 UTC (rev 376) +++ maven-generator-plugin/trunk/pom.xml 2008-11-18 14:10:57 UTC (rev 377) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinpluginproject</artifactId> - <version>3.0</version> + <version>3.1</version> </parent> <artifactId>maven-generator-plugin</artifactId>

1 0

[Lutingenerator-commits] r376 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 13:55:46 +0000 (Tue, 18 Nov 2008) New Revision: 376 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java lutingenerator/trunk/src/main/java/org/codelutin/generator/ObjectModelGenerator.java Log: Modify log and comment Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2008-11-17 11:21:33 UTC (rev 375) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2008-11-18 13:55:46 UTC (rev 376) @@ -16,12 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/* - * Created on 7 janv. 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ + package org.codelutin.generator; import java.io.File; @@ -35,10 +30,11 @@ import org.apache.commons.logging.LogFactory; /** + * Generator. + * * @author cedric - * - * To change the template for this generated type comment go to - * Window - Preferences - Java - Code Generation - Code and Comments + * + * */ public abstract class Generator { @@ -94,16 +90,19 @@ } protected long getLastModifiedSource(){ + return lastModifiedSource; } /** - * @param file fichier a tester + * @param file fichier a tester * @return vrai si le fichier passé en parametre est plus recent que - * les sources sur generateur. - */ + * les sources sur generateur. + */ protected boolean isNewerThanSource(File file){ - log.debug("source date: "+lastModifiedSource+" file date: "+file.lastModified()+ "("+file+")"); + if(log.isDebugEnabled()) { + log.debug("source date: " + getLastModifiedSource() +" file date: " + file.lastModified() + "("+file+")"); + } return file.lastModified() > getLastModifiedSource(); } Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/ObjectModelGenerator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/ObjectModelGenerator.java 2008-11-17 11:21:33 UTC (rev 375) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/ObjectModelGenerator.java 2008-11-18 13:55:46 UTC (rev 376) @@ -279,7 +279,7 @@ * class en appelant la m?thode * {@link #generateFromClass(Writer, ObjectModelClass)} et enfin sur chaque * interface en appelant a méthode - * {@link #generateFromInterface(Writer, ObjectModelClass)} Le nom de + * {@link #generateFromInterface(Writer, ObjectModelInterface)} Le nom de * fichier est récupérer pour chacun d'eux en appelant la méthode * getFilenameFor.... La methode generateFrom... n'utilise pas le Writer * alors le fichier n'est pas généré, si on l'utilise m?me pour ne rien

1 0

[Lutingenerator-commits] r375 - in maven-generator-plugin/trunk: . src/main/java/org/codelutin/generator/plugin
by chemit＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: chemit Date: 2008-11-17 11:21:33 +0000 (Mon, 17 Nov 2008) New Revision: 375 Modified: maven-generator-plugin/trunk/changelog maven-generator-plugin/trunk/pom.xml maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: - add extraClassPathDirectory parameter to can specify an extra directory to add in classLoader - bump lutingenerator version Modified: maven-generator-plugin/trunk/changelog =================================================================== --- maven-generator-plugin/trunk/changelog 2008-11-17 11:20:09 UTC (rev 374) +++ maven-generator-plugin/trunk/changelog 2008-11-17 11:21:33 UTC (rev 375) @@ -1,4 +1,9 @@ -0.61 chemit 200811?? +0.62 chemit 200811?? + * 20081117 [chemit] + - add extraClassPathDirectory parameter to can specify an extra directory to add in classLoader + - bump lutingenerator version + +0.61 chatellier 20081114 * 20081107 [chatellier] - add test compile dir and test resources in generation gaol * 20081101 [chemit] Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-11-17 11:20:09 UTC (rev 374) +++ maven-generator-plugin/trunk/pom.xml 2008-11-17 11:21:33 UTC (rev 375) @@ -20,7 +20,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> - <version>0.61</version> + <version>0.62-SNAPSHOT</version> <scope>compile</scope> </dependency> Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-17 11:20:09 UTC (rev 374) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-17 11:21:33 UTC (rev 375) @@ -40,6 +40,9 @@ import org.codelutin.generator.GeneratorTask; import java.io.File; +import java.net.URLClassLoader; +import java.net.URL; +import java.net.MalformedURLException; import java.util.Arrays; import java.util.List; @@ -111,6 +114,14 @@ */ private boolean overwrite = false; + /** + * An extra direcotry to be added to the classpath. + * + * @parameter expression="${generator.extraClassPathDirectory}" + */ + protected File extraClassPathDirectory; + + public void execute() throws MojoExecutionException, MojoFailureException { getLog().info("Effectue toutes les générations et copie les fichiers générés " + "dans le répertoire de compilation"); @@ -147,8 +158,12 @@ generator.setProperties("defaultPackage=" + defaultPackage); generator.setIncludes(includes); - generator.setExcludeTemplates(excludeTemplates==null?java.util.Collections.<String>emptyList():excludeTemplates); + generator.setExcludeTemplates(excludeTemplates == null ? java.util.Collections.<String>emptyList() : excludeTemplates); + if (extraClassPathDirectory != null) { + getLog().info("will add the cp to classloader "+ extraClassPathDirectory); + generator.setLoader(fixClassLoader(extraClassPathDirectory)); + } /* Execution */ generator.execute(); } @@ -158,7 +173,7 @@ * de compilation du projet Maven. */ protected void fixCompileSourceRoots() { - + if (!project.getCompileSourceRoots().contains(destDirGen.getPath())) { getLog().info("add compile source root : " + destDirGen); project.addCompileSourceRoot(destDirGen.getPath()); @@ -182,4 +197,16 @@ project.addTestResource(resources); } } + + protected ClassLoader fixClassLoader(File dirToAdd) throws MojoExecutionException { + try { + // we ask to add the directory in classloader + return new URLClassLoader(new URL[]{dirToAdd.toURI().toURL()}, getClass().getClassLoader()); + } catch (MalformedURLException e) { + throw new MojoExecutionException(e.getMessage()); + } + + + + } }

1 0

[Lutingenerator-commits] r374 - in lutingenerator/trunk: . src/main/java/org/codelutin/generator
by chemit＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: chemit Date: 2008-11-17 11:20:09 +0000 (Mon, 17 Nov 2008) New Revision: 374 Modified: lutingenerator/trunk/changelog lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java Log: GeneratorTask can have a dedicated classLoader to be used to instanciate generator implementations Modified: lutingenerator/trunk/changelog =================================================================== --- lutingenerator/trunk/changelog 2008-11-14 09:35:26 UTC (rev 373) +++ lutingenerator/trunk/changelog 2008-11-17 11:20:09 UTC (rev 374) @@ -1,4 +1,7 @@ -0.61 chemit 200811?? +0.62 chemit 200811?? + * 20081117 [chemit] : GeneratorTask can have a dedicated classLoader to be used to instanciate generator implementations + +0.61 chatellier 20081114 * 20081101 [chemit] - add a parent setter on ChildGenerator - add an excludeTemplates property on Generator and GeneratorTask to permit exclusion of generators for some composite generator Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-11-14 09:35:26 UTC (rev 373) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-11-17 11:20:09 UTC (rev 374) @@ -84,6 +84,9 @@ protected boolean overwrite = true; + // to enable a customized classloader + protected ClassLoader loader; + public void setOverwrite(boolean v) { overwrite = v; } @@ -122,7 +125,12 @@ this.srcFile = srcFile; } - public void execute() throws BuildException { + public void setLoader(ClassLoader loader) { + this.loader = loader; + } + + @Override + public void execute() throws BuildException { Generator[] generators; if (templates == null) { throw new BuildException("templates attribute must be set!", @@ -139,10 +147,11 @@ for (int i = 0; i < templateGenerators.size(); i++) { String templateName = templateGenerators.get(i); try { - generators[i] = (Generator) Class - .forName(templateName).newInstance(); + generators[i] = newGeneratorInstance(templateName); + + //generators[i] = (Generator) Class.forName(templateName).newInstance(); generators[i].setExcludeTemplates(excludeTemplates); - + } catch (ClassCastException eee) { System.out.println("Generator don't herite Generator Class : " + templateName); @@ -205,4 +214,12 @@ } } + protected Generator newGeneratorInstance(String fqn) throws ClassNotFoundException, IllegalAccessException, InstantiationException { + if (loader==null) { + return (Generator) Class.forName(fqn).newInstance(); + } else { + + return (Generator) Class.forName(fqn,true,loader).newInstance(); + } + } } // GeneratorTask

1 0

[Lutingenerator-commits] r373 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org 14 Nov '08

14 Nov '08

Author: chatellier Date: 2008-11-14 09:35:26 +0000 (Fri, 14 Nov 2008) New Revision: 373 Modified: maven-generator-plugin/trunk/pom.xml Log: Correct vars Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-11-14 09:28:22 UTC (rev 372) +++ maven-generator-plugin/trunk/pom.xml 2008-11-14 09:35:26 UTC (rev 373) @@ -82,9 +82,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-generator…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project>

1 0

[Lutingenerator-commits] r372 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org 14 Nov '08

14 Nov '08

Author: chatellier Date: 2008-11-14 09:28:22 +0000 (Fri, 14 Nov 2008) New Revision: 372 Modified: maven-generator-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-11-14 09:28:19 UTC (rev 371) +++ maven-generator-plugin/trunk/pom.xml 2008-11-14 09:28:22 UTC (rev 372) @@ -51,7 +51,7 @@   <name>Plugin maven Generator</name> - <version>0.61</version> + <version>0.62-SNAPSHOT</version> <inceptionYear>2006</inceptionYear> <description>maven plugin to use the lutingenerator library</description> @@ -82,9 +82,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/tags/maven-generator-plugin-0.61</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/tags/maven-generator-plugin-0.61</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-generator…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-generator…</url> </scm> </project>

1 0