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

r575 - trunk/simexplorer-is-entities
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 14:31:45 +0000 (Sat, 02 Feb 2008) New Revision: 575 Modified: trunk/simexplorer-is-entities/pom.xml Log: renseignement description du module Modified: trunk/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is-entities/pom.xml 2008-02-02 14:31:06 UTC (rev 574) +++ trunk/simexplorer-is-entities/pom.xml 2008-02-02 14:31:45 UTC (rev 575) @@ -10,7 +10,7 @@ <name>Entities</name> <version>0.0.1-SNAPSHOT</version> - <description></description> + <description>simexplorer-is entities module</description> <packaging>jar</packaging> <parent>

1 0

r574 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 14:31:06 +0000 (Sat, 02 Feb 2008) New Revision: 574 Modified: trunk/simexplorer-is/pom.xml Log: tout dur de partout :) Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-02 14:29:52 UTC (rev 573) +++ trunk/simexplorer-is/pom.xml 2008-02-02 14:31:06 UTC (rev 574) @@ -98,14 +98,14 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skip>true</skip> + <skip>${maven.test.skip}</skip> </configuration> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> </configuration> </plugin> <plugin>

1 0

r573 - trunk/simexplorer-is
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 14:29:52 +0000 (Sat, 02 Feb 2008) New Revision: 573 Modified: trunk/simexplorer-is/profiles.xml Log: des commentaires sur les propri?\195?\169t?\195?\169s utilis?\195?\169es Modified: trunk/simexplorer-is/profiles.xml =================================================================== --- trunk/simexplorer-is/profiles.xml 2008-02-02 10:20:24 UTC (rev 572) +++ trunk/simexplorer-is/profiles.xml 2008-02-02 14:29:52 UTC (rev 573) @@ -7,20 +7,15 @@ <activeByDefault>true</activeByDefault> </activation> <properties> -  +  <labs.id>130</labs.id> -  +  <maven.src.dir>${basedir}/src</maven.src.dir> -  +  <maven.test.skip>true</maven.test.skip>  <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> -  + <maven.compile.target>1.5</maven.compile.target> </properties> </profile> </profiles>

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 10:20:24 +0000 (Sat, 02 Feb 2008) New Revision: 572 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: debut implantation getVersions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-02 10:19:54 UTC (rev 571) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-02 10:20:24 UTC (rev 572) @@ -20,16 +20,23 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import static org.codelutin.i18n.I18n._; +import javax.swing.DefaultListModel; +import javax.swing.JList; import javax.swing.JTree; +import javax.swing.ListModel; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeModel; @@ -38,8 +45,6 @@ import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; -import static org.codelutin.i18n.I18n.*; - /** * Action pour afficher le tab de détail d'un LoggableElement * @@ -81,7 +86,7 @@ Version version = data.getVersion(); log.info("show detail uuid:" + uuid + ", version:" + version + " (remote ?" + model.isRemote() + ")"); // chargement de l'élément à partir du service - LoggableElement element = StorageServiceHelper.getElement(getContext(),model.isRemote(), uuid, version.toString()); + LoggableElement element = StorageServiceHelper.getElement(getContext(), model.isRemote(), uuid, version.toString()); // push dans le model model.setBean(element); return true; @@ -90,7 +95,7 @@ @Override protected void afterAction(ActionEvent e) { // get model - DetailTabModel model = (DetailTabModel) getModel(); + final DetailTabModel model = (DetailTabModel) getModel(); // get ui JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); @@ -107,6 +112,17 @@ DefaultTreeModel t = new DefaultTreeModel(root); tree.setModel(t); } + + JList historyTree = ui.getHistoryList(); + ListModel historyModel = historyTree.getModel(); + + if (!(historyModel instanceof DefaultListModel)) { + DefaultListModel t = new DefaultListModel(); + historyTree.setModel(t); + } else { + DefaultListModel t = new DefaultListModel(); + t.setSize(0); + } if (firstTime) { // add a listener of tree model tree.addTreeSelectionListener(new TreeSelectionListener() { @@ -134,25 +150,29 @@ } ui.getDownload().setEnabled(download); if (download) { - ui.getDownload().setToolTipText(_("simexplorer.action.dowload2",node.getUserObject())); + ui.getDownload().setToolTipText(_("simexplorer.action.dowload2", node.getUserObject())); } else { ui.getDownload().setToolTipText(null); } ui.getDelete().setEnabled(delete); if (delete) { - ui.getDelete().setToolTipText(_("simexplorer.action.delete2",node.getUserObject())); + ui.getDelete().setToolTipText(_("simexplorer.action.delete2", node.getUserObject())); } else { ui.getDelete().setToolTipText(null); } ui.getExportApplication().setEnabled(export); + + // update detail panel if (detail) { showDetail(node); } - if (history) { - showHistory(node); - } + // update history list + showHistory(node, model, history); + + // refresh ui + getMainUI().refreshDetailTabUI(ui, model); } }); } @@ -160,7 +180,7 @@ tree.setSelectionRow(0); // refresh ui - getMainUI().refreshDetailTabUI(ui); + getMainUI().refreshDetailTabUI(ui, model); } @Override @@ -174,10 +194,23 @@ ui.getDetailFake().setText("detail [" + node.getUserObject().getClass().getSimpleName() + "]" + node.getUserObject()); } - protected void showHistory(LoggableElementTreeNode node) { - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - ui.getHistoryFake().setText("history [" + node.getUserObject().getClass().getSimpleName() + "]" + node.getUserObject()); - ui.repaint(); + protected void showHistory(LoggableElementTreeNode node, DetailTabModel model, boolean history) { + if (!history) { + model.setVersions(null); + return; + } + StorageService service = getContext().getStorageService(model.isRemote()); + //TODO should use model.getBean() ??? + LoggableElement element = (LoggableElement) node.getUserObject(); + try { + MetaData[] versions; + versions = service.getVersions(getContext().getToken(), element.getMetaData().getUuid()); + model.setVersions(versions); + } catch (SimExplorerServiceException e) { + throw new SimExplorerRuntimeException(e); + } + + } protected JTree getTree() { 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-02 10:19:54 UTC (rev 571) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-02 10:20:24 UTC (rev 572) @@ -25,9 +25,9 @@ </JPanel> </JScrollPane> <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> - <JPanel id="history"> - <JLabel id='historyFake' text="HistoryPanel"/> - </JPanel> +  + <JList id='historyList'/> +  </JScrollPane> </JSplitPane> </JScrollPane>

1 0

r571 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . model
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 10:19:54 +0000 (Sat, 02 Feb 2008) New Revision: 571 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: debut implantation getVersions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-02 10:19:20 UTC (rev 570) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-02 10:19:54 UTC (rev 571) @@ -18,6 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; @@ -29,7 +30,9 @@ import org.codelutin.i18n.LanguageEnum; import javax.swing.AbstractButton; +import javax.swing.DefaultListModel; import javax.swing.JComboBox; +import javax.swing.JList; import javax.swing.JTabbedPane; import javax.swing.JTree; import javax.swing.SwingUtilities; @@ -68,7 +71,7 @@ } } - public void refreshDetailTabUI(final JApplicationDetailTab ui) { + public void refreshDetailTabUI(final JApplicationDetailTab ui, final DetailTabModel model) { SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -77,6 +80,25 @@ // tree data model may have changed, must revalidate tree.invalidate(); + JList historyList = ui.getHistoryList(); + + DefaultListModel historyModel = (DefaultListModel) historyList.getModel(); + + MetaData[] versions = model.getVersions(); + if (versions == null) { + historyModel.setSize(0); + } else { + historyModel.setSize(versions.length); + + for (int i = 0; i < versions.length; i++) { + MetaData version = versions[i]; + historyModel.setElementAt(version, i); + } + } + + // history list may have changed, must revalidate + historyList.invalidate(); + // parent must be repaint (will revalidate layout for tree) ui.repaint(); } @@ -92,7 +114,7 @@ ui.getSearchText().setText(model.getQuery()); // refresh search actions - refreshSearchActions(ui,model); + refreshSearchActions(ui, model); // refresh changePage combobox refreshChangePageCombo(ui, model); @@ -117,7 +139,7 @@ container.getSearchApplication().setEnabled(model.hasQuery() || !text.isEmpty()); container.getResetSearchApplication().setEnabled(model.hasQuery() || !text.isEmpty()); } - + public void refreshConnnectState(final boolean isConnected) { //SwingUtilities.invokeLater(new Runnable() { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-02 10:19:20 UTC (rev 570) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-02 10:19:54 UTC (rev 571) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.model; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import jaxx.runtime.builder.TabModel; @@ -41,6 +42,8 @@ protected int index; /** l'élément dont on veut afficher le détail */ protected LoggableElement bean; + /** la liste des versions disponibles pour un élément */ + protected MetaData[] versions; public String getName() { return tab.name(); @@ -62,6 +65,14 @@ return index; } + public String getUuid() { + return uuid; + } + + public MetaData[] getVersions() { + return versions; + } + public void setRemote(boolean remote) { this.remote = remote; } @@ -78,4 +89,7 @@ this.bean = bean; } + public void setVersions(MetaData[] versions) { + this.versions = versions; + } } \ No newline at end of file

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 10:19:20 +0000 (Sat, 02 Feb 2008) New Revision: 570 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java Log: initializer inutile + inlie variable 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-02 10:18:57 UTC (rev 569) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java 2008-02-02 10:19:20 UTC (rev 570) @@ -75,7 +75,7 @@ if (nm.length() - index > 8) { throw new NumberFormatException(nm + " exceeds 8 digits"); } - int digit = 0; + int digit; for (int i = index; i < nm.length(); i++) { result = result << 4; digit = Character.digit(nm.charAt(i), radix); @@ -94,8 +94,7 @@ } public static String getFileNameFromUniqueId(String uniqueId) { - String extractedFileName = uniqueId.substring(9); - return extractedFileName; + return uniqueId.substring(9); } }

1 0

r569 - trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 10:18:57 +0000 (Sat, 02 Feb 2008) New Revision: 569 Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java Log: javadoc + suppress unchecked Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-02 10:18:36 UTC (rev 568) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-02 10:18:57 UTC (rev 569) @@ -302,6 +302,7 @@ /** * @param uuid * @param version + * @param searcher * @return * @throws IOException * @throws Exception @@ -620,6 +621,7 @@ * @return Instance of element * @throws Exception */ + @SuppressWarnings({"unchecked"}) private MetaData loadLuceneElement(Document document) throws Exception { MetaData element = new MetaData();

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 10:18:36 +0000 (Sat, 02 Feb 2008) New Revision: 568 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/MockStorageServiceImpl.java Log: implantation getVersions 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-01 16:26:09 UTC (rev 567) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-02 10:18:36 UTC (rev 568) @@ -223,7 +223,8 @@ for (int i = 0; i < wordcount; i++) { sb.append(randomstrings[r.nextInt(cs)]).append(" "); } - InputStream is = new ByteArrayInputStream(sb.toString().getBytes()); + InputStream is; + is = new ByteArrayInputStream(sb.toString().getBytes()); return is; } } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-01 16:26:09 UTC (rev 567) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-02 10:18:36 UTC (rev 568) @@ -18,19 +18,18 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import com.healthmarketscience.rmiio.RemoteInputStream; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import com.healthmarketscience.rmiio.RemoteInputStream; - -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; - /** @author tony */ public class MockStorageServiceImpl implements StorageService { @@ -40,6 +39,7 @@ protected List<String> mockDataIndex; + protected MetaDataGenerator metaGenerator; protected ElementGenerator generator; public SortedMap<String, MetaData> mockData() { @@ -95,12 +95,12 @@ public int findFullTextCount(String token, String query, boolean onlyLatest) throws SimExplorerServiceException { //TODO Changer - return findApplicationsCount(token,onlyLatest); + return findApplicationsCount(token, onlyLatest); } public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException { //TODO Changer - return findApplications(token,onlyLatest,indexStart,count,dateOrder); + return findApplications(token, onlyLatest, indexStart, count, dateOrder); } public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerServiceException { @@ -134,12 +134,11 @@ } public MetaData[] getVersions(String token, String uuid) throws SimExplorerServiceException { - //TODO - return new MetaData[0]; + return getMetaGenerator().generateVersionnedMetaDataEntity(); } public String loginUser(String login, String password) throws SimExplorerServiceException { - if (login==null) { + if (login == null) { throw new SimExplorerServiceException(new NullPointerException("login can not be null")); } return "password"; @@ -152,14 +151,21 @@ return generator; } + public MetaDataGenerator getMetaGenerator() { + if (metaGenerator == null) { + metaGenerator = new MetaDataGenerator(); + } + return metaGenerator; + } + public void deleteElement(String token, String uuid, String version) { // TODO Auto-generated method stub - + } public void deleteElement(String token, String uuid) { // TODO Auto-generated method stub - + } }

1 0

r567 - in trunk: simexplorer-is simexplorer-is-entities simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service simexplorer-is-sto
by glandais＠users.labs.libre-entreprise.org 01 Feb '08

01 Feb '08

Author: glandais Date: 2008-02-01 16:26:09 +0000 (Fri, 01 Feb 2008) New Revision: 567 Added: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XMLStreamEncoder.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java Removed: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/contenttype/ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java Modified: trunk/simexplorer-is-entities/pom.xml trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/ContentType.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/ContentTypeFactory.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/RawType.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XmlConstants.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/StorageServiceCommon.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is-storage/src/resources/properties/config.properties 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/action/application/ExportApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.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/Install.java trunk/simexplorer-is/pom.xml Log: Attachment refactoring Piped streams when exporting XML : bug fix Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is/pom.xml 2008-02-01 16:26:09 UTC (rev 567) @@ -113,8 +113,6 @@ <artifactId>maven-eclipse-plugin</artifactId> <configuration> <useProjectReferences>true</useProjectReferences> - <downloadJavadocs>true</downloadJavadocs> - <downloadSources>true</downloadSources> </configuration> </plugin> </plugins> Modified: trunk/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is-entities/pom.xml 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/pom.xml 2008-02-01 16:26:09 UTC (rev 567) @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-entities</artifactId> <name>Entities</name> - + <version>0.0.1-SNAPSHOT</version> <description></description> <packaging>jar</packaging> @@ -19,4 +19,12 @@ <version>0.0.1-SNAPSHOT</version> </parent> + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + </dependencies> + </project> \ No newline at end of file Copied: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment (from rev 566, trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/contenttype) Added: 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 (rev 0) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/Attachment.java 2008-02-01 16:26:09 UTC (rev 567) @@ -0,0 +1,101 @@ +/* +* ##% 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.attachment; + +import java.io.Serializable; + +import org.apache.commons.lang.StringUtils; + +public class Attachment implements Serializable { + + private static final long serialVersionUID = 5467615366054227592L; + + private String fileName; + private ContentType contentType; + private int dataHash; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public ContentType getContentType() { + return contentType; + } + + public void setContentType(ContentType contentType) { + this.contentType = contentType; + } + + public int getDataHash() { + return dataHash; + } + + public void setDataHash(int dataHash) { + this.dataHash = dataHash; + } + + public String getUniqueId() { + String hexDataHash = StringUtils.leftPad(Integer.toHexString(dataHash), + 8, '0'); + return hexDataHash + fileName; + } + + public static int intFromHexString(String nm) throws NumberFormatException { + int radix = 16; + int index = 0; + int result = 0; + + // Handle radix specifier, if present + if (nm.startsWith("0x", index) || nm.startsWith("0X", index)) { + index += 2; + radix = 16; + } else if (nm.startsWith("#", index)) { + index++; + radix = 16; + } + if (nm.length() - index > 8) { + throw new NumberFormatException(nm + " exceeds 8 digits"); + } + int digit = 0; + for (int i = index; i < nm.length(); i++) { + result = result << 4; + digit = Character.digit(nm.charAt(i), radix); + if (digit == -1) { + throw new NumberFormatException(nm + " : \'" + nm.charAt(i) + + "\' is not a valid hex digit"); + } + result |= digit; + } + return result; + } + + public static int getHashFromUniqueId(String uniqueId) { + String hexHash = uniqueId.substring(0, 8); + return intFromHexString("0X" + hexHash); + } + + public static String getFileNameFromUniqueId(String uniqueId) { + String extractedFileName = uniqueId.substring(9); + return extractedFileName; + } + +} Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/ContentType.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/contenttype/ContentType.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/ContentType.java 2008-02-01 16:26:09 UTC (rev 567) @@ -15,7 +15,7 @@ * 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.contenttype; +package fr.cemagref.simexplorer.is.attachment; import java.io.InputStream; import java.io.Reader; Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/ContentTypeFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/contenttype/ContentTypeFactory.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/ContentTypeFactory.java 2008-02-01 16:26:09 UTC (rev 567) @@ -15,7 +15,7 @@ * 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.contenttype; +package fr.cemagref.simexplorer.is.attachment; import java.util.HashMap; import java.util.Map; Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/RawType.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/contenttype/RawType.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/attachment/RawType.java 2008-02-01 16:26:09 UTC (rev 567) @@ -15,7 +15,7 @@ * 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.contenttype; +package fr.cemagref.simexplorer.is.attachment; import java.io.InputStream; import java.io.InputStreamReader; Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-01 16:26:09 UTC (rev 567) @@ -18,11 +18,12 @@ package fr.cemagref.simexplorer.is.entities.metadata; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; +import java.util.List; import java.util.Map; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.BaseEntity; public class MetaData extends BaseEntity implements Serializable { @@ -37,7 +38,7 @@ private Date creationDate; private String hash; private Map<String, String> descriptors; - private Map<String, ContentType> attachments; + private List<Attachment> attachments; private String parentDataUuid; private String parentDataVersion; private String parentVersionUuid; @@ -167,9 +168,9 @@ /** * @return the attachments */ - public Map<String, ContentType> getAttachments() { + public List<Attachment> getAttachments() { if (attachments == null) { - attachments = new HashMap<String, ContentType>(); + attachments = new ArrayList<Attachment>(); } return attachments; } @@ -178,7 +179,7 @@ * @param attachments * the attachments to set */ - public void setAttachments(Map<String, ContentType> attachments) { + public void setAttachments(List<Attachment> attachments) { this.attachments = attachments; } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-02-01 16:26:09 UTC (rev 567) @@ -27,10 +27,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -171,8 +168,6 @@ */ public InputStream saveElement(String rootNodeName, E element) throws Exception { - PipedOutputStream os = new PipedOutputStream(); - org.w3c.dom.Document xmlDocument = getXMLBuilder().newDocument(); // DOM properties xmlDocument.setXmlVersion("1.0"); @@ -184,13 +179,13 @@ xmlDocument.appendChild(rootNode); DOMSource domSource = new DOMSource(xmlDocument); - StreamResult result = new StreamResult(os); - TransformerFactory tf = TransformerFactory.newInstance(); - Transformer transformer = tf.newTransformer(); - transformer.transform(domSource, result); - InputStream is = new PipedInputStream(os); + PipedOutputStream os = new PipedOutputStream(); + PipedInputStream is = new PipedInputStream(os); + XMLStreamEncoder xse = new XMLStreamEncoder(domSource, os); + xse.start(); + return is; } @@ -284,15 +279,12 @@ DOMSource domSource = new DOMSource(xmlDocument); PipedOutputStream os = new PipedOutputStream(); - StreamResult result = new StreamResult(os); - TransformerFactory tf = TransformerFactory.newInstance(); - Transformer transformer = tf.newTransformer(); - transformer.transform(domSource, result); + PipedInputStream is = new PipedInputStream(os); - PipedInputStream inputStream; - inputStream = new PipedInputStream(os); + XMLStreamEncoder xse = new XMLStreamEncoder(domSource, os); + xse.start(); - return inputStream; + return is; } /* Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-02-01 16:26:09 UTC (rev 567) @@ -29,7 +29,7 @@ public E loadElement(Element xmlElement) throws Exception { E element = super.loadElement(xmlElement); - MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaData.class); + MetaDataFactory elementFactory = MetaDataFactory.getFactory(MetaData.class); // Load metadata informations Element mdeElement = getXMLElementByTagName(xmlElement, KEY_METADATA); @@ -42,7 +42,7 @@ @Override public void saveElement(org.w3c.dom.Document document, Element xmlElement, E element) throws Exception { - MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaData.class); + MetaDataFactory elementFactory = MetaDataFactory.getFactory(MetaData.class); // Save metadata informations Element mdeElement = document.createElement(KEY_METADATA); Deleted: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java 2008-02-01 16:26:09 UTC (rev 567) @@ -1,229 +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.factories; - -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import fr.cemagref.simexplorer.is.contenttype.ContentType; -import fr.cemagref.simexplorer.is.contenttype.ContentTypeFactory; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; - -public class MetaDataEntityFactory<E extends MetaData> extends - BaseEntityFactory<MetaData> { - - private static final SimpleDateFormat sdf = new SimpleDateFormat( - "yyyy-MM-dd'T'HH:mm:ss"); - - @Override - public MetaData createInstance() { - return new MetaData(); - } - - @SuppressWarnings({"unchecked"}) - public static <E extends MetaData> MetaDataEntityFactory<E> getFactory( - Class<E> entityClass) throws Exception { - return (MetaDataEntityFactory) BaseEntityFactory.getFactory(entityClass); - } - /* - * (non-Javadoc) - * - * @see fr.cemagref.simexplorer.is.storage.factories.BaseEntityFactory#loadXMLElement(org.w3c.dom.Element) - */ - - @Override - public MetaData loadElement(Element xmlElement) throws Exception { - MetaData entity = super.loadElement(xmlElement); - entity.setUuid(getXMLProperty(xmlElement, KEY_METADATA_UUID)); - entity.setName(getXMLProperty(xmlElement, KEY_METADATA_NAME)); - entity.setType(getXMLProperty(xmlElement, KEY_METADATA_TYPE)); - entity.setDescription(getXMLProperty(xmlElement, - KEY_METADATA_DESCRIPTION)); - entity.setVersion(getXMLProperty(xmlElement, KEY_METADATA_VERSION)); - - String latestVersion = getXMLProperty(xmlElement, - KEY_METADATA_LATESTVERSION); - if (latestVersion != null && "1".equals(latestVersion)) { - entity.setLatest(true); - } else { - entity.setLatest(false); - } - - String creationDate = getXMLProperty(xmlElement, - KEY_METADATA_CREATIONDATE); - if (creationDate != null) { - Date date = sdf.parse(creationDate); - entity.setCreationDate(date); - } - - entity.setHash(getXMLProperty(xmlElement, KEY_METADATA_HASH)); - entity.setParentDataUuid(getXMLProperty(xmlElement, - KEY_METADATA_PARENTDATA_UUID)); - entity.setParentDataVersion(getXMLProperty(xmlElement, - KEY_METADATA_PARENTDATA_VERSION)); - entity.setParentVersionUuid(getXMLProperty(xmlElement, - KEY_METADATA_PARENTVERSION_UUID)); - entity.setParentVersionVersion(getXMLProperty(xmlElement, - KEY_METADATA_PARENTVERSION_VERSION)); - - Map<String, String> descriptors = new HashMap<String, String>(); - - Element descriptorsElement = getXMLElementByTagName(xmlElement, - KEY_METADATA_DESCRIPTORS); - if (descriptorsElement != null) { - Set<Element> descriptorElements = getXMLElementsByTagName( - descriptorsElement, KEY_METADATA_DESCRIPTOR); - for (Element descriptorElement : descriptorElements) { - String name = getXMLProperty(descriptorElement, - KEY_METADATA_DESCRIPTOR_NAME); - String value = getXMLProperty(descriptorElement, - KEY_METADATA_DESCRIPTOR_VALUE); - descriptors.put(name, value); - } - } - entity.setDescriptors(descriptors); - - Map<String, ContentType> attachments = new HashMap<String, ContentType>(); - - Element attachmentsElement = getXMLElementByTagName(xmlElement, - KEY_METADATA_ATTACHMENTS); - if (attachmentsElement != null) { - Set<Element> attachmentElements = getXMLElementsByTagName( - attachmentsElement, KEY_METADATA_ATTACHMENT); - for (Element attachmentElement : attachmentElements) { - String name = getXMLProperty(attachmentElement, - KEY_METADATA_ATTACHMENT_NAME); - String type = getXMLProperty(attachmentElement, - KEY_METADATA_ATTACHMENT_TYPE); - ContentType contentType = ContentTypeFactory - .getContentTypeInstance(type); - attachments.put(name, contentType); - } - } - - entity.setAttachments(attachments); - - return entity; - } - - @Override - public void saveElement(Document document, Element xmlElement, - MetaData element) throws Exception { - - setXMLProperty(document, xmlElement, KEY_METADATA_UUID, element - .getUuid()); - setXMLProperty(document, xmlElement, KEY_METADATA_NAME, element - .getName()); - setXMLProperty(document, xmlElement, KEY_METADATA_TYPE, element - .getType()); - setXMLProperty(document, xmlElement, KEY_METADATA_DESCRIPTION, element - .getDescription()); - setXMLProperty(document, xmlElement, KEY_METADATA_VERSION, element - .getVersion().toString()); - - if (element.isLatest()) { - setXMLProperty(document, xmlElement, KEY_METADATA_LATESTVERSION, - "1"); - } else { - setXMLProperty(document, xmlElement, KEY_METADATA_LATESTVERSION, - "0"); - } - - if (element.getCreationDate() != null) { - setXMLProperty(document, xmlElement, KEY_METADATA_CREATIONDATE, sdf - .format(element.getCreationDate())); - } - - setXMLProperty(document, xmlElement, KEY_METADATA_HASH, element - .getHash()); - setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_UUID, - element.getParentDataUuid()); - setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_VERSION, - element.getParentDataVersion()); - setXMLProperty(document, xmlElement, KEY_METADATA_PARENTVERSION_UUID, - element.getParentVersionUuid()); - setXMLProperty(document, xmlElement, - KEY_METADATA_PARENTVERSION_VERSION, element - .getParentVersionVersion()); - - Map<String, String> descriptors = element.getDescriptors(); - - Element descriptorsElement = document - .createElement(KEY_METADATA_DESCRIPTORS); - - for (Map.Entry<String, String> kv : descriptors.entrySet()) { - Element descriptorElement = document - .createElement(KEY_METADATA_DESCRIPTOR); - setXMLProperty(document, descriptorElement, - KEY_METADATA_DESCRIPTOR_NAME, kv.getKey()); - setXMLProperty(document, descriptorElement, - KEY_METADATA_DESCRIPTOR_VALUE, kv.getValue()); - descriptorsElement.appendChild(descriptorElement); - } - - xmlElement.appendChild(descriptorsElement); - - Map<String, ContentType> attachments = element.getAttachments(); - - if (attachments != null) { - - Element attachmentsElement = document - .createElement(KEY_METADATA_ATTACHMENTS); - - for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { - Element attachmentElement = document - .createElement(KEY_METADATA_ATTACHMENT); - setXMLProperty(document, attachmentElement, - KEY_METADATA_ATTACHMENT_NAME, kv.getKey()); - setXMLProperty(document, attachmentElement, - KEY_METADATA_ATTACHMENT_TYPE, kv.getValue().getClass() - .getSimpleName()); - attachmentsElement.appendChild(attachmentElement); - } - xmlElement.appendChild(attachmentsElement); - - } - - } - - /** - * As metadata is stored inside an entity, this method loads metadata with - * parsing stream and retrieve metadata node - * - * @param xmlStream - * @return - * @throws Exception - */ - public MetaData loadElementFromParentXML(InputStream xmlStream) - throws Exception { - Document document = getXMLBuilder().parse(xmlStream); - Element rootElement = (Element) document.getFirstChild(); - Element mdeElement = getXMLElementByTagName(rootElement, KEY_METADATA); - MetaData mde; - mde = loadElement(mdeElement); - return mde; - } - -} Copied: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java (from rev 566, trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java) =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java (rev 0) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataFactory.java 2008-02-01 16:26:09 UTC (rev 567) @@ -0,0 +1,249 @@ +/* +* ##% 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.factories; + +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.attachment.ContentType; +import fr.cemagref.simexplorer.is.attachment.ContentTypeFactory; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; + +public class MetaDataFactory<E extends MetaData> extends + BaseEntityFactory<MetaData> { + + private static final SimpleDateFormat sdf = new SimpleDateFormat( + "yyyy-MM-dd'T'HH:mm:ss"); + + @Override + public MetaData createInstance() { + return new MetaData(); + } + + @SuppressWarnings( { "unchecked" }) + public static <E extends MetaData> MetaDataFactory<E> getFactory( + Class<E> entityClass) throws Exception { + return (MetaDataFactory) BaseEntityFactory + .getFactory(entityClass); + } + + /* + * (non-Javadoc) + * + * @see fr.cemagref.simexplorer.is.storage.factories.BaseEntityFactory#loadXMLElement(org.w3c.dom.Element) + */ + + @Override + public MetaData loadElement(Element xmlElement) throws Exception { + MetaData entity = super.loadElement(xmlElement); + entity.setUuid(getXMLProperty(xmlElement, KEY_METADATA_UUID)); + entity.setName(getXMLProperty(xmlElement, KEY_METADATA_NAME)); + entity.setType(getXMLProperty(xmlElement, KEY_METADATA_TYPE)); + entity.setDescription(getXMLProperty(xmlElement, + KEY_METADATA_DESCRIPTION)); + entity.setVersion(getXMLProperty(xmlElement, KEY_METADATA_VERSION)); + + String latestVersion = getXMLProperty(xmlElement, + KEY_METADATA_LATESTVERSION); + if (latestVersion != null && "1".equals(latestVersion)) { + entity.setLatest(true); + } else { + entity.setLatest(false); + } + + String creationDate = getXMLProperty(xmlElement, + KEY_METADATA_CREATIONDATE); + if (creationDate != null) { + Date date = sdf.parse(creationDate); + entity.setCreationDate(date); + } + + entity.setHash(getXMLProperty(xmlElement, KEY_METADATA_HASH)); + entity.setParentDataUuid(getXMLProperty(xmlElement, + KEY_METADATA_PARENTDATA_UUID)); + entity.setParentDataVersion(getXMLProperty(xmlElement, + KEY_METADATA_PARENTDATA_VERSION)); + entity.setParentVersionUuid(getXMLProperty(xmlElement, + KEY_METADATA_PARENTVERSION_UUID)); + entity.setParentVersionVersion(getXMLProperty(xmlElement, + KEY_METADATA_PARENTVERSION_VERSION)); + + Map<String, String> descriptors = new HashMap<String, String>(); + + Element descriptorsElement = getXMLElementByTagName(xmlElement, + KEY_METADATA_DESCRIPTORS); + if (descriptorsElement != null) { + Set<Element> descriptorElements = getXMLElementsByTagName( + descriptorsElement, KEY_METADATA_DESCRIPTOR); + for (Element descriptorElement : descriptorElements) { + String name = getXMLProperty(descriptorElement, + KEY_METADATA_DESCRIPTOR_NAME); + String value = getXMLProperty(descriptorElement, + KEY_METADATA_DESCRIPTOR_VALUE); + descriptors.put(name, value); + } + } + entity.setDescriptors(descriptors); + + List<Attachment> attachments = new ArrayList<Attachment>(); + + Element attachmentsElement = getXMLElementByTagName(xmlElement, + KEY_METADATA_ATTACHMENTS); + if (attachmentsElement != null) { + Set<Element> attachmentElements = getXMLElementsByTagName( + attachmentsElement, KEY_METADATA_ATTACHMENT); + for (Element attachmentElement : attachmentElements) { + Attachment attachment = new Attachment(); + + String name = getXMLProperty(attachmentElement, + KEY_METADATA_ATTACHMENT_NAME); + attachment.setFileName(name); + + String type = getXMLProperty(attachmentElement, + KEY_METADATA_ATTACHMENT_TYPE); + ContentType contentType = ContentTypeFactory + .getContentTypeInstance(type); + attachment.setContentType(contentType); + + String dataHash = getXMLProperty(attachmentElement, + KEY_METADATA_ATTACHMENT_HASH); + attachment.setDataHash(Integer.parseInt(dataHash)); + + attachments.add(attachment); + } + } + + entity.setAttachments(attachments); + + return entity; + } + + @Override + public void saveElement(Document document, Element xmlElement, + MetaData element) throws Exception { + + setXMLProperty(document, xmlElement, KEY_METADATA_UUID, element + .getUuid()); + setXMLProperty(document, xmlElement, KEY_METADATA_NAME, element + .getName()); + setXMLProperty(document, xmlElement, KEY_METADATA_TYPE, element + .getType()); + setXMLProperty(document, xmlElement, KEY_METADATA_DESCRIPTION, element + .getDescription()); + setXMLProperty(document, xmlElement, KEY_METADATA_VERSION, element + .getVersion().toString()); + + if (element.isLatest()) { + setXMLProperty(document, xmlElement, KEY_METADATA_LATESTVERSION, + "1"); + } else { + setXMLProperty(document, xmlElement, KEY_METADATA_LATESTVERSION, + "0"); + } + + if (element.getCreationDate() != null) { + setXMLProperty(document, xmlElement, KEY_METADATA_CREATIONDATE, sdf + .format(element.getCreationDate())); + } + + setXMLProperty(document, xmlElement, KEY_METADATA_HASH, element + .getHash()); + setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_UUID, + element.getParentDataUuid()); + setXMLProperty(document, xmlElement, KEY_METADATA_PARENTDATA_VERSION, + element.getParentDataVersion()); + setXMLProperty(document, xmlElement, KEY_METADATA_PARENTVERSION_UUID, + element.getParentVersionUuid()); + setXMLProperty(document, xmlElement, + KEY_METADATA_PARENTVERSION_VERSION, element + .getParentVersionVersion()); + + Map<String, String> descriptors = element.getDescriptors(); + + Element descriptorsElement = document + .createElement(KEY_METADATA_DESCRIPTORS); + + for (Map.Entry<String, String> kv : descriptors.entrySet()) { + Element descriptorElement = document + .createElement(KEY_METADATA_DESCRIPTOR); + setXMLProperty(document, descriptorElement, + KEY_METADATA_DESCRIPTOR_NAME, kv.getKey()); + setXMLProperty(document, descriptorElement, + KEY_METADATA_DESCRIPTOR_VALUE, kv.getValue()); + descriptorsElement.appendChild(descriptorElement); + } + + xmlElement.appendChild(descriptorsElement); + + List<Attachment> attachments = element.getAttachments(); + + if (attachments != null) { + + Element attachmentsElement = document + .createElement(KEY_METADATA_ATTACHMENTS); + + for (Attachment attachment : attachments) { + Element attachmentElement = document + .createElement(KEY_METADATA_ATTACHMENT); + + setXMLProperty(document, attachmentElement, + KEY_METADATA_ATTACHMENT_NAME, attachment.getFileName()); + setXMLProperty(document, attachmentElement, + KEY_METADATA_ATTACHMENT_TYPE, attachment + .getContentType().getClass().getSimpleName()); + setXMLProperty(document, attachmentElement, + KEY_METADATA_ATTACHMENT_HASH, Integer + .toString(attachment.getDataHash())); + + attachmentsElement.appendChild(attachmentElement); + } + xmlElement.appendChild(attachmentsElement); + + } + + } + + /** + * As metadata is stored inside an entity, this method loads metadata with + * parsing stream and retrieve metadata node + * + * @param xmlStream + * @return + * @throws Exception + */ + public MetaData loadElementFromParentXML(InputStream xmlStream) + throws Exception { + Document document = getXMLBuilder().parse(xmlStream); + Element rootElement = (Element) document.getFirstChild(); + Element mdeElement = getXMLElementByTagName(rootElement, KEY_METADATA); + MetaData mde; + mde = loadElement(mdeElement); + return mde; + } + +} Added: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XMLStreamEncoder.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XMLStreamEncoder.java (rev 0) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XMLStreamEncoder.java 2008-02-01 16:26:09 UTC (rev 567) @@ -0,0 +1,60 @@ +/* +* ##% 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.factories; + +import java.io.IOException; +import java.io.PipedOutputStream; + +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +public class XMLStreamEncoder extends Thread { + + private DOMSource domSource; + private PipedOutputStream os; + + private StreamResult result; + private Transformer transformer; + + public XMLStreamEncoder(DOMSource domSource, PipedOutputStream os) + throws TransformerConfigurationException { + super(); + this.domSource = domSource; + this.os = os; + + result = new StreamResult(os); + TransformerFactory tf = TransformerFactory.newInstance(); + transformer = tf.newTransformer(); + } + + public void run() { + try { + transformer.transform(domSource, result); + result.getOutputStream().close(); + } catch (TransformerException e) { + // TODO + } catch (IOException e) { + // TODO + } + } + +} Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XmlConstants.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XmlConstants.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/XmlConstants.java 2008-02-01 16:26:09 UTC (rev 567) @@ -82,6 +82,7 @@ public static final String KEY_METADATA_ATTACHMENT_NAME = "name"; public static final String KEY_METADATA_ATTACHMENT_TYPE = "type"; + public static final String KEY_METADATA_ATTACHMENT_HASH = "hash"; public static final String FILE_XML = "data.xml"; public static final String FILE_DATA_PREFIX = "attachment"; 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-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-01 16:26:09 UTC (rev 567) @@ -17,9 +17,8 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import java.io.ByteArrayInputStream; import java.io.InputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -30,7 +29,8 @@ import org.apache.commons.lang.RandomStringUtils; -import fr.cemagref.simexplorer.is.contenttype.ContentTypeFactory; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.attachment.ContentTypeFactory; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.Constant; @@ -170,9 +170,17 @@ } + private Attachment generateAttachment() throws Exception { + Attachment attachment = new Attachment(); + attachment.setContentType(ContentTypeFactory + .getContentTypeInstance("RawType")); + attachment.setDataHash(r.nextInt()); + attachment.setFileName(shortString() + ".txt"); + return attachment; + } + private void processLibrary(Library library) throws Exception { - library.getMetaData().getAttachments().put(shortString() + ".txt", - ContentTypeFactory.getContentTypeInstance("RawType")); + library.getMetaData().getAttachments().add(generateAttachment()); } private void processCode(Code code) { @@ -189,9 +197,8 @@ throws Exception { Result result = new Result(); explorationData.setResult(result); - explorationData.getMetaData().getAttachments().put( - shortString() + ".txt", - ContentTypeFactory.getContentTypeInstance("RawType")); + explorationData.getMetaData().getAttachments() + .add(generateAttachment()); Set<ConstantValue> constantValues = generateArray(ConstantValue.class); for (ConstantValue constantValue : constantValues) { @@ -211,14 +218,12 @@ } public InputStream generateTextStream() throws Exception { - PipedOutputStream os = new PipedOutputStream(); int wordcount = 300 + r.nextInt(300); StringBuffer sb = new StringBuffer(); for (int i = 0; i < wordcount; i++) { sb.append(randomstrings[r.nextInt(cs)]).append(" "); } - os.write(sb.toString().getBytes()); - InputStream is = new PipedInputStream(os); + InputStream is = new ByteArrayInputStream(sb.toString().getBytes()); return is; } } 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-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-01 16:26:09 UTC (rev 567) @@ -26,10 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.zip.Deflater; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import java.util.zip.ZipOutputStream; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -39,12 +37,12 @@ import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.MetaDataEntityFactory; +import fr.cemagref.simexplorer.is.factories.MetaDataFactory; import fr.cemagref.simexplorer.is.factories.XmlConstants; import fr.cemagref.simexplorer.is.storage.StorageException; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; @@ -69,8 +67,7 @@ } } - public MetaData saveElement(String token, - RemoteInputStream zipRemoteStream) + public MetaData saveElement(String token, RemoteInputStream zipRemoteStream) throws SimExplorerServiceException { InputStream zipStream; try { @@ -205,7 +202,12 @@ } } } - return saveElement(token, xmlFile, attachments); + MetaData elementSaved = saveElement(token, xmlFile, attachments); + getStorageEngine().deleteTempData(xmlFile); + for (Map.Entry<String, String> tmpId : attachments.entrySet()) { + getStorageEngine().deleteTempData(tmpId.getValue()); + } + return elementSaved; } catch (Exception e) { throw new SimExplorerServiceException(e); } @@ -221,7 +223,12 @@ entry.getValue()); idsattachment.put(entry.getKey(), idattachment); } - return saveElement(token, idxml, idsattachment); + MetaData elementSaved = saveElement(token, idxml, idsattachment); + getStorageEngine().deleteTempData(idxml); + for (Map.Entry<String, String> tmpId : idsattachment.entrySet()) { + getStorageEngine().deleteTempData(tmpId.getValue()); + } + return elementSaved; } public RemoteInputStream retrieveData(String token, String uuid, @@ -229,7 +236,7 @@ try { MetaData mde = getMetadata(token, uuid, version); InputStream stream = getStorageEngine().retrieveData(token, mde, - dataKey); + Attachment.getFileNameFromUniqueId(dataKey)); RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( stream); return remoteStream.export(); @@ -270,19 +277,21 @@ List<LoggableElement> children = element.getChildren(); for (LoggableElement loggableElement : children) { MetaData thisMde = loggableElement.getMetaData(); - Map<String, ContentType> attachments = loggableElement - .getMetaData().getAttachments(); - for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { - files.put(FILE_DATA_PREFIX + "/" + kv.getKey(), + List<Attachment> attachments = loggableElement.getMetaData() + .getAttachments(); + for (Attachment attachment : attachments) { + files.put( + FILE_DATA_PREFIX + "/" + attachment.getUniqueId(), getStorageEngine().retrieveData(token, thisMde, - kv.getKey())); + attachment.getFileName())); } } + PipedInputStream pipedIn = new PipedInputStream(pipedOut); + ZipStreamEncoder zse = new ZipStreamEncoder(files, pipedOut); zse.start(); - PipedInputStream pipedIn = new PipedInputStream(pipedOut); RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( pipedIn); return remoteStream.export(); @@ -306,8 +315,7 @@ private MetaData saveElement(String token, String idxml, Map<String, String> idsattachment) throws Exception { // Load metadata xml - MetaDataEntityFactory mdeFactory = MetaDataEntityFactory - .getFactory(MetaData.class); + MetaDataFactory mdeFactory = MetaDataFactory.getFactory(MetaData.class); MetaData metaData = mdeFactory .loadElementFromParentXML(getStorageEngine().retrieveTempData( idxml)); @@ -337,10 +345,12 @@ attachments.put(KEY_XML, getStorageEngine().retrieveTempData(idxml)); - Map<String, ContentType> realAttachments = metaData.getAttachments(); - for (Map.Entry<String, ContentType> entry : realAttachments.entrySet()) { - attachments.put(entry.getKey(), getStorageEngine() - .retrieveTempData(idsattachment.get(entry.getKey()))); + List<Attachment> realAttachments = metaData.getAttachments(); + for (Attachment attachment : realAttachments) { + + attachments.put(attachment.getFileName(), getStorageEngine() + .retrieveTempData( + idsattachment.get(attachment.getUniqueId()))); } getStorageEngine().saveElement(token, metaData, attachments); @@ -353,7 +363,7 @@ String entitiesNode, String entityNode, Map<String, String> idsattachment) throws Exception { - BaseEntityFactory<MetaData> elementFactory = MetaDataEntityFactory + BaseEntityFactory<MetaData> elementFactory = MetaDataFactory .getFactory(MetaData.class); Document document = BaseEntityFactory.getXMLBuilder().parse( @@ -367,8 +377,10 @@ Set<Element> entityElements = elementFactory.getXMLElementsByTagName( entitiesElement, entityNode); for (Element element : entityElements) { - saveElement(token, getStorageEngine().storeTempData( - BaseEntityFactory.serializeElement(element)), idsattachment); + String elementDataId = getStorageEngine().storeTempData( + BaseEntityFactory.serializeElement(element)); + saveElement(token, elementDataId, idsattachment); + getStorageEngine().deleteTempData(elementDataId); } } @@ -399,8 +411,8 @@ public MetaData[] getVersions(String token, String uuid) throws SimExplorerServiceException { try { - Set<MetaData> versions = getStorageEngine() - .getElementVersions(token, uuid); + Set<MetaData> versions = getStorageEngine().getElementVersions( + token, uuid); return versions.toArray(new MetaData[versions.size()]); } catch (StorageException 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-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-01 16:26:09 UTC (rev 567) @@ -18,8 +18,10 @@ package fr.cemagref.simexplorer.is.service; import java.io.InputStream; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Random; @@ -34,7 +36,8 @@ import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.attachment.ContentType; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; @@ -114,31 +117,30 @@ Map<String, RemoteInputStream> attachments = new HashMap<String, RemoteInputStream>(); - Map<String, ContentType> attachmentsKeys = new HashMap<String, ContentType>(); + List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - attachmentsKeys.putAll(ea.getMetaData().getAttachments()); + attachmentsKeys.addAll(ea.getMetaData().getAttachments()); Set<Component> components = ea.getComponents(); for (Component component : components) { - attachmentsKeys.putAll(component.getMetaData() + attachmentsKeys.addAll(component.getMetaData() .getAttachments()); Set<Library> libraries = component.getLibraries(); for (Library library : libraries) { - attachmentsKeys.putAll(library.getMetaData() + attachmentsKeys.addAll(library.getMetaData() .getAttachments()); } } Set<ExplorationData> explorations = ea.getExplorations(); for (ExplorationData explorationData : explorations) { - attachmentsKeys.putAll(explorationData.getMetaData() + attachmentsKeys.addAll(explorationData.getMetaData() .getAttachments()); } - for (Map.Entry<String, ContentType> kv : attachmentsKeys - .entrySet()) { + for (Attachment attachment : attachmentsKeys) { InputStream stream = elementGenerator.generateTextStream(); RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( stream); - attachments.put(kv.getKey(), remoteStream.export()); + attachments.put(attachment.getUniqueId(), remoteStream.export()); } RemoteInputStreamServer xmlRemoteStream = new SimpleRemoteInputStream( Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-01 16:26:09 UTC (rev 567) @@ -17,13 +17,14 @@ * ##% */ package fr.cemagref.simexplorer.is.storage; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Random; import java.util.UUID; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; @@ -83,7 +84,7 @@ descriptors.put("descriptor" + j, UUID.randomUUID().toString()); } me.setDescriptors(descriptors); - me.setAttachments(new HashMap<String, ContentType>()); + me.setAttachments(new ArrayList<Attachment>()); me.setParentDataUuid(null); me.setParentDataVersion(null); me.setParentVersionUuid(null); Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-01 16:26:09 UTC (rev 567) @@ -93,9 +93,12 @@ @Override public void storeData(MetaData entity, String field, InputStream is) throws StorageException { + + // Simple stream on file try { - FileOutputStream fos = new FileOutputStream(getFile(entity, field)); + File file = getFile(entity, field); + FileOutputStream fos = new FileOutputStream(file); // Buffer copy stream to stream BufferedInputStream bin = new BufferedInputStream(is); Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/DatabaseConstants.java 2008-02-01 16:26:09 UTC (rev 567) @@ -63,10 +63,30 @@ */ public static final String KEY_DESCRIPTOR = "simexplorer.descriptor"; /** + * Field name for descriptor + */ + public static final String KEY_DESCRIPTOR_KEY = "key"; + /** + * Field name for descriptor + */ + public static final String KEY_DESCRIPTOR_VALUE = "value"; + /** * Field name for attachment */ public static final String KEY_ATTACHMENT = "simexplorer.attachment"; /** + * Field name for attachment + */ + public static final String KEY_ATTACHMENT_FILENAME = "filename"; + /** + * Field name for attachment + */ + public static final String KEY_ATTACHMENT_HASH = "hash"; + /** + * Field name for attachment + */ + public static final String KEY_ATTACHMENT_TYPE = "type"; + /** * Field name for id of parent data */ public static final String KEY_PARENTDATA_UUID = "simexplorer.parentdata.uuid"; Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-01 16:26:09 UTC (rev 567) @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.StringTokenizer; import java.util.Map.Entry; import org.apache.lucene.analysis.Analyzer; @@ -34,7 +35,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Fieldable; -import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; @@ -53,13 +53,15 @@ import org.apache.lucene.store.LockFactory; import org.apache.lucene.store.NoLockFactory; -import fr.cemagref.simexplorer.is.contenttype.ContentType; -import fr.cemagref.simexplorer.is.contenttype.ContentTypeFactory; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.attachment.ContentType; +import fr.cemagref.simexplorer.is.attachment.ContentTypeFactory; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.StorageException; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.util.Config; +import fr.cemagref.simexplorer.is.storage.util.KeyValue; /** * Lucene implementation @@ -595,8 +597,8 @@ * @return Entities list * @throws Exception */ - private Set<MetaData> convertHitsToElements(Hits hits, int start, - int count) throws Exception { + private Set<MetaData> convertHitsToElements(Hits hits, int start, int count) + throws Exception { Set<MetaData> elements = new HashSet<MetaData>(); if (hits != null) { // For documents in range @@ -618,8 +620,7 @@ * @return Instance of element * @throws Exception */ - private MetaData loadLuceneElement(Document document) - throws Exception { + private MetaData loadLuceneElement(Document document) throws Exception { MetaData element = new MetaData(); // Fill element with Lucene document @@ -642,32 +643,73 @@ } element.setHash(document.get(KEY_HASH)); - Map<String, String> descriptors = new HashMap<String, String>(); - Map<String, ContentType> attachments = new HashMap<String, ContentType>(); + Map<Integer, KeyValue> descriptors = new HashMap<Integer, KeyValue>(); + Map<Integer, Attachment> attachments = new HashMap<Integer, Attachment>(); List<Fieldable> fields = document.getFields(); for (Fieldable fieldable : fields) { if (fieldable.name().startsWith(KEY_DESCRIPTOR)) { - String field = fieldable.name().replace(KEY_DESCRIPTOR + ".", - ""); - String value = fieldable.stringValue(); - descriptors.put(field, value); + String fieldValue = fieldable.stringValue(); + + String key = fieldable.name().replace(KEY_DESCRIPTOR + ".", ""); + StringTokenizer st = new StringTokenizer(key, "."); + Integer iDescriptor = Integer.valueOf(st.nextToken()); + + KeyValue kv = descriptors.get(iDescriptor); + if (kv == null) { + kv = new KeyValue(); + descriptors.put(iDescriptor, kv); + } + + if (st.nextToken().equals(KEY_DESCRIPTOR_KEY)) { + kv.setKey(fieldValue); + } else { + kv.setValue(fieldValue); + } } if (fieldable.name().startsWith(KEY_ATTACHMENT)) { - String field = fieldable.name().replace(KEY_ATTACHMENT + ".", - ""); - String value = fieldable.stringValue(); - ContentType contentType = ContentTypeFactory - .getContentTypeInstance(value); - attachments.put(field, contentType); + + String fieldValue = fieldable.stringValue(); + + String key = fieldable.name().replace(KEY_ATTACHMENT + ".", ""); + StringTokenizer st = new StringTokenizer(key, "."); + Integer iAttachment = Integer.valueOf(st.nextToken()); + + Attachment attachment = attachments.get(iAttachment); + if (attachment == null) { + attachment = new Attachment(); + attachments.put(iAttachment, attachment); + } + + String field = st.nextToken(); + + if (field.equals(KEY_ATTACHMENT_FILENAME)) { + attachment.setFileName(fieldValue); + } + if (field.equals(KEY_ATTACHMENT_HASH)) { + attachment.setDataHash(Attachment.intFromHexString("0X" + fieldValue)); + } + if (field.equals(KEY_ATTACHMENT_TYPE)) { + attachment.setContentType(ContentTypeFactory + .getContentTypeInstance(fieldValue)); + } } } - element.setDescriptors(descriptors); + Map<String, String> finalDescriptors = new HashMap<String, String>(); + for (Map.Entry<Integer, KeyValue> entry : descriptors.entrySet()) { + finalDescriptors.put(entry.getValue().getKey(), entry.getValue() + .getKey()); + } + element.setDescriptors(finalDescriptors); - element.setAttachments(attachments); + List<Attachment> finalAttachments = new ArrayList<Attachment>(); + for (Map.Entry<Integer, Attachment> entry : attachments.entrySet()) { + finalAttachments.add(entry.getValue()); + } + element.setAttachments(finalAttachments); element.setParentDataUuid(document.get(KEY_PARENTDATA_UUID)); element.setParentDataVersion(document.get(KEY_PARENTDATA_VERSION)); @@ -707,8 +749,7 @@ * @return * @throws Exception */ - private Document saveLuceneElement(MetaData element, - List<Reader> readers) { + private Document saveLuceneElement(MetaData element, List<Reader> readers) { Document document = new Document(); // Store all element properties in Lucene document @@ -734,19 +775,27 @@ addSimpleField(document, KEY_HASH, element.getHash()); Map<String, String> descriptors = element.getDescriptors(); + int i = 0; for (Map.Entry<String, String> entry : descriptors.entrySet()) { - String key = KEY_DESCRIPTOR + "." + entry.getKey(); - String value = entry.getValue(); - addSimpleField(document, key, value); + String key = KEY_DESCRIPTOR + "." + i; + addSimpleField(document, key + "." + KEY_DESCRIPTOR_KEY, entry + .getKey()); + addSimpleField(document, key + "." + KEY_DESCRIPTOR_VALUE, entry + .getValue()); + i++; } - Map<String, ContentType> attachments = element.getAttachments(); - for (Map.Entry<String, ContentType> entry : attachments.entrySet()) { - String key = KEY_ATTACHMENT + "." + entry.getKey(); - ContentType value = entry.getValue(); - if (value != null) { - addSimpleField(document, key, value.getClass().getSimpleName()); - } + List<Attachment> attachments = element.getAttachments(); + i = 0; + for (Attachment attachment : attachments) { + String key = KEY_ATTACHMENT + "." + i; + addSimpleField(document, key + "." + KEY_ATTACHMENT_FILENAME, + attachment.getFileName()); + addSimpleField(document, key + "." + KEY_ATTACHMENT_HASH, Integer + .toHexString(attachment.getDataHash())); + addSimpleField(document, key + "." + KEY_ATTACHMENT_TYPE, + attachment.getContentType().getClass().getSimpleName()); + i++; } addSimpleField(document, KEY_PARENTDATA_UUID, element @@ -764,5 +813,4 @@ return document; } - } 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-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-01 16:26:09 UTC (rev 567) @@ -26,7 +26,8 @@ import java.util.Set; import java.util.UUID; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.attachment.ContentType; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.StorageException; @@ -120,11 +121,13 @@ InputStream content = attachmentHandler .retrieveData(element, field); if (element.getAttachments() != null) { - ContentType contentType = element.getAttachments().get(field); - if (contentType != null) { + Attachment attachment = findAttachment(field, element + .getAttachments()); + if (attachment != null) { try { // Transform stream into indexable text - Reader reader = contentType.renderToText(content); + Reader reader = attachment.getContentType() + .renderToText(content); readers.add(reader); } catch (Exception e) { throw new StorageException(e); @@ -146,6 +149,16 @@ database.insertElement(element, readers); } + private Attachment findAttachment(String uniqueId, + List<Attachment> attachments) { + for (Attachment attachment : attachments) { + if (attachment.getUniqueId().equals(uniqueId)) { + return attachment; + } + } + return null; + } + // Read /* (non-Javadoc) @@ -181,8 +194,8 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#retrieveData(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) */ - public InputStream retrieveData(String token, MetaData entity, - String field) throws StorageException { + public InputStream retrieveData(String token, MetaData entity, String field) + throws StorageException { InputStream result = attachmentHandler.retrieveData(entity, field); return result; } @@ -245,9 +258,9 @@ public void deleteElement(String token, String uuid, Version version) throws StorageException { MetaData element = getMetadata(token, uuid, version); - Map<String, ContentType> attachments = element.getAttachments(); - for (Map.Entry<String, ContentType> entry : attachments.entrySet()) { - attachmentHandler.deleteData(element, entry.getKey()); + List<Attachment> attachments = element.getAttachments(); + for (Attachment attachment : attachments) { + attachmentHandler.deleteData(element, attachment.getUniqueId()); } database.deleteElement(element); } Added: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java (rev 0) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/KeyValue.java 2008-02-01 16:26:09 UTC (rev 567) @@ -0,0 +1,42 @@ +/* +* ##% 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.storage.util; + +public class KeyValue { + + private String key; + + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + +} Modified: trunk/simexplorer-is-storage/src/resources/properties/config.properties =================================================================== --- trunk/simexplorer-is-storage/src/resources/properties/config.properties 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-storage/src/resources/properties/config.properties 2008-02-01 16:26:09 UTC (rev 567) @@ -1,3 +1,3 @@ -simexplorer.db=/var/local/simexplorer/db4 -simexplorer.data=/var/local/simexplorer/data4/ +simexplorer.db=/var/local/simexplorer/db5 +simexplorer.data=/var/local/simexplorer/data5/ simexplorer.optimizeperiod=3600 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-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-01 16:26:09 UTC (rev 567) @@ -41,10 +41,10 @@ return size; } - public static MetaDataEntity[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) throws Exception { + public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) throws Exception { StorageService service = context.getStorageService(remote); String token = context.getToken(); - MetaDataEntity[] data; + MetaData[] data; if (query == null || query.isEmpty()) { data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, rowOrder); } else { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-02-01 16:26:09 UTC (rev 567) @@ -85,7 +85,7 @@ //TODO Where to save (if local to remote and vice-versa ?) StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); - service.exportElement(getContext().getToken(), null, uuid, version.toString()); + //service.exportElement(getContext().getToken(), null, uuid, version.toString()); } @Override Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-01 16:26:09 UTC (rev 567) @@ -76,7 +76,7 @@ // mark it, after action will push table model firstTime = getUI() == null; - MetaDataEntity data = listModel.get(model.getIndex()); + MetaData data = listModel.get(model.getIndex()); String uuid = data.getUuid(); Version version = data.getVersion(); log.info("show detail uuid:" + uuid + ", version:" + version + " (remote ?" + model.isRemote() + ")"); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-02-01 16:26:09 UTC (rev 567) @@ -71,7 +71,7 @@ ListTabModel model = (ListTabModel) getModel(); - MetaDataEntity[] data = model.getList(); + MetaData[] data = model.getList(); if (data == null) { // first coming here, init model Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-02-01 16:26:09 UTC (rev 567) @@ -74,7 +74,7 @@ ListTabModel model = (ListTabModel) getModel(); - MetaDataEntity[] data = model.getList(); + MetaData[] data = model.getList(); if (data == null) { // first coming here, init model Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java 2008-02-01 16:26:09 UTC (rev 567) @@ -36,7 +36,7 @@ /** @author tony */ public class JApplicationTableModel extends AbstractTableModel { - MetaDataEntity[] data; + MetaData[] data; PropertyDescriptor[] descriptors; private static final long serialVersionUID = -105647814466295077L; @@ -45,15 +45,15 @@ public JApplicationTableModel() { } - public JApplicationTableModel(MetaDataEntity[] data) { + public JApplicationTableModel(MetaData[] data) { this.data = data; } - public MetaDataEntity[] getData() { + public MetaData[] getData() { return data; } - public void setData(MetaDataEntity[] data) { + public void setData(MetaData[] data) { this.data = data; } @@ -75,7 +75,7 @@ public Object getValueAt(int rowIndex, int columnIndex) { Object result = null; - MetaDataEntity current = data[rowIndex]; + MetaData current = data[rowIndex]; if (current != null) { try { PropertyDescriptor propertyDescriptor = getDescriptors()[columnIndex]; @@ -103,7 +103,7 @@ descriptors = new PropertyDescriptor[columnNames.length]; BeanInfo beanInfo; try { - beanInfo = Introspector.getBeanInfo(MetaDataEntity.class); + beanInfo = Introspector.getBeanInfo(MetaData.class); List<String> props = new ArrayList<String>(columnNames.length); int index = "simexplorer.common.".length(); for (String columnName : columnNames) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-01 16:26:09 UTC (rev 567) @@ -37,7 +37,7 @@ protected PaginationModel pagination; - protected MetaDataEntity[] list; + protected MetaData[] list; protected boolean onlyLatest; @@ -61,7 +61,7 @@ return query; } - public MetaDataEntity[] getList() { + public MetaData[] getList() { return list; } @@ -69,7 +69,7 @@ return pagination; } - public MetaDataEntity get(int index) { + public MetaData get(int index) { checkSize(index); return getList()[index]; } @@ -115,7 +115,7 @@ } - public void setList(MetaDataEntity[] list) { + public void setList(MetaData[] list) { this.list = list; } @@ -140,7 +140,7 @@ setPagination(paginationModel); // obtain datas from service - MetaDataEntity[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), getDateOrder()); + MetaData[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), getDateOrder()); // save in model setList(data); @@ -152,7 +152,7 @@ PaginationModel paginationModel = getPagination(); // obtain datas from service - MetaDataEntity[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), getQuery(), (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), getDateOrder()); + MetaData[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), getQuery(), (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), getDateOrder()); // save in model setList(data); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-01 16:26:09 UTC (rev 567) @@ -31,8 +31,8 @@ protected SimExplorerTab tab; - protected MetaDataEntity[] listLocal; - protected MetaDataEntity[] listRemote; + protected MetaData[] listLocal; + protected MetaData[] listRemote; private static final long serialVersionUID = -3623331875470531459L; @@ -44,11 +44,11 @@ return tab; } - public MetaDataEntity[] getListLocal() { + public MetaData[] getListLocal() { return listLocal; } - public MetaDataEntity[] getListRemote() { + public MetaData[] getListRemote() { return listRemote; } @@ -56,11 +56,11 @@ this.tab = SimExplorerTab.valueOf(name); } - public void setListLocal(MetaDataEntity[] listLocal) { + public void setListLocal(MetaData[] listLocal) { this.listLocal = listLocal; } - public void setListRemote(MetaDataEntity[] listRemote) { + public void setListRemote(MetaData[] listRemote) { this.listRemote = listRemote; } } \ No newline at end of file Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-01 16:26:09 UTC (rev 567) @@ -35,7 +35,7 @@ import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.ContentType; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.Constant; 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-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-01 16:26:09 UTC (rev 567) @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import java.util.Map.Entry; import org.apache.tapestry.StreamResponse; import org.codelutin.tapestry.beans.TreeNode; @@ -31,7 +30,8 @@ import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.attachment.ContentType; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; @@ -119,7 +119,7 @@ List<String> result = new ArrayList<String>(); result.add("Type"); result.add("Name"); - result.add("File"); + result.add("Hash"); result.add(""); return result; } @@ -196,11 +196,11 @@ List<TreeNode> children = new ArrayList<TreeNode>(); - Map<String, ContentType> attachments = explorationData.getMetaData() + List<Attachment> attachments = explorationData.getMetaData() .getAttachments(); - for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { - children.add(generateDownload(explorationData, kv)); + for (Attachment attachment : attachments) { + children.add(generateDownload(explorationData, attachment)); } explorationDataNode.setChildren(children); @@ -256,11 +256,10 @@ TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_FOLDER); - Map<String, ContentType> attachments = library.getMetaData() - .getAttachments(); + List<Attachment> attachments = library.getMetaData().getAttachments(); List<TreeNode> children = new ArrayList<TreeNode>(); - for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { - children.add(generateDownload(library, kv)); + for (Attachment attachment : attachments) { + children.add(generateDownload(library, attachment)); } node.setChildren(children); @@ -270,17 +269,17 @@ } private TreeNode generateDownload(LoggableElement explorationData, - Entry<String, ContentType> kv) { + Attachment attachment) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); String context = explorationData.getMetaData().getUuid() + "," + explorationData.getMetaData().getVersion() + "," - + kv.getKey(); + + attachment.getUniqueId(); node - .setColumns(generateStringArray(kv.getValue().getDescription(), - kv.getKey(), generateString(kv.getKey(), + .setColumns(generateStringArray(attachment.getContentType().getDescription(), + Integer.toHexString(attachment.getDataHash()), generateString(attachment.getFileName(), "downloadFile", context))); return node; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-01 09:58:10 UTC (rev 566) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-01 16:26:09 UTC (rev 567) @@ -18,8 +18,9 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import java.io.InputStream; -import java.util.Date; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; @@ -30,7 +31,8 @@ import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; -import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.attachment.Attachment; +import fr.cemagref.simexplorer.is.attachment.ContentType; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; @@ -46,7 +48,7 @@ @InjectPage private ElementList elementList; - + @Override public String getWindowTitle() { return ""; @@ -82,32 +84,32 @@ Map<String, RemoteInputStream> attachments = new HashMap<String, RemoteInputStream>(); - Map<String, ContentType> attachmentsKeys = new HashMap<String, ContentType>(); + List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - attachmentsKeys.putAll(ea.getMetaData().getAttachments()); + attachmentsKeys.addAll(ea.getMetaData().getAttachments()); Set<Component> components = ea.getComponents(); for (Component component : components) { - attachmentsKeys.putAll(component.getMetaData() + attachmentsKeys.addAll(component.getMetaData() .getAttachments()); Set<Library> libraries = component.getLibraries(); for (Library library : libraries) { - attachmentsKeys.putAll(library.getMetaData() + attachmentsKeys.addAll(library.getMetaData() .getAttachments()); } } Set<ExplorationData> explorations = ea.getExplorations(); for (ExplorationData explorationData : explorations) { - attachmentsKeys.putAll(explorationData.getMetaData() + attachmentsKeys.addAll(explorationData.getMetaData() .getAttachments()); } - for (Map.Entry<String, ContentType> kv : attachmentsKeys - .entrySet()) { + for (Attachment attachment : attachmentsKeys) { InputStream stream = elementGenerator .generateTextStream(); RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( stream); - attachments.put(kv.getKey(), remoteStream.export()); + attachments.put(attachment.getUniqueId(), remoteStream + .export()); } RemoteInputStreamServer xmlRemoteStream = new SimpleRemoteInputStream(

1 0

r566 - in trunk: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage simexplorer-is-storage/src/java/fr/cemag
by glandais＠users.labs.libre-entreprise.org 01 Feb '08

01 Feb '08

Author: glandais Date: 2008-02-01 09:58:10 +0000 (Fri, 01 Feb 2008) New Revision: 566 Added: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java Removed: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaDataEntity.java Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.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/MockStorageServiceImpl.java 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/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.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-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.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/action/tab/ShowDetailTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.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/ElementHistory.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 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/ElementPageDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/DownloadableFile.java Log: MetaDataEntity renamed to MetaData Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-02-01 09:58:10 UTC (rev 566) @@ -20,17 +20,17 @@ import java.util.ArrayList; import java.util.List; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; public abstract class LoggableElement extends DataEntity { - private MetaDataEntity metaData; + private MetaData metaData; private static final long serialVersionUID = 2000267650904269217L; /** * @return the metaData */ - public MetaDataEntity getMetaData() { + public MetaData getMetaData() { return metaData; } @@ -38,7 +38,7 @@ * @param metaData * the metaData to set */ - public void setMetaData(MetaDataEntity metaData) { + public void setMetaData(MetaData metaData) { this.metaData = metaData; } Copied: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java (from rev 564, trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaDataEntity.java) =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java (rev 0) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2008-02-01 09:58:10 UTC (rev 566) @@ -0,0 +1,253 @@ +/* +* ##% 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.entities.metadata; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.entities.BaseEntity; + +public class MetaData extends BaseEntity implements Serializable { + + private static final long serialVersionUID = -7916932464982315229L; + + private String uuid; + private String name; + private String type; + private String description; + private Version version; + private Date creationDate; + private String hash; + private Map<String, String> descriptors; + private Map<String, ContentType> attachments; + private String parentDataUuid; + private String parentDataVersion; + private String parentVersionUuid; + private String parentVersionVersion; + private boolean latest; + + /** + * @return the uuid + */ + public String getUuid() { + return uuid; + } + + /** + * @param uuid + * the uuid to set + */ + public void setUuid(String uuid) { + this.uuid = uuid; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name + * the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param type + * the type to set + */ + public void setType(String type) { + this.type = type; + } + + /** + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * @param description + * the description to set + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * @return the version + */ + public Version getVersion() { + return version; + } + + /** + * @param version + * the version to set + */ + public void setVersion(String version) { + this.version = new Version(version); + } + + /** + * @return the creationDate + */ + public Date getCreationDate() { + return creationDate; + } + + /** + * @param creationDate + * the creationDate to set + */ + public void setCreationDate(Date creationDate) { + this.creationDate = creationDate; + } + + /** + * @return the hash + */ + public String getHash() { + return hash; + } + + /** + * @param hash + * the hash to set + */ + public void setHash(String hash) { + this.hash = hash; + } + + /** + * @return the descriptors + */ + public Map<String, String> getDescriptors() { + return descriptors; + } + + /** + * @param descriptors + * the descriptors to set + */ + public void setDescriptors(Map<String, String> descriptors) { + this.descriptors = descriptors; + } + + /** + * @return the attachments + */ + public Map<String, ContentType> getAttachments() { + if (attachments == null) { + attachments = new HashMap<String, ContentType>(); + } + return attachments; + } + + /** + * @param attachments + * the attachments to set + */ + public void setAttachments(Map<String, ContentType> attachments) { + this.attachments = attachments; + } + + /** + * @return the parentDataUuid + */ + public String getParentDataUuid() { + return parentDataUuid; + } + + /** + * @param parentDataUuid + * the parentDataUuid to set + */ + public void setParentDataUuid(String parentDataUuid) { + this.parentDataUuid = parentDataUuid; + } + + /** + * @return the parentDataVersion + */ + public String getParentDataVersion() { + return parentDataVersion; + } + + /** + * @param parentDataVersion + * the parentDataVersion to set + */ + public void setParentDataVersion(String parentDataVersion) { + this.parentDataVersion = parentDataVersion; + } + + /** + * @return the parentVersionUuid + */ + public String getParentVersionUuid() { + return parentVersionUuid; + } + + /** + * @param parentVersionUuid + * the parentVersionUuid to set + */ + public void setParentVersionUuid(String parentVersionUuid) { + this.parentVersionUuid = parentVersionUuid; + } + + /** + * @return the parentVersionVersion + */ + public String getParentVersionVersion() { + return parentVersionVersion; + } + + /** + * @param parentVersionVersion + * the parentVersionVersion to set + */ + public void setParentVersionVersion(String parentVersionVersion) { + this.parentVersionVersion = parentVersionVersion; + } + + public boolean isLatest() { + return latest; + } + + public void setLatest(boolean latest) { + this.latest = latest; + } + +} Deleted: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaDataEntity.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaDataEntity.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/MetaDataEntity.java 2008-02-01 09:58:10 UTC (rev 566) @@ -1,253 +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.entities.metadata; - -import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import fr.cemagref.simexplorer.is.contenttype.ContentType; -import fr.cemagref.simexplorer.is.entities.BaseEntity; - -public class MetaDataEntity extends BaseEntity implements Serializable { - - private static final long serialVersionUID = -7916932464982315229L; - - private String uuid; - private String name; - private String type; - private String description; - private Version version; - private Date creationDate; - private String hash; - private Map<String, String> descriptors; - private Map<String, ContentType> attachments; - private String parentDataUuid; - private String parentDataVersion; - private String parentVersionUuid; - private String parentVersionVersion; - private boolean latest; - - /** - * @return the uuid - */ - public String getUuid() { - return uuid; - } - - /** - * @param uuid - * the uuid to set - */ - public void setUuid(String uuid) { - this.uuid = uuid; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name - * the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the type - */ - public String getType() { - return type; - } - - /** - * @param type - * the type to set - */ - public void setType(String type) { - this.type = type; - } - - /** - * @return the description - */ - public String getDescription() { - return description; - } - - /** - * @param description - * the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * @return the version - */ - public Version getVersion() { - return version; - } - - /** - * @param version - * the version to set - */ - public void setVersion(String version) { - this.version = new Version(version); - } - - /** - * @return the creationDate - */ - public Date getCreationDate() { - return creationDate; - } - - /** - * @param creationDate - * the creationDate to set - */ - public void setCreationDate(Date creationDate) { - this.creationDate = creationDate; - } - - /** - * @return the hash - */ - public String getHash() { - return hash; - } - - /** - * @param hash - * the hash to set - */ - public void setHash(String hash) { - this.hash = hash; - } - - /** - * @return the descriptors - */ - public Map<String, String> getDescriptors() { - return descriptors; - } - - /** - * @param descriptors - * the descriptors to set - */ - public void setDescriptors(Map<String, String> descriptors) { - this.descriptors = descriptors; - } - - /** - * @return the attachments - */ - public Map<String, ContentType> getAttachments() { - if (attachments == null) { - attachments = new HashMap<String, ContentType>(); - } - return attachments; - } - - /** - * @param attachments - * the attachments to set - */ - public void setAttachments(Map<String, ContentType> attachments) { - this.attachments = attachments; - } - - /** - * @return the parentDataUuid - */ - public String getParentDataUuid() { - return parentDataUuid; - } - - /** - * @param parentDataUuid - * the parentDataUuid to set - */ - public void setParentDataUuid(String parentDataUuid) { - this.parentDataUuid = parentDataUuid; - } - - /** - * @return the parentDataVersion - */ - public String getParentDataVersion() { - return parentDataVersion; - } - - /** - * @param parentDataVersion - * the parentDataVersion to set - */ - public void setParentDataVersion(String parentDataVersion) { - this.parentDataVersion = parentDataVersion; - } - - /** - * @return the parentVersionUuid - */ - public String getParentVersionUuid() { - return parentVersionUuid; - } - - /** - * @param parentVersionUuid - * the parentVersionUuid to set - */ - public void setParentVersionUuid(String parentVersionUuid) { - this.parentVersionUuid = parentVersionUuid; - } - - /** - * @return the parentVersionVersion - */ - public String getParentVersionVersion() { - return parentVersionVersion; - } - - /** - * @param parentVersionVersion - * the parentVersionVersion to set - */ - public void setParentVersionVersion(String parentVersionVersion) { - this.parentVersionVersion = parentVersionVersion; - } - - public boolean isLatest() { - return latest; - } - - public void setLatest(boolean latest) { - this.latest = latest; - } - -} Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/LoggableElementFactory.java 2008-02-01 09:58:10 UTC (rev 566) @@ -20,7 +20,7 @@ import org.w3c.dom.Element; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; public abstract class LoggableElementFactory<E extends LoggableElement> extends BaseEntityFactory<E> { @@ -29,11 +29,11 @@ public E loadElement(Element xmlElement) throws Exception { E element = super.loadElement(xmlElement); - MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaDataEntity.class); + MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaData.class); // Load metadata informations Element mdeElement = getXMLElementByTagName(xmlElement, KEY_METADATA); - MetaDataEntity metaData = elementFactory.loadElement(mdeElement); + MetaData metaData = elementFactory.loadElement(mdeElement); element.setMetaData(metaData); return element; @@ -42,7 +42,7 @@ @Override public void saveElement(org.w3c.dom.Document document, Element xmlElement, E element) throws Exception { - MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaDataEntity.class); + MetaDataEntityFactory elementFactory = MetaDataEntityFactory.getFactory(MetaData.class); // Save metadata informations Element mdeElement = document.createElement(KEY_METADATA); Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/MetaDataEntityFactory.java 2008-02-01 09:58:10 UTC (rev 566) @@ -29,21 +29,21 @@ import fr.cemagref.simexplorer.is.contenttype.ContentType; import fr.cemagref.simexplorer.is.contenttype.ContentTypeFactory; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -public class MetaDataEntityFactory<E extends MetaDataEntity> extends - BaseEntityFactory<MetaDataEntity> { +public class MetaDataEntityFactory<E extends MetaData> extends + BaseEntityFactory<MetaData> { private static final SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss"); @Override - public MetaDataEntity createInstance() { - return new MetaDataEntity(); + public MetaData createInstance() { + return new MetaData(); } @SuppressWarnings({"unchecked"}) - public static <E extends MetaDataEntity> MetaDataEntityFactory<E> getFactory( + public static <E extends MetaData> MetaDataEntityFactory<E> getFactory( Class<E> entityClass) throws Exception { return (MetaDataEntityFactory) BaseEntityFactory.getFactory(entityClass); } @@ -54,8 +54,8 @@ */ @Override - public MetaDataEntity loadElement(Element xmlElement) throws Exception { - MetaDataEntity entity = super.loadElement(xmlElement); + public MetaData loadElement(Element xmlElement) throws Exception { + MetaData entity = super.loadElement(xmlElement); entity.setUuid(getXMLProperty(xmlElement, KEY_METADATA_UUID)); entity.setName(getXMLProperty(xmlElement, KEY_METADATA_NAME)); entity.setType(getXMLProperty(xmlElement, KEY_METADATA_TYPE)); @@ -130,7 +130,7 @@ @Override public void saveElement(Document document, Element xmlElement, - MetaDataEntity element) throws Exception { + MetaData element) throws Exception { setXMLProperty(document, xmlElement, KEY_METADATA_UUID, element .getUuid()); @@ -216,12 +216,12 @@ * @return * @throws Exception */ - public MetaDataEntity loadElementFromParentXML(InputStream xmlStream) + public MetaData loadElementFromParentXML(InputStream xmlStream) throws Exception { Document document = getXMLBuilder().parse(xmlStream); Element rootElement = (Element) document.getFirstChild(); Element mdeElement = getXMLElementByTagName(rootElement, KEY_METADATA); - MetaDataEntity mde; + MetaData mde; mde = loadElement(mdeElement); return mde; } 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-01 09:58:10 UTC (rev 566) @@ -42,7 +42,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.data.Result; import fr.cemagref.simexplorer.is.entities.data.Structure; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; @@ -84,7 +84,7 @@ } private void update(LoggableElement element) throws Exception { - MetaDataEntity metaData = new MetaDataEntity(); + MetaData metaData = new MetaData(); metaData.setUuid(UUID.randomUUID().toString()); metaData.setName(longString()); metaData.setType(element.getClass().getSimpleName()); Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-01 09:58:10 UTC (rev 566) @@ -28,7 +28,7 @@ import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; /** @author tony */ @@ -36,22 +36,22 @@ static final int SIZE = 400; - protected SortedMap<String, MetaDataEntity> mockData; + protected SortedMap<String, MetaData> mockData; protected List<String> mockDataIndex; protected ElementGenerator generator; - public SortedMap<String, MetaDataEntity> mockData() { + public SortedMap<String, MetaData> mockData() { if (mockData == null) { - mockData = new TreeMap<String, MetaDataEntity>(); + mockData = new TreeMap<String, MetaData>(); mockDataIndex = new ArrayList<String>(); MetaDataGenerator generator = new MetaDataGenerator(); for (int i = 0; i < SIZE; i++) { - MetaDataEntity metaDataEntity = generator.generateMetaDataEntity(); - metaDataEntity.setName(i + " -- " + metaDataEntity.getName()); - mockData.put(metaDataEntity.getUuid(), metaDataEntity); - mockDataIndex.add(metaDataEntity.getUuid()); + MetaData metaData = generator.generateMetaDataEntity(); + metaData.setName(i + " -- " + metaData.getName()); + mockData.put(metaData.getUuid(), metaData); + mockDataIndex.add(metaData.getUuid()); } } return mockData; @@ -65,19 +65,19 @@ throw new IllegalStateException("not implemented"); } - public MetaDataEntity saveElement(String token, RemoteInputStream zipRemoteStream) throws SimExplorerServiceException { - return (MetaDataEntity) checkImplemented(); + public MetaData saveElement(String token, RemoteInputStream zipRemoteStream) throws SimExplorerServiceException { + return (MetaData) checkImplemented(); } - public MetaDataEntity saveElement(String token, RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) throws SimExplorerServiceException { - return (MetaDataEntity) checkImplemented(); + public MetaData saveElement(String token, RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) throws SimExplorerServiceException { + return (MetaData) checkImplemented(); } - public MetaDataEntity getMetadata(String token, String uuid) throws SimExplorerServiceException { + public MetaData getMetadata(String token, String uuid) throws SimExplorerServiceException { return mockData().get(uuid); } - public MetaDataEntity getMetadata(String token, String uuid, String version) throws SimExplorerServiceException { + public MetaData getMetadata(String token, String uuid, String version) throws SimExplorerServiceException { return mockData().get(uuid); } @@ -98,7 +98,7 @@ return findApplicationsCount(token,onlyLatest); } - public MetaDataEntity[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException { + public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException { //TODO Changer return findApplications(token,onlyLatest,indexStart,count,dateOrder); } @@ -107,14 +107,14 @@ return mockData().size(); } - public MetaDataEntity[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) throws SimExplorerServiceException { + public MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) throws SimExplorerServiceException { int last = start + count; System.out.println("ask data from " + start + " width:" + count); - SortedMap<String, MetaDataEntity> map = mockData(); + SortedMap<String, MetaData> map = mockData(); if (last > map.size()) { last = map.size(); } - MetaDataEntity[] result = new MetaDataEntity[last - start]; + MetaData[] result = new MetaData[last - start]; for (int i = start; i < last; i++) { result[i - start] = map.get(mockDataIndex.get(i)); @@ -133,9 +133,9 @@ } } - public MetaDataEntity[] getVersions(String token, String uuid) throws SimExplorerServiceException { + public MetaData[] getVersions(String token, String uuid) throws SimExplorerServiceException { //TODO - return new MetaDataEntity[0]; + return new MetaData[0]; } public String loginUser(String login, String password) throws SimExplorerServiceException { 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-01 09:58:10 UTC (rev 566) @@ -24,7 +24,7 @@ import com.healthmarketscience.rmiio.RemoteInputStream; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; /** * Service interface @@ -63,7 +63,7 @@ * @return Metadata of element imported * @throws SimExplorerServiceException */ - MetaDataEntity saveElement(String token, RemoteInputStream zipRemoteStream) + MetaData saveElement(String token, RemoteInputStream zipRemoteStream) throws SimExplorerServiceException; /** @@ -78,7 +78,7 @@ * @return Metadata of element saved * @throws SimExplorerServiceException */ - MetaDataEntity saveElement(String token, RemoteInputStream xmlRemoteStream, + MetaData saveElement(String token, RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) throws SimExplorerServiceException; @@ -90,7 +90,7 @@ * @return * @throws SimExplorerServiceException */ - MetaDataEntity getMetadata(String token, String uuid) + MetaData getMetadata(String token, String uuid) throws SimExplorerServiceException; /** @@ -102,7 +102,7 @@ * @return * @throws SimExplorerServiceException */ - MetaDataEntity getMetadata(String token, String uuid, String version) + MetaData getMetadata(String token, String uuid, String version) throws SimExplorerServiceException; /** @@ -166,7 +166,7 @@ * @return * @throws SimExplorerServiceException */ - MetaDataEntity[] findFullText(String token, String query, + MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException; @@ -192,7 +192,7 @@ * @return * @throws SimExplorerServiceException */ - MetaDataEntity[] findApplications(String token, boolean onlyLatest, + MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) throws SimExplorerServiceException; @@ -216,7 +216,7 @@ * @return * @throws SimExplorerServiceException */ - MetaDataEntity[] getVersions(String token, String uuid) + MetaData[] getVersions(String token, String uuid) 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-01 09:58:10 UTC (rev 566) @@ -41,7 +41,7 @@ import fr.cemagref.simexplorer.is.contenttype.ContentType; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; import fr.cemagref.simexplorer.is.factories.MetaDataEntityFactory; @@ -69,7 +69,7 @@ } } - public MetaDataEntity saveElement(String token, + public MetaData saveElement(String token, RemoteInputStream zipRemoteStream) throws SimExplorerServiceException { InputStream zipStream; @@ -81,7 +81,7 @@ } } - public MetaDataEntity saveElement(String token, + public MetaData saveElement(String token, RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) throws SimExplorerServiceException { @@ -101,7 +101,7 @@ } } - public MetaDataEntity getMetadata(String token, String uuid) + public MetaData getMetadata(String token, String uuid) throws SimExplorerServiceException { try { return getStorageEngine().getMetadata(token, uuid); @@ -110,7 +110,7 @@ } } - public MetaDataEntity getMetadata(String token, String uuid, String version) + public MetaData getMetadata(String token, String uuid, String version) throws SimExplorerServiceException { try { return getStorageEngine().getMetadata(token, uuid, @@ -120,7 +120,7 @@ } } - public MetaDataEntity[] findFullText(String token, String query, + public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException { try { @@ -151,7 +151,7 @@ } } - public MetaDataEntity[] findApplications(String token, boolean onlyLatest, + public MetaData[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) throws SimExplorerServiceException { try { @@ -165,7 +165,7 @@ public LoggableElement getElement(String token, String uuid, String version) throws SimExplorerServiceException { - MetaDataEntity mde = getMetadata(token, uuid, version); + MetaData mde = getMetadata(token, uuid, version); try { LoggableElement le; @@ -180,7 +180,7 @@ } } - private MetaDataEntity saveElement(String token, InputStream zipStream) + private MetaData saveElement(String token, InputStream zipStream) throws SimExplorerServiceException { String xmlFile = null; Map<String, String> attachments = new HashMap<String, String>(); @@ -211,7 +211,7 @@ } } - private MetaDataEntity saveElement(String token, InputStream xmlFile, + private MetaData saveElement(String token, InputStream xmlFile, Map<String, InputStream> attachments) throws Exception { // Store temporary data String idxml = getStorageEngine().storeTempData(xmlFile); @@ -227,7 +227,7 @@ public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws SimExplorerServiceException { try { - MetaDataEntity mde = getMetadata(token, uuid, version); + MetaData mde = getMetadata(token, uuid, version); InputStream stream = getStorageEngine().retrieveData(token, mde, dataKey); RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( @@ -242,7 +242,7 @@ public RemoteInputStream exportElement(String token, String uuid, String version) throws SimExplorerServiceException { - MetaDataEntity mde = getMetadata(token, uuid, version); + MetaData mde = getMetadata(token, uuid, version); try { InputStream xmlStream = getStorageEngine().retrieveData(token, mde, KEY_XML); @@ -260,7 +260,7 @@ public RemoteInputStream exportFull(String token, String uuid, String version) throws SimExplorerServiceException { LoggableElement element = getElement(token, uuid, version); - MetaDataEntity mde = element.getMetaData(); + MetaData mde = element.getMetaData(); try { PipedOutputStream pipedOut = new PipedOutputStream(); Map<String, InputStream> files = new HashMap<String, InputStream>(); @@ -269,7 +269,7 @@ KEY_XML)); List<LoggableElement> children = element.getChildren(); for (LoggableElement loggableElement : children) { - MetaDataEntity thisMde = loggableElement.getMetaData(); + MetaData thisMde = loggableElement.getMetaData(); Map<String, ContentType> attachments = loggableElement .getMetaData().getAttachments(); for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { @@ -303,12 +303,12 @@ * @return * @throws Exception */ - private MetaDataEntity saveElement(String token, String idxml, + private MetaData saveElement(String token, String idxml, Map<String, String> idsattachment) throws Exception { // Load metadata xml MetaDataEntityFactory mdeFactory = MetaDataEntityFactory - .getFactory(MetaDataEntity.class); - MetaDataEntity metaData = mdeFactory + .getFactory(MetaData.class); + MetaData metaData = mdeFactory .loadElementFromParentXML(getStorageEngine().retrieveTempData( idxml)); @@ -353,8 +353,8 @@ String entitiesNode, String entityNode, Map<String, String> idsattachment) throws Exception { - BaseEntityFactory<MetaDataEntity> elementFactory = MetaDataEntityFactory - .getFactory(MetaDataEntity.class); + BaseEntityFactory<MetaData> elementFactory = MetaDataEntityFactory + .getFactory(MetaData.class); Document document = BaseEntityFactory.getXMLBuilder().parse( getStorageEngine().retrieveTempData(idxml)); @@ -373,16 +373,16 @@ } - private void processVersionRules(String token, MetaDataEntity metaData) + private void processVersionRules(String token, MetaData metaData) throws Exception { // Check existing version in storage - MetaDataEntity previousVersion = getStorageEngine().getMetadata(token, + MetaData previousVersion = getStorageEngine().getMetadata(token, metaData.getUuid(), metaData.getVersion()); /* - * MetaDataEntity parentData = getStorageEngine().getElementVersion(metaData + * MetaData parentData = getStorageEngine().getElementVersion(metaData * .getParentData().getUuid(), metaData.getParentData() .getVersion()); - * MetaDataEntity parentVersion = + * MetaData parentVersion = * getStorageEngine().getElementVersion(metaData * .getParentVersion().getUuid(), metaData.getParentVersion() * .getVersion()); @@ -396,12 +396,12 @@ } - public MetaDataEntity[] getVersions(String token, String uuid) + public MetaData[] getVersions(String token, String uuid) throws SimExplorerServiceException { try { - Set<MetaDataEntity> versions = getStorageEngine() + Set<MetaData> versions = getStorageEngine() .getElementVersions(token, uuid); - return versions.toArray(new MetaDataEntity[versions.size()]); + return versions.toArray(new MetaData[versions.size()]); } catch (StorageException e) { throw new SimExplorerServiceException(e); } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-02-01 09:58:10 UTC (rev 566) @@ -25,7 +25,7 @@ import javax.ejb.Local; import javax.ejb.Stateless; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.security.credentials.CredentialManager; import fr.cemagref.simexplorer.is.security.entities.Permission; @@ -63,10 +63,10 @@ } @Override - public MetaDataEntity[] findElementsByType(String token, String type, + public MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, int dateOrder) throws StorageException { - MetaDataEntity[] list; + MetaData[] list; list = super.findElementsByType(token, type, onlyLatest, start, count, dateOrder); // TODO how to filter without losing pagination? @@ -81,7 +81,7 @@ } @Override - public MetaDataEntity[] findFullText(String token, String query, + public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws StorageException { // TODO how to filter without losing pagination? @@ -97,9 +97,9 @@ } @Override - public MetaDataEntity getMetadata(String token, String uuid, Version version) + public MetaData getMetadata(String token, String uuid, Version version) throws StorageException { - MetaDataEntity mde; + MetaData mde; Permission permission = credentialManager.getPermission(token, uuid); if (permission != null && permission.isCanRead()) { mde = super.getMetadata(token, uuid, version); @@ -110,9 +110,9 @@ } @Override - public MetaDataEntity getMetadata(String token, String uuid) + public MetaData getMetadata(String token, String uuid) throws StorageException { - MetaDataEntity mde; + MetaData mde; Permission permission = credentialManager.getPermission(token, uuid); if (permission != null && permission.isCanRead()) { mde = super.getMetadata(token, uuid); @@ -136,7 +136,7 @@ } @Override - public InputStream retrieveData(String token, MetaDataEntity entity, + public InputStream retrieveData(String token, MetaData entity, String field) throws StorageException { InputStream stream; Permission permission = credentialManager.getPermission(token, entity @@ -150,7 +150,7 @@ } @Override - public void saveElement(String token, MetaDataEntity element, + public void saveElement(String token, MetaData element, Map<String, InputStream> attachments) throws StorageException { Permission permission = credentialManager.getPermission(token, element .getUuid()); Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-02-01 09:58:10 UTC (rev 566) @@ -24,7 +24,7 @@ import java.util.UUID; import fr.cemagref.simexplorer.is.contenttype.ContentType; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; public class MetaDataGenerator { @@ -40,9 +40,9 @@ * descriptorFields[i] = "descriptor" + i; } } */ - public MetaDataEntity generateMetaDataEntity(String uuid, Version version, - MetaDataEntity parentVersion, MetaDataEntity parentData) { - MetaDataEntity me = generateMetaDataEntity(uuid, version, parentVersion); + public MetaData generateMetaDataEntity(String uuid, Version version, + MetaData parentVersion, MetaData parentData) { + MetaData me = generateMetaDataEntity(uuid, version, parentVersion); if (parentData != null) { me.setParentDataUuid(parentData.getUuid()); me.setParentDataVersion(parentData.getVersion().toString()); @@ -50,9 +50,9 @@ return me; } - public MetaDataEntity generateMetaDataEntity(String uuid, Version version, - MetaDataEntity parentVersion) { - MetaDataEntity me = generateMetaDataEntity(uuid, version); + public MetaData generateMetaDataEntity(String uuid, Version version, + MetaData parentVersion) { + MetaData me = generateMetaDataEntity(uuid, version); if (parentVersion != null) { me.setParentVersionUuid(parentVersion.getUuid()); @@ -64,8 +64,8 @@ return me; } - public MetaDataEntity generateMetaDataEntity(String uuid, Version version) { - MetaDataEntity me = new MetaDataEntity(); + public MetaData generateMetaDataEntity(String uuid, Version version) { + MetaData me = new MetaData(); me.setUuid(uuid); me.setName(uuid); @@ -92,15 +92,15 @@ return me; } - public MetaDataEntity generateMetaDataEntity() { + public MetaData generateMetaDataEntity() { return generateMetaDataEntity(UUID.randomUUID().toString(), new Version("1.0")); } - public MetaDataEntity[] generateVersionnedMetaDataEntity() { + public MetaData[] generateVersionnedMetaDataEntity() { String uuid = UUID.randomUUID().toString(); - MetaDataEntity[] mes = new MetaDataEntity[4]; + MetaData[] mes = new MetaData[4]; mes[0] = generateMetaDataEntity(uuid, new Version("1.0")); mes[1] = generateMetaDataEntity(uuid, new Version("1.1"), mes[0]); mes[2] = generateMetaDataEntity(uuid, new Version("1.2"), mes[1]); Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/AttachmentHandler.java 2008-02-01 09:58:10 UTC (rev 566) @@ -19,7 +19,7 @@ import java.io.InputStream; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.StorageException; /** @@ -41,7 +41,7 @@ * Content * @throws StorageException */ - public abstract void storeData(MetaDataEntity entity, String field, + public abstract void storeData(MetaData entity, String field, InputStream is) throws StorageException; /** @@ -54,7 +54,7 @@ * @return Content * @throws StorageException */ - public abstract InputStream retrieveData(MetaDataEntity entity, String field) + public abstract InputStream retrieveData(MetaData entity, String field) throws StorageException; /** @@ -66,7 +66,7 @@ * Unique field for content * @throws StorageException */ - public abstract void deleteData(MetaDataEntity entity, String field) + public abstract void deleteData(MetaData entity, String field) throws StorageException; } \ No newline at end of file Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-01 09:58:10 UTC (rev 566) @@ -26,7 +26,7 @@ import java.io.IOException; import java.io.InputStream; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.StorageException; import fr.cemagref.simexplorer.is.storage.util.Config; @@ -53,7 +53,7 @@ * Unique field for content * @return Instance of file */ - private File getFile(MetaDataEntity entity, String field) { + private File getFile(MetaData entity, String field) { String resultPath = baseFolder; // Create file path @@ -78,7 +78,7 @@ } @Override - public InputStream retrieveData(MetaDataEntity entity, String field) + public InputStream retrieveData(MetaData entity, String field) throws StorageException { // Simple stream on file FileInputStream fis = null; @@ -91,7 +91,7 @@ } @Override - public void storeData(MetaDataEntity entity, String field, InputStream is) + public void storeData(MetaData entity, String field, InputStream is) throws StorageException { // Simple stream on file try { @@ -119,7 +119,7 @@ } @Override - public void deleteData(MetaDataEntity entity, String field) + public void deleteData(MetaData entity, String field) throws StorageException { // Simple delete on file getFile(entity, field).delete(); Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/Database.java 2008-02-01 09:58:10 UTC (rev 566) @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.StorageException; @@ -78,7 +78,7 @@ * @param readers * @throws StorageException */ - public abstract void insertElement(MetaDataEntity element, + public abstract void insertElement(MetaData element, List<Reader> readers) throws StorageException; // Read @@ -93,7 +93,7 @@ * @return Fund element, null if not fund * @throws StorageException */ - public abstract MetaDataEntity getElement(String uuid, Version version) + public abstract MetaData getElement(String uuid, Version version) throws StorageException; /** @@ -116,7 +116,7 @@ * @return Element list * @throws StorageException */ - public abstract Set<MetaDataEntity> findElementsById(String uuid, + public abstract Set<MetaData> findElementsById(String uuid, boolean onlyLatest) throws StorageException; /** @@ -128,7 +128,7 @@ * @return Element list * @throws StorageException */ - public Set<MetaDataEntity> findElementsByProperties( + public Set<MetaData> findElementsByProperties( Map<String, String> properties) throws StorageException { return findElementsByProperties(properties, 0, -1, 0); } @@ -147,7 +147,7 @@ * @return Element list * @throws StorageException */ - public abstract Set<MetaDataEntity> findElementsByProperties( + public abstract Set<MetaData> findElementsByProperties( Map<String, String> properties, int start, int count, int dateOrder) throws StorageException; @@ -197,7 +197,7 @@ * @return Element list * @throws StorageException */ - public Set<MetaDataEntity> findElementsByType(String type, + public Set<MetaData> findElementsByType(String type, boolean onlyLatest, int start, int count, int dateOrder) throws StorageException { return findElementsByProperties(getPropertiesByType(type, onlyLatest), @@ -235,7 +235,7 @@ * @return Element list * @throws StorageException */ - public abstract Set<MetaDataEntity> findElementsByContentSearch( + public abstract Set<MetaData> findElementsByContentSearch( String queryText, boolean onlyLatest, int start, int count, int dateOrder) throws StorageException; @@ -260,7 +260,7 @@ * Element to delete * @throws StorageException */ - public void deleteElement(MetaDataEntity element) throws StorageException { + public void deleteElement(MetaData element) throws StorageException { deleteElement(element.getUuid(), element.getVersion()); } Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabase.java 2008-02-01 09:58:10 UTC (rev 566) @@ -55,7 +55,7 @@ import fr.cemagref.simexplorer.is.contenttype.ContentType; import fr.cemagref.simexplorer.is.contenttype.ContentTypeFactory; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.StorageException; import fr.cemagref.simexplorer.is.storage.database.Database; @@ -248,13 +248,13 @@ } @Override - public void insertElement(MetaDataEntity element, List<Reader> readers) + public void insertElement(MetaData element, List<Reader> readers) throws StorageException { // Save element to a Lucene document Document document = saveLuceneElement(element, readers); // Retrieve existing element with same id/version - MetaDataEntity oldElement = getElement(element.getUuid(), element + MetaData oldElement = getElement(element.getUuid(), element .getVersion()); // Delete element if exists, for update if (oldElement != null) { @@ -273,9 +273,9 @@ } @Override - public MetaDataEntity getElement(String uuid, Version version) + public MetaData getElement(String uuid, Version version) throws StorageException { - MetaDataEntity result = null; + MetaData result = null; try { // Get current searcher instance @@ -350,7 +350,7 @@ } @Override - public Set<MetaDataEntity> findElementsById(String uuid, boolean onlyLatest) + public Set<MetaData> findElementsById(String uuid, boolean onlyLatest) throws StorageException { // Create hash map with id Map<String, String> properties = new HashMap<String, String>(); @@ -359,7 +359,7 @@ properties.put(KEY_LATEST, "1"); } - Set<MetaDataEntity> result = null; + Set<MetaData> result = null; try { // Get current searcher instance @@ -403,10 +403,10 @@ } @Override - public Set<MetaDataEntity> findElementsByProperties( + public Set<MetaData> findElementsByProperties( Map<String, String> properties, int start, int count, int dateOrder) throws StorageException { - Set<MetaDataEntity> result = null; + Set<MetaData> result = null; try { // Get current searcher instance @@ -477,7 +477,7 @@ } @Override - public Set<MetaDataEntity> findElementsByContentSearch(String queryText, + public Set<MetaData> findElementsByContentSearch(String queryText, boolean onlyLatest, int start, int count, int dateOrder) throws StorageException { Query query = null; @@ -487,7 +487,7 @@ throw new StorageException(e); } - Set<MetaDataEntity> result = null; + Set<MetaData> result = null; Hits hits; try { @@ -595,9 +595,9 @@ * @return Entities list * @throws Exception */ - private Set<MetaDataEntity> convertHitsToElements(Hits hits, int start, + private Set<MetaData> convertHitsToElements(Hits hits, int start, int count) throws Exception { - Set<MetaDataEntity> elements = new HashSet<MetaDataEntity>(); + Set<MetaData> elements = new HashSet<MetaData>(); if (hits != null) { // For documents in range for (int i = start; i < hits.length() @@ -618,9 +618,9 @@ * @return Instance of element * @throws Exception */ - private MetaDataEntity loadLuceneElement(Document document) + private MetaData loadLuceneElement(Document document) throws Exception { - MetaDataEntity element = new MetaDataEntity(); + MetaData element = new MetaData(); // Fill element with Lucene document @@ -707,7 +707,7 @@ * @return * @throws Exception */ - private Document saveLuceneElement(MetaDataEntity element, + private Document saveLuceneElement(MetaData element, List<Reader> readers) { Document document = new Document(); 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-02-01 09:58:10 UTC (rev 566) @@ -24,7 +24,7 @@ import javax.ejb.Local; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.StorageException; @@ -61,7 +61,7 @@ * Attachments related * @throws Exception */ - public abstract void saveElement(String token, MetaDataEntity element, + public abstract void saveElement(String token, MetaData element, Map<String, InputStream> attachments) throws StorageException; /** @@ -72,7 +72,7 @@ * @return The element * @throws Exception */ - public abstract MetaDataEntity getMetadata(String token, String uuid) + public abstract MetaData getMetadata(String token, String uuid) throws StorageException; /** @@ -95,7 +95,7 @@ * @param uuid * @return */ - public abstract Set<MetaDataEntity> getElementVersions(String token, + public abstract Set<MetaData> getElementVersions(String token, String uuid) throws StorageException; /** @@ -106,7 +106,7 @@ * @return * @throws Exception */ - public abstract MetaDataEntity getMetadata(String token, String uuid, + public abstract MetaData getMetadata(String token, String uuid, Version version) throws StorageException; /** @@ -120,7 +120,7 @@ * @throws Exception */ public abstract InputStream retrieveData(String token, - MetaDataEntity entity, String field) throws StorageException; + MetaData entity, String field) throws StorageException; /** * Get number of items corresponding to query @@ -144,7 +144,7 @@ * @return * @throws Exception */ - public abstract MetaDataEntity[] findFullText(String token, String query, + public abstract MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws StorageException; @@ -159,7 +159,7 @@ * @return * @throws Exception */ - public abstract MetaDataEntity[] findElementsByType(String token, + public abstract MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, int dateOrder) throws StorageException; 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-02-01 09:58:10 UTC (rev 566) @@ -27,7 +27,7 @@ import java.util.UUID; import fr.cemagref.simexplorer.is.contenttype.ContentType; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.StorageException; import fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler; @@ -56,7 +56,7 @@ /** * Metadata handling temporary data */ - private MetaDataEntity mdTmp; + private MetaData mdTmp; private boolean opened = false; @@ -70,7 +70,7 @@ // Storage attachmentHandler = new FileSystemAttachmentHandler(); // Storing tmp data - mdTmp = new MetaDataEntity(); + mdTmp = new MetaData(); mdTmp.setUuid(UUID.randomUUID().toString()); mdTmp.setVersion("0"); } @@ -102,9 +102,9 @@ // Create / update /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#saveElement(fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity, java.util.Map) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#saveElement(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.util.Map) */ - public void saveElement(String token, MetaDataEntity element, + public void saveElement(String token, MetaData element, Map<String, InputStream> attachments) throws StorageException { // Save all attachments in system @@ -151,10 +151,10 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#getMetadata(java.lang.String) */ - public MetaDataEntity getMetadata(String token, String uuid) + public MetaData getMetadata(String token, String uuid) throws StorageException { - MetaDataEntity mde = null; - Set<MetaDataEntity> set = database.findElementsById(uuid, true); + MetaData mde = null; + Set<MetaData> set = database.findElementsById(uuid, true); if (!set.isEmpty()) { mde = set.iterator().next(); } @@ -172,16 +172,16 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#getMetadata(java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version) */ - public MetaDataEntity getMetadata(String token, String uuid, Version version) + public MetaData getMetadata(String token, String uuid, Version version) throws StorageException { - MetaDataEntity mde = database.getElement(uuid, version); + MetaData mde = database.getElement(uuid, version); return mde; } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#retrieveData(fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity, java.lang.String) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#retrieveData(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) */ - public InputStream retrieveData(String token, MetaDataEntity entity, + public InputStream retrieveData(String token, MetaData entity, String field) throws StorageException { InputStream result = attachmentHandler.retrieveData(entity, field); return result; @@ -198,23 +198,23 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#findFullText(java.lang.String, boolean, int, int, int) */ - public MetaDataEntity[] findFullText(String token, String query, + public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws StorageException { - MetaDataEntity[] result = database.findElementsByContentSearch(query, + MetaData[] result = database.findElementsByContentSearch(query, onlyLatest, indexStart, count, dateOrder).toArray( - new MetaDataEntity[0]); + new MetaData[0]); return result; } /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#findElementsByType(java.lang.String, boolean, int, int, int) */ - public MetaDataEntity[] findElementsByType(String token, String type, + public MetaData[] findElementsByType(String token, String type, boolean onlyLatest, int start, int count, int dateOrder) throws StorageException { - MetaDataEntity[] result = database.findElementsByType(type, onlyLatest, - start, count, dateOrder).toArray(new MetaDataEntity[0]); + MetaData[] result = database.findElementsByType(type, onlyLatest, + start, count, dateOrder).toArray(new MetaData[0]); return result; } @@ -244,7 +244,7 @@ */ public void deleteElement(String token, String uuid, Version version) throws StorageException { - MetaDataEntity element = getMetadata(token, uuid, version); + MetaData element = getMetadata(token, uuid, version); Map<String, ContentType> attachments = element.getAttachments(); for (Map.Entry<String, ContentType> entry : attachments.entrySet()) { attachmentHandler.deleteData(element, entry.getKey()); @@ -278,7 +278,7 @@ attachmentHandler.deleteData(mdTmp, id); } - public Set<MetaDataEntity> getElementVersions(String token, String uuid) + public Set<MetaData> getElementVersions(String token, String uuid) throws StorageException { return database.findElementsById(uuid, false); } Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java 2008-02-01 09:58:10 UTC (rev 566) @@ -26,7 +26,7 @@ import java.util.Set; import junit.framework.TestCase; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; @@ -103,7 +103,7 @@ List<Reader> readers = new ArrayList<Reader>(); for (int i = 0; i < c; i++) { - MetaDataEntity[] mes = mdg.generateVersionnedMetaDataEntity(); + MetaData[] mes = mdg.generateVersionnedMetaDataEntity(); for (int j = 0; j < mes.length; j++) { int wordcount = 10000 + r.nextInt(20000); @@ -165,7 +165,7 @@ int start = count / 2; int length = Math.min(200, Math.min(count, Math.max(1, count / 4))); - Set<MetaDataEntity> metaDatas = database + Set<MetaData> metaDatas = database .findElementsByContentSearch(key, false, start, length, 1); System.out.println(key + " (" + start + " " + length + ") : " Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java 2008-02-01 09:58:10 UTC (rev 566) @@ -26,7 +26,7 @@ import java.util.Set; import junit.framework.TestCase; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; @@ -55,17 +55,17 @@ } public void testInsertElementGetElement() throws Exception { - MetaDataEntity me = mdg.generateMetaDataEntity(); + MetaData me = mdg.generateMetaDataEntity(); database.insertElement(me, new ArrayList<Reader>()); database.commit(); - MetaDataEntity me2 = database.getElement(me.getUuid(), me.getVersion()); + MetaData me2 = database.getElement(me.getUuid(), me.getVersion()); assertEquals(me.getDescription(), me2.getDescription()); database.insertElement(me, new ArrayList<Reader>()); database.commit(); } public void testIndexAddFindElementsByContentSearch() throws Exception { - MetaDataEntity me = mdg.generateMetaDataEntity(); + MetaData me = mdg.generateMetaDataEntity(); String keyphrase = Long.toHexString(r.nextLong()); @@ -85,7 +85,7 @@ } public void testGetVersions() throws Exception { - MetaDataEntity[] mes = mdg.generateVersionnedMetaDataEntity(); + MetaData[] mes = mdg.generateVersionnedMetaDataEntity(); for (int i = 0; i < mes.length; i++) { database.insertElement(mes[i], new ArrayList<Reader>()); } @@ -101,19 +101,19 @@ } public void testFindElementsById() throws Exception { - MetaDataEntity[] mes = mdg.generateVersionnedMetaDataEntity(); + MetaData[] mes = mdg.generateVersionnedMetaDataEntity(); for (int i = 0; i < mes.length; i++) { database.insertElement(mes[i], new ArrayList<Reader>()); } database.commit(); - Set<MetaDataEntity> elements = database.findElementsById(mes[0] + Set<MetaData> elements = database.findElementsById(mes[0] .getUuid(), false); assertEquals(elements.size(), mes.length); } public void testFindElementsByProperties() throws Exception { - MetaDataEntity me = mdg.generateMetaDataEntity(); + MetaData me = mdg.generateMetaDataEntity(); database.insertElement(me, new ArrayList<Reader>()); database.commit(); Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThread.java 2008-02-01 09:58:10 UTC (rev 566) @@ -22,7 +22,7 @@ import java.util.Random; import java.util.Set; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.database.Database; import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; @@ -71,7 +71,7 @@ } private void searchElements(String id) throws Exception { - Set<MetaDataEntity> mde = database.findElementsById(id, true); + Set<MetaData> mde = database.findElementsById(id, true); if (mde.isEmpty()) { System.err.println(idThreadLucene + " - " + id); } @@ -84,7 +84,7 @@ int ncycles = 5 + (new Random()).nextInt(20); for (int j = 0; j < ncycles; j++) { - MetaDataEntity[] mes = mdg.generateVersionnedMetaDataEntity(); + MetaData[] mes = mdg.generateVersionnedMetaDataEntity(); for (int i = 0; i < mes.length; i++) { mes[i].setParentDataUuid(Integer.toString(idThreadLucene)); database.insertElement(mes[i], new ArrayList<Reader>()); 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-01 09:58:10 UTC (rev 566) @@ -19,7 +19,7 @@ package fr.cemagref.simexplorer.is.ui; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.service.StorageService; /** Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-01 09:58:10 UTC (rev 566) @@ -18,7 +18,7 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-02-01 09:58:10 UTC (rev 566) @@ -18,7 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-02-01 09:58:10 UTC (rev 566) @@ -18,7 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java 2008-02-01 09:58:10 UTC (rev 566) @@ -18,7 +18,7 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-01 09:58:10 UTC (rev 566) @@ -18,7 +18,7 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/SynchronizeTabModel.java 2008-02-01 09:58:10 UTC (rev 566) @@ -18,7 +18,7 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.model; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import jaxx.runtime.builder.TabModel; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-02-01 09:58:10 UTC (rev 566) @@ -20,7 +20,7 @@ import org.apache.tapestry.beaneditor.PropertyModel; import org.apache.tapestry.grid.GridDataSource; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -44,7 +44,7 @@ /** * Cached entities */ - private MetaDataEntity[] entities = null; + private MetaData[] entities = null; /** * Authentification token @@ -97,7 +97,7 @@ * @see org.apache.tapestry.grid.GridDataSource#getRowType() */ public Class getRowType() { - return MetaDataEntity.class; + return MetaData.class; } /* (non-Javadoc) Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-01 09:58:10 UTC (rev 566) @@ -45,7 +45,7 @@ import fr.cemagref.simexplorer.is.entities.data.Library; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.data.Structure; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; import fr.cemagref.simexplorer.is.ui.web.tools.AttachmentStreamResponse; 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-01 09:58:10 UTC (rev 566) @@ -37,7 +37,7 @@ import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.Library; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; import fr.cemagref.simexplorer.is.ui.web.tools.AttachmentStreamResponse; @@ -54,7 +54,7 @@ Object response; - MetaDataEntity mde = getMetadata(); + MetaData mde = getMetadata(); try { RemoteInputStream ris = RemoteStorageService.getStorageService() @@ -73,7 +73,7 @@ public Object onActionFromDownloadFull() { Object response; - MetaDataEntity mde = getMetadata(); + MetaData mde = getMetadata(); try { RemoteInputStream ris = RemoteStorageService.getStorageService() Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-01 09:58:10 UTC (rev 566) @@ -29,7 +29,7 @@ import org.codelutin.tapestry.beans.TreeNode; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -37,16 +37,16 @@ public class ElementHistory extends ElementPageDetail { public class MetadataVersionComparator implements - Comparator<MetaDataEntity> { + Comparator<MetaData> { - public int compare(MetaDataEntity arg0, MetaDataEntity arg1) { + public int compare(MetaData arg0, MetaData arg1) { return arg0.getVersion().compareTo(arg1.getVersion()); } } @Persist - private MetaDataEntity[] versions; + private MetaData[] versions; @Inject private ComponentResources resources; @@ -92,13 +92,13 @@ rootNode.setColumns(generateStringArray("History")); rootNode.setObject(new Version("")); rootNode.setChildren(new ArrayList<TreeNode>()); - for (MetaDataEntity mde : versions) { + for (MetaData mde : versions) { insertNode(mde, 0, rootNode); } return rootNode; } - private void insertNode(MetaDataEntity mde, int pos, TreeNode parent) { + private void insertNode(MetaData mde, int pos, TreeNode parent) { List<TreeNode> nodes = parent.getChildren(); if (pos == mde.getVersion().getLength()) { nodes.add(generateLeaf(mde)); @@ -119,7 +119,7 @@ } } - private TreeNode generateFolder(MetaDataEntity mde, int pos, TreeNode parent) { + private TreeNode generateFolder(MetaData mde, int pos, TreeNode parent) { TreeNode node = new TreeNode(); node.setChildren(new ArrayList<TreeNode>()); Version v = generateVersion(mde.getVersion(), pos); @@ -137,7 +137,7 @@ return v; } - private TreeNode generateLeaf(MetaDataEntity mde) { + private TreeNode generateLeaf(MetaData mde) { TreeNode node = new TreeNode(); // FIXME date tostring node.setColumns(generateStringArray(mde.getVersion().toString(), mde Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-01 09:58:10 UTC (rev 566) @@ -29,7 +29,7 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.web.grid.ElementDataSource; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; @@ -47,13 +47,13 @@ @Persist private ElementDataSource elementDataSource; - private MetaDataEntity element; + private MetaData element; @InjectPage private ElementDetail elementDetail; void pageLoaded() { - model = beanModelSource.create(MetaDataEntity.class, true, resources); + model = beanModelSource.create(MetaData.class, true, resources); List<String> wantedProperties = new ArrayList<String>(); wantedProperties.add("type"); wantedProperties.add("uuid"); @@ -92,11 +92,11 @@ return elementDataSource; } - public MetaDataEntity getElement() { + public MetaData getElement() { return element; } - public void setElement(MetaDataEntity element) { + public void setElement(MetaData element) { this.element = element; } 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-02-01 09:58:10 UTC (rev 566) @@ -22,7 +22,7 @@ import org.apache.tapestry.ioc.annotations.Inject; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -53,7 +53,7 @@ return element; } - public MetaDataEntity getMetadata() { + public MetaData getMetadata() { return element.getMetaData(); } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-01 09:58:10 UTC (rev 566) @@ -27,7 +27,7 @@ import org.apache.tapestry.ioc.annotations.Inject; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; public abstract class ElementPageDetail extends ElementPage { @@ -102,12 +102,12 @@ } protected String generateString(String actionCaption, String action, - MetaDataEntity element) { + MetaData element) { String context = element.getUuid() + "," + element.getVersion(); return generateString(actionCaption, action, context); } - private String generateActions(MetaDataEntity element, boolean security, + private String generateActions(MetaData element, boolean security, String... actions) { StringBuilder sb = new StringBuilder(""); @@ -126,7 +126,7 @@ } protected String[] generateStringArray(String s1, String s2, String s3, - MetaDataEntity element, boolean security, String... actions) { + MetaData element, boolean security, String... actions) { List<String> result = new ArrayList<String>(); result.add(s1); result.add(s2); Modified: 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-01 09:54:27 UTC (rev 565) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/DownloadableFile.java 2008-02-01 09:58:10 UTC (rev 566) @@ -17,11 +17,11 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.tools; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; public class DownloadableFile { - private MetaDataEntity metaDataEntity; + private MetaData metaData; private String filename; public String getFilename() { @@ -32,12 +32,12 @@ this.filename = filename; } - public MetaDataEntity getMetaDataEntity() { - return metaDataEntity; + public MetaData getMetaDataEntity() { + return metaData; } - public void setMetaDataEntity(MetaDataEntity metaDataEntity) { - this.metaDataEntity = metaDataEntity; + public void setMetaDataEntity(MetaData metaData) { + this.metaData = metaData; } }

1 0