Author: jcouteau Date: 2010-11-25 17:40:54 +0100 (Thu, 25 Nov 2010) New Revision: 520 Url: http://nuiton.org/repositories/revision/wikitty/520 Log: Fix poms for EUGene generation in api and dto modules (finally) Fix some license headers Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java trunk/wikitty-dto/pom.xml trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/pom.xml 2010-11-25 16:40:54 UTC (rev 520) @@ -569,8 +569,16 @@ <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>${eugeneVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> + </pluginManagement> </build> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-api/pom.xml 2010-11-25 16:40:54 UTC (rev 520) @@ -63,11 +63,6 @@ </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> @@ -149,35 +144,6 @@ </resource> </resources> - <pluginManagement> - <plugins> - <!-- eugene plugin --> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - <!-- Create a jar that includes all tests --> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java 2010-11-25 16:40:54 UTC (rev 520) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.entities; import java.lang.annotation.ElementType; Modified: trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java =================================================================== --- trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-api/src/test/java/entities/BusinessEntityImplTest.java 2010-11-25 16:40:54 UTC (rev 520) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package entities; Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-dto/pom.xml 2010-11-25 16:40:54 UTC (rev 520) @@ -20,14 +20,8 @@ <dependencies> <!-- sibling dependencies --> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> </dependency> @@ -51,12 +45,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <!-- TEST --> <dependency> <groupId>junit</groupId> @@ -89,35 +77,14 @@ <build> <plugins> - <!-- processor plugin --> <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters> - org.nuiton.processor.filters.GeneratorTemplatesFilter - </filters> - </configuration> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> <id>api-dto-generation</id> - <phase>generate-test-sources</phase> + <phase>generate-sources</phase> <configuration> - <testPhase>true</testPhase> <inputs> <input>classpath:model:/:wikitty.objectmodel</input> </inputs> @@ -139,13 +106,6 @@ </goals> </execution> </executions> - <!--dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-dto</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies--> </plugin> <!-- expose new plexus components --> Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-11-25 16:24:27 UTC (rev 519) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-11-25 16:40:54 UTC (rev 520) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: dto + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin, Jean Couteau + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.dto; import org.junit.Test; @@ -8,7 +32,6 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.entities.WikittyLabelDTO; import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.services.WikittyServiceInMemory;