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

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

22 Jul '08

Author: tchemit Date: 2008-07-22 20:06:35 +0000 (Tue, 22 Jul 2008) New Revision: 760 Modified: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java Log: utilisation d'un r?\195?\169pertoire de compilation dans le projet Modified: trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java =================================================================== --- trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java 2008-07-22 18:03:24 UTC (rev 759) +++ trunk/lutinjaxx/maven/src/main/java/org/codelutin/jaxx/JaxxGeneratorGoal.java 2008-07-22 20:06:35 UTC (rev 760) @@ -25,6 +25,7 @@ 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 java.io.File; @@ -38,8 +39,16 @@ * @phase process-resources */ public class JaxxGeneratorGoal extends AbstractMojo { - /** + * The maven project. + * + * @parameter expression="${project}" + * @read-only + * @required + */ + private MavenProject project; + + /** * @description R�pertoire sources des fichiers jaxx � g�n�rer. * @parameter expression="${jaxx.src}" default-value="${basedir}/src/uimodel" */ @@ -83,7 +92,12 @@ private static final String[] INCLUDES = {"**\\/*.jaxx"}; public void execute() throws MojoExecutionException, MojoFailureException { + if (!out.exists()) { + out.mkdirs(); + } + fixCompileSourceRoots(); + DirectoryScanner ds; ds = new DirectoryScanner(); ds.setBasedir(getSrc()); @@ -194,4 +208,10 @@ public String[] getFiles() { return files; } + + protected void fixCompileSourceRoots() { + if (!project.getCompileSourceRoots().contains(out.getPath())) { + project.addCompileSourceRoot(out.getPath()); + } + } } \ No newline at end of file

1 0

[Buix-commits] r759 - trunk/lutinjaxx/maven/src/main/resources
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 18:03:24 +0000 (Tue, 22 Jul 2008) New Revision: 759 Modified: trunk/lutinjaxx/maven/src/main/resources/log4j.properties Log: revert ! Modified: trunk/lutinjaxx/maven/src/main/resources/log4j.properties =================================================================== --- trunk/lutinjaxx/maven/src/main/resources/log4j.properties 2008-07-22 18:02:38 UTC (rev 758) +++ trunk/lutinjaxx/maven/src/main/resources/log4j.properties 2008-07-22 18:03:24 UTC (rev 759) @@ -5,5 +5,5 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.logger.org.codelutin.jaxx=DEBUG -log4j.logger.jaxx=DEBUG +#log4j.logger.org.codelutin.jaxx=DEBUG +#log4j.logger.jaxx=DEBUG

1 0

[Buix-commits] r758 - trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 18:02:38 +0000 (Tue, 22 Jul 2008) New Revision: 758 Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java Log: revert ! Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java =================================================================== --- trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 17:16:20 UTC (rev 757) +++ trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 18:02:38 UTC (rev 758) @@ -100,8 +100,8 @@ rowConstraints = (GridBagConstraints) tableConstraints.clone(); for (int x = 0; x < rowSpans.size(); x++) { - Integer rowSpan = rowSpans.get(x); - if (rowSpan != null && rowSpan > 0) { + int rowSpan = rowSpans.get(x); + if (rowSpan > 0) { rowSpans.set(x, rowSpan - 1); } } @@ -110,7 +110,7 @@ public void newCell() { emptyCell = true; rowConstraints.gridx++; - while (rowConstraints.gridx < rowSpans.size() && rowSpans.get(rowConstraints.gridx) != null && rowSpans.get(rowConstraints.gridx) > 0) { + while (rowConstraints.gridx < rowSpans.size() && rowSpans.get(rowConstraints.gridx) > 0) { rowConstraints.gridx++; } cellConstraints = (GridBagConstraints) rowConstraints.clone();

1 0

[Buix-commits] r757 - trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 17:16:20 +0000 (Tue, 22 Jul 2008) New Revision: 757 Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java Log: test d'un NPE ? Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java =================================================================== --- trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 17:09:28 UTC (rev 756) +++ trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 17:16:20 UTC (rev 757) @@ -110,7 +110,7 @@ public void newCell() { emptyCell = true; rowConstraints.gridx++; - while (rowConstraints.gridx < rowSpans.size() && rowSpans.get(rowConstraints.gridx) > 0) { + while (rowConstraints.gridx < rowSpans.size() && rowSpans.get(rowConstraints.gridx) != null && rowSpans.get(rowConstraints.gridx) > 0) { rowConstraints.gridx++; } cellConstraints = (GridBagConstraints) rowConstraints.clone();

1 0

[Buix-commits] r756 - trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 17:09:28 +0000 (Tue, 22 Jul 2008) New Revision: 756 Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java Log: test d'un NPE ? Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java =================================================================== --- trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 17:02:30 UTC (rev 755) +++ trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 17:09:28 UTC (rev 756) @@ -32,8 +32,7 @@ try { if (object instanceof CompiledTable) { CellHandler.setAttribute(((CompiledTable) object).getTableConstraints(), propertyName, stringValue); - } - else { + } else { super.setAttribute(object, propertyName, stringValue, inline, compiler); } } @@ -101,8 +100,8 @@ rowConstraints = (GridBagConstraints) tableConstraints.clone(); for (int x = 0; x < rowSpans.size(); x++) { - int rowSpan = rowSpans.get(x); - if (rowSpan > 0) { + Integer rowSpan = rowSpans.get(x); + if (rowSpan != null && rowSpan > 0) { rowSpans.set(x, rowSpan - 1); } }

1 0

[Buix-commits] r755 - trunk/lutinjaxx/core/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 17:02:30 +0000 (Tue, 22 Jul 2008) New Revision: 755 Modified: trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java Log: des logs dans jaxx :) Modified: trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-07-22 16:51:50 UTC (rev 754) +++ trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-07-22 17:02:30 UTC (rev 755) @@ -341,6 +341,9 @@ private void runInitializers() { for (Runnable runnable : initializers) { + if (log.isDebugEnabled()) { + log.debug(runnable); + } runnable.run(); } initializers.clear();

1 0

[Buix-commits] r754 - trunk/lutinjaxx/core/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 22 Jul '08

22 Jul '08

Author: tchemit Date: 2008-07-22 16:51:50 +0000 (Tue, 22 Jul 2008) New Revision: 754 Modified: trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java Log: des logs dans jaxx :) Modified: trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-07-22 16:40:01 UTC (rev 753) +++ trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-07-22 16:51:50 UTC (rev 754) @@ -1830,16 +1830,20 @@ if (compiler == null) throw new CompilerException("Internal error: could not find compiler for " + className + " during second pass"); if (log.isDebugEnabled()) { - log.debug("compile second pass for " + className); + log.debug("runInitializers for " + className); } if (!compiler.failed) { compiler.runInitializers(); } if (log.isDebugEnabled()) { - log.debug("compile first pass for " + className); + log.debug("compile second pass for " + className); } compiler.compileSecondPass(); + if (log.isDebugEnabled()) { + log.debug("done with result [" + !compiler.failed + "] for " + className); + } if (!compiler.failed) { + } else { success = false; }

1 0

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

22 Jul '08

Author: tchemit Date: 2008-07-22 16:40:01 +0000 (Tue, 22 Jul 2008) New Revision: 753 Modified: trunk/lutinjaxx/core/pom.xml trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java trunk/lutinjaxx/maven/src/main/resources/log4j.properties trunk/lutinjaxx/pom.xml Log: des logs dans jaxx :) Modified: trunk/lutinjaxx/core/pom.xml =================================================================== --- trunk/lutinjaxx/core/pom.xml 2008-07-22 15:39:01 UTC (rev 752) +++ trunk/lutinjaxx/core/pom.xml 2008-07-22 16:40:01 UTC (rev 753) @@ -26,6 +26,11 @@ <dependencies> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>util</artifactId> </dependency> Modified: trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-07-22 15:39:01 UTC (rev 752) +++ trunk/lutinjaxx/core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-07-22 16:40:01 UTC (rev 753) @@ -23,6 +23,8 @@ import jaxx.tags.TagHandler; import jaxx.tags.TagManager; import jaxx.types.TypeManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.Attributes; @@ -65,15 +67,18 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.ServiceLoader; import java.util.Set; import java.util.Stack; -import java.util.ServiceLoader; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; /** Compiles JAXX files into Java classes. */ public class JAXXCompiler { + /** log */ + protected static final Log log = LogFactory.getLog(JAXXCompiler.class); + /** * True to throw exceptions when we encounter unresolvable classes, false to ignore. * This is currently set to false until JAXX has full support for inner classes @@ -253,7 +258,9 @@ public static void loadLibraries() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException { ServiceLoader<Initializer> loader = ServiceLoader.load(Initializer.class); for (Initializer initializer : loader) { - System.out.println("load initializer "+initializer); + if (log.isDebugEnabled()) { + log.debug("load initializer " + initializer); + } initializer.initialize(); } } @@ -787,8 +794,7 @@ CompiledObject parent = components[i].getParent(); while (parent != null) { boolean found = false; - for (int j = i + 1; j < components.length; j++) - { // found parent after component, swap them + for (int j = i + 1; j < components.length; j++) { // found parent after component, swap them if (components[j] == parent) { components[j] = components[i]; components[i] = parent; @@ -1411,7 +1417,7 @@ } script = script.trim(); if (!"".equals(script) && !script.endsWith("}") && !script.endsWith(";")) { - script +=";"; + script += ";"; } scriptManager.registerScript(script); @@ -1432,8 +1438,7 @@ public void registerStylesheet(Stylesheet stylesheet) { if (this.stylesheet == null) { this.stylesheet = stylesheet; - } - else { + } else { this.stylesheet.add(stylesheet.getRules()); } } @@ -1515,8 +1520,7 @@ int lineOffset; if (ex instanceof ParseException) { lineOffset = Math.max(0, ((ParseException) ex).getLine() - 1); - } - else { + } else { lineOffset = 0; } Element currentTag = null; @@ -1784,6 +1788,9 @@ while (filesIterator.hasNext()) { File file = filesIterator.next(); String className = classNamesIterator.next(); + if (log.isDebugEnabled()) { + log.debug("compile first pass for " + className); + } if (symbolTables.get(file) == null) { compiled = true; if (compilers.containsKey(className)) { @@ -1811,8 +1818,7 @@ } } - } - while (compiled); + } while (compiled); // pass 2 currentPass = PASS_2; @@ -1823,9 +1829,15 @@ JAXXCompiler compiler = compilers.get(className); if (compiler == null) throw new CompilerException("Internal error: could not find compiler for " + className + " during second pass"); + if (log.isDebugEnabled()) { + log.debug("compile second pass for " + className); + } if (!compiler.failed) { compiler.runInitializers(); } + if (log.isDebugEnabled()) { + log.debug("compile first pass for " + className); + } compiler.compileSecondPass(); if (!compiler.failed) { } else { @@ -1941,15 +1953,13 @@ } else if (arg[i].equals("-cp") || arg[i].equals("-classpath")) { if (++i < arg.length) { options.setClassPath(arg[i]); - } - else { + } else { success = false; } } else if (arg[i].equals("-javac_opts")) { if (++i < arg.length) { options.setJavacOpts(arg[i]); - } - else { + } else { success = false; } } else if (arg[i].equals("-k") || arg[i].equals("-keep")) @@ -1962,8 +1972,7 @@ System.err.println("jaxxc version " + getVersion() + " by Ethan Nicholas"); System.err.println("http://www.jaxxframework.org/"); System.exit(0); - } else - if (arg[i].equals("-internalDumpVersion")) { // used by ant to extract the version info + } else if (arg[i].equals("-internalDumpVersion")) { // used by ant to extract the version info System.out.println("jaxx.version=" + getVersion()); return; } else { @@ -1975,8 +1984,7 @@ if (success) { success = compile(new File("."), files.toArray(new String[files.size()]), options); - } - else { + } else { showUsage(); System.exit(1); } Modified: trunk/lutinjaxx/maven/src/main/resources/log4j.properties =================================================================== --- trunk/lutinjaxx/maven/src/main/resources/log4j.properties 2008-07-22 15:39:01 UTC (rev 752) +++ trunk/lutinjaxx/maven/src/main/resources/log4j.properties 2008-07-22 16:40:01 UTC (rev 753) @@ -4,4 +4,6 @@ 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 -file:///home/tony/.m2/repository/lutinlib/lutinproject/2.2/lutinproject-2.2.pom + +log4j.logger.org.codelutin.jaxx=DEBUG +log4j.logger.jaxx=DEBUG Modified: trunk/lutinjaxx/pom.xml =================================================================== --- trunk/lutinjaxx/pom.xml 2008-07-22 15:39:01 UTC (rev 752) +++ trunk/lutinjaxx/pom.xml 2008-07-22 16:40:01 UTC (rev 753) @@ -182,37 +182,45 @@ <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>util</artifactId> - <version>0.2-SNAPSHOT</version> + <version>${current.version}</version> </dependency> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>core</artifactId> - <version>0.2-SNAPSHOT</version> + <version>${current.version}</version> </dependency> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>runtime</artifactId> - <version>0.2-SNAPSHOT</version> + <version>${current.version}</version> </dependency> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing</artifactId> - <version>0.2-SNAPSHOT</version> + <version>${current.version}</version> </dependency> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> - <version>0.2-SNAPSHOT</version> + <version>${current.version}</version> </dependency> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing-tab</artifactId> - <version>0.2-SNAPSHOT</version> + <version>${current.version}</version> </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> + + + <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> <version>${java.version}</version>

1 0

[Buix-commits] r752 - in trunk/lutinjaxx/maven/src/test/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:39:01 +0000 (Tue, 22 Jul 2008) New Revision: 752 Added: trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompileConfig.java trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompilerTest.java Removed: trunk/lutinjaxx/maven/src/test/java/jaxx/CompileConfig.java trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java Log: move to our package org.codelutin.jaxx Deleted: trunk/lutinjaxx/maven/src/test/java/jaxx/CompileConfig.java =================================================================== --- trunk/lutinjaxx/maven/src/test/java/jaxx/CompileConfig.java 2008-07-22 15:38:42 UTC (rev 751) +++ trunk/lutinjaxx/maven/src/test/java/jaxx/CompileConfig.java 2008-07-22 15:39:01 UTC (rev 752) @@ -1,42 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 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 jaxx; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Une annotation pour configurer les tests de compilation. - * - * @author chemit - */ -(a)Retention(java.lang.annotation.RetentionPolicy.RUNTIME) -@Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) -public @interface CompileConfig { - - public String packageName(); - - public boolean optimize() default true; - - public boolean runJavac() default false; - - public boolean verbose() default false; - - public String javaOpts() default ""; -} Deleted: trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java 2008-07-22 15:38:42 UTC (rev 751) +++ trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java 2008-07-22 15:39:01 UTC (rev 752) @@ -1,132 +0,0 @@ -package jaxx; - -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; -import java.lang.reflect.InvocationTargetException; - -public class CompilerTest extends TestCase { - - protected JaxxGeneratorGoal goal; - - protected static final String PREFIX_PACKAGE = "testcases"; - - protected static File srcDir; - - protected static File getSrcDir() { - if (srcDir == null) { - srcDir = new File("src" + File.separator + "test" + File.separator + "java"); - } - return srcDir; - } - - protected static File outDir; - - protected static File getOutDir() { - if (outDir == null) { - outDir = new File("target" + File.separator + "test-gen-java"); - outDir.mkdirs(); - } - return outDir; - } - - protected static File ClassOutDir; - - protected static File getClassOutDir() { - if (ClassOutDir == null) { - ClassOutDir = new File("target" + File.separator + "test-classes"); - ClassOutDir.mkdirs(); - } - return ClassOutDir; - } - - @Override - public void setUp() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, MojoExecutionException, MojoFailureException { - CompileConfig anno = getClass().getMethod(getName()).getAnnotation(CompileConfig.class); - assertNotNull("could not found " + CompileConfig.class.getSimpleName() + " annotation on test " + getClass(), anno); - final File srcDir = getSrcDir(); - assertTrue("could not found srcDir (or not existing) : " + srcDir + " on test " + getClass(), srcDir != null && srcDir.exists()); - final File outDir = getOutDir(); - assertTrue("could not found outDir (or not existing) : " + outDir + " on test " + getClass(), outDir != null && outDir.exists()); - final File classOutDir = getClassOutDir(); - assertTrue("could not found classOutDir (or not existing) : " + classOutDir + " on test " + getClass(), classOutDir != null && classOutDir.exists()); - String packageName = anno.packageName(); - goal = new JaxxGeneratorGoal(); - goal.setSrc(srcDir); - goal.setOut(outDir); - goal.setClassOut(classOutDir); - goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); - goal.setOptimize(anno.optimize()); - goal.setVerbose(anno.verbose()); - //TODO Use the maven plexus TestCase inorder to include dependencies - goal.setJavaOpts(anno.javaOpts()); - System.out.println(getName()); - - } - - @CompileConfig(packageName = "InnerClasses", runJavac = true) - public void testInnerClasses() throws MojoExecutionException, MojoFailureException { - goal.execute(); - } - - - @CompileConfig(packageName = "SpecialSubclassing", runJavac = true) - public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { - try { - goal.execute(); - } catch (Exception e) { - // there is some inter-dependances between generated java file - // we runJavaC on each file, but we should compile a sourcePath instead... - assertTrue(true); - } - goal.execute(); - } - - @CompileConfig(packageName = "CssTests") - public void testCssTests() throws MojoExecutionException, MojoFailureException { - goal.execute(); - } - - @CompileConfig(packageName = "errors") - public void testErrors() throws MojoExecutionException, MojoFailureException { - } - - @CompileConfig(packageName = "Initializers", runJavac = false) - public void testInitializers() throws MojoExecutionException, MojoFailureException { - goal.execute(); - } - - @CompileConfig(packageName = "Script", runJavac = false) - public void testScript() throws MojoExecutionException, MojoFailureException { - try { - goal.execute(); - } catch (Exception e) { - // there is some inter-dependances between generated java file - // we runJavaC on each file, but we should compile a sourcePath instead... - assertTrue(true); - } - } - - @CompileConfig(packageName = "OverridingDataBindings", runJavac = false) - public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException { - goal.execute(); - } - - @CompileConfig(packageName = "ClassReferences", runJavac = true) - public void testClassReferences() throws MojoExecutionException, MojoFailureException { - try { - goal.execute(); - } catch (Exception e) { - // there is some inter-dependances between generated java file - // we runJavaC on each file, but we should compile a sourcePath instead... - assertTrue(true); - } - goal.execute(); - } - - -} \ No newline at end of file Copied: trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompileConfig.java (from rev 740, trunk/lutinjaxx/maven/src/test/java/jaxx/CompileConfig.java) =================================================================== --- trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompileConfig.java (rev 0) +++ trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompileConfig.java 2008-07-22 15:39:01 UTC (rev 752) @@ -0,0 +1,42 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 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; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Une annotation pour configurer les tests de compilation. + * + * @author chemit + */ +(a)Retention(java.lang.annotation.RetentionPolicy.RUNTIME) +@Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) +public @interface CompileConfig { + + public String packageName(); + + public boolean optimize() default true; + + public boolean runJavac() default false; + + public boolean verbose() default false; + + public String javaOpts() default ""; +} Copied: trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompilerTest.java (from rev 750, trunk/lutinjaxx/maven/src/test/java/jaxx/CompilerTest.java) =================================================================== --- trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompilerTest.java (rev 0) +++ trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-07-22 15:39:01 UTC (rev 752) @@ -0,0 +1,131 @@ +package org.codelutin.jaxx; + +import junit.framework.TestCase; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; + +public class CompilerTest extends TestCase { + + protected JaxxGeneratorGoal goal; + + protected static final String PREFIX_PACKAGE = "testcases"; + + protected static File srcDir; + + protected static File getSrcDir() { + if (srcDir == null) { + srcDir = new File("src" + File.separator + "test" + File.separator + "java"); + } + return srcDir; + } + + protected static File outDir; + + protected static File getOutDir() { + if (outDir == null) { + outDir = new File("target" + File.separator + "test-gen-java"); + outDir.mkdirs(); + } + return outDir; + } + + protected static File ClassOutDir; + + protected static File getClassOutDir() { + if (ClassOutDir == null) { + ClassOutDir = new File("target" + File.separator + "test-classes"); + ClassOutDir.mkdirs(); + } + return ClassOutDir; + } + + @Override + public void setUp() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, MojoExecutionException, MojoFailureException { + CompileConfig anno = getClass().getMethod(getName()).getAnnotation(CompileConfig.class); + assertNotNull("could not found " + CompileConfig.class.getSimpleName() + " annotation on test " + getClass(), anno); + final File srcDir = getSrcDir(); + assertTrue("could not found srcDir (or not existing) : " + srcDir + " on test " + getClass(), srcDir != null && srcDir.exists()); + final File outDir = getOutDir(); + assertTrue("could not found outDir (or not existing) : " + outDir + " on test " + getClass(), outDir != null && outDir.exists()); + final File classOutDir = getClassOutDir(); + assertTrue("could not found classOutDir (or not existing) : " + classOutDir + " on test " + getClass(), classOutDir != null && classOutDir.exists()); + String packageName = anno.packageName(); + goal = new JaxxGeneratorGoal(); + goal.setSrc(srcDir); + goal.setOut(outDir); + goal.setClassOut(classOutDir); + goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); + goal.setOptimize(anno.optimize()); + goal.setVerbose(anno.verbose()); + //TODO Use the maven plexus TestCase inorder to include dependencies + goal.setJavaOpts(anno.javaOpts()); + System.out.println(getName()); + + } + + @CompileConfig(packageName = "InnerClasses", runJavac = true) + public void testInnerClasses() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + + @CompileConfig(packageName = "SpecialSubclassing", runJavac = true) + public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { + try { + goal.execute(); + } catch (Exception e) { + // there is some inter-dependances between generated java file + // we runJavaC on each file, but we should compile a sourcePath instead... + assertTrue(true); + } + goal.execute(); + } + + @CompileConfig(packageName = "CssTests") + public void testCssTests() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + @CompileConfig(packageName = "errors") + public void testErrors() throws MojoExecutionException, MojoFailureException { + } + + @CompileConfig(packageName = "Initializers", runJavac = false) + public void testInitializers() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + @CompileConfig(packageName = "Script", runJavac = false) + public void testScript() throws MojoExecutionException, MojoFailureException { + try { + goal.execute(); + } catch (Exception e) { + // there is some inter-dependances between generated java file + // we runJavaC on each file, but we should compile a sourcePath instead... + assertTrue(true); + } + } + + @CompileConfig(packageName = "OverridingDataBindings", runJavac = false) + public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException { + goal.execute(); + } + + @CompileConfig(packageName = "ClassReferences", runJavac = true) + public void testClassReferences() throws MojoExecutionException, MojoFailureException { + try { + goal.execute(); + } catch (Exception e) { + // there is some inter-dependances between generated java file + // we runJavaC on each file, but we should compile a sourcePath instead... + assertTrue(true); + } + goal.execute(); + } + + +} \ No newline at end of file

1 0

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

22 Jul '08

Author: tchemit Date: 2008-07-22 15:38:42 +0000 (Tue, 22 Jul 2008) New Revision: 751 Added: trunk/lutinjaxx/maven/src/test/java/org/ trunk/lutinjaxx/maven/src/test/java/org/codelutin/ trunk/lutinjaxx/maven/src/test/java/org/codelutin/jaxx/ Log: move to our package org.codelutin.jaxx

1 0