- Simexplorer-si-commits - mailman.cloud.codelutin.com

r1475 - trunk/simexplorer-is/simexplorer-is-swing
by glandais＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: glandais Date: 2008-04-16 13:35:40 +0000 (Wed, 16 Apr 2008) New Revision: 1475 Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml Log: Adding packager plugin Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-04-16 13:34:51 UTC (rev 1474) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-04-16 13:35:40 UTC (rev 1475) @@ -1,157 +1,208 @@ <?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <artifactId>simexplorer-is-swing</artifactId> - <name>Swing</name> + <modelVersion>4.0.0</modelVersion> - <version>${current.version}</version> - <description>Java Swing UI SimExplorer-is application</description> - <packaging>jar</packaging> + <artifactId>simexplorer-is-swing</artifactId> + <name>Swing</name> - <parent> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is</artifactId> - <version>${current.version}</version> - </parent> + <version>${current.version}</version> + <description>Java Swing UI SimExplorer-is application</description> + <packaging>jar</packaging> + <parent> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is</artifactId> + <version>${current.version}</version> + </parent> + <profiles> <profile> <id>project</id> - <activation> + <activation> <activeByDefault>true</activeByDefault> </activation> - <properties> - <maven.verbose>false</maven.verbose> -  - <maven.jar.main.class>fr.cemagref.simexplorer.is.ui.swing.SimExplorer</maven.jar.main.class> + <properties> + <maven.verbose>false</maven.verbose> +  + <maven.jar.main.class> + fr.cemagref.simexplorer.is.ui.swing.SimExplorer + </maven.jar.main.class> </properties> </profile> </profiles> - - <build> - <plugins> -  - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>0.2-SNAPSHOT</version> - <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> -  -  - </configuration> - <executions> - <execution> - <phase>process-classes</phase> - <id>javaActionConfig</id> - <goals> - <goal>parserJavaActionConfig</goal> - </goals> - <configuration> - <treateDefaultEntry>false</treateDefaultEntry> - <entries> - <entry> - <basedir>${maven.src.dir}/java</basedir> - <includes> - <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java</param> - </includes> - <excludes> - <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java</param> - </excludes> - </entry> - </entries> - </configuration> - </execution> - <execution> - <phase>process-classes</phase> - <id>javaTabConfig</id> - <goals> - <goal>parserJavaTabConfig</goal> - </goals> - <configuration> - <treateDefaultEntry>false</treateDefaultEntry> - <entries> - <entry> - <basedir>${maven.src.dir}/java</basedir> - <includes> - <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/SimExplorerTab.java</param> - </includes> - </entry> - </entries> - </configuration> - </execution> - <execution> -  - <phase>process-classes</phase> - <id>java</id> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + + <build> + <plugins> +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>0.2-SNAPSHOT</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> +  +  + </configuration> + <executions> + <execution> + <phase>process-classes</phase> + <id>javaActionConfig</id> + <goals> + <goal>parserJavaActionConfig</goal> + </goals> + <configuration> + <treateDefaultEntry> + false + </treateDefaultEntry> + <entries> + <entry> + <basedir> + ${maven.src.dir}/java + </basedir> + <includes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java + </param> + </includes> + <excludes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java + </param> + </excludes> + </entry> + </entries> + </configuration> + </execution> + <execution> + <phase>process-classes</phase> + <id>javaTabConfig</id> + <goals> + <goal>parserJavaTabConfig</goal> + </goals> + <configuration> + <treateDefaultEntry> + false + </treateDefaultEntry> + <entries> + <entry> + <basedir> + ${maven.src.dir}/java + </basedir> + <includes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/SimExplorerTab.java + </param> + </includes> + </entry> + </entries> + </configuration> + </execution> + <execution> +  + <phase>process-classes</phase> + <id>java</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> <manifest> - <mainClass>${maven.jar.main.class}</mainClass> + <mainClass> + ${maven.jar.main.class} + </mainClass> <addClasspath>true</addClasspath> <addExtensions /> - <classpathPrefix>./dependency/</classpathPrefix> + <classpathPrefix> + ./dependency/ + </classpathPrefix> </manifest> </archive> </configuration> </plugin> - </plugins> - </build> - <dependencies> -  - <dependency> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-service</artifactId> - </dependency> - <dependency> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-swing-generated</artifactId> - </dependency> -  - <dependency> - <groupId>lutinlib</groupId> - <artifactId>lutincommandline-ui</artifactId> - </dependency> -  - <dependency> + <plugin> + <groupId>de.tarent.maven.plugins</groupId> + <artifactId>maven-pkg-plugin</artifactId> + <version>2.0.0</version> + <configuration> + <defaultDistro>izpack</defaultDistro> + <shortDescription> + Java Swing UI SimExplorer-is application + </shortDescription> + + <defaults> + <srcAuxFilesDir>src/pkg</srcAuxFilesDir> + <section>app-office</section> + <mainClass>${maven.jar.main.class}</mainClass> + <maxJavaMemory>256m</maxJavaMemory> + </defaults> + </configuration> + </plugin> + + </plugins> + </build> + + <pluginRepositories> + <pluginRepository> + <id>evolvis-release-repository</id> + <name>evolvis.org release repository</name> + <url>http://maven-repo.evolvis.org/releases</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + + <dependencies> +  + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-service</artifactId> + </dependency> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-swing-generated</artifactId> + </dependency> +  + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutincommandline-ui</artifactId> + </dependency> +  + <dependency> <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId> </dependency> - </dependencies> + </dependencies> </project>

1 0

r1474 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: glandais Date: 2008-04-16 13:34:51 +0000 (Wed, 16 Apr 2008) New Revision: 1474 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: Removing unused methods Bug fixes in hierarchy saving Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-04-16 13:33:38 UTC (rev 1473) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-04-16 13:34:51 UTC (rev 1474) @@ -75,21 +75,8 @@ LoggableElement saveElement(String token, SerializableInputStream xmlStream, Map<Attachment, SerializableInputStream> attachmentsStream) throws SimExplorerException; + /** - * Update. - * - * @param token the token - * @param uuid the uuid - * @param version the version - * @param updatedElement the updated element - * @param justRemoveLatest just remove latest, if true, updatedElement has to be null - * - * @throws SimExplorerException the sim explorer service exception - */ - void update(String token, String uuid, Version version, MetaData updatedElement, boolean justRemoveLatest) - throws SimExplorerException; - - /** * Retrieve metadata (latest version). * * @param token the token @@ -165,19 +152,6 @@ MetaData[] getMetadatasUsing(String token, String uuid) throws SimExplorerException; /** - * Export XML of element to a stream. - * - * @param token the token - * @param uuid the uuid - * @param version the version - * - * @return RMIIO stream with data - * - * @throws SimExplorerException the sim explorer service exception - */ - InputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerException; - - /** * Export full element to a stream as a zip. * * @param token the token Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-04-16 13:33:38 UTC (rev 1473) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-04-16 13:34:51 UTC (rev 1474) @@ -400,32 +400,6 @@ } /** - * Retrieve element xml common. - * - * @param token the token - * @param uuid the uuid - * @param version the version - * - * @return the input stream - * - * @throws SimExplorerException the sim explorer service exception - */ - public InputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerException { - if (log.isDebugEnabled()) { - log.debug("retrieveElementXML"); - } - MetaData mde = getMetadata(token, uuid, version); - InputStream xmlStream = getStorageEngine().retrieveData(token, mde, getXMLAttachment()); - SerializableInputStream serializableInputStream; - try { - serializableInputStream = new SerializableInputStream(xmlStream); - } catch (IOException e) { - throw new SimExplorerTechnicalException(e); - } - return serializableInputStream; - } - - /** * Retrieve element full. * * @param token the token @@ -474,49 +448,6 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#update(java.lang.String, java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version, fr.cemagref.simexplorer.is.entities.metadata.MetaData, boolean) - */ - public void update(String token, String uuid, Version version, MetaData updatedElement, boolean justRemoveLatest) - throws SimExplorerException { - if (log.isDebugEnabled()) { - log.debug("update"); - } - Map<Attachment, InputStream> attachments = new HashMap<Attachment, InputStream>(); - MetaData elementToUpdate; - - MetaData currentMetaData = getStorageEngine().getMetadata(token, uuid, version); - - if (justRemoveLatest) { - currentMetaData.setLatest(false); - elementToUpdate = currentMetaData; - } else { - elementToUpdate = updatedElement; - } - - InputStream currentXml = getStorageEngine().retrieveData(token, currentMetaData, getXMLAttachment()); - - LoggableElement loggableElement = LoggableElementFactory.parseStream(currentXml); - - loggableElement.setMetaData(elementToUpdate); - InputStream newXml = LoggableElementFactory.getStream(loggableElement); - - attachments.put(getXMLAttachment(), newXml); - - List<Attachment> realAttachments = loggableElement.getAttachments(); - for (Attachment attachment : realAttachments) { - attachments.put(attachment, getStorageEngine().retrieveData(token, currentMetaData, attachment)); - } - - if (justRemoveLatest) { - rawDeleteElement(token, uuid, version.toString()); - } else { - getStorageEngine().duplicateElementHierarchy(token, currentMetaData, elementToUpdate); - } - getStorageEngine().saveElement(token, loggableElement, attachments); - getStorageEngine().commit(); - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) */ public Version[] getVersions(String token, String uuid) throws SimExplorerException { @@ -694,6 +625,57 @@ } /** + * Update. + * + * @param token the token + * @param uuid the uuid + * @param version the version + * @param updatedElement the updated element + * @param justRemoveLatest just remove latest, if true, updatedElement has to be null + * + * @throws SimExplorerException the sim explorer service exception + */ + private void update(String token, String uuid, Version version, MetaData updatedElement, boolean justRemoveLatest) + throws SimExplorerException { + if (log.isDebugEnabled()) { + log.debug("update"); + } + Map<Attachment, InputStream> attachments = new HashMap<Attachment, InputStream>(); + MetaData elementToUpdate; + + MetaData currentMetaData = getStorageEngine().getMetadata(token, uuid, version); + + if (justRemoveLatest) { + currentMetaData.setLatest(false); + elementToUpdate = currentMetaData; + } else { + elementToUpdate = updatedElement; + } + + InputStream currentXml = getStorageEngine().retrieveData(token, currentMetaData, getXMLAttachment()); + + LoggableElement loggableElement = LoggableElementFactory.parseStream(currentXml); + + loggableElement.setMetaData(elementToUpdate); + InputStream newXml = LoggableElementFactory.getStream(loggableElement); + + attachments.put(getXMLAttachment(), newXml); + + List<Attachment> realAttachments = loggableElement.getAttachments(); + for (Attachment attachment : realAttachments) { + attachments.put(attachment, getStorageEngine().retrieveData(token, currentMetaData, attachment)); + } + + if (justRemoveLatest) { + rawDeleteElement(token, uuid, version.toString()); + } else { + getStorageEngine().duplicateElementHierarchy(token, currentMetaData, elementToUpdate); + } + getStorageEngine().saveElement(token, loggableElement, attachments); + getStorageEngine().commit(); + } + + /** * Process version rules. * * @param token the token @@ -702,7 +684,7 @@ * * @throws SimExplorerException the exception */ - protected void processVersionRules(String token, MetaData metaData, LoggableElement element) + private void processVersionRules(String token, MetaData metaData, LoggableElement element) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("processVersionRules"); @@ -798,7 +780,7 @@ // update already stored element with element being saved version previousVersion.setLatest(true); previousVersion.setParentUuid(previousVersion.getUuid()); - previousVersion.setParentVersion(previousVersion.getVersion().toString()); + previousVersion.setParentVersion(previousVersion.getVersion()); previousVersion.setVersion(metaData.getVersion().toString()); // do not delete previous version, but create a copy of it with new version update(token, previousVersion.getUuid(), versionToUpgrade, previousVersion, false); @@ -841,8 +823,8 @@ * * @throws SimExplorerException the sim explorer exception */ - private void recursiveSaveElement(String token, Entity element, Map<Attachment, String> idsattachment) - throws SimExplorerException { + private void recursiveSaveElement(String token, LoggableElement parent, Entity element, + Map<Attachment, String> idsattachment) throws SimExplorerException { if (log.isDebugEnabled()) { log.debug("recursiveSaveElement"); } @@ -851,10 +833,9 @@ if (child instanceof LoggableElement) { LoggableElement leChild = (LoggableElement) child; LoggableElement childElement = saveElement(token, leChild, idsattachment); - // TODO check - getStorageEngine().saveElementHierarchy(token, leChild.getMetaData(), childElement.getMetaData()); + getStorageEngine().saveElementHierarchy(token, parent.getMetaData(), childElement.getMetaData()); } else { - recursiveSaveElement(token, child, idsattachment); + recursiveSaveElement(token, parent, child, idsattachment); } } } @@ -892,7 +873,7 @@ // Process version rules processVersionRules(token, metaData, element); - recursiveSaveElement(token, element, idsattachment); + recursiveSaveElement(token, element, element, idsattachment); // Prepare saving Map<Attachment, InputStream> attachments = new HashMap<Attachment, InputStream>();

1 0

r1473 - trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities
by glandais＠users.labs.libre-entreprise.org 16 Apr '08

16 Apr '08

Author: glandais Date: 2008-04-16 13:33:38 +0000 (Wed, 16 Apr 2008) New Revision: 1473 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java Log: Javadoc translated Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-04-14 08:55:09 UTC (rev 1472) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-04-16 13:33:38 UTC (rev 1473) @@ -31,7 +31,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; /** - * Une classe utilitaires pour les Entities du projet. + * Some tool enums for entity * * * @author Code Lutin, Landais Gabriel, Chemit Tony @@ -39,7 +39,7 @@ public class EntityHelper { /** - * ActionAvailabilty : précise si le périmètre de l'action + * ActionAvailabilty : in which case we need an action */ public static enum ActionAvailabilty { @@ -52,7 +52,7 @@ } /** - * Une énumération pour définir les types des entités du projet. + * Defines actions of application * * @author chemit */ Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-04-14 08:55:09 UTC (rev 1472) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2008-04-16 13:33:38 UTC (rev 1473) @@ -33,11 +33,10 @@ import fr.cemagref.simexplorer.is.entities.data.Structure; /** - * Une enum pour definir les differents types d'entities rencontres dans le projet. <p/> On ajoute ici une clef i18n - * pour pouvoir traduire plus tard ces types. <p/> Note: on n'utilise pas directement les traductions pour permettre le - * mÃ©canisme de changement de langue (voir module swing et web). + * Enum defining entity types in SimExplorer.<br> + * Each type has its own i18n for later translation.<br> + * We do not use translations yet, as we don't know user langage at this stage. * - * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.i18n.I18nable @@ -82,7 +81,7 @@ /** The Constant log. */ private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory .getLog(EntityTypeEnum.class); - + /** The le. */ private boolean le; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-04-14 08:55:09 UTC (rev 1472) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitable.java 2008-04-16 13:33:38 UTC (rev 1473) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.entities; /** - * Le contrat a respecter par un entity pour être visiter par un {@link EntityVisitor} visiteur. + * Visited interface, for being visited by a {@link EntityVisitor} visitor. * * * @author Code Lutin, Landais Gabriel, Chemit Tony @@ -26,9 +26,9 @@ public interface EntityVisitable { /** - * Méthode à implanter dans chaque visitable pour indiquer ce que le visiteur doit visiter. + * Specify what should be visited in this method. * - * @param visitor le visiteur + * @param visitor visitor * */ void accept(EntityVisitor visitor); Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-04-14 08:55:09 UTC (rev 1472) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityVisitor.java 2008-04-16 13:33:38 UTC (rev 1473) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.entities; /** - * Le contrat à respecter pour un visiteur à visiter des {@link EntityVisitable}.. + * Visitor interface allowing giving visits to {@link EntityVisitable}. * * @author Code Lutin, Landais Gabriel, Chemit Tony * @see EntityVisitable

1 0

r1472 - trunk/simexplorer-is/src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org 14 Apr '08

14 Apr '08

Author: glandais Date: 2008-04-14 08:55:09 +0000 (Mon, 14 Apr 2008) New Revision: 1472 Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: Update TODO Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-04-14 08:54:51 UTC (rev 1471) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-04-14 08:55:09 UTC (rev 1472) @@ -22,14 +22,6 @@ Fonctionnalités seconde réunion =============================== -Général -------- - - - (NOK) Mettre à jour les entêtes de fichier avec la bonne licence GPL - - (NOK) Refondre les entités afin de les générer depuis un modèle et gérer la - sérialisation par outils comme JAXB/XStream, ceci dans un module propre - (et non inclu avec les autres classes storage) - Serveur -------

1 0

r1471 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 14 Apr '08

14 Apr '08

Author: glandais Date: 2008-04-14 08:54:51 +0000 (Mon, 14 Apr 2008) New Revision: 1471 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: Bug md5 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-04-14 08:54:25 UTC (rev 1470) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-04-14 08:54:51 UTC (rev 1471) @@ -302,9 +302,9 @@ } else { if (entryName.startsWith(FILE_DATA_PREFIX)) { String fileName = entryName.replace(FILE_DATA_PREFIX + FOLDER_SEPARATOR, ""); + String zipMD5 = Attachment.getHashFromUniqueId(fileName); fileName = Attachment.getFileNameFromUniqueId(fileName); String idFile = streamInfo.getUuid(); - String zipMD5 = Attachment.getHashFromUniqueId(fileName); if (!streamInfo.getHash().equals(zipMD5)) { throw new SimExplorerBusinessException(_("simexplorer.service.invalidhash")); } @@ -790,7 +790,7 @@ if (getStorageEngine().canCreateSubVersion(token, metaData.getUuid())) { // trying to save a version with same hash but in superior version // so we will copy versionToUpgrade to metaData.getVersion() - Version versionToUpgrade = Version.valueOf(previousVersion.toString()); + Version versionToUpgrade = previousVersion.getVersion(); // set previous as not being the latest one update(token, previousVersion.getUuid(), previousVersion.getVersion(), null, true);

1 0

r1470 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 14 Apr '08

14 Apr '08

Author: glandais Date: 2008-04-14 08:54:25 +0000 (Mon, 14 Apr 2008) New Revision: 1470 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java Log: Bug cr?\195?\169ation d'un utilisateur/groupe supprim?\195?\169 pr?\195?\169c?\195?\169dement Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-04-14 08:53:41 UTC (rev 1469) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-04-14 08:54:25 UTC (rev 1470) @@ -440,9 +440,16 @@ } if (canSaveElement(token)) { Group oldGroup = daoActor.getGroup(name); - // FIXME visible = false + // si le groupe existe déjà if (oldGroup != null) { - throw new SimExplorerBusinessException(_("simexplorer.service.business.groupexist")); + // mais qu'il n'est plus visible + if (!oldGroup.isVisible()) { + // le rendre à nouveau visible + oldGroup.setVisible(true); + updateGroup(token, oldGroup, new ArrayList<Actor>()); + } else { + throw new SimExplorerBusinessException(_("simexplorer.service.business.groupexist")); + } } Group group = new Group(); @@ -464,9 +471,13 @@ } if (canSaveElement(token)) { User oldUser = daoActor.getUser(login); - // FIXME visible = false if (oldUser != null) { - throw new SimExplorerBusinessException(_("simexplorer.service.business.userexist")); + if (!oldUser.isVisible()) { + oldUser.setVisible(true); + updateUser(token, oldUser); + } else { + throw new SimExplorerBusinessException(_("simexplorer.service.business.userexist")); + } } User user = new User();

1 0

r1469 - trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata
by glandais＠users.labs.libre-entreprise.org 14 Apr '08

14 Apr '08

Author: glandais Date: 2008-04-14 08:53:41 +0000 (Mon, 14 Apr 2008) New Revision: 1469 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java Log: Version is now immuable Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-04-14 08:53:19 UTC (rev 1468) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-04-14 08:53:41 UTC (rev 1469) @@ -28,6 +28,7 @@ /** * The Class MetaData. Used by IS to store relative data of a LoggableElement. SimExplorer should not set properties of * this class. + * * @author Code Lutin, Landais Gabriel, Chemit Tony */ @org.codelutin.i18n.I18nable @@ -135,11 +136,7 @@ * @param version the version to set */ public void setVersion(Version version) { - if (version == null) { - this.version = null; - } else { - this.version = Version.valueOf(version.toString()); - } + this.version = version; } /** @@ -211,11 +208,7 @@ * @param parentVersion the parentVersionVersion to set */ public void setParentVersion(Version parentVersion) { - if (parentVersion == null) { - this.parentVersion = null; - } else { - this.parentVersion = Version.valueOf(parentVersion.toString()); - } + this.parentVersion = parentVersion; } /**

1 0

r1468 - trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 14 Apr '08

14 Apr '08

Author: glandais Date: 2008-04-14 08:53:19 +0000 (Mon, 14 Apr 2008) New Revision: 1468 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java Log: Number of ea created Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-04-14 08:53:01 UTC (rev 1467) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-04-14 08:53:19 UTC (rev 1468) @@ -51,7 +51,7 @@ public Object onActionFromGenerateData() throws Exception { StorageServiceGenerator storageServiceGenerator = new StorageServiceGenerator(); storageServiceGenerator.generateLotsExplorationApplication(RemoteStorageService.getStorageService(), - getToken(), 1); + getToken(), 10); return elementList; }

1 0

r1467 - trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 14 Apr '08

14 Apr '08

Author: glandais Date: 2008-04-14 08:53:01 +0000 (Mon, 14 Apr 2008) New Revision: 1467 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java Log: Reporting security errors Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-04-14 08:41:41 UTC (rev 1466) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-04-14 08:53:01 UTC (rev 1467) @@ -28,6 +28,7 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException; /** * The Class ExceptionReport. @@ -120,7 +121,7 @@ */ public String getErrorMessage() { if (!_unknown) { - if (exception instanceof SimExplorerBusinessException) { + if (exception instanceof SimExplorerSecurityException) { return messages.get("simexplorer.ui.web.error.security"); } return exception.getMessage();

1 0

r1466 - trunk/simexplorer-is/simexplorer-is-web/src/main/webapp
by glandais＠users.labs.libre-entreprise.org 14 Apr '08

14 Apr '08

Author: glandais Date: 2008-04-14 08:41:41 +0000 (Mon, 14 Apr 2008) New Revision: 1466 Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementManage.tml trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupEdit.tml Log: Item vide de combo Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementManage.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementManage.tml 2008-04-10 17:00:51 UTC (rev 1465) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/ElementManage.tml 2008-04-14 08:41:41 UTC (rev 1466) @@ -7,7 +7,7 @@ <p><t:form> <t:checkbox value="filterOwner" onclick="this.form.submit();"/>${message:simexplorer.ui.web.elementmanage.filterowner} : - <t:select model="users" value="userOwner" encoder="userEncoder" /> + <t:select model="users" t:validate="required" value="userOwner" encoder="userEncoder" /> <input type="submit" value="${message:simexplorer.ui.web.elementmanage.ok}" /> </t:form></p> Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupEdit.tml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-04-10 17:00:51 UTC (rev 1465) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-04-14 08:41:41 UTC (rev 1466) @@ -9,7 +9,7 @@ <t:if test="superAdmin"> <p><t:label for="owner" /> : <input t:type="Select" t:id="owner" - t:value="owner" model="users" encoder="userEncoder" /></p> + t:value="owner" model="users" t:validate="required" encoder="userEncoder" /></p> </t:if> <p>${message:simexplorer.ui.web.userMembers} : <input t:type="Palette" model="users"

1 0