Author: bleny Date: 2013-05-31 14:37:06 +0200 (Fri, 31 May 2013) New Revision: 226 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: clean poms Removed: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java Modified: trunk/magalie-persistence/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-05-31 10:42:59 UTC (rev 225) +++ trunk/magalie-persistence/pom.xml 2013-05-31 12:37:06 UTC (rev 226) @@ -32,19 +32,16 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> - <scope>runtime</scope> </dependency> <dependency> @@ -133,7 +130,6 @@ <plugin> <groupId>de.juplo</groupId> <artifactId>hibernate4-maven-plugin</artifactId> - <version>1.0.1</version> <executions> <execution> <id>executionCreate</id> @@ -142,7 +138,7 @@ </goals> <configuration> <type>CREATE</type> - <outputFile>${project.build.directory}/generated-sources/Create.sql</outputFile> + <outputFile>${project.build.directory}/generated-sources/magalie-create-oracle.sql</outputFile> </configuration> </execution> <execution> @@ -152,7 +148,7 @@ </goals> <configuration> <type>DROP</type> - <outputFile>${project.build.directory}/generated-sources/Drop.sql</outputFile> + <outputFile>${project.build.directory}/generated-sources/magalie-drop-oracle.sql</outputFile> </configuration> </execution> </executions> @@ -161,37 +157,6 @@ <target>SCRIPT</target> </configuration> </plugin> - <plugin> - <groupId>de.juplo</groupId> - <artifactId>hibernate4-maven-plugin</artifactId> - <version>1.0.1</version> - <executions> - <execution> - <id>executionCreate</id> - <goals> - <goal>export</goal> - </goals> - <configuration> - <type>CREATE</type> - <outputFile>${project.build.directory}/generated-sources/Create.sql</outputFile> - </configuration> - </execution> - <execution> - <id>executionDrop</id> - <goals> - <goal>export</goal> - </goals> - <configuration> - <type>DROP</type> - <outputFile>${project.build.directory}/generated-sources/Drop.sql</outputFile> - </configuration> - </execution> - </executions> - <configuration> - <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect> - <target>SCRIPT</target> - </configuration> - </plugin> </plugins> </build> Deleted: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-05-31 10:42:59 UTC (rev 225) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/AbstractEntity.java 2013-05-31 12:37:06 UTC (rev 226) @@ -1,55 +0,0 @@ -package com.franciaflex.magalie.persistence.entity; - -/* - * #%L - * MagaLiE :: Persistence - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import com.google.common.base.Objects; -import org.apache.commons.lang3.builder.ToStringBuilder; - -import java.io.Serializable; - -public abstract class AbstractEntity implements Serializable { - - public abstract String getId(); - - @Override - public boolean equals(Object o) { - String id = getId(); - if (this == o) return true; - if (!(o instanceof AbstractEntity)) return false; - AbstractEntity that = (AbstractEntity) o; - if (id == null && that.getId() == null) return false; - if (!id.equals(that.getId())) return false; - return Objects.equal(id, that.getId()); - } - - @Override - public int hashCode() { - return Objects.hashCode(getId()); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this); - } -} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-31 10:42:59 UTC (rev 225) +++ trunk/pom.xml 2013-05-31 12:37:06 UTC (rev 226) @@ -134,7 +134,57 @@ <dependencies> + <!-- common dependencies (all module) --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4jVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockitoVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.esotericsoftware.yamlbeans</groupId> + <artifactId>yamlbeans</artifactId> + <version>1.06</version> + </dependency> + + <!-- persistence module dependencies --> + + <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> <version>1.0.1.Final</version> @@ -158,16 +208,10 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> <version>${hibernateVersion}</version> + <scope>runtime</scope> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - <version>${h2Version}</version> - </dependency> - - <dependency> <groupId>org.nuiton.jpa</groupId> <artifactId>nuiton-jpa-api</artifactId> <version>${nuitonJpaVersion}</version> @@ -180,17 +224,13 @@ <scope>test</scope> </dependency> - <!-- Nuiton libs --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> + <!-- web module --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> </dependency> <dependency> @@ -206,14 +246,6 @@ <version>${nuitonWebVersion}</version> </dependency> - <!--dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency--> - - <!-- Struts 2 --> - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> @@ -265,51 +297,8 @@ </exclusions> </dependency> - <!-- Logging --> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <version>${slf4jVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4jVersion}</version> - <scope>test</scope> - </dependency> - - <!-- Others --> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.7</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockitoVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.esotericsoftware.yamlbeans</groupId> - <artifactId>yamlbeans</artifactId> - <version>1.06</version> - </dependency> - </dependencies> + </dependencyManagement> <build> @@ -329,28 +318,17 @@ </plugin> <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> - </plugin> - - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <version>${eugeneVersion}</version> </plugin> + <plugin> + <groupId>de.juplo</groupId> + <artifactId>hibernate4-maven-plugin</artifactId> + <version>1.0.1</version> + </plugin> + </plugins> </pluginManagement> @@ -396,22 +374,6 @@ <reporting> <plugins> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>aggregate-application-config-report</report> - </reports> - </reportSet> - </reportSets> - <configuration> - <i18nBundleName>${magalieI18nBundle}</i18nBundleName> - </configuration> - </plugin> - - <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> <reportSets>