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 c28f8dda6e36bb492df7bae7373d52e8ec6adcfb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 15 15:25:46 2015 +0200 Utilisation nouvelle configuration simplifiée dans eugene + suppression classe inutile Voir #7457 --- .../referential/LengthWeightParameterModel.java | 13 ------------- .../xmi/observe-services-model-common.properties | 7 +++++-- .../main/xmi/observe-services-model-common.zargo | Bin 33476 -> 32572 bytes .../xmi/observe-services-model-longline.properties | 3 +-- .../xmi/observe-services-model-seine.properties | 3 +-- 5 files changed, 7 insertions(+), 19 deletions(-) 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 deleted file mode 100644 index c9f3f8a..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/LengthWeightParameterModel.java +++ /dev/null @@ -1,13 +0,0 @@ -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 index d9cfe2c..8d7a46a 100644 --- a/observe-services-model/src/main/xmi/observe-services-model-common.properties +++ b/observe-services-model/src/main/xmi/observe-services-model-common.properties @@ -5,5 +5,8 @@ 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 + +fr.ird.observe.services.model.referential.Gear.attribute.gearCaracteristic.stereotype=unique,ordered +fr.ird.observe.services.model.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered +fr.ird.observe.services.model.referential.Species.attribute.ocean.stereotype=unique,ordered +fr.ird.observe.services.model.referential.SpeciesList.attribute.species.stereotype=unique,ordered 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 index 454e047..72c7c8b 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-model-common.zargo 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 index e6c432f..f01b4ae 100644 --- a/observe-services-model/src/main/xmi/observe-services-model-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-model-longline.properties @@ -4,5 +4,4 @@ model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model 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 +package.fr.ird.observe.services.model.stereotype=bean 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 index 35e8518..f01b4ae 100644 --- a/observe-services-model/src/main/xmi/observe-services-model-seine.properties +++ b/observe-services-model/src/main/xmi/observe-services-model-seine.properties @@ -4,5 +4,4 @@ model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model 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 +package.fr.ird.observe.services.model.stereotype=bean -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.