Author: tchemit Date: 2014-04-23 09:57:45 +0200 (Wed, 23 Apr 2014) New Revision: 1338 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1338 Log: fixes #3169 Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2014-04-23 07:57:21 UTC (rev 1337) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2014-04-23 07:57:45 UTC (rev 1338) @@ -990,11 +990,9 @@ // there is already a existing file in class-path, skip - if (isVerbose()) { - - log.info("Will not generate [" + fqn + "], already found in class-path at location : " + fileLocation); - } else { - + if (log.isDebugEnabled()) { + log.debug("Will not generate [" + fqn + "], already found in class-path at location : " + fileLocation); + } else if (isVerbose()) { log.info("Will not generate [" + fqn + "], already found in class-path."); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java 2014-04-23 07:57:21 UTC (rev 1337) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java 2014-04-23 07:57:45 UTC (rev 1338) @@ -122,8 +122,8 @@ } if (modelPropertiesProvider == null) { - if (log.isWarnEnabled()) { - log.warn("No properties provider filled, will instanciate a new default one"); + if (log.isDebugEnabled()) { + log.debug("No properties provider filled, will instanciate a new default one"); } setModelPropertiesProvider(ModelPropertiesUtil.newStore(getClass().getClassLoader(), false)); } @@ -266,7 +266,7 @@ numberImportedTagValues++; } } - if (log.isInfoEnabled()) { + if (isVerbose()) { log.info(numberImportedTagValues + " tag values were succesfull imported from " + propFile); } int nbFailed = prop.size() - numberImportedTagValues; Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java 2014-04-23 07:57:21 UTC (rev 1337) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java 2014-04-23 07:57:45 UTC (rev 1338) @@ -368,13 +368,15 @@ if (model == null) { throw new MojoExecutionException( "No modelType named '" + modelType + "', use one of " + - _models.keySet()); + _models.keySet() + ); } if (inputs.length == 0) { throw new MojoExecutionException( "Must specify something to include using the includes " + - "property"); + "property" + ); } //FIXME-TC20091217 use a configurator in plexus ? // Actually we obtain a different instance of the mojo conflit with @@ -423,30 +425,6 @@ properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); } -// if (engine.containsWriter("model")) { -// -// // add model writer support -// -// properties.put(ModelChainedFileWriter.PROP_DEFAULT_PACKAGE, -// defaultPackage); -// properties.put(ModelChainedFileWriter.PROP_GENERATED_PACKAGES, -// generatedPackages); -// properties.put(ModelChainedFileWriter.PROP_TEMPLATES, templates); -// properties.put(ModelChainedFileWriter.PROP_EXCLUDE_TEMPLATES, -// getExcludeTemplatesAsString()); -// properties.put(ModelChainedFileWriter.PROP_MODEL_PROPERTIES_PROVIDER, -// getModelPropertiesProvider()); -// -// DefaultTemplateConfiguration configuration = -// new DefaultTemplateConfiguration(); -// configuration.setEncoding(getEncoding()); -// configuration.setLoader(getClassLoader()); -// configuration.setOverwrite(isOverwrite()); -// configuration.setVerbose(isVerbose()); -// properties.put(ModelChainedFileWriter.PROP_TEMPLATE_CONFIGURATION, -// configuration); -// } - if (engine.containsWriter("xmlmodel")) { // add xml model writer support @@ -512,11 +490,13 @@ if (size == 1) { getLog().info( "Process phase [" + writer.getInputProtocol() + - "] for one entry."); + "] for one entry." + ); } else { getLog().info( "Process phase [" + writer.getInputProtocol() + - "] for " + size + " entries."); + "] for " + size + " entries." + ); } if (dryRun || isVerbose()) { for (ChainedFileWriterEntry entry : writer.getEntries()) { @@ -542,14 +522,27 @@ models.add(writerToMemoryModel); } - String message = reportGeneratedFiles(writer, t0); + String message = reportGeneratedFiles(writer.getWriterReport(), t0); getLog().info(message); } // merge all models in a unique one ? or apply templates on each model ? + long t0 = System.nanoTime(); + WriterReport writerReport = newWriterReport(); + int size = models.size(); + if (size == 1) { + getLog().info( + "Process phase [java] for one entry." + ); + } else { + getLog().info( + "Process phase [java] for " + size + " entries." + ); + } + for (ChainedFileWriterToMemoryModel entry : models) { Model model = entry.getModel(); Long lastModified = entry.getLastModifiedSource(); @@ -565,6 +558,9 @@ fixCompileSourceRoots(outputDir); } + String message = reportGeneratedFiles(writerReport, t0); + getLog().info(message); + } finally { // always clear everything to avoid side-effects in goal is // invoked more than once @@ -600,22 +596,6 @@ } } - - public String reportGeneratedFiles(ChainedFileWriter writer, long t0) { - WriterReport writerReport = writer.getWriterReport(); - int nbFiles = writerReport.getFilesCount(); - - if (nbFiles == 0) { - return "No file generated."; - } - - long delay = System.nanoTime() - t0; - if (nbFiles == 1) { - return "Generate one file in " + StringUtil.convertTime(delay) + "."; - } - return "Generate " + nbFiles + " files in " + StringUtil.convertTime(delay) + "."; - } - /** * Add a single input to the {@link #inputs} property. * <p/> @@ -737,7 +717,7 @@ /** * @return the string representation of excludesTemplates - * (separated by comma) + * (separated by comma) */ protected String getExcludeTemplatesAsString() { String result = ""; @@ -900,23 +880,31 @@ if (isTestPhase()) { if (!project.getTestCompileSourceRoots().contains( destDirGen.getPath())) { - getLog().info("Add test compile source root : " + destDirGen); + if (isVerbose()) { + getLog().info("Add test compile source root : " + destDirGen); + } project.addTestCompileSourceRoot(destDirGen.getPath()); Resource resources = new Resource(); resources.setDirectory(destDirGen.getAbsolutePath()); resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("Add test resource root :" + resources); + if (isVerbose()) { + getLog().info("Add test resource root :" + resources); + } project.addTestResource(resources); } } else { if (!project.getCompileSourceRoots().contains( destDirGen.getPath())) { - getLog().info("Add compile source root : " + destDirGen); + if (isVerbose()) { + getLog().info("Add compile source root : " + destDirGen); + } project.addCompileSourceRoot(destDirGen.getPath()); Resource resources = new Resource(); resources.setDirectory(destDirGen.getAbsolutePath()); resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("Add resource root :" + resources); + if (isVerbose()) { + getLog().info("Add resource root :" + resources); + } project.addResource(resources); } } @@ -993,7 +981,8 @@ } catch (Exception e) { throw new IllegalStateException( "Can't obtain template [" + templateName + - "] for reason " + e.getMessage(), e); + "] for reason " + e.getMessage(), e + ); } } @@ -1011,4 +1000,18 @@ } return templatesList; } + + protected String reportGeneratedFiles(WriterReport writerReport, long t0) { + int nbFiles = writerReport.getFilesCount(); + + if (nbFiles == 0) { + return "No file generated."; + } + + long delay = System.nanoTime() - t0; + if (nbFiles == 1) { + return "Generate one file in " + StringUtil.convertTime(delay) + "."; + } + return "Generate " + nbFiles + " files in " + StringUtil.convertTime(delay) + "."; + } } Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java 2014-04-23 07:57:21 UTC (rev 1337) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java 2014-04-23 07:57:45 UTC (rev 1338) @@ -292,7 +292,9 @@ // File out = new File(outputDirectory, relativePath); // File out = new File(outputDirectory, in.getName()); - getLog().info("Copy file " + in + " to " + out); + if (configuration.isVerbose()) { + getLog().info("Copy file " + in + " to " + out); + } if (overwrite) { FileUtils.copyFile(in, out); Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2014-04-23 07:57:21 UTC (rev 1337) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2014-04-23 07:57:45 UTC (rev 1338) @@ -163,8 +163,10 @@ File inputDirectory = entry.getKey(); List<File> files = entry.getValue(); - getLog().info("Processing XSL tranformation on " + - inputDirectory + " for " + files.size() + " file(s)."); + if (configuration.isVerbose()) { + getLog().info("Processing XSL tranformation on " + + inputDirectory + " for " + files.size() + " file(s)."); + } for (File file : files) { @@ -237,7 +239,7 @@ writerReport.addFile( getClass().getName(), result, - true + false ); } Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java 2014-04-23 07:57:21 UTC (rev 1337) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java 2014-04-23 07:57:45 UTC (rev 1338) @@ -112,7 +112,9 @@ File inputDirectory = entry.getKey(); List<File> files = entry.getValue(); - getLog().info("Expanding " + files.size() + " xmi file(s) from " + inputDirectory); + if (configuration.isVerbose()) { + getLog().info("Expanding " + files.size() + " xmi file(s) from " + inputDirectory); + } for (File file : files) { @@ -161,7 +163,7 @@ WriterReport writerReport = getWriterReport(); if (writerReport != null) { - writerReport.addFile(getClass().getName(), dstFile, true); + writerReport.addFile(getClass().getName(), dstFile, false); } PluginHelper.createDirectoryIfNecessary(dst);