Author: tchemit Date: 2010-04-06 22:46:18 +0200 (Tue, 06 Apr 2010) New Revision: 1714 Log: clean pom + begin of use of Project descriptor Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-06 19:42:20 UTC (rev 1713) +++ trunk/pom.xml 2010-04-06 20:46:18 UTC (rev 1714) @@ -382,11 +382,6 @@ <plugin> <artifactId>maven-site-plugin</artifactId> - <!-- TODO Remove this when using mavenpom >=2.0.3 --> - <!--<configuration>--> - <!--<locales>${siteLocales}</locales>--> - <!--<generateSitemap>true</generateSitemap>--> - <!--</configuration>--> <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java 2010-04-06 19:42:20 UTC (rev 1713) +++ trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java 2010-04-06 20:46:18 UTC (rev 1714) @@ -3,7 +3,11 @@ import org.codehaus.plexus.velocity.VelocityComponent; import org.nuiton.license.plugin.header.generator.HeaderGenerator; import org.nuiton.license.plugin.model.LicenseStore; +import org.nuiton.license.plugin.model.project.LicenseProject; +import org.nuiton.license.plugin.model.project.io.xpp3.LicenseProjectXpp3Reader; +import java.io.File; +import java.io.FileReader; import java.util.Map; @@ -24,11 +28,20 @@ public class UpdateHeaderFileMojo extends AbstractLicenseMojo { /** + * The project license descriptor file. + * + * @parameter expression="${license.descriptor}" default-value="src/license/project.xml" + * @required + * @since 2.1 + */ + protected File descriptor; + + /** * l'annee de creation du module (sera place dans le header) * * @parameter expression="${license.inceptionYear}" default-value="${project.inceptionYear}" * @required - * @since 1.0.0 + * @since 2.1 */ protected String inceptionYear; @@ -38,7 +51,7 @@ * @parameter expression="${license.organizationName}" * default-value="${project.organization.name}" * @required - * @since 1.0.0 + * @since 2.1 */ protected String organizationName; @@ -47,7 +60,7 @@ * * @parameter expression="${license.projectName}" default-value="${project.name}" * @required - * @since 1.0.0 + * @since 2.1 */ protected String projectName; @@ -56,7 +69,7 @@ * * @parameter expression="${license.licenseName}" * @required - * @since 1.0.0 + * @since 2.1 */ protected String licenseName; @@ -69,6 +82,7 @@ */ protected String licenseResolver; + /** * A flag to keep a backup of every modified file. * @@ -114,10 +128,21 @@ /** store of licenses */ protected LicenseStore licenseStore; + /** descriptor of project. */ + protected LicenseProject licenseProject; + @Override protected void init() throws Exception { // init licenses store licenseStore = createLicenseStore(licenseResolver); + + // load project descriptor + FileReader reader = new FileReader(descriptor); + try { + licenseProject = new LicenseProjectXpp3Reader().read(reader); + } finally { + reader.close(); + } } @Override