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

r735 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 17:13:27 +0000 (Thu, 07 Feb 2008) New Revision: 735 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java Log: generate hash Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-07 17:13:14 UTC (rev 734) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-07 17:13:27 UTC (rev 735) @@ -147,6 +147,10 @@ return RandomStringUtils.randomAlphabetic(r.nextInt(10) + 10); } + private String hash() { + return RandomStringUtils.randomAlphanumeric(32); + } + /** * Initialize strings. */ @@ -302,8 +306,8 @@ Attachment attachment = new Attachment(); attachment.setContentType(ContentTypeFactory .getContentTypeInstance("RawType")); - - attachment.setDataHash("d41d8cd98f00b204e9800998ecf8427e"); + attachment.setDataHash(hash()); + //attachment.setDataHash("d41d8cd98f00b204e9800998ecf8427e"); attachment.setFileName(shortString() + ".txt"); return attachment; }

1 0

r734 - trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 17:13:14 +0000 (Thu, 07 Feb 2008) New Revision: 734 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java Log: affiche pas le dataHash dansle toString ? Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java 2008-02-07 17:10:42 UTC (rev 733) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java 2008-02-07 17:13:14 UTC (rev 734) @@ -164,8 +164,9 @@ @Override public String toString() { StringBuffer sb = new StringBuffer(); - sb.append(getFileName()).append(" - "); - sb.append(getDataHash()); + sb.append(getFileName()); + //sb.append(getFileName()).append(" - "); + //sb.append(getDataHash()); if (getContentType() != null) { sb.append(" - ").append(getContentType().getDescription()); }

1 0

r733 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing uimodel/fr/cemagref/simexplorer/is/ui/swing uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 17:10:42 +0000 (Thu, 07 Feb 2008) New Revision: 733 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: optimisation ui Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 17:10:09 UTC (rev 732) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-07 17:10:42 UTC (rev 733) @@ -309,14 +309,22 @@ ui.getDetailHeader().setText(_("simexplorer.node.detail", selectedNode.getMetaData().getName(), model.getSelectedVersion())); ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); ui.getDetailType().setText(detail.getType()); - ui.getDetailDescription().setText(detail.getDescription()); + String s = detail.getDescription(); + String tooltip = s; + if (s.length()>32) { + s = s.substring(0,32)+"..."; + } + ui.getDetailDescription().setText(s); + if (!s.equals(tooltip)) { + ui.getDetailDescription().setToolTipText(tooltip); + } ui.getDetailCreationDate().setText(DATE_FORMAT.format(detail.getCreationDate())); ui.getDetail().setVisible(true); JTable table = ui.getDetailTable(); ((JDetailTableModel) table.getModel()).setData(detail); int nbRows = table.getRowCount() + 1; - if (nbRows > 11) { - nbRows = 11; + if (nbRows > 6) { + nbRows = 6; } ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbRows * (4 + table.getFont().getSize())))); List<Attachment> attachments = detail.getAttachments(); @@ -336,8 +344,8 @@ } listAttachments.setSelectedIndex(0); nbRows = listModel.getSize(); - if (nbRows > 10) { - nbRows = 10; + if (nbRows > 5) { + nbRows = 5; } Dimension dimHead = ui.getDetailHeaderAttachmentsPanel().getPreferredSize(); listAttachments.setVisible(true); Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-07 17:10:09 UTC (rev 732) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-02-07 17:10:42 UTC (rev 733) @@ -1,5 +1,5 @@ <JFrame name="mainFrame" title='{_("simexplorer.main.ui.title")}' - defaultCloseOperation='DISPOSE_ON_CLOSE' width='900' height='720'> + defaultCloseOperation='DISPOSE_ON_CLOSE' width='700' height='525'> <script> import static org.codelutin.i18n.I18n._; import static jaxx.runtime.UIHelper.createImageIcon; Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 17:10:09 UTC (rev 732) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 17:10:42 UTC (rev 733) @@ -20,7 +20,7 @@ <JLabel id='detailHeader' text='{_("simexplorer.node.nodetail")}'/> </JPanel> </cell> - </row> + </row> <row> <cell fill='vertical'> <JPanel id='detailHeaderAttachmentsPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> @@ -34,13 +34,13 @@ <JScrollPane columnHeaderView='{toolbar}'> <JTree id="navigationTree" model='{new javax.swing.tree.DefaultTreeModel(null)}'/> </JScrollPane> - <JScrollPane id="scrollPane" columnHeaderView='{detailHeaderPanel}'> + <JScrollPane id="scrollPane" columnHeaderView='{detailHeaderPanel}' border='{null}' horizontalScrollBarPolicy='horizontal_scrollbar_never' verticalScrollBarPolicy='vertical_scrollbar_never'> <Table id='detail' insets='2,2,2,1'> <row fill='vertical'> <cell anchor='west'> <JLabel text='{_("simexplorer.common.type")}'/> </cell> - <cell weightx="1" anchor='east'> + <cell weightx="1" anchor='west'> <JLabel id='detailType'/> </cell> </row> @@ -48,7 +48,7 @@ <cell anchor='west'> <JLabel text='{_("simexplorer.common.version")}'/> </cell> - <cell weightx="1" anchor='east'> + <cell weightx="1" anchor='west'> <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> </cell> </row> @@ -56,7 +56,7 @@ <cell anchor='west'> <JLabel text='{_("simexplorer.common.description")}'/> </cell> - <cell weightx="1" anchor='east'> + <cell weightx="1" anchor='west'> <JLabel id='detailDescription'/> </cell> </row> @@ -64,34 +64,34 @@ <cell anchor='west'> <JLabel text='{_("simexplorer.common.creationDate")}'/> </cell> - <cell anchor='east'> + <cell anchor='west'> <JLabel id='detailCreationDate'/> </cell> </row> <row> <cell fill='both' columns="2"> - <JPanel background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> + <JPanel id='detailDescriptorsHeaderPanel' background='{Color.WHITE}' border='{javax.swing.border.LineBorder.createBlackLineBorder()}'> <JLabel id='detailDescriptorsHeader'/> </JPanel> </cell> </row> <row> - <cell columns='2' fill='horizontal'> - <JScrollPane id='scrollTable'> + <cell fill='horizontal' columns="2"> + <JScrollPane id='scrollTable' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> <JTable id="detailTable" model='{new fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel()}' focusable='false' enabled='false'/> </JScrollPane> </cell> </row> <row> - <cell columns='2' fill='horizontal'> - <JScrollPane id='scrollAttachments' columnHeaderView='{detailHeaderAttachmentsPanel}'> + <cell fill='horizontal' columns="2"> + <JScrollPane id='scrollAttachments' columnHeaderView='{detailHeaderAttachmentsPanel}' horizontalScrollBarPolicy='horizontal_scrollbar_as_needed' verticalScrollBarPolicy='vertical_scrollbar_as_needed'> <JList id="detailAttachments" model='{new DefaultListModel()}'/> </JScrollPane> </cell> </row> <row weighty="1" weightx="2"> - <cell fill='both' columns='2'> + <cell fill='both'> <JPanel> <JLabel text=''/> </JPanel>

1 0

r732 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 17:10:09 +0000 (Thu, 07 Feb 2008) New Revision: 732 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java Log: ajout de tous les LE Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-07 17:07:02 UTC (rev 731) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-07 17:10:09 UTC (rev 732) @@ -122,15 +122,17 @@ protected void registerEA(String uuid, ExplorationApplication... eas) throws Exception { this.eas.put(uuid, eas); registerLoggableElement(uuid, eas); - for (Component component : eas[0].getComponents()) { - registerLoggableElement(component.getMetaData().getUuid(), component); - for (Library library : component.getLibraries()) { - registerLoggableElement(library.getMetaData().getUuid(), library); + for (ExplorationApplication ea : eas) { + for (Component component : ea.getComponents()) { + registerLoggableElement(component.getMetaData().getUuid(), component); + for (Library library : component.getLibraries()) { + registerLoggableElement(library.getMetaData().getUuid(), library); + } } + for (ExplorationData explorationData : ea.getExplorations()) { + registerLoggableElement(explorationData.getMetaData().getUuid(), explorationData); + } } - for (ExplorationData explorationData : eas[0].getExplorations()) { - registerLoggableElement(explorationData.getMetaData().getUuid(), explorationData); - } } protected void registerLoggableElement(String uuid, LoggableElement... loggableElements) throws Exception {

1 0

r731 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 17:07:02 +0000 (Thu, 07 Feb 2008) New Revision: 731 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: renommage tab Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-07 16:31:06 UTC (rev 730) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-07 17:07:02 UTC (rev 731) @@ -162,8 +162,8 @@ simexplorer.option.description.resetConfig=Reset user configuration. simexplorer.option.description.showConfig=See configuration details simexplorer.option.description.ui=launch or not user interface (value) -simexplorer.tab.detail=Application detail -simexplorer.tab.detail.tooltip=Screen of details of an Application +simexplorer.tab.detail=Detail +simexplorer.tab.detail.tooltip=Screen of details of an Element simexplorer.tab.local=Local applications simexplorer.tab.local.tooltip=List of all applications existing on local database simexplorer.tab.remote=Remote applications Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-07 16:31:06 UTC (rev 730) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-07 17:07:02 UTC (rev 731) @@ -162,8 +162,8 @@ simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration simexplorer.option.description.ui=launch or not user interface (value) -simexplorer.tab.detail=D\u00E9tail Application -simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'une application +simexplorer.tab.detail=D\u00E9tail +simexplorer.tab.detail.tooltip=L'\u00E9cran affichant les d\u00E9tails d'un \u00E9l\u00E9ment simexplorer.tab.local=Applications locales simexplorer.tab.local.tooltip=La liste des applications pr\u00E9sentes localement simexplorer.tab.remote=Applications distantes

1 0

r730 - in trunk: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: glandais Date: 2008-02-07 16:31:06 +0000 (Thu, 07 Feb 2008) New Revision: 730 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/BaseEntity.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java Log: Code cleanup Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/BaseEntity.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/BaseEntity.java 2008-02-07 16:26:14 UTC (rev 729) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/BaseEntity.java 2008-02-07 16:31:06 UTC (rev 730) @@ -26,5 +26,6 @@ // empty class + /** The Constant serialVersionUID. */ private static final long serialVersionUID = -1180452401816397351L; } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-07 16:26:14 UTC (rev 729) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-07 16:31:06 UTC (rev 730) @@ -209,6 +209,7 @@ /** * Generate array. + * @param <T> Class in array * * @param clazz * the clazz Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java 2008-02-07 16:26:14 UTC (rev 729) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockAuthenticationServiceImpl.java 2008-02-07 16:31:06 UTC (rev 730) @@ -65,13 +65,6 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.AuthenticationService#changePassword(java.lang.String, java.lang.String) - */ - public void changePassword(String token, String password) { - checkImplemented(); - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getUser(java.lang.String, java.lang.Integer) */ public User getUser(String token, Integer id) { Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-02-07 16:26:14 UTC (rev 729) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-02-07 16:31:06 UTC (rev 730) @@ -148,10 +148,10 @@ * * @param entity * Element related - * @param field - * Data field * @param token * the token + * @param attachment + * the attachment * * @return Data stream * Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-07 16:26:14 UTC (rev 729) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-07 16:31:06 UTC (rev 730) @@ -248,6 +248,14 @@ // Tools + /** + * Gets the tmp attachment. + * + * @param id + * the id + * + * @return the tmp attachment + */ private Attachment getTmpAttachment(String id) { Attachment res = new Attachment(); res.setDataHash(""); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-07 16:26:14 UTC (rev 729) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-07 16:31:06 UTC (rev 730) @@ -22,7 +22,6 @@ import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.corelib.components.Form; -import org.apache.tapestry.corelib.components.TextField; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject;

1 0

r729 - in trunk: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: glandais Date: 2008-02-07 16:26:14 +0000 (Thu, 07 Feb 2008) New Revision: 729 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: Commit removed from service interface Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:26:14 UTC (rev 729) @@ -36,14 +36,6 @@ public interface StorageService { /** - * Commit in storage. - * - * @throws SimExplorerServiceException - * the sim explorer service exception - */ - void commit() throws SimExplorerServiceException; - - /** * Login user onto system Not used for local usages. * * @param login Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:26:14 UTC (rev 729) @@ -72,16 +72,6 @@ throws SimExplorerStorageException; /** - * Close. - * - * @throws Exception - * the exception - */ - public void close() throws Exception { - getStorageEngine().close(); - } - - /** * Gets the xML attachment. * * @return the xML attachment @@ -96,17 +86,6 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#commit() - */ - public void commit() throws SimExplorerServiceException { - try { - getStorageEngine().commit(); - } catch (SimExplorerStorageException e) { - throw new SimExplorerServiceException(e); - } - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#saveElement(java.lang.String, com.healthmarketscience.rmiio.RemoteInputStream) */ public MetaData saveElement(String token, RemoteInputStream zipRemoteStream) @@ -592,6 +571,7 @@ throws SimExplorerServiceException { try { getStorageEngine().deleteElement(token, uuid, new Version(version)); + getStorageEngine().commit(); } catch (SimExplorerStorageException e) { throw new SimExplorerServiceException(e); } @@ -604,6 +584,7 @@ throws SimExplorerServiceException { try { getStorageEngine().deleteElements(token, uuid); + getStorageEngine().commit(); } catch (SimExplorerStorageException e) { throw new SimExplorerServiceException(e); } Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 16:26:14 UTC (rev 729) @@ -158,7 +158,6 @@ } } - storageService.commit(); } } Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-07 16:26:14 UTC (rev 729) @@ -59,7 +59,6 @@ RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( zipStream); storageService.saveElement(null, zipRemoteStream); - storageService.commit(); assertNotNull(storageService.getMetadata(null, "abcd")); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 16:26:14 UTC (rev 729) @@ -44,13 +44,6 @@ base = new MockDatabase(); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#commit() - */ - public void commit() throws SimExplorerServiceException { - checkImplemented(); - } - /** * Check implemented. *

1 0

r728 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools
by glandais＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: glandais Date: 2008-02-07 16:14:32 +0000 (Thu, 07 Feb 2008) New Revision: 728 Removed: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/DownloadableFile.java Log: Useless class Deleted: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/DownloadableFile.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/DownloadableFile.java 2008-02-07 16:09:43 UTC (rev 727) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/DownloadableFile.java 2008-02-07 16:14:32 UTC (rev 728) @@ -1,71 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* 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 2 -* 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, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.ui.web.tools; - -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; - -/** - * The Class DownloadableFile. - */ -public class DownloadableFile { - - /** The meta data. */ - private MetaData metaData; - - /** The filename. */ - private String filename; - - /** - * Gets the filename. - * - * @return the filename - */ - public String getFilename() { - return filename; - } - - /** - * Sets the filename. - * - * @param filename - * the new filename - */ - public void setFilename(String filename) { - this.filename = filename; - } - - /** - * Gets the meta data entity. - * - * @return the meta data entity - */ - public MetaData getMetaDataEntity() { - return metaData; - } - - /** - * Sets the meta data entity. - * - * @param metaData - * the new meta data entity - */ - public void setMetaDataEntity(MetaData metaData) { - this.metaData = metaData; - } - -}

1 0

r727 - in trunk: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: glandais Date: 2008-02-07 16:09:43 +0000 (Thu, 07 Feb 2008) New Revision: 727 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java Log: Harmonisation noms fonctions export Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:09:43 UTC (rev 727) @@ -144,8 +144,8 @@ * @throws SimExplorerServiceException * the sim explorer service exception */ - RemoteInputStream exportElement(String token, String uuid, String version) - throws SimExplorerServiceException; + RemoteInputStream retrieveElementXML(String token, String uuid, + String version) throws SimExplorerServiceException; /** * Export full element to a remote stream as a zip. @@ -162,8 +162,8 @@ * @throws SimExplorerServiceException * the sim explorer service exception */ - RemoteInputStream exportFull(String token, String uuid, String version) - throws SimExplorerServiceException; + RemoteInputStream retrieveElementFull(String token, String uuid, + String version) throws SimExplorerServiceException; /** * Retrieve data related to an entity. @@ -174,16 +174,17 @@ * the uuid * @param version * the version - * - * @param attachment the attachment - * + * @param attachment + * the attachment + * * @return the remote input stream * * @throws SimExplorerServiceException * the sim explorer service exception */ - RemoteInputStream retrieveData(String token, String uuid, String version, - Attachment attachment) throws SimExplorerServiceException; + RemoteInputStream retrieveElementData(String token, String uuid, + String version, Attachment attachment) + throws SimExplorerServiceException; /** * Retrieve number of elements matching query. @@ -281,7 +282,7 @@ * @throws SimExplorerServiceException * the sim explorer service exception */ - LoggableElement getElement(String token, String uuid, String version) + LoggableElement getLoggableElement(String token, String uuid, String version) throws SimExplorerServiceException; /** Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:09:43 UTC (rev 727) @@ -224,10 +224,10 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getElement(java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#getLoggableElement(java.lang.String, java.lang.String, java.lang.String) */ - public LoggableElement getElement(String token, String uuid, String version) - throws SimExplorerServiceException { + public LoggableElement getLoggableElement(String token, String uuid, + String version) throws SimExplorerServiceException { MetaData mde = getMetadata(token, uuid, version); try { @@ -343,9 +343,9 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveElementData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream retrieveData(String token, String uuid, + public RemoteInputStream retrieveElementData(String token, String uuid, String version, Attachment attachment) throws SimExplorerServiceException { try { @@ -363,9 +363,9 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveElementXML(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportElement(String token, String uuid, + public RemoteInputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerServiceException { MetaData mde = getMetadata(token, uuid, version); try { @@ -383,11 +383,11 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveElementFull(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportFull(String token, String uuid, + public RemoteInputStream retrieveElementFull(String token, String uuid, String version) throws SimExplorerServiceException { - LoggableElement element = getElement(token, uuid, version); + LoggableElement element = getLoggableElement(token, uuid, version); MetaData mde = element.getMetaData(); try { PipedOutputStream pipedOut = new PipedOutputStream(); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 16:09:43 UTC (rev 727) @@ -99,7 +99,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportElement(String token, String uuid, + public RemoteInputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerServiceException { return (RemoteInputStream) checkImplemented(); } @@ -107,7 +107,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportFull(String token, String uuid, + public RemoteInputStream retrieveElementFull(String token, String uuid, String version) throws SimExplorerServiceException { return (RemoteInputStream) checkImplemented(); } @@ -115,7 +115,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream retrieveData(String token, String uuid, + public RemoteInputStream retrieveElementData(String token, String uuid, String version, Attachment attachment) throws SimExplorerServiceException { return null; } @@ -161,7 +161,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getElement(java.lang.String, java.lang.String, java.lang.String) */ - public LoggableElement getElement(String token, String uuid, String version) + public LoggableElement getLoggableElement(String token, String uuid, String version) throws SimExplorerServiceException { try { LoggableElement[] eas = base.loggableElements.get(uuid); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-07 16:09:43 UTC (rev 727) @@ -59,7 +59,7 @@ public static LoggableElement getElement(SimExplorerContext context, boolean remote, String uuid, String version) throws Exception { StorageService service = context.getStorageService(remote); LoggableElement data; - data = service.getElement(context.getToken(), uuid, version); + data = service.getLoggableElement(context.getToken(), uuid, version); return data; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-07 16:09:43 UTC (rev 727) @@ -102,7 +102,7 @@ super.doAction(e); //TODO push this in StorageHelper StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); - RemoteInputStream ris = service.exportElement(getContext().getToken(), uuid, version.toString()); + RemoteInputStream ris = service.retrieveElementXML(getContext().getToken(), uuid, version.toString()); if (ris == null) { // todo log error log.warn("could not get incoming data for " + uuid); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-07 16:09:43 UTC (rev 727) @@ -68,7 +68,7 @@ try { RemoteInputStream ris = RemoteStorageService.getStorageService() - .exportElement(getToken(), mde.getUuid(), + .retrieveElementXML(getToken(), mde.getUuid(), mde.getVersion().toString()); InputStream stream = RemoteInputStreamClient.wrap(ris); response = new XMLAttachment(stream, mde.getType() + "." @@ -92,7 +92,7 @@ try { RemoteInputStream ris = RemoteStorageService.getStorageService() - .exportFull(getToken(), mde.getUuid(), + .retrieveElementFull(getToken(), mde.getUuid(), mde.getVersion().toString()); InputStream stream = RemoteInputStreamClient.wrap(ris); response = new ZipAttachment(stream, mde.getType() + "." @@ -127,7 +127,7 @@ for (Attachment attachment : attachments) { if (attachment.getUniqueId().equals(attachmentUniqueId)) { RemoteInputStream ris = RemoteStorageService - .getStorageService().retrieveData(getToken(), uuid, + .getStorageService().retrieveElementData(getToken(), uuid, version, attachment); InputStream stream = RemoteInputStreamClient.wrap(ris); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-02-07 16:09:43 UTC (rev 727) @@ -44,7 +44,7 @@ */ public void setup(String uuid, String version) { try { - element = RemoteStorageService.getStorageService().getElement( + element = RemoteStorageService.getStorageService().getLoggableElement( getToken(), uuid, version); } catch (Exception e) { throw new SimExplorerWebException(e);

1 0

r726 - trunk/simexplorer-is
by glandais＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: glandais Date: 2008-02-07 16:07:44 +0000 (Thu, 07 Feb 2008) New Revision: 726 Modified: trunk/simexplorer-is/pom.xml Log: Javadoc generation Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-07 15:50:47 UTC (rev 725) +++ trunk/simexplorer-is/pom.xml 2008-02-07 16:07:44 UTC (rev 726) @@ -1,7 +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/maven-v4_0_0.xsd"> + 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> @@ -28,38 +28,40 @@ <description>simexplorer is</description> <inceptionYear>2008</inceptionYear> -  - <profiles> +  + <profiles> <profile> <id>project</id> <activation> <activeByDefault>true</activeByDefault> </activation> <properties> -  - <labs.id>130</labs.id> -  - <maven.verbose>false</maven.verbose> -  +  + <labs.id>130</labs.id> +  + <maven.verbose>false</maven.verbose> +  <maven.src.dir>${basedir}/src</maven.src.dir>  <maven.test.skip>true</maven.test.skip>  <maven.compile.source>1.6</maven.compile.source> <maven.compile.target>1.6</maven.compile.target> -  - <maven.compile.encoding>ISO-8859-15</maven.compile.encoding> +  + <maven.compile.encoding> + ISO-8859-15 + </maven.compile.encoding> </properties> </profile> </profiles> - +  <issueManagement> <url> @@ -84,14 +86,14 @@ </site> </distributionManagement> - <repositories> - <repository> - <id>repository.jboss.com</id> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> + <repositories> + <repository> + <id>repository.jboss.com</id> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> - <build> + <build> <plugins> <plugin> <groupId>lutinplugin</groupId> @@ -150,8 +152,8 @@ <configuration> <source>${maven.compile.source}</source> <target>${maven.compile.target}</target> - <encoding>${maven.compile.encoding}</encoding> - </configuration> + <encoding>${maven.compile.encoding}</encoding> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -160,6 +162,15 @@ <useProjectReferences>true</useProjectReferences> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + <encoding>${maven.compile.encoding}</encoding> + </configuration> + </plugin> + </plugins> </build>

1 0