Author: tchemit Date: 2012-08-31 11:23:52 +0200 (Fri, 31 Aug 2012) New Revision: 579 Url: http://forge.codelutin.com/repositories/revision/echobase/579 Log: refs #1438: split in tow model (for the two db) Added: trunk/echobase-entities/src/main/xmi/echobase-internal.properties trunk/echobase-entities/src/main/xmi/echobase-internal.zargo Modified: trunk/echobase-entities/pom.xml trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java trunk/echobase-entities/src/main/xmi/echobase.properties trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/pom.xml 2012-08-31 09:23:52 UTC (rev 579) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> <!-- ************************************************************* --> @@ -42,16 +44,45 @@ <executions> <execution> <phase>generate-sources</phase> - <id>generate-persistence</id> + <id>zargo-to-objectmodel</id> <configuration> + <skipInputs>model</skipInputs> <inputs> - <input>src/main/xmi:echobase.zargo</input> + <input>zargo</input> </inputs> </configuration> <goals> <goal>generate</goal> </goals> </execution> + <execution> + <phase>generate-sources</phase> + <id>generate-entities</id> + <configuration> + <inputs> + <input> + target/generated-sources/models:echobase.objectmodel + </input> + </inputs> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <phase>generate-sources</phase> + <id>generate-internal-entities</id> + <configuration> + <inputs> + <input> + target/generated-sources/models:echobase-internal.objectmodel + </input> + </inputs> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> </executions> <dependencies> <dependency> Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-08-31 09:23:52 UTC (rev 579) @@ -25,6 +25,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; +import fr.ifremer.echobase.entities.WorkingDbConfiguration; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; @@ -101,6 +102,9 @@ // ExportQuery decorator registerJXPathDecorator(locale, ExportQuery.class, "${name}$s - ${description}$s"); + // WorkingDbConfiguration decorator + registerJXPathDecorator(locale, WorkingDbConfiguration.class, "${url}$s - ${login}$s (${description}$s)"); + // AcousticInstrument decorator registerJXPathDecorator(locale, AcousticInstrument.class, "${id}$s"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java 2012-08-31 09:23:52 UTC (rev 579) @@ -127,10 +127,7 @@ EchoBaseDbMeta(EchoBasePersistenceHelper persistenceHelper) { super(persistenceHelper, - EchoBaseEntityEnum.values(), - EchoBaseEntityEnum.EchoBaseUser, - EchoBaseEntityEnum.EntityModificationLog, - EchoBaseEntityEnum.ExportQuery); + EchoBaseEntityEnum.values(), EchoBaseEntityEnum.EntityModificationLog); { Copied: trunk/echobase-entities/src/main/xmi/echobase-internal.properties (from rev 573, trunk/echobase-entities/src/main/xmi/echobase.properties) =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase-internal.properties (rev 0) +++ trunk/echobase-entities/src/main/xmi/echobase-internal.properties 2012-08-31 09:23:52 UTC (rev 579) @@ -0,0 +1,68 @@ +### +# #%L +# EchoBase :: Entities +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 Ifremer, 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% +### + +model.tagValue.notGenerateToString=true +model.tagValue.generateOperatorForDAOHelper=true +model.tagValue.generateStandaloneEnumForDAOHelper=true +model.tagValue.constantPrefix=PROPERTY_ +model.tagValue.version=1.1 +model.tagValue.noPCS=true +model.tagValue.doNotGenerateBooleanGetMethods=true +model.tagValue.indexForeignKeys=true + +############################################################################### +### Ordered attributes ######################################################## +############################################################################### + +############################################################################### +### Unique attributes ######################################################### +############################################################################### + +############################################################################### +### Big Text attributes ####################################################### +############################################################################### + +fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagvalue.type=text + +############################################################################### +### Natural id ############################################################### +############################################################################### + +fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true +fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.notNull=true +fr.ifremer.echobase.entities.EchoBaseUser.attribute.password.tagValue.notNull=true + +fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true +fr.ifremer.echobase.entities.ExportQuery.attribute.description.tagValue.notNull=true +fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagValue.notNull=true +fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedDate.tagValue.notNull=true +fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedUser.tagValue.notNull=true + +fr.ifremer.echobase.entities.WorkingDbConfiguration.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.url.tagValue.naturalId=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.url.tagValue.notNull=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.login.tagValue.naturalId=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.login.tagValue.notNull=true \ No newline at end of file Copied: trunk/echobase-entities/src/main/xmi/echobase-internal.zargo (from rev 573, trunk/echobase-entities/src/main/xmi/echobase.zargo) =================================================================== (Binary files differ) Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-08-31 09:23:52 UTC (rev 579) @@ -22,12 +22,11 @@ # #L% ### -#model.tagValue.i18n=echobase.common. model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=1.0 +model.tagValue.version=1.1 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true @@ -55,30 +54,17 @@ ############################################################################### fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text -fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagvalue.type=text ############################################################################### ### Natural id for references ################################################ ############################################################################### -fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true -fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true -fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.notNull=true -fr.ifremer.echobase.entities.EchoBaseUser.attribute.password.tagValue.notNull=true - fr.ifremer.echobase.entities.EntityModificationLog.attribute.entityType.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.entityId.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationDate.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationUser.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true -fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true -fr.ifremer.echobase.entities.ExportQuery.attribute.description.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedDate.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedUser.tagValue.notNull=true - fr.ifremer.echobase.entities.references.AcousticInstrument.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.notNull=true Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/pom.xml 2012-08-31 09:23:52 UTC (rev 579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.3.7</version> </parent> <groupId>fr.ifremer</groupId>