- Jaxx-commits - mailman.cloud.codelutin.com

[Buix-commits] r750 - trunk/lutinjaxx/maven/src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 15:35:22 +0000 (Tue, 22 Jul 2008) New Revision: 750 Modified: trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java Log: move to our package org.codelutin.jaxx Modified: trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java 2008-07-22 15:35:13 UTC (rev 749) +++ trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java 2008-07-22 15:35:22 UTC (rev 750) @@ -3,6 +3,7 @@ import junit.framework.TestCase; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.codelutin.jaxx.JaxxGeneratorGoal; import java.io.File; import java.io.IOException; @@ -68,13 +69,13 @@ } @CompileConfig(packageName = "InnerClasses", runJavac = true) - public void testInnerClasses() throws MojoExecutionException, MojoFailureException { - goal.execute(); - } - + public void testInnerClasses() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + @CompileConfig(packageName = "SpecialSubclassing", runJavac = true) - public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { + public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { try { goal.execute(); } catch (Exception e) { @@ -101,7 +102,7 @@ @CompileConfig(packageName = "Script", runJavac = false) public void testScript() throws MojoExecutionException, MojoFailureException { - try { + try { goal.execute(); } catch (Exception e) { // there is some inter-dependances between generated java file

1 0

[Buix-commits] r749 - in trunk/lutinjaxx/maven/src/main/java: jaxx org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 15:35:13 +0000 (Tue, 22 Jul 2008) New Revision: 749 Added: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java Removed: trunk/lutinjaxx/maven/src/main/java/jaxx/JaxxGeneratorGoal.java Log: move to our package org.codelutin.jaxx Deleted: trunk/lutinjaxx/maven/src/main/java/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/lutinjaxx/maven/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-07-21 13:21:26 UTC (rev 748) +++ trunk/lutinjaxx/maven/src/main/java/jaxx/JaxxGeneratorGoal.java 2008-07-22 15:35:13 UTC (rev 749) @@ -1,197 +0,0 @@ -/* *##% - * Copyright (C) 2007 - * JaxxPlugin, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * 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 Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package jaxx; - -import jaxx.compiler.CompilerOptions; -import jaxx.compiler.JAXXCompiler; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugin.logging.Log; -import org.codehaus.plexus.util.DirectoryScanner; - -import java.io.File; -import java.net.URL; - -/** - * Classe permettant de transformer des sources jaxx vers du source java. - * - * @author chemit - * @goal generate - * @phase process-resources - */ -public class JaxxGeneratorGoal extends AbstractMojo { - - /** - * @description R�pertoire sources des fichiers jaxx � g�n�rer. - * @parameter expression="${jaxx.src}" default-value="${basedir}/src/uimodel" - */ - protected File src; - /** - * @description R�pertoire de destination des fichiers � g�n�rer. - * @parameter expression="${jaxx.out}" default-value="${basedir}/target/gen/java" - */ - protected File out; - /** - * @description R�pertoire de destination des fichiers � compiler. - * @parameter expression="${jaxx.classOut}" default-value="${basedir}/target/test-classes" - */ - protected File classOut; - /** - * @description pour optimizer le code compil� ou g�n�r� ? - * @parameter expression="${jaxx.optimize}" default-value="false" - */ - protected boolean optimize; - - /** - * @description les options de la compilation - * @parameter expression="${jaxx.javaOpts}" - */ - protected String javaOpts = null; - - /** - * @description pour filter - * @parameter expression="${jaxx.includes}" - */ - protected String[] includes; - - /** - * @description verbose - * @parameter expression="${jaxx.verbose}" default-value="${maven.verbose}" - */ - protected boolean verbose; - - protected String[] files; - - private static final String[] INCLUDES = {"**\\/*.jaxx"}; - - public void execute() throws MojoExecutionException, MojoFailureException { - - DirectoryScanner ds; - ds = new DirectoryScanner(); - ds.setBasedir(getSrc()); - boolean noIncludes = includes == null || includes.length == 0; - ds.setIncludes(noIncludes ? INCLUDES : includes); - ds.scan(); - files = ds.getIncludedFiles(); - log.info("jaxx - found " + files.length + " file(s) to generate. "); - CompilerOptions options = toCompilerOptions(); - if (verbose) { - log.debug("classPath: " + options.getClassPath()); - log.debug("javaOut : " + options.getTargetDirectory()); - log.debug("classOut : " + options.getJavacTargetDirectory()); - log.debug("javacOpts: " + options.getJavacOpts()); - log.debug("optiomize: " + options.getOptimize()); - for (String file : files) { - log.debug(file); - } - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - log.debug(cl.toString()); - if (cl.getClass().getSimpleName().equals("RealmClassLoader")) { - try { - java.lang.reflect.Method m = cl.getClass().getDeclaredMethod("getURLs"); - m.setAccessible(true); - URL[] urls = (URL[]) m.invoke(cl); - - for (URL url : urls) { - log.debug("ulr in class loader " + url); - } - } catch (Exception e) { - log.warn("??? : " + e.getMessage(), e); - } - } - } - - if (!JAXXCompiler.compile(src, files, options)) { - throw new MojoFailureException("Aborting due to errors reported by jaxxc"); - } - } - - public CompilerOptions toCompilerOptions() { - CompilerOptions result = new CompilerOptions(); - result.setClassPath(getSrc().getPath()); - if (getJavaOpts() != null && !"".equals(getJavaOpts())) { - result.setJavacOpts(getJavaOpts()); - } - result.setKeepJavaFiles(true); - result.setOptimize(isOptimize()); - result.setJavacTargetDirectory(getClassOut()); - result.setTargetDirectory(getOut()); - return result; - } - - protected Log log = getLog(); - - public File getSrc() { - return src; - } - - public boolean isOptimize() { - return optimize; - } - - public File getOut() { - return out; - } - - public String getJavaOpts() { - return javaOpts; - } - - public File getClassOut() { - return classOut; - } - - public String[] getIncludes() { - return includes; - } - - public void setJavaOpts(String javaOpts) { - this.javaOpts = javaOpts; - } - - public void setOptimize(boolean optimize) { - this.optimize = optimize; - } - - public void setOut(File out) { - this.out = out; - } - - public void setClassOut(File classOut) { - this.classOut = classOut; - } - - public void setSrc(File src) { - this.src = src; - } - - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - public void setIncludes(String[] includes) { - this.includes = includes; - } - - public String[] getFiles() { - return files; - } -} \ No newline at end of file Copied: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java (from rev 740, trunk/lutinjaxx/maven/src/main/java/jaxx/JaxxGeneratorGoal.java) =================================================================== --- trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java (rev 0) +++ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java 2008-07-22 15:35:13 UTC (rev 749) @@ -0,0 +1,197 @@ +/* *##% + * Copyright (C) 2007 + * JaxxPlugin, Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.jaxx; + +import jaxx.compiler.CompilerOptions; +import jaxx.compiler.JAXXCompiler; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.logging.Log; +import org.codehaus.plexus.util.DirectoryScanner; + +import java.io.File; +import java.net.URL; + +/** + * Classe permettant de transformer des sources jaxx vers du source java. + * + * @author chemit + * @goal generate + * @phase process-resources + */ +public class JaxxGeneratorGoal extends AbstractMojo { + + /** + * @description R�pertoire sources des fichiers jaxx � g�n�rer. + * @parameter expression="${jaxx.src}" default-value="${basedir}/src/uimodel" + */ + protected File src; + /** + * @description R�pertoire de destination des fichiers � g�n�rer. + * @parameter expression="${jaxx.out}" default-value="${basedir}/target/gen/java" + */ + protected File out; + /** + * @description R�pertoire de destination des fichiers � compiler. + * @parameter expression="${jaxx.classOut}" default-value="${basedir}/target/test-classes" + */ + protected File classOut; + /** + * @description pour optimizer le code compil� ou g�n�r� ? + * @parameter expression="${jaxx.optimize}" default-value="false" + */ + protected boolean optimize; + + /** + * @description les options de la compilation + * @parameter expression="${jaxx.javaOpts}" + */ + protected String javaOpts = null; + + /** + * @description pour filter + * @parameter expression="${jaxx.includes}" + */ + protected String[] includes; + + /** + * @description verbose + * @parameter expression="${jaxx.verbose}" default-value="${maven.verbose}" + */ + protected boolean verbose; + + protected String[] files; + + private static final String[] INCLUDES = {"**\\/*.jaxx"}; + + public void execute() throws MojoExecutionException, MojoFailureException { + + DirectoryScanner ds; + ds = new DirectoryScanner(); + ds.setBasedir(getSrc()); + boolean noIncludes = includes == null || includes.length == 0; + ds.setIncludes(noIncludes ? INCLUDES : includes); + ds.scan(); + files = ds.getIncludedFiles(); + log.info("jaxx - found " + files.length + " file(s) to generate. "); + CompilerOptions options = toCompilerOptions(); + if (verbose) { + log.debug("classPath: " + options.getClassPath()); + log.debug("javaOut : " + options.getTargetDirectory()); + log.debug("classOut : " + options.getJavacTargetDirectory()); + log.debug("javacOpts: " + options.getJavacOpts()); + log.debug("optiomize: " + options.getOptimize()); + for (String file : files) { + log.debug(file); + } + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + log.debug(cl.toString()); + if (cl.getClass().getSimpleName().equals("RealmClassLoader")) { + try { + java.lang.reflect.Method m = cl.getClass().getDeclaredMethod("getURLs"); + m.setAccessible(true); + URL[] urls = (URL[]) m.invoke(cl); + + for (URL url : urls) { + log.debug("ulr in class loader " + url); + } + } catch (Exception e) { + log.warn("??? : " + e.getMessage(), e); + } + } + } + + if (!JAXXCompiler.compile(src, files, options)) { + throw new MojoFailureException("Aborting due to errors reported by jaxxc"); + } + } + + public CompilerOptions toCompilerOptions() { + CompilerOptions result = new CompilerOptions(); + result.setClassPath(getSrc().getPath()); + if (getJavaOpts() != null && !"".equals(getJavaOpts())) { + result.setJavacOpts(getJavaOpts()); + } + result.setKeepJavaFiles(true); + result.setOptimize(isOptimize()); + result.setJavacTargetDirectory(getClassOut()); + result.setTargetDirectory(getOut()); + return result; + } + + protected Log log = getLog(); + + public File getSrc() { + return src; + } + + public boolean isOptimize() { + return optimize; + } + + public File getOut() { + return out; + } + + public String getJavaOpts() { + return javaOpts; + } + + public File getClassOut() { + return classOut; + } + + public String[] getIncludes() { + return includes; + } + + public void setJavaOpts(String javaOpts) { + this.javaOpts = javaOpts; + } + + public void setOptimize(boolean optimize) { + this.optimize = optimize; + } + + public void setOut(File out) { + this.out = out; + } + + public void setClassOut(File classOut) { + this.classOut = classOut; + } + + public void setSrc(File src) { + this.src = src; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + public void setIncludes(String[] includes) { + this.includes = includes; + } + + public String[] getFiles() { + return files; + } +} \ No newline at end of file

1 0

[Buix-commits] r748 - trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org 21 Jul '08

21 Jul '08

Author: tchemit Date: 2008-07-21 13:21:26 +0000 (Mon, 21 Jul 2008) New Revision: 748 Added: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/AbstractActionGeneratorGoal.java trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionProviderGeneratorGoal.java Modified: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java Log: generate action provider + refactor actions-*** goals Added: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/AbstractActionGeneratorGoal.java =================================================================== --- trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/AbstractActionGeneratorGoal.java (rev 0) +++ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/AbstractActionGeneratorGoal.java 2008-07-21 13:21:26 UTC (rev 748) @@ -0,0 +1,68 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.jaxx; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.project.MavenProject; + +import java.io.File; + +/** @author chemit */ +public abstract class AbstractActionGeneratorGoal extends AbstractMojo { + + /** + * @description D�pendance du projet. + * @parameter default-value="${project}" + * @readonly + */ + protected MavenProject project; + + /** + * @description Nom du fichier destination � g�n�rer. + * @parameter expression="${jaxx.baseResource}" default-value="${basedir}/src/main/resources" + */ + protected File baseResource; + + /** + * @description Nom du fichier destination � g�n�rer. + * @parameter expression="${jaxx.actionsFile}" default-value="/jaxx/${project.artifactId}-actions.properties" + */ + protected String actionsFile; + + /** + * @description Nom du fichier destination � g�n�rer. + * @parameter expression="${jaxx.cp}" default-value="${basedir}/target/classes" + */ + protected File cp; + + /** + * @description R�pertoire sources des fichiers java � traiter. + * @parameter expression="${jaxx.src}" default-value="${basedir}/src/main/java" + */ + protected File src; + + /** + * @description verbose + * @parameter expression="${jaxx.verbose}" default-value="false" + */ + protected boolean verbose; + + /** + * @description flag to copy generated file to cp + * @parameter expression="${jaxx.copyToCP}" default-value="false" + */ + protected boolean copyToCP; + +} Modified: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java =================================================================== --- trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java 2008-07-21 10:53:01 UTC (rev 747) +++ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java 2008-07-21 13:21:26 UTC (rev 748) @@ -20,7 +20,6 @@ package org.codelutin.jaxx; import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; @@ -46,44 +45,12 @@ * Classe permettant de generer le fichier de propri�t�s des actions d�tect�es. * * @author chemit - * @goal generate-actions + * @goal generate-actions-properties * @phase process-classes */ -public class ActionGeneratorGoal extends AbstractMojo { +public class ActionGeneratorGoal extends AbstractActionGeneratorGoal { /** - * @description D�pendance du projet. - * @parameter default-value="${project}" - * @readonly - */ - protected MavenProject project; - - /** - * @description R�pertoire sources des fichiers java � traiter. - * @parameter expression="${jaxx.src}" default-value="${basedir}/src/main/java" - */ - protected File src; - - /** - * @description Nom du fichier destination � g�n�rer. - * @parameter expression="${jaxx.baseResource}" default-value="${basedir}/src/main/resources" - */ - protected File baseResource; - - /** - * @description Nom du fichier destination � g�n�rer. - * @parameter expression="${jaxx.out}" default-value="${basedir}/src/main/resources/jaxx/${project.artifactId}-actions.properties" - */ - protected File out; - - /** - * @description Nom du fichier destination � g�n�rer. - * @parameter expression="${jaxx.cp}" default-value="${basedir}/target/classes" - */ - protected File cp; - - - /** * @description pour filter * @parameter expression="${jaxx.includes}" */ @@ -95,19 +62,6 @@ */ protected String[] excludes; - /** - * @description verbose - * @parameter expression="${jaxx.verbose}" default-value="false" - */ - protected boolean verbose; - - /** - * @description flag to copy generated file to cp - * @parameter expression="${jaxx.copyToCP}" default-value="false" - */ - protected boolean copyToCP; - - protected String[] files; private static final String[] INCLUDES = {"**\\/*.java"}; @@ -117,6 +71,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { init(); + if (verbose) { printInit(); } @@ -204,12 +159,13 @@ protected void saveProperties(Properties result) throws IOException { OutputStream writer = null; - File parent = out.getParentFile(); + File generatedFile = new File(baseResource, actionsFile); + File parent = generatedFile.getParentFile(); if (!parent.exists()) { parent.mkdirs(); } try { - writer = new org.codelutin.util.PropertiesDateRemoveFilterStream(new java.io.FileOutputStream(out)); + writer = new org.codelutin.util.PropertiesDateRemoveFilterStream(new java.io.FileOutputStream(generatedFile)); result.store(writer, null); @@ -225,8 +181,7 @@ if (copyToCP) { // save it also in classes - String path = out.getAbsolutePath().substring(baseResource.getAbsolutePath().length() + 1); - File compiledFile = new File(cp, path); + File compiledFile = new File(cp, actionsFile); if (getLog().isDebugEnabled()) { getLog().debug("copy to classapth generated file " + compiledFile); } @@ -234,46 +189,15 @@ if (!parent.exists()) { parent.mkdirs(); } - FileUtil.copy(out, compiledFile); + FileUtil.copy(generatedFile, compiledFile); } } - public File getSrc() { - return src; - } - public File getOut() { - return out; - } - - public String[] getIncludes() { - return includes; - } - - public void setOut(File out) { - this.out = out; - } - - public void setSrc(File src) { - this.src = src; - } - - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - public void setIncludes(String[] includes) { - this.includes = includes; - } - - public String[] getFiles() { - return files; - } - protected void init() { DirectoryScanner ds; ds = new DirectoryScanner(); - ds.setBasedir(getSrc()); + ds.setBasedir(src); boolean noIncludes = includes == null || includes.length == 0; ds.setIncludes(noIncludes ? INCLUDES : includes); boolean noExcludes = excludes == null || excludes.length == 0; @@ -283,7 +207,7 @@ ds.scan(); files = ds.getIncludedFiles(); - getLog().info("jaxx - found " + files.length + " file(s) to generate. "); + getLog().info("jaxx-actions - found " + files.length + " file(s) to treate. "); loader = initClassLoader(project, getLog()); } @@ -346,9 +270,9 @@ result = new URLClassLoader(url, getClass().getClassLoader()); } } catch (MalformedURLException eee) { - throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", getOut(), eee.getMessage()), eee); + throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", cp, eee.getMessage()), eee); } catch (IOException e) { - throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", getOut(), e.getMessage()), e); + throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", cp, e.getMessage()), e); } loader = result; } Copied: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionProviderGeneratorGoal.java (from rev 746, trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java) =================================================================== --- trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionProviderGeneratorGoal.java (rev 0) +++ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionProviderGeneratorGoal.java 2008-07-21 13:21:26 UTC (rev 748) @@ -0,0 +1,157 @@ +/* *##% + * Copyright (C) 2007 + * JaxxPlugin, Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.jaxx; + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.codelutin.util.FileUtil; + +import java.io.File; +import java.io.IOException; + +/** + * Classe permettant de generer un {@link org.codelutin.jaxx.action.ActionProvider} et so fichier de d�claration. + * + * @author chemit + * @goal generate-actions-provider + * @phase process-resources + */ +public class ActionProviderGeneratorGoal extends AbstractActionGeneratorGoal { + + /** + * @description FQN de la classe � g�n�rer. + * @parameter expression="${jaxx.fqn}" + * @required + */ + protected String fqn; + + /** + * @description nom logique du provider � g�n�rer. + * @parameter expression="${jaxx.providerName}" + * @required + */ + protected String providerName; + + /** + * @description FQN de la classe d'action � utiliser. + * @parameter expression="${jaxx.fqnAction}" + * @required + */ + protected String fqnAction; + + /** + * template of ActionProvider + * $1 : package of class + * $2 : simple name of class + * $3 : abstract action fqn + * $4 : path to actions properties file + * $5 : provider name + */ + protected static final String PROVIDER_TEMPLATE = + "package %1$s;\n" + + "\n" + + "public class %2$s extends org.codelutin.jaxx.action.ActionProviderFromProperties<%3$s> {\n" + + "\n" + + " public %2$s() {\n" + + " super(\"%5$s\", %3$s.class, \"%4$s\");\n" + + " }\n" + + "\n" + + "}\n"; + + protected File generateJavaProvider; + + protected File generatedProviderDeclaration; + + + public void execute() throws MojoExecutionException, MojoFailureException { + + init(); + + try { + + generateProvider(); + + generateProviderDeclaration(); + + } catch (IOException e) { + getLog().error(e); + throw new MojoExecutionException(e.getMessage(), e); + } + } + + protected void generateProvider() throws IOException { + + int index = fqn.lastIndexOf("."); + String packageJava = fqn.substring(0, index); + String simpleJavaName = fqn.substring(index + 1); + + //TODO check if file was modified + String content = String.format(PROVIDER_TEMPLATE, + packageJava, + simpleJavaName, + fqnAction, + actionsFile, + providerName + ); + + FileUtil.writeString(generateJavaProvider, content); + } + + protected void generateProviderDeclaration() throws IOException { + + //TODO check if file was modified + + // just add the fqn inside the file :) + FileUtil.writeString(generatedProviderDeclaration, fqn); + + if (copyToCP) { + // save it also in classes (since we are in process-resources phase and resources has already been copied) + String path = generatedProviderDeclaration.getAbsolutePath().substring(baseResource.getAbsolutePath().length() + 1); + File compiledFile = new File(cp, path); + if (getLog().isDebugEnabled()) { + getLog().debug("copy to classapth generated file " + compiledFile); + } + File parent = compiledFile.getParentFile(); + if (!parent.exists()) { + parent.mkdirs(); + } + FileUtil.copy(generatedProviderDeclaration, compiledFile); + } + } + + protected void init() { + + generateJavaProvider = new File(src, fqn.replaceAll("\\.", java.io.File.separator) + ".java"); + + File parent = generateJavaProvider.getParentFile(); + if (!parent.exists()) { + parent.mkdirs(); + } + + generatedProviderDeclaration = new File(baseResource, "META-INF/services/org.codelutin.jaxx.action.ActionProvider"); + parent = generatedProviderDeclaration.getParentFile(); + if (!parent.exists()) { + parent.mkdirs(); + } + + } + + +} \ No newline at end of file

1 0

[Buix-commits] r747 - trunk/lutinjaxx/jaxx-swing
by tchemit＠users.labs.libre-entreprise.org 21 Jul '08

21 Jul '08

Author: tchemit Date: 2008-07-21 10:53:01 +0000 (Mon, 21 Jul 2008) New Revision: 747 Modified: trunk/lutinjaxx/jaxx-swing/pom.xml Log: wrong version Modified: trunk/lutinjaxx/jaxx-swing/pom.xml =================================================================== --- trunk/lutinjaxx/jaxx-swing/pom.xml 2008-07-21 01:03:32 UTC (rev 746) +++ trunk/lutinjaxx/jaxx-swing/pom.xml 2008-07-21 10:53:01 UTC (rev 747) @@ -14,7 +14,7 @@ <name>jaxx-swing</name> <packaging>jar</packaging> - <version>0.2</version> + <version>0.2-SNAPSHOT</version> <description>Jaxx library swing extension</description> <dependencies>

1 0

[Buix-commits] r746 - trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org 21 Jul '08

21 Jul '08

Author: tchemit Date: 2008-07-21 01:03:32 +0000 (Mon, 21 Jul 2008) New Revision: 746 Modified: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java Log: copy generated file also to classpath to make possible to have it at next launch with no resources:resources goal needed Modified: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java =================================================================== --- trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java 2008-07-21 00:25:38 UTC (rev 745) +++ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java 2008-07-21 01:03:32 UTC (rev 746) @@ -30,6 +30,7 @@ import org.codelutin.jaxx.action.ActionConfig; import org.codelutin.jaxx.action.SelectActionConfig; import org.codelutin.jaxx.action.ToggleActionConfig; +import org.codelutin.util.FileUtil; import org.codelutin.util.SortedProperties; import java.io.File; @@ -65,6 +66,12 @@ /** * @description Nom du fichier destination � g�n�rer. + * @parameter expression="${jaxx.baseResource}" default-value="${basedir}/src/main/resources" + */ + protected File baseResource; + + /** + * @description Nom du fichier destination � g�n�rer. * @parameter expression="${jaxx.out}" default-value="${basedir}/src/main/resources/jaxx/${project.artifactId}-actions.properties" */ protected File out; @@ -94,6 +101,13 @@ */ protected boolean verbose; + /** + * @description flag to copy generated file to cp + * @parameter expression="${jaxx.copyToCP}" default-value="false" + */ + protected boolean copyToCP; + + protected String[] files; private static final String[] INCLUDES = {"**\\/*.java"}; @@ -118,23 +132,6 @@ } - protected void saveProperties(Properties result) throws IOException { - OutputStream writer = null; - try { - writer = new org.codelutin.util.PropertiesDateRemoveFilterStream(new java.io.FileOutputStream(out)); - - result.store(writer, null); - - } finally { - if (writer != null) { - - writer.flush(); - writer.close(); - - } - } - } - protected Properties loadProperties() { Properties result = new SortedProperties(); for (String file : files) { @@ -205,6 +202,42 @@ return result; } + protected void saveProperties(Properties result) throws IOException { + OutputStream writer = null; + File parent = out.getParentFile(); + if (!parent.exists()) { + parent.mkdirs(); + } + try { + writer = new org.codelutin.util.PropertiesDateRemoveFilterStream(new java.io.FileOutputStream(out)); + + result.store(writer, null); + + + } finally { + if (writer != null) { + + writer.flush(); + writer.close(); + + } + } + + if (copyToCP) { + // save it also in classes + String path = out.getAbsolutePath().substring(baseResource.getAbsolutePath().length() + 1); + File compiledFile = new File(cp, path); + if (getLog().isDebugEnabled()) { + getLog().debug("copy to classapth generated file " + compiledFile); + } + parent = compiledFile.getParentFile(); + if (!parent.exists()) { + parent.mkdirs(); + } + FileUtil.copy(out, compiledFile); + } + } + public File getSrc() { return src; }

1 0

[Buix-commits] r745 - in trunk/lutinjaxx: . jaxx-swing-action/src/main/java/org/codelutin/jaxx/action maven maven/src/main/java maven/src/main/java/org maven/src/main/java/org/codelutin maven/src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org 21 Jul '08

21 Jul '08

Author: tchemit Date: 2008-07-21 00:25:38 +0000 (Mon, 21 Jul 2008) New Revision: 745 Added: trunk/lutinjaxx/maven/src/main/java/org/ trunk/lutinjaxx/maven/src/main/java/org/codelutin/ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionConfig.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SelectActionConfig.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ToggleActionConfig.java trunk/lutinjaxx/maven/pom.xml trunk/lutinjaxx/pom.xml Log: utilisation org.codelutin:lutinutil en 0.30-SNAPSHOT mise en place d'un goal de generation des mappings d'actions Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionConfig.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionConfig.java 2008-07-20 22:16:56 UTC (rev 744) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionConfig.java 2008-07-21 00:25:38 UTC (rev 745) @@ -75,19 +75,19 @@ public abstract String largeIcon() default ""; /** - * @return + * @return accelerator * @see javax.swing.Action#ACCELERATOR_KEY */ public abstract String accelerator() default ""; /** - * @return + * @return mnemonic key * @see javax.swing.Action#MNEMONIC_KEY */ public abstract int mnemonic() default '\0'; /** - * @return + * @return mnemonic key index * @see javax.swing.Action#DISPLAYED_MNEMONIC_INDEX_KEY */ public abstract int displayedMnemonicIndex() default '\0'; @@ -99,16 +99,15 @@ public abstract boolean selected() default false; /** - * @return + * @return enabled state * @see javax.swing.Action#isEnabled() */ public abstract boolean enabled() default true; - /** - * @return - * @see javax.swing.Action#isEnabled() - */ + /** @return hideActionText state */ public abstract boolean hideActionText() default false; + /** @return array of names to be used in actions mapping */ + public abstract String[] multiNames() default {}; } \ No newline at end of file Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SelectActionConfig.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SelectActionConfig.java 2008-07-20 22:16:56 UTC (rev 744) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SelectActionConfig.java 2008-07-21 00:25:38 UTC (rev 745) @@ -63,7 +63,7 @@ public abstract String longDescription() default ""; /** - * @return + * @return accelerator key * @see javax.swing.Action#ACCELERATOR_KEY */ public abstract String accelerator() default ""; @@ -75,9 +75,12 @@ public abstract int selectedIndex() default 0; /** - * @return + * @return enabled state * @see javax.swing.Action#isEnabled() */ public abstract boolean enabled() default true; + /** @return array of names to be used in actions mapping */ + public abstract String[] multiNames() default {}; + } \ No newline at end of file Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ToggleActionConfig.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ToggleActionConfig.java 2008-07-20 22:16:56 UTC (rev 744) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ToggleActionConfig.java 2008-07-21 00:25:38 UTC (rev 745) @@ -74,13 +74,13 @@ public abstract String largeIcon() default ""; /** - * @return + * @return accelerator key of default state * @see javax.swing.Action#ACCELERATOR_KEY */ public abstract String accelerator() default ""; /** - * @return + * @return mnemonic key of default state * @see javax.swing.Action#MNEMONIC_KEY */ public abstract int mnemonic() default '\0'; @@ -116,13 +116,13 @@ public abstract String largeIcon2() default ""; /** - * @return + * @return accelerator key of default state * @see javax.swing.Action#ACCELERATOR_KEY */ public abstract String accelerator2() default ""; /** - * @return + * @return mnemonic key of second state * @see javax.swing.Action#MNEMONIC_KEY */ public abstract int mnemonic2() default '\0'; @@ -134,15 +134,14 @@ public abstract boolean selected() default false; /** - * @return + * @return enaled state * @see javax.swing.Action#isEnabled() */ public abstract boolean enabled() default true; - /** - * @return - * @see javax.swing.Action#isEnabled() - */ + /** @return hideActionText state */ public abstract boolean hideActionText() default false; + /** @return array of names to be used in actions mapping */ + public abstract String[] multiNames() default {}; } \ No newline at end of file Modified: trunk/lutinjaxx/maven/pom.xml =================================================================== --- trunk/lutinjaxx/maven/pom.xml 2008-07-20 22:16:56 UTC (rev 744) +++ trunk/lutinjaxx/maven/pom.xml 2008-07-21 00:25:38 UTC (rev 745) @@ -19,13 +19,27 @@ <name>maven plugin</name> <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>core</artifactId> <scope>compile</scope> </dependency> + <dependency> <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing-action</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing</artifactId> <scope>test</scope> </dependency> Added: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java =================================================================== --- trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java (rev 0) +++ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/ActionGeneratorGoal.java 2008-07-21 00:25:38 UTC (rev 745) @@ -0,0 +1,331 @@ +/* *##% + * Copyright (C) 2007 + * JaxxPlugin, Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.codelutin.jaxx; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.util.DirectoryScanner; +import static org.codelutin.i18n.I18n._; +import org.codelutin.jaxx.action.ActionConfig; +import org.codelutin.jaxx.action.SelectActionConfig; +import org.codelutin.jaxx.action.ToggleActionConfig; +import org.codelutin.util.SortedProperties; + +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Properties; +import java.util.Set; + +/** + * Classe permettant de generer le fichier de propri�t�s des actions d�tect�es. + * + * @author chemit + * @goal generate-actions + * @phase process-classes + */ +public class ActionGeneratorGoal extends AbstractMojo { + + /** + * @description D�pendance du projet. + * @parameter default-value="${project}" + * @readonly + */ + protected MavenProject project; + + /** + * @description R�pertoire sources des fichiers java � traiter. + * @parameter expression="${jaxx.src}" default-value="${basedir}/src/main/java" + */ + protected File src; + + /** + * @description Nom du fichier destination � g�n�rer. + * @parameter expression="${jaxx.out}" default-value="${basedir}/src/main/resources/jaxx/${project.artifactId}-actions.properties" + */ + protected File out; + + /** + * @description Nom du fichier destination � g�n�rer. + * @parameter expression="${jaxx.cp}" default-value="${basedir}/target/classes" + */ + protected File cp; + + + /** + * @description pour filter + * @parameter expression="${jaxx.includes}" + */ + protected String[] includes; + + /** + * @description pour filter + * @parameter expression="${jaxx.excludes}" + */ + protected String[] excludes; + + /** + * @description verbose + * @parameter expression="${jaxx.verbose}" default-value="false" + */ + protected boolean verbose; + + protected String[] files; + + private static final String[] INCLUDES = {"**\\/*.java"}; + + private ClassLoader loader; + + public void execute() throws MojoExecutionException, MojoFailureException { + + init(); + if (verbose) { + printInit(); + } + + Properties result = loadProperties(); + + try { + saveProperties(result); + } catch (IOException e) { + + throw new MojoExecutionException(e.getMessage(), e); + } + + } + + protected void saveProperties(Properties result) throws IOException { + OutputStream writer = null; + try { + writer = new org.codelutin.util.PropertiesDateRemoveFilterStream(new java.io.FileOutputStream(out)); + + result.store(writer, null); + + } finally { + if (writer != null) { + + writer.flush(); + writer.close(); + + } + } + } + + protected Properties loadProperties() { + Properties result = new SortedProperties(); + for (String file : files) { + String fqn = file.substring(0, file.length() - 5).replaceAll("\\/", "."); + + if (getLog().isDebugEnabled()) { + getLog().debug("fqn to treate " + fqn); + } + + try { + Class<?> clazz = Class.forName(fqn, false, loader); + + // try a ActionConfig + ActionConfig actionConfig = clazz.getAnnotation(ActionConfig.class); + if (actionConfig != null) { + if (actionConfig.multiNames().length > 0) { + // multinames + registerEntry(clazz, result, actionConfig.multiNames()); + continue; + } + + if (!actionConfig.actionCommand().isEmpty()) { + registerEntry(clazz, result, actionConfig.actionCommand()); + continue; + } + + getLog().warn("could not treate class " + clazz); + continue; + } + + // try a SelectActionConfig + SelectActionConfig selectActionConfig = clazz.getAnnotation(SelectActionConfig.class); + if (selectActionConfig != null) { + if (selectActionConfig.multiNames().length > 0) { + // multinames + registerEntry(clazz, result, selectActionConfig.multiNames()); + continue; + } + + if (!selectActionConfig.actionCommand().isEmpty()) { + registerEntry(clazz, result, selectActionConfig.actionCommand()); + continue; + } + getLog().warn("could not treate class " + clazz); + continue; + } + // try a toggleAction + ToggleActionConfig toggleActionConfig = clazz.getAnnotation(ToggleActionConfig.class); + if (toggleActionConfig != null) { + if (toggleActionConfig.multiNames().length > 0) { + // multinames + registerEntry(clazz, result, toggleActionConfig.multiNames()); + continue; + } + + if (!toggleActionConfig.actionCommand().isEmpty()) { + registerEntry(clazz, result, toggleActionConfig.actionCommand()); + continue; + } + + getLog().warn("could not treate class " + clazz); + } + + } catch (ClassNotFoundException e) { + getLog().error("could not find class " + e.getMessage()); + } + } + return result; + } + + public File getSrc() { + return src; + } + + public File getOut() { + return out; + } + + public String[] getIncludes() { + return includes; + } + + public void setOut(File out) { + this.out = out; + } + + public void setSrc(File src) { + this.src = src; + } + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + public void setIncludes(String[] includes) { + this.includes = includes; + } + + public String[] getFiles() { + return files; + } + + protected void init() { + DirectoryScanner ds; + ds = new DirectoryScanner(); + ds.setBasedir(getSrc()); + boolean noIncludes = includes == null || includes.length == 0; + ds.setIncludes(noIncludes ? INCLUDES : includes); + boolean noExcludes = excludes == null || excludes.length == 0; + if (!noExcludes) { + ds.setExcludes(excludes); + } + ds.scan(); + files = ds.getIncludedFiles(); + + getLog().info("jaxx - found " + files.length + " file(s) to generate. "); + + loader = initClassLoader(project, getLog()); + } + + protected void registerEntry(Class<?> clazz, Properties result, String... names) { + for (String name : names) { + if (getLog().isDebugEnabled()) { + getLog().debug("name: " + name + ", class:" + clazz); + } + result.put("action." + name, clazz.getName()); + } + } + + protected void printInit() { + + for (String file : files) { + getLog().debug(file); + } + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + + getLog().debug(cl.toString()); + if (cl.getClass().getSimpleName().equals("RealmClassLoader")) { + try { + java.lang.reflect.Method m = cl.getClass().getDeclaredMethod("getURLs"); + m.setAccessible(true); + URL[] urls = (URL[]) m.invoke(cl); + + for (URL url : urls) { + getLog().debug("ulr in class loader " + url); + } + } catch (Exception e) { + getLog().warn("??? : " + e.getMessage(), e); + } + } + } + + @SuppressWarnings({"unchecked"}) + protected URLClassLoader initClassLoader(MavenProject project, Log log) { + URLClassLoader loader = null; + if (project != null) { + URLClassLoader result; + try { + Set<Artifact> compileClasspathElements = project.getArtifacts(); + URL[] url = new URL[compileClasspathElements.size() + 1]; + url[0] = cp.toURI().toURL(); + int i = 1; + for (Artifact artifact : compileClasspathElements) { + File file = new File(artifact.getFile().getAbsolutePath()); + if (file.getName().endsWith(".jar")) { + url[i] = new URL("jar", "", file.toURI().toURL().toString() + "!/"); + } else { + url[i] = file.toURI().toURL(); + } + i++; + } + //ClassLoader parent = Thread.currentThread().getContextClassLoader(); + if (compileClasspathElements.size() == 0) { + result = new URLClassLoader(url, getClass().getClassLoader()); + } else { + result = new URLClassLoader(url, getClass().getClassLoader()); + } + } catch (MalformedURLException eee) { + throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", getOut(), eee.getMessage()), eee); + } catch (IOException e) { + throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", getOut(), e.getMessage()), e); + } + loader = result; + } + if (log.isDebugEnabled() && loader != null) { + for (URL entry : loader.getURLs()) { + log.info("cp url " + entry); + } + } + return loader; + } + + +} \ No newline at end of file Modified: trunk/lutinjaxx/pom.xml =================================================================== --- trunk/lutinjaxx/pom.xml 2008-07-20 22:16:56 UTC (rev 744) +++ trunk/lutinjaxx/pom.xml 2008-07-21 00:25:38 UTC (rev 745) @@ -30,7 +30,7 @@ <dependencies> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> </dependency> </dependencies> @@ -174,9 +174,9 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.29</version> + <version>0.30-SNAPSHOT</version> </dependency> <dependency>

1 0

[Buix-commits] r744 - trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action
by tchemit＠users.labs.libre-entreprise.org 20 Jul '08

20 Jul '08

Author: tchemit Date: 2008-07-20 22:16:56 +0000 (Sun, 20 Jul 2008) New Revision: 744 Added: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactoryFromProvider.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionProviderFromProperties.java Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/AbstractActionProvider.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SimpleActionFactoryImpl.java Log: restore this deprecated factory (to make it compiliance with projects...) add a new factory with provider to detect actions Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/AbstractActionProvider.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/AbstractActionProvider.java 2008-07-20 22:01:49 UTC (rev 743) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/AbstractActionProvider.java 2008-07-20 22:16:56 UTC (rev 744) @@ -14,24 +14,31 @@ */ package org.codelutin.jaxx.action; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import javax.swing.AbstractAction; import java.util.Map; /** @author chemit */ public abstract class AbstractActionProvider<A extends AbstractAction> implements ActionProvider<A> { - protected final String name; + protected static Log log = LogFactory.getLog(AbstractActionProvider.class); - protected final Class<A> baseClass; + protected String name; + protected Class<A> baseClass; + protected Map<String, Class<? extends A>> actions; protected abstract Map<String, Class<? extends A>> initCache(); - protected AbstractActionProvider(String name, Class<A> baseClass) { + protected AbstractActionProvider(String name, Class<A> baseClass, boolean doInitCache) { this.name = name; this.baseClass = baseClass; - this.actions = initCache(); + if (doInitCache) { + this.actions = initCache(); + } } public String getName() { Copied: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactoryFromProvider.java (from rev 740, trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SimpleActionFactoryImpl.java) =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactoryFromProvider.java (rev 0) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactoryFromProvider.java 2008-07-20 22:16:56 UTC (rev 744) @@ -0,0 +1,60 @@ +/* +* ##% Copyright (C) 2007, 2008 Code Lutin, Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package org.codelutin.jaxx.action; + +import javax.swing.AbstractAction; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.TreeMap; + +/** + * A simple implementation of {@link ActionFactory} using a properties file to + * load action mapping. + * <p/> + * An entry is in that form : <code>action.actionName=fqn</code> where + * <p/> + * <code>actionName</code> is the key of action used in factory, and + * <code>fqn</code> is the fully qualified name of the implemented action class. + * + * @author chemit + */ +public class ActionFactoryFromProvider extends ActionFactory { + + /** real file where to load actions mapping */ + protected String actionFilePath; + + public ActionFactoryFromProvider() { + super(); + } + + + protected Map<String, Class<? extends AbstractAction>> init() { + // obtain a ServiceLoader on ActionProvider + ServiceLoader<ActionProvider> loader = ServiceLoader.load(ActionProvider.class); + Map<String, Class<? extends AbstractAction>> cache = new TreeMap<String, Class<? extends AbstractAction>>(); + + for (ActionProvider<?> actionProvider : loader) { + if (log.isDebugEnabled()) { + log.debug("load action provider " + actionProvider); + } + cache.putAll(actionProvider.getClasses()); + } + return cache; + } + +} \ No newline at end of file Added: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionProviderFromProperties.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionProviderFromProperties.java (rev 0) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionProviderFromProperties.java 2008-07-20 22:16:56 UTC (rev 744) @@ -0,0 +1,82 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.jaxx.action; + +import static org.codelutin.i18n.I18n._; + +import javax.swing.AbstractAction; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; +import java.util.Properties; +import java.util.TreeMap; + +/** @author chemit */ +public class ActionProviderFromProperties<A extends AbstractAction> extends AbstractActionProvider<A> { + + /** default prefix for an entryin mapping file. */ + protected static final String ACTION_KEY_PREFIX = "action."; + + protected String propertiesPath; + + protected ActionProviderFromProperties(String name, Class<A> baseClass, String propertiesPath) { + super(name, baseClass, false); + this.propertiesPath = propertiesPath; + this.actions = initCache(); + } + + @SuppressWarnings({"unchecked"}) + protected Map<String, Class<? extends A>> initCache() { + + InputStream inputStream = null; + + Properties properties = new Properties(); + + try { + inputStream = getClass().getResourceAsStream(propertiesPath); + log.info("load " + propertiesPath); + properties.load(inputStream); + } catch (IOException e) { + log.warn(_("jaxx.error.load.actions.file", e.getMessage())); + throw new RuntimeException(_("jaxx.error.load.actions.file", e.getMessage())); + } finally { + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + log.warn(_("jaxx.error.close.actions.file", e.getMessage())); + //throw new RuntimeException(_("jaxx.error.load.actions.file", e.getMessage())); + } + } + } + + Map<String, Class<? extends A>> cache = new TreeMap<String, Class<? extends A>>(); + int prefix = ACTION_KEY_PREFIX.length(); + for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { + String key = objectObjectEntry.getKey() + ""; + String qfn = objectObjectEntry.getValue() + ""; + try { + Class<? extends A> implCass; + implCass = (Class<? extends A>) Class.forName(qfn); + log.debug("found action " + implCass); + cache.put(key.substring(prefix), implCass); + } catch (ClassNotFoundException e) { + throw new RuntimeException(_("jaxx.error.load.actions.class", key, qfn)); + } + } + + return cache; + } +} Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SimpleActionFactoryImpl.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SimpleActionFactoryImpl.java 2008-07-20 22:01:49 UTC (rev 743) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/SimpleActionFactoryImpl.java 2008-07-20 22:16:56 UTC (rev 744) @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.ServiceLoader; import java.util.TreeMap; /** @@ -40,6 +39,7 @@ * <code>fqn</code> is the fully qualified name of the implemented action class. * * @author chemit + * @deprecated prefer use {@link org.codelutin.jaxx.action.ActionFactoryFromProvider} */ public class SimpleActionFactoryImpl extends ActionFactory { /** default file where to load action mapping */ @@ -61,18 +61,6 @@ @SuppressWarnings({"unchecked"}) protected Map<String, Class<? extends AbstractAction>> init() { - ServiceLoader<ActionProvider> loader = ServiceLoader.load(ActionProvider.class); - Map<String, Class<? extends AbstractAction>> cache = new TreeMap<String, Class<? extends AbstractAction>>(); - - for (ActionProvider<? extends AbstractAction> actionProvider : loader) { - log.info("load action provider " + actionProvider); - cache.putAll(actionProvider.getClasses()); - } - return cache; - } - - @SuppressWarnings({"unchecked"}) - protected Map<String, Class<? extends AbstractAction>> initOld() { Properties properties = new Properties(); List<URL> urls = Resource.getURLs(".*jaxx/.+-actions\\.properties"); for (URL url : urls) {

1 0

[Buix-commits] r743 - trunk/lutinjaxx/jaxx-swing-action
by tchemit＠users.labs.libre-entreprise.org 20 Jul '08

20 Jul '08

Author: tchemit Date: 2008-07-20 22:01:49 +0000 (Sun, 20 Jul 2008) New Revision: 743 Modified: trunk/lutinjaxx/jaxx-swing-action/pom.xml Log: i18n in this module Modified: trunk/lutinjaxx/jaxx-swing-action/pom.xml =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/pom.xml 2008-07-20 22:01:30 UTC (rev 742) +++ trunk/lutinjaxx/jaxx-swing-action/pom.xml 2008-07-20 22:01:49 UTC (rev 743) @@ -19,7 +19,19 @@ <build> <plugins> - + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build>

1 0

[Buix-commits] r742 - in trunk/lutinjaxx/jaxx-swing-action/src/main/resources: . i18n
by tchemit＠users.labs.libre-entreprise.org 20 Jul '08

20 Jul '08

Author: tchemit Date: 2008-07-20 22:01:30 +0000 (Sun, 20 Jul 2008) New Revision: 742 Added: trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/ trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties Log: i18n for loading providers Added: trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties (rev 0) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties 2008-07-20 22:01:30 UTC (rev 742) @@ -0,0 +1,3 @@ +jaxx.error.close.actions.file=Error while closing file of actions +jaxx.error.load.actions.class=Error while loading actions +jaxx.error.load.actions.file=Error while loading file of actions Added: trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties (rev 0) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties 2008-07-20 22:01:30 UTC (rev 742) @@ -0,0 +1,3 @@ +jaxx.error.close.actions.file=Erreur lors de la fermeture du fichier d'actions +jaxx.error.load.actions.class=Erreur lors du chargement des actions +jaxx.error.load.actions.file=Erreur lors du chargement du fchier d'actions

1 0

[Buix-commits] r741 - in trunk/lutinjaxx/core/src/main/resources: . META-INF META-INF/services
by tchemit＠users.labs.libre-entreprise.org 20 Jul '08

20 Jul '08

Author: tchemit Date: 2008-07-20 20:02:26 +0000 (Sun, 20 Jul 2008) New Revision: 741 Added: trunk/lutinjaxx/core/src/main/resources/META-INF/ trunk/lutinjaxx/core/src/main/resources/META-INF/services/ trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer Log: readd core default provider Added: trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer =================================================================== --- trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer (rev 0) +++ trunk/lutinjaxx/core/src/main/resources/META-INF/services/jaxx.spi.Initializer 2008-07-20 20:02:26 UTC (rev 741) @@ -0,0 +1 @@ +jaxx.DefaultInitializer \ No newline at end of file

1 0