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; } }