Author: glandais Date: 2008-01-24 18:00:06 +0000 (Thu, 24 Jan 2008) New Revision: 504 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/StorageService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java Log: retrieve data & get versions 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-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 18:00:06 UTC (rev 504) @@ -18,19 +18,20 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +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 com.healthmarketscience.rmiio.RemoteOutputStream; + +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; 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; - /** @author tony */ public class MockStorageServiceImpl implements StorageService { 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-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-24 18:00:06 UTC (rev 504) @@ -26,6 +26,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; /** * Service interface @@ -205,4 +206,17 @@ */ MetaDataEntity[] getVersions(String token, String uuid) throws Exception; + /** + * @param token + * @param uuid + * @param version + */ +// void deleteElement(String token, String uuid, Version version); + + /** + * @param token + * @param uuid + */ +// void deleteElement(String token, String uuid); + } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 18:00:06 UTC (rev 504) @@ -32,14 +32,4 @@ return null; } - public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { - //TODO - return null; - } - - public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { - //TODO - return new MetaDataEntity[0]; - } - } 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-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-24 18:00:06 UTC (rev 504) @@ -29,14 +29,15 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; - import org.w3c.dom.Document; import org.w3c.dom.Element; import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; +import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.RemoteOutputStream; import com.healthmarketscience.rmiio.RemoteOutputStreamClient; +import com.healthmarketscience.rmiio.SimpleRemoteInputStream; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; @@ -172,6 +173,15 @@ return saveElement(token, idxml, idsattachment); } + public RemoteInputStream retrieveData(String token, String uuid, + String version, String dataKey) throws Exception { + MetaDataEntity mde = getMetadata(token, uuid, version); + InputStream stream = storageEngine.retrieveData(token, mde, dataKey); + RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( + stream); + return remoteStream.export(); + } + public void exportElement(String token, RemoteOutputStream xmlOutputStream, String uuid, String version) throws Exception { MetaDataEntity mde = getMetadata(token, uuid, version); @@ -340,4 +350,8 @@ } + public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { + Set<MetaDataEntity> versions = storageEngine.getElementVersions(token, uuid); + return versions.toArray(new MetaDataEntity[versions.size()]); + } } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 17:58:21 UTC (rev 503) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 18:00:06 UTC (rev 504) @@ -54,14 +54,4 @@ return token; } - public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { - //TODO - return null; - } - - public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { - //TODO - return new MetaDataEntity[0]; - } - }