Author: glandais Date: 2007-12-10 15:20:48 +0000 (Mon, 10 Dec 2007) New Revision: 60 Modified: trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/FSStorageEngine.java trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java Log: Pour compilation Modified: trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/FSStorageEngine.java =================================================================== --- trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/FSStorageEngine.java 2007-12-10 15:20:06 UTC (rev 59) +++ trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/FSStorageEngine.java 2007-12-10 15:20:48 UTC (rev 60) @@ -1,26 +1,107 @@ package fr.cemagref.simexplorer.is.storage.engine; -import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.OutputStream; import java.util.Collections; import java.util.List; -import org.apache.lucene.document.Field; -import org.w3c.dom.Element; - -import fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler; -import fr.cemagref.simexplorer.is.storage.attachment.fs.FileSystemAttachmentHandler; +import fr.cemagref.simexplorer.is.storage.attachment.handler.AttachmentHandler; +import fr.cemagref.simexplorer.is.storage.attachment.handler.FileSystemAttachmentHandler; import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; -import fr.cemagref.simexplorer.is.storage.entities.FileEntity; -import fr.cemagref.simexplorer.is.storage.entities.LoggableElement; -import fr.cemagref.simexplorer.is.storage.entities.Version; -import fr.cemagref.simexplorer.is.storage.factories.EntityFactory; -import fr.cemagref.simexplorer.is.storage.factories.FileEntityFactory; +import fr.cemagref.simexplorer.is.storage.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.storage.entities.metadata.Version; +import fr.cemagref.simexplorer.is.storage.factories.DataEntityFactory; import fr.cemagref.simexplorer.is.storage.factories.LoggableElementFactory; public class FSStorageEngine extends StorageEngine { + @Override + public void close() throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void deleteData(LoggableElement entity, String field) + throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public void exportElement(LoggableElement element, OutputStream os) + throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public LoggableElement getElement(String uuid) throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public LoggableElement getElementVersion(String uuid, Version version) + throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public List<Version> getVersions(String uuid) throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public LoggableElement importElement(InputStream inputStream) + throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public LoggableElement newElement(LoggableElement element) throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public void open() throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public InputStream retrieveData(LoggableElement entity, String field) + throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public LoggableElement saveElement(LoggableElement element) + throws Exception { + // TODO Auto-generated method stub + return null; + } + + @Override + public void storeData(LoggableElement entity, String field, InputStream is) + throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public LoggableElement synchronizeElement(LoggableElement element) + throws Exception { + // TODO Auto-generated method stub + return null; + } + + /* private static AttachmentHandler handler; private static boolean handlerInit = false; @@ -37,9 +118,9 @@ } @Override - public void storeData(FileEntity entity, String field, InputStream is) + public void storeData(LoggableElement entity, String field, InputStream is) throws Exception { - getHandler().storeData(entity, field, is); + getHandler().storeData(database, entity, field, is); } @@ -48,7 +129,7 @@ throws Exception { LoggableElement completeElement = database.getElement(element .getUuid(), element.getVersion()); - LoggableElementFactory<LoggableElement> factory = (LoggableElementFactory<LoggableElement>) EntityFactory + LoggableElementFactory<LoggableElement> factory = (LoggableElementFactory<LoggableElement>) DataEntityFactory .getFactory(completeElement.getClass()); factory.getElementXML(element, os); } @@ -62,15 +143,15 @@ public LoggableElement getElementVersion(String uuid, Version version) throws Exception { - /* + // FIXME String strXMLElement = document.get(KEY_XML); InputStream is = new ByteArrayInputStream(strXMLElement.getBytes()); - org.w3c.dom.Document xmlDocument = EntityFactory.getBuilder().parse(is); + org.w3c.dom.Document xmlDocument = DataEntityFactory.getBuilder().parse(is); LoggableElement element = factory.loadXMLElement((Element) xmlDocument .getFirstChild()); - */ + return database.getElement(uuid, version); } @@ -94,12 +175,12 @@ throw new Exception(element.getUuid() + " already exist"); } element.setVersion("1"); - /* - * FIXME - document.add(new Field(KEY_XML, factory.getElementXML(element), - Field.Store.COMPRESS, Field.Index.NO)); - */ + // FIXME + //document.add(new Field(KEY_XML, factory.getElementXML(element), + // Field.Store.COMPRESS, Field.Index.NO)); + + database.insertElement(element); return getElement(element.getUuid()); } @@ -127,11 +208,10 @@ element.setVersion(version.toString()); - /* - * FIXME - document.add(new Field(KEY_XML, factory.getElementXML(element), - Field.Store.COMPRESS, Field.Index.NO)); - */ + // FIXME + //document.add(new Field(KEY_XML, factory.getElementXML(element), + // Field.Store.COMPRESS, Field.Index.NO)); + database.insertElement(element); return getElement(element.getUuid()); @@ -146,7 +226,7 @@ @Override public void deleteData(FileEntity entity, String field) throws Exception { - getHandler().deleteData(entity, field); + getHandler().deleteData(database, entity, field); } @Override @@ -154,6 +234,6 @@ throws Exception { return getHandler().retrieveData(entity, field); } - +*/ } Modified: trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java =================================================================== --- trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2007-12-10 15:20:06 UTC (rev 59) +++ trunk/simexplorer-si-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2007-12-10 15:20:48 UTC (rev 60) @@ -5,9 +5,8 @@ import java.util.List; import fr.cemagref.simexplorer.is.storage.database.Database; -import fr.cemagref.simexplorer.is.storage.entities.FileEntity; -import fr.cemagref.simexplorer.is.storage.entities.LoggableElement; -import fr.cemagref.simexplorer.is.storage.entities.Version; +import fr.cemagref.simexplorer.is.storage.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.storage.entities.metadata.Version; public abstract class StorageEngine { @@ -50,32 +49,32 @@ * Content * @throws Exception */ - public abstract void storeData(FileEntity entity, String field, + public abstract void storeData(LoggableElement entity, String field, InputStream is) throws Exception; /** * Retrieve content * * @param entity - * Entity related to content + * DataEntity related to content * @param field * Unique field for content * @return Content * @throws Exception */ - public abstract InputStream retrieveData(FileEntity entity, String field) + public abstract InputStream retrieveData(LoggableElement entity, String field) throws Exception; /** * Delete content * * @param entity - * Entity related to content + * DataEntity related to content * @param field * Unique field for content * @throws Exception */ - public abstract void deleteData(FileEntity entity, String field) + public abstract void deleteData(LoggableElement entity, String field) throws Exception; }