This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6fa083ba5aa170519ae40d6b4eb11fd5dc7a2a91 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 22:27:39 2015 +0200 Début d'un module pour générer les objets des services (refs #7457) --- observe-services-model/LICENSE.txt | 0 observe-services-model/README.txt | 0 observe-services-model/pom.xml | 128 +++++++++++++++++++++ .../services/model/AbstractObserveModel.java | 34 ++++++ .../ird/observe/services/model/OpenableModel.java | 13 +++ .../observe/services/model/constants/GearType.java | 50 ++++++++ .../services/model/constants/ReferenceStatus.java | 18 +++ .../referential/LengthWeightParameterModel.java | 13 +++ .../xmi/observe-services-model-common.properties | 9 ++ .../main/xmi/observe-services-model-common.zargo | Bin 0 -> 33476 bytes .../xmi/observe-services-model-longline.properties | 8 ++ .../main/xmi/observe-services-model-longline.zargo | Bin 0 -> 96409 bytes .../xmi/observe-services-model-seine.properties | 8 ++ .../main/xmi/observe-services-model-seine.zargo | Bin 0 -> 85905 bytes pom.xml | 3 +- 15 files changed, 283 insertions(+), 1 deletion(-) diff --git a/observe-services-model/LICENSE.txt b/observe-services-model/LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/observe-services-model/README.txt b/observe-services-model/README.txt new file mode 100644 index 0000000..e69de29 diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml new file mode 100644 index 0000000..60f548d --- /dev/null +++ b/observe-services-model/pom.xml @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Business + + $HeadURL$ + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + %% + 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% + --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <version>4.0.2-SNAPSHOT</version> + </parent> + + <artifactId>observe-services-model</artifactId> + + <name>ObServe :: Services model</name> + <description>ObServe services model module</description> + + <dependencies> + + <!-- Nuiton --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <!-- JAXX --> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + </dependency> + + <!-- Swingx --> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <!-- comons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + </dependencies> + + <build> + <resources> + <resource> + <directory>${project.build.directory}/generated-sources/resources/</directory> + <includes> + <include>objectmodel/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <configuration> + <defaultPackage>fr.ird.observe.services.model</defaultPackage> + <fullPackagePath>fr.ird.observe.services.model</fullPackagePath> + </configuration> + <executions> + <execution> + <phase>generate-sources</phase> + <id>generate-services-model</id> + <configuration> + <inputs> + <input>zargo:src/main/xmi:observe-services-model-common.zargo</input> + <!--<input>zargo:src/main/xmi:observe-services-model-seine.zargo</input>--> + <!--<input>zargo:src/main/xmi:observe-services-model-longline.zargo</input>--> + </inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <templates>org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer</templates> + <failIfUnsafe>true</failIfUnsafe> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java new file mode 100644 index 0000000..8be1ffe --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveModel.java @@ -0,0 +1,34 @@ +package fr.ird.observe.services.model; + +import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.jaxx.application.bean.JavaBeanObject; +import org.nuiton.util.CollectionUtil; + +import java.util.Collection; + +/** + * Created on 14/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 7.0 + */ +public abstract class AbstractObserveModel extends AbstractSerializableBean implements JavaBeanObject { + + private static final long serialVersionUID = 1L; + + protected void firePropertyChange(String propertyName, Object newValue) { + firePropertyChange(propertyName, null, newValue); + } + + protected <B> B getChild(Collection<B> child, int index) { + return CollectionUtil.getOrNull(child, index); + } + + @Override + public void firePropertyChanged(String propertyName, + Object oldValue, + Object newValue) { + firePropertyChange(propertyName, oldValue, newValue); + } + +} \ No newline at end of file diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/OpenableModel.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/OpenableModel.java new file mode 100644 index 0000000..ae00654 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/OpenableModel.java @@ -0,0 +1,13 @@ +package fr.ird.observe.services.model; + +/** + * Created on 14/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since XXX + */ +public abstract class OpenableModel extends AbstractOpenableModel { + + private static final long serialVersionUID = 1L; + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/GearType.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/GearType.java new file mode 100644 index 0000000..d0521ed --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/GearType.java @@ -0,0 +1,50 @@ +package fr.ird.observe.services.model.constants; + +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2014 IRD, Codelutin, 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 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +/** + * Created on 8/5/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.6 + */ +public enum GearType { + + /** Seine */ + seine, + + /** Longline */ + longline; + + public static GearType fromOrdinal(int ordinal) { + + GearType result = null; + for (GearType gearType : values()) { + if (ordinal == gearType.ordinal()) { + result = gearType; + } + } + return result; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/ReferenceStatus.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/ReferenceStatus.java new file mode 100644 index 0000000..e64610d --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/ReferenceStatus.java @@ -0,0 +1,18 @@ +package fr.ird.observe.services.model.constants; + +/** + * Une énumération pour caractériser les valeurs des status d'une entité du + * référentiel + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.2 + */ +public enum ReferenceStatus { + + /** status desactive */ + disabled, + + /** status active */ + enabled; + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/LengthWeightParameterModel.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/LengthWeightParameterModel.java new file mode 100644 index 0000000..c9f3f8a --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/LengthWeightParameterModel.java @@ -0,0 +1,13 @@ +package fr.ird.observe.services.model.referential; + +/** + * Created on 14/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since XXX + */ +public class LengthWeightParameterModel extends AbstractLengthWeightParameterModel { + + private static final long serialVersionUID = 1L; + +} diff --git a/observe-services-model/src/main/xmi/observe-services-model-common.properties b/observe-services-model/src/main/xmi/observe-services-model-common.properties new file mode 100644 index 0000000..d9cfe2c --- /dev/null +++ b/observe-services-model/src/main/xmi/observe-services-model-common.properties @@ -0,0 +1,9 @@ +model.tagvalue.version=7.0 + +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveModel +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Models +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Model + +package.fr.ird.observe.services.model.stereotype=bean +package.fr.ird.observe.services.model.data.stereotype=bean +package.fr.ird.observe.services.model.referential.stereotype=bean diff --git a/observe-services-model/src/main/xmi/observe-services-model-common.zargo b/observe-services-model/src/main/xmi/observe-services-model-common.zargo new file mode 100644 index 0000000..454e047 Binary files /dev/null and b/observe-services-model/src/main/xmi/observe-services-model-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-model-longline.properties b/observe-services-model/src/main/xmi/observe-services-model-longline.properties new file mode 100644 index 0000000..e6c432f --- /dev/null +++ b/observe-services-model/src/main/xmi/observe-services-model-longline.properties @@ -0,0 +1,8 @@ +model.tagvalue.version=7.0 + +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveModel +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Models +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Model + +package.fr.ird.observe.services.model.data.longline.stereotype=bean +package.fr.ird.observe.services.model.referential.longline.stereotype=bean diff --git a/observe-services-model/src/main/xmi/observe-services-model-longline.zargo b/observe-services-model/src/main/xmi/observe-services-model-longline.zargo new file mode 100644 index 0000000..114c920 Binary files /dev/null and b/observe-services-model/src/main/xmi/observe-services-model-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-model-seine.properties b/observe-services-model/src/main/xmi/observe-services-model-seine.properties new file mode 100644 index 0000000..35e8518 --- /dev/null +++ b/observe-services-model/src/main/xmi/observe-services-model-seine.properties @@ -0,0 +1,8 @@ +model.tagvalue.version=7.0 + +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveModel +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Models +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Model + +package.fr.ird.observe.services.model.data.seine.stereotype=bean +package.fr.ird.observe.services.model.referential.seine.stereotype=bean diff --git a/observe-services-model/src/main/xmi/observe-services-model-seine.zargo b/observe-services-model/src/main/xmi/observe-services-model-seine.zargo new file mode 100644 index 0000000..9116a17 Binary files /dev/null and b/observe-services-model/src/main/xmi/observe-services-model-seine.zargo differ diff --git a/pom.xml b/pom.xml index 18fc25a..b5e70b4 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,7 @@ </developers> <modules> + <module>observe-services-model</module> <module>observe-entities</module> <module>observe-business</module> <module>observe-validation</module> @@ -108,7 +109,7 @@ <projectId>observe</projectId> - <eugenePluginVersion>3.0-alpha-2</eugenePluginVersion> + <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <topiaVersion>2.11</topiaVersion> <jaxxVersion>2.24</jaxxVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.