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

r415 - in trunk: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine
by glandais＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: glandais Date: 2008-01-22 14:12:45 +0000 (Tue, 22 Jan 2008) New Revision: 415 Added: 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/StorageEngineSecuImpl.java Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java Log: StorageEngine interface Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java 2008-01-22 14:11:10 UTC (rev 414) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java 2008-01-22 14:12:45 UTC (rev 415) @@ -31,21 +31,22 @@ import fr.cemagref.simexplorer.is.factories.MetaDataEntityFactory; import fr.cemagref.simexplorer.is.factories.XmlConstants; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; +import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; @Stateless(name = "StorageService") @Remote(StorageService.class) @RemoteBinding(jndiBinding = "StorageService") public class StorageServiceImpl implements StorageService, XmlConstants { - private StorageEngine storageEngine = null; + private StorageEngine storageEngineImpl = null; private static final String KEY_XML = "_xml"; public StorageServiceImpl() { super(); - storageEngine = new StorageEngine(); + storageEngineImpl = new StorageEngineImpl(); try { - storageEngine.open(); + storageEngineImpl.open(); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -53,15 +54,15 @@ } public void open() throws Exception { - storageEngine.open(); + storageEngineImpl.open(); } public void close() throws Exception { - storageEngine.close(); + storageEngineImpl.close(); } public void commit() throws Exception { - storageEngine.commit(); + storageEngineImpl.commit(); } public MetaDataEntity saveElement(RemoteInputStream zipRemoteStream) @@ -84,33 +85,33 @@ } public MetaDataEntity getMetadata(String uuid) throws Exception { - return storageEngine.getMetadata(uuid); + return storageEngineImpl.getMetadata(uuid); } public MetaDataEntity getMetadata(String uuid, String version) throws Exception { - return storageEngine.getMetadata(uuid, new Version(version)); + return storageEngineImpl.getMetadata(uuid, new Version(version)); } public MetaDataEntity[] findFullText(String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws Exception { - return storageEngine.findFullText(query, onlyLatest, indexStart, count, + return storageEngineImpl.findFullText(query, onlyLatest, indexStart, count, dateOrder); } public int findFullTextCount(String query, boolean onlyLatest) throws Exception { - return storageEngine.findFullTextCount(query, onlyLatest); + return storageEngineImpl.findFullTextCount(query, onlyLatest); } public int findApplicationsCount(boolean onlyLatest) throws Exception { - return storageEngine.findElementsByTypeCount(VALUE_METADATA_TYPE_EA, + return storageEngineImpl.findElementsByTypeCount(VALUE_METADATA_TYPE_EA, onlyLatest); } public MetaDataEntity[] findApplications(boolean onlyLatest, int start, int count, int dateOrder) throws Exception { - return storageEngine.findElementsByType(VALUE_METADATA_TYPE_EA, + return storageEngineImpl.findElementsByType(VALUE_METADATA_TYPE_EA, onlyLatest, start, count, dateOrder); } @@ -120,7 +121,7 @@ LoggableElement le = (LoggableElement) BaseEntityFactory.getFactory( LoggableElement.class.getPackage().getName() + "." + mde.getType()) - .loadElement(storageEngine.retrieveData(mde, KEY_XML)); + .loadElement(storageEngineImpl.retrieveData(mde, KEY_XML)); return le; } @@ -136,12 +137,12 @@ if (!entry.isDirectory()) { String entryName = entry.getName(); if (entryName.equals(FILE_XML)) { - xmlFile = storageEngine.storeTempData(zis); + xmlFile = storageEngineImpl.storeTempData(zis); } else { if (entryName.startsWith(FILE_DATA_PREFIX)) { String fileName = entryName.replace(FILE_DATA_PREFIX + "/", ""); - String idFile = storageEngine.storeTempData(zis); + String idFile = storageEngineImpl.storeTempData(zis); attachments.put(fileName, idFile); } } @@ -154,10 +155,10 @@ public MetaDataEntity saveElement(InputStream xmlFile, Map<String, InputStream> attachments) throws Exception { // Store temporary data - String idxml = storageEngine.storeTempData(xmlFile); + String idxml = storageEngineImpl.storeTempData(xmlFile); Map<String, String> idsattachment = new HashMap<String, String>(); for (Map.Entry<String, InputStream> entry : attachments.entrySet()) { - String idattachment = storageEngine.storeTempData(entry.getValue()); + String idattachment = storageEngineImpl.storeTempData(entry.getValue()); idsattachment.put(entry.getKey(), idattachment); } return saveElement(idxml, idsattachment); @@ -166,7 +167,7 @@ public void exportElement(RemoteOutputStream xmlOutputStream, String uuid, String version) throws Exception { MetaDataEntity mde = getMetadata(uuid, version); - InputStream xmlStream = storageEngine.retrieveData(mde, KEY_XML); + InputStream xmlStream = storageEngineImpl.retrieveData(mde, KEY_XML); OutputStream os = RemoteOutputStreamClient.wrap(xmlOutputStream); // Buffer copy stream to stream @@ -196,7 +197,7 @@ MetaDataEntityFactory mdeFactory = (MetaDataEntityFactory) BaseEntityFactory .getFactory(MetaDataEntity.class); MetaDataEntity metaData = mdeFactory - .loadElementFromParentXML(storageEngine.retrieveTempData(idxml)); + .loadElementFromParentXML(storageEngineImpl.retrieveTempData(idxml)); if (metaData.getType() != null && VALUE_METADATA_TYPE_EA.equals(metaData.getType())) { @@ -243,16 +244,16 @@ // Prepare saving Map<String, InputStream> attachments = new HashMap<String, InputStream>(); - attachments.put(KEY_XML, storageEngine.retrieveTempData(idxml)); + attachments.put(KEY_XML, storageEngineImpl.retrieveTempData(idxml)); if (metaData.getType() != null && !VALUE_METADATA_TYPE_EA.equals(metaData.getType())) { for (Map.Entry<String, String> entry : idsattachment.entrySet()) { - attachments.put(entry.getKey(), storageEngine + attachments.put(entry.getKey(), storageEngineImpl .retrieveTempData(entry.getValue())); } } - storageEngine.saveElement(metaData, attachments); - storageEngine.commit(); + storageEngineImpl.saveElement(metaData, attachments); + storageEngineImpl.commit(); return metaData; } @@ -260,7 +261,7 @@ private void processVersionRules(MetaDataEntity metaData) throws Exception { // Check existing version in storage - MetaDataEntity previousVersion = storageEngine.getMetadata(metaData + MetaDataEntity previousVersion = storageEngineImpl.getMetadata(metaData .getUuid(), metaData.getVersion()); /* * MetaDataEntity parentData = storageEngine.getElementVersion(metaData @@ -287,7 +288,7 @@ .getFactory(MetaDataEntity.class); Document document = BaseEntityFactory.getXMLBuilder().parse( - storageEngine.retrieveTempData(idxml)); + storageEngineImpl.retrieveTempData(idxml)); Element rootElement = (Element) document.getFirstChild(); @@ -298,7 +299,7 @@ .getXMLElementsByTagName(componentsElement, KEY_EXPLORATIONAPPLICATION_COMPONENT_NODE); for (Element element : componentElements) { - components.add(storageEngine.storeTempData(elementFactory + components.add(storageEngineImpl.storeTempData(elementFactory .serializeElement(element))); } @@ -322,7 +323,7 @@ } else { explorationDataArray = new String[1]; } - explorationDataArray[0] = storageEngine + explorationDataArray[0] = storageEngineImpl .storeTempData(elementFactory.serializeElement(elementAD)); explorationDatas.add(explorationDataArray); Copied: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java (from rev 288, 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 (rev 0) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-01-22 14:12:45 UTC (rev 415) @@ -0,0 +1,248 @@ +package fr.cemagref.simexplorer.is.storage.engine; + +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +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.Version; +import fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler; +import fr.cemagref.simexplorer.is.storage.attachment.FileSystemAttachmentHandler; +import fr.cemagref.simexplorer.is.storage.database.Database; +import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; + +/** + * Handle data storage and indexing + * + * @author landais + * + */ +public class StorageEngineImpl implements StorageEngine { + + /** + * Indexing + */ + protected Database database; + + /** + * Storage + */ + protected AttachmentHandler attachmentHandler; + + /** + * Metadata handling temporary data + */ + private MetaDataEntity mdTmp; + + /** + * Default constructor with default implementations of storage and indexing + */ + public StorageEngineImpl() { + super(); + // Indexing + database = new LuceneDatabase(); + // Storage + attachmentHandler = new FileSystemAttachmentHandler(); + // Storing tmp data + mdTmp = new MetaDataEntity(); + mdTmp.setUuid(UUID.randomUUID().toString()); + mdTmp.setVersion("0"); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#open() + */ + public void open() throws Exception { + database.open(); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#close() + */ + public void close() throws Exception { + database.close(); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#commit() + */ + public void commit() throws Exception { + database.commit(); + } + + // Create / update + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#saveElement(fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity, java.util.Map) + */ + public void saveElement(MetaDataEntity element, + Map<String, InputStream> attachments) throws Exception { + + // Save all attachments in system + for (Map.Entry<String, InputStream> entry : attachments.entrySet()) { + attachmentHandler.storeData(element, entry.getKey(), entry + .getValue()); + } + + // Parse all attachments for indexing + List<Reader> readers = new ArrayList<Reader>(); + for (Map.Entry<String, InputStream> entry : attachments.entrySet()) { + String field = entry.getKey(); + InputStream content = attachmentHandler + .retrieveData(element, field); + if (element.getAttachments() != null) { + ContentType contentType = element.getAttachments().get(field); + if (contentType != null) { + // Transform stream into indexable text + Reader reader = contentType.renderToText(content); + readers.add(reader); + } + } + } + + if (element.getName() != null) { + Reader reader = new StringReader(element.getName()); + readers.add(reader); + } + if (element.getDescription() != null) { + Reader reader = new StringReader(element.getDescription()); + readers.add(reader); + } + + // Insert element in database + database.insertElement(element, readers); + } + + // Read + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#getMetadata(java.lang.String) + */ + public MetaDataEntity getMetadata(String uuid) throws Exception { + MetaDataEntity mde = null; + Set<MetaDataEntity> set = database.findElementsById(uuid, true); + if (!set.isEmpty()) { + mde = set.iterator().next(); + } + return mde; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#getVersions(java.lang.String) + */ + public List<Version> getVersions(String uuid) throws Exception { + return database.getVersions(uuid); + } + + /* (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 uuid, Version version) + throws Exception { + MetaDataEntity 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) + */ + public InputStream retrieveData(MetaDataEntity entity, String field) + throws Exception { + InputStream result = attachmentHandler.retrieveData(entity, field); + return result; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#findFullTextCount(java.lang.String, boolean) + */ + public int findFullTextCount(String query, boolean onlyLatest) + throws Exception { + return database.findElementsByContentSearchCount(query, onlyLatest); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#findFullText(java.lang.String, boolean, int, int, int) + */ + public MetaDataEntity[] findFullText(String query, boolean onlyLatest, + int indexStart, int count, int dateOrder) throws Exception { + MetaDataEntity[] result = database.findElementsByContentSearch(query, + onlyLatest, indexStart, count, dateOrder).toArray( + new MetaDataEntity[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 type, boolean onlyLatest, + int start, int count, int dateOrder) throws Exception { + MetaDataEntity[] result = database.findElementsByType(type, onlyLatest, + start, count, dateOrder).toArray(new MetaDataEntity[0]); + return result; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#findElementsByTypeCount(java.lang.String, boolean) + */ + public int findElementsByTypeCount(String type, boolean onlyLatest) + throws Exception { + return database.findElementsByTypeCount(type, onlyLatest); + } + + // Delete + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#deleteElements(java.lang.String) + */ + public void deleteElements(String uuid) throws Exception { + List<Version> versions = getVersions(uuid); + for (Version version : versions) { + deleteElement(uuid, version); + } + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#deleteElement(java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.Version) + */ + public void deleteElement(String uuid, Version version) throws Exception { + MetaDataEntity element = getMetadata(uuid, version); + Map<String, ContentType> attachments = element.getAttachments(); + for (Map.Entry<String, ContentType> entry : attachments.entrySet()) { + attachmentHandler.deleteData(element, entry.getKey()); + } + database.deleteElement(element); + } + + // Tools + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#storeTempData(java.io.InputStream) + */ + public String storeTempData(InputStream stream) throws Exception { + String id = UUID.randomUUID().toString(); + attachmentHandler.storeData(mdTmp, id, stream); + return id; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#retrieveTempData(java.lang.String) + */ + public InputStream retrieveTempData(String id) throws Exception { + InputStream is = attachmentHandler.retrieveData(mdTmp, id); + return is; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#deleteTempData(java.lang.String) + */ + public void deleteTempData(String id) throws Exception { + attachmentHandler.deleteData(mdTmp, id); + } + +} Added: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java (rev 0) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-01-22 14:12:45 UTC (rev 415) @@ -0,0 +1,105 @@ +package fr.cemagref.simexplorer.is.storage.engine; + +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + +public class StorageEngineSecuImpl extends StorageEngineImpl { + + @Override + public void deleteElement(String uuid, Version version) throws Exception { + // TODO Auto-generated method stub + super.deleteElement(uuid, version); + } + + @Override + public void deleteElements(String uuid) throws Exception { + // TODO Auto-generated method stub + super.deleteElements(uuid); + } + + @Override + public void deleteTempData(String id) throws Exception { + // TODO Auto-generated method stub + super.deleteTempData(id); + } + + @Override + public MetaDataEntity[] findElementsByType(String type, boolean onlyLatest, + int start, int count, int dateOrder) throws Exception { + // TODO Auto-generated method stub + return super.findElementsByType(type, onlyLatest, start, count, + dateOrder); + } + + @Override + public int findElementsByTypeCount(String type, boolean onlyLatest) + throws Exception { + // TODO Auto-generated method stub + return super.findElementsByTypeCount(type, onlyLatest); + } + + @Override + public MetaDataEntity[] findFullText(String query, boolean onlyLatest, + int indexStart, int count, int dateOrder) throws Exception { + // TODO Auto-generated method stub + return super.findFullText(query, onlyLatest, indexStart, count, + dateOrder); + } + + @Override + public int findFullTextCount(String query, boolean onlyLatest) + throws Exception { + // TODO Auto-generated method stub + return super.findFullTextCount(query, onlyLatest); + } + + @Override + public MetaDataEntity getMetadata(String uuid, Version version) + throws Exception { + // TODO Auto-generated method stub + return super.getMetadata(uuid, version); + } + + @Override + public MetaDataEntity getMetadata(String uuid) throws Exception { + // TODO Auto-generated method stub + return super.getMetadata(uuid); + } + + @Override + public List<Version> getVersions(String uuid) throws Exception { + // TODO Auto-generated method stub + return super.getVersions(uuid); + } + + @Override + public InputStream retrieveData(MetaDataEntity entity, String field) + throws Exception { + // TODO Auto-generated method stub + return super.retrieveData(entity, field); + } + + @Override + public InputStream retrieveTempData(String id) throws Exception { + // TODO Auto-generated method stub + return super.retrieveTempData(id); + } + + @Override + public void saveElement(MetaDataEntity element, + Map<String, InputStream> attachments) throws Exception { + // TODO Auto-generated method stub + super.saveElement(element, attachments); + } + + @Override + public String storeTempData(InputStream stream) throws Exception { + // TODO Auto-generated method stub + return super.storeTempData(stream); + } + +}

1 0

r414 - trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine
by glandais＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: glandais Date: 2008-01-22 14:11:10 +0000 (Tue, 22 Jan 2008) New Revision: 414 Added: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java Log: Added: 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 (rev 0) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-01-22 14:11:10 UTC (rev 414) @@ -0,0 +1,189 @@ +package fr.cemagref.simexplorer.is.storage.engine; + +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + +public interface StorageEngine { + + /** + * Open storage + * + * @throws Exception + */ + public abstract void open() throws Exception; + + /** + * Close storage + * + * @throws Exception + */ + public abstract void close() throws Exception; + + /** + * Commit changes to storage + * + * @throws Exception + */ + public abstract void commit() throws Exception; + + /** + * Save an element to storage + * + * @param element + * Element to save + * @param attachments + * Attachments related + * @throws Exception + */ + public abstract void saveElement(MetaDataEntity element, + Map<String, InputStream> attachments) throws Exception; + + /** + * Retrieve an element + * + * @param uuid + * Id of the element + * @return The element + * @throws Exception + */ + public abstract MetaDataEntity getMetadata(String uuid) throws Exception; + + /** + * Retrieve versions of an element<br> + * Empty list if no element with this id + * + * @param uuid + * Id of the element + * @return List of versions of the element<br> + * + * @throws Exception + */ + public abstract List<Version> getVersions(String uuid) throws Exception; + + /** + * Retrieve an element in a specific version + * + * @param uuid + * @param version + * @return + * @throws Exception + */ + public abstract MetaDataEntity getMetadata(String uuid, Version version) + throws Exception; + + /** + * Get data associated to an element + * + * @param entity + * Element related + * @param field + * Data field + * @return Data stream + * @throws Exception + */ + public abstract InputStream retrieveData(MetaDataEntity entity, String field) + throws Exception; + + /** + * Get number of items corresponding to query + * + * @param query + * @param onlyLatest + * @return + * @throws Exception + */ + public abstract int findFullTextCount(String query, boolean onlyLatest) + throws Exception; + + /** + * Retrieve list of items corresponding to query + * + * @param query + * @param onlyLatest + * @param indexStart + * @param count + * @param dateOrder + * @return + * @throws Exception + */ + public abstract MetaDataEntity[] findFullText(String query, + boolean onlyLatest, int indexStart, int count, int dateOrder) + throws Exception; + + /** + * Retrieve list of items of type wanted + * + * @param type + * @param onlyLatest + * @param start + * @param count + * @param dateOrder + * @return + * @throws Exception + */ + public abstract MetaDataEntity[] findElementsByType(String type, + boolean onlyLatest, int start, int count, int dateOrder) + throws Exception; + + /** + * Retrieve number of items of type wanted + * + * @param type + * @param onlyLatest + * @return + * @throws Exception + */ + public abstract int findElementsByTypeCount(String type, boolean onlyLatest) + throws Exception; + + /** + * Delete elements + * + * @param uuid + * @throws Exception + */ + public abstract void deleteElements(String uuid) throws Exception; + + /** + * Delete one element + * + * @param uuid + * @param version + * @throws Exception + */ + public abstract void deleteElement(String uuid, Version version) + throws Exception; + + /** + * Store temporary data, for stream duplication + * + * @param stream + * Stream to store + * @return id for retrieval + * @throws Exception + */ + public abstract String storeTempData(InputStream stream) throws Exception; + + /** + * Retrieve temporary data + * + * @param id + * Id associated + * @return Data stream + * @throws Exception + */ + public abstract InputStream retrieveTempData(String id) throws Exception; + + /** + * Delete temporary data + * + * @param id + * @throws Exception + */ + public abstract void deleteTempData(String id) throws Exception; + +} \ No newline at end of file

1 0

r413 - trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine
by glandais＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: glandais Date: 2008-01-22 14:11:00 +0000 (Tue, 22 Jan 2008) New Revision: 413 Removed: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java Log: Deleted: 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-01-22 14:09:33 UTC (rev 412) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-01-22 14:11:00 UTC (rev 413) @@ -1,330 +0,0 @@ -package fr.cemagref.simexplorer.is.storage.engine; - -import java.io.InputStream; -import java.io.Reader; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -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.Version; -import fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler; -import fr.cemagref.simexplorer.is.storage.attachment.FileSystemAttachmentHandler; -import fr.cemagref.simexplorer.is.storage.database.Database; -import fr.cemagref.simexplorer.is.storage.database.lucene.LuceneDatabase; - -/** - * Handle data storage and indexing - * - * @author landais - * - */ -public class StorageEngine { - - /** - * Indexing - */ - protected Database database; - - /** - * Storage - */ - protected AttachmentHandler attachmentHandler; - - /** - * Metadata handling temporary data - */ - private MetaDataEntity mdTmp; - - /** - * Default constructor with default implementations of storage and indexing - */ - public StorageEngine() { - super(); - // Indexing - database = new LuceneDatabase(); - // Storage - attachmentHandler = new FileSystemAttachmentHandler(); - // Storing tmp data - mdTmp = new MetaDataEntity(); - mdTmp.setUuid(UUID.randomUUID().toString()); - mdTmp.setVersion("0"); - } - - /** - * Open storage - * - * @throws Exception - */ - public void open() throws Exception { - database.open(); - } - - /** - * Close storage - * - * @throws Exception - */ - public void close() throws Exception { - database.close(); - } - - /** - * Commit changes to storage - * - * @throws Exception - */ - public void commit() throws Exception { - database.commit(); - } - - // Create / update - - /** - * Save an element to storage - * - * @param element - * Element to save - * @param attachments - * Attachments related - * @throws Exception - */ - public void saveElement(MetaDataEntity element, - Map<String, InputStream> attachments) throws Exception { - - // Save all attachments in system - for (Map.Entry<String, InputStream> entry : attachments.entrySet()) { - attachmentHandler.storeData(element, entry.getKey(), entry - .getValue()); - } - - // Parse all attachments for indexing - List<Reader> readers = new ArrayList<Reader>(); - for (Map.Entry<String, InputStream> entry : attachments.entrySet()) { - String field = entry.getKey(); - InputStream content = attachmentHandler - .retrieveData(element, field); - if (element.getAttachments() != null) { - ContentType contentType = element.getAttachments().get(field); - if (contentType != null) { - // Transform stream into indexable text - Reader reader = contentType.renderToText(content); - readers.add(reader); - } - } - } - - if (element.getName() != null) { - Reader reader = new StringReader(element.getName()); - readers.add(reader); - } - if (element.getDescription() != null) { - Reader reader = new StringReader(element.getDescription()); - readers.add(reader); - } - - // Insert element in database - database.insertElement(element, readers); - } - - // Read - - /** - * Retrieve an element - * - * @param uuid - * Id of the element - * @return The element - * @throws Exception - */ - public MetaDataEntity getMetadata(String uuid) throws Exception { - MetaDataEntity mde = null; - Set<MetaDataEntity> set = database.findElementsById(uuid, true); - if (!set.isEmpty()) { - mde = set.iterator().next(); - } - return mde; - } - - /** - * Retrieve versions of an element<br> - * Empty list if no element with this id - * - * @param uuid - * Id of the element - * @return List of versions of the element<br> - * - * @throws Exception - */ - public List<Version> getVersions(String uuid) throws Exception { - return database.getVersions(uuid); - } - - /** - * Retrieve an element in a specific version - * - * @param uuid - * @param version - * @return - * @throws Exception - */ - public MetaDataEntity getMetadata(String uuid, Version version) - throws Exception { - MetaDataEntity mde = database.getElement(uuid, version); - return mde; - } - - /** - * Get data associated to an element - * - * @param entity - * Element related - * @param field - * Data field - * @return Data stream - * @throws Exception - */ - public InputStream retrieveData(MetaDataEntity entity, String field) - throws Exception { - InputStream result = attachmentHandler.retrieveData(entity, field); - return result; - } - - /** - * Get number of items corresponding to query - * - * @param query - * @param onlyLatest - * @return - * @throws Exception - */ - public int findFullTextCount(String query, boolean onlyLatest) - throws Exception { - return database.findElementsByContentSearchCount(query, onlyLatest); - } - - /** - * Retrieve list of items corresponding to query - * - * @param query - * @param onlyLatest - * @param indexStart - * @param count - * @param dateOrder - * @return - * @throws Exception - */ - public MetaDataEntity[] findFullText(String query, boolean onlyLatest, - int indexStart, int count, int dateOrder) throws Exception { - MetaDataEntity[] result = database.findElementsByContentSearch(query, - onlyLatest, indexStart, count, dateOrder).toArray( - new MetaDataEntity[0]); - return result; - } - - /** - * Retrieve list of items of type wanted - * - * @param type - * @param onlyLatest - * @param start - * @param count - * @param dateOrder - * @return - * @throws Exception - */ - public MetaDataEntity[] findElementsByType(String type, boolean onlyLatest, - int start, int count, int dateOrder) throws Exception { - MetaDataEntity[] result = database.findElementsByType(type, onlyLatest, - start, count, dateOrder).toArray(new MetaDataEntity[0]); - return result; - } - - /** - * Retrieve number of items of type wanted - * - * @param type - * @param onlyLatest - * @return - * @throws Exception - */ - public int findElementsByTypeCount(String type, boolean onlyLatest) - throws Exception { - return database.findElementsByTypeCount(type, onlyLatest); - } - - // Delete - - /** - * Delete elements - * - * @param uuid - * @throws Exception - */ - public void deleteElements(String uuid) throws Exception { - List<Version> versions = getVersions(uuid); - for (Version version : versions) { - deleteElement(uuid, version); - } - } - - /** - * Delete one element - * - * @param uuid - * @param version - * @throws Exception - */ - public void deleteElement(String uuid, Version version) throws Exception { - MetaDataEntity element = getMetadata(uuid, version); - Map<String, ContentType> attachments = element.getAttachments(); - for (Map.Entry<String, ContentType> entry : attachments.entrySet()) { - attachmentHandler.deleteData(element, entry.getKey()); - } - database.deleteElement(element); - } - - // Tools - - /** - * Store temporary data, for stream duplication - * - * @param stream - * Stream to store - * @return id for retrieval - * @throws Exception - */ - public String storeTempData(InputStream stream) throws Exception { - String id = UUID.randomUUID().toString(); - attachmentHandler.storeData(mdTmp, id, stream); - return id; - } - - /** - * Retrieve temporary data - * - * @param id - * Id associated - * @return Data stream - * @throws Exception - */ - public InputStream retrieveTempData(String id) throws Exception { - InputStream is = attachmentHandler.retrieveData(mdTmp, id); - return is; - } - - /** - * Delete temporary data - * - * @param id - * @throws Exception - */ - public void deleteTempData(String id) throws Exception { - attachmentHandler.deleteData(mdTmp, id); - } - -}

1 0

r412 - in trunk: simexplorer-is-security/src/java/META-INF simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/
by glandais＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: glandais Date: 2008-01-22 14:09:33 +0000 (Tue, 22 Jan 2008) New Revision: 412 Added: trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java Modified: trunk/simexplorer-is-security/src/java/META-INF/orm.xml trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java Log: User/group edit Logon timeout Modified: trunk/simexplorer-is-security/src/java/META-INF/orm.xml =================================================================== --- trunk/simexplorer-is-security/src/java/META-INF/orm.xml 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-security/src/java/META-INF/orm.xml 2008-01-22 14:09:33 UTC (rev 412) @@ -17,7 +17,7 @@ <id name="id"> <generated-value strategy="SEQUENCE" /> </id> - <many-to-many name="groups" target-entity="Group"> + <many-to-many name="groups" target-entity="Group" fetch="EAGER"> <cascade> <cascade-all /> </cascade> Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-22 14:09:33 UTC (rev 412) @@ -6,6 +6,7 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.LoginAction; import fr.cemagref.simexplorer.is.security.entities.User; @@ -102,35 +103,44 @@ } public List<Group> getGroups() { - return em.createQuery("select g from Group g").getResultList(); + List<Group> groups = em.createQuery("select g from Group g") + .getResultList(); + return groups; } public List<Group> getGroupsOwnedBy(User user) { - return em.createQuery("select g from Group g where g.owner=:owner") - .setParameter("owner", user).getResultList(); + List<Group> groups = em.createQuery( + "select g from Group g where g.owner=:owner").setParameter( + "owner", user).getResultList(); + return groups; } public List<User> getUsers() { - return em.createQuery("select u from User u").getResultList(); + List<User> users = em.createQuery("select u from User u") + .getResultList(); + return users; } public List<User> getUsersOfGroup(Group group) { - return em + List<User> users = em .createQuery( "select distinct u from User u where :group member of u.groups") .setParameter("group", group).getResultList(); + return users; } public List<Group> getGroupsOfUser(User user) { - return em.createQuery( + List<Group> groups = em.createQuery( "select distinct u.groups from User u where u = :user") .setParameter("user", user).getResultList(); + return groups; } public List<Group> getGroupsOfGroup(Group group) { - return em.createQuery( + List<Group> groups = em.createQuery( "select distinct g.groups from Group g where g = :group") .setParameter("group", group).getResultList(); + return groups; } } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-01-22 14:09:33 UTC (rev 412) @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; public class Actor implements Serializable { @@ -31,4 +32,67 @@ this.groups = groups; } + private int hashCodeGroups(List<Group> groups) { + final int prime = 31; + int result = 1; + result = prime * result + groups.size(); + for (Group group : groups) { + result = prime * result + ((group == null) ? 0 : group.hashCode()); + } + return result; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + hashCodeGroups(groups); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + return result; + } + + private boolean equalsGroups(List<Group> groups1, List<Group> groups2) { + if (groups1 == groups2) + return true; + if (groups2 == null) + return false; + if (groups1.size() != groups2.size()) { + return false; + } + Iterator<Group> iterator2 = groups2.iterator(); + for (Iterator<Group> iterator1 = groups1.iterator(); iterator1 + .hasNext();) { + Group group1 = iterator1.next(); + Group group2 = iterator2.next(); + if (group1 == null) { + if (group2 != null) + return false; + } else if (!group1.equals(group2)) + return false; + } + return true; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final Actor other = (Actor) obj; + if (groups == null) { + if (other.groups != null) + return false; + } else if (!equalsGroups(groups, other.groups)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + return true; + } + } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-01-22 14:09:33 UTC (rev 412) @@ -30,8 +30,9 @@ @Override public int hashCode() { final int prime = 31; - int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); + int result = super.hashCode(); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((owner == null) ? 0 : owner.hashCode()); return result; } @@ -39,17 +40,22 @@ public boolean equals(Object obj) { if (this == obj) return true; - if (obj == null) + if (!super.equals(obj)) return false; if (getClass() != obj.getClass()) return false; - final Actor other = (Actor) obj; - if (id == null) { - if (other.id != null) + final Group other = (Group) obj; + if (name == null) { + if (other.name != null) return false; - } else if (!id.equals(other.id)) + } else if (!name.equals(other.name)) return false; + if (owner == null) { + if (other.owner != null) + return false; + } else if (!owner.equals(other.owner)) + return false; return true; } - + } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-01-22 14:09:33 UTC (rev 412) @@ -57,8 +57,13 @@ @Override public int hashCode() { final int prime = 31; - int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); + int result = super.hashCode(); + result = prime * result + (admin ? 1231 : 1237); + result = prime * result + ((login == null) ? 0 : login.hashCode()); + result = prime * result + ((mail == null) ? 0 : mail.hashCode()); + result = prime * result + + ((passwordHash == null) ? 0 : passwordHash.hashCode()); + result = prime * result + (superAdmin ? 1231 : 1237); return result; } @@ -66,17 +71,31 @@ public boolean equals(Object obj) { if (this == obj) return true; - if (obj == null) + if (!super.equals(obj)) return false; if (getClass() != obj.getClass()) return false; - final Actor other = (Actor) obj; - if (id == null) { - if (other.id != null) + final User other = (User) obj; + if (admin != other.admin) + return false; + if (login == null) { + if (other.login != null) return false; - } else if (!id.equals(other.id)) + } else if (!login.equals(other.login)) return false; + if (mail == null) { + if (other.mail != null) + return false; + } else if (!mail.equals(other.mail)) + return false; + if (passwordHash == null) { + if (other.passwordHash != null) + return false; + } else if (!passwordHash.equals(other.passwordHash)) + return false; + if (superAdmin != other.superAdmin) + return false; return true; } - + } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationService.java 2008-01-22 14:09:33 UTC (rev 412) @@ -54,6 +54,8 @@ public String loginUser(String login, String password); + public void closeSessionTimer(String token); + public User getLoggedUser(String token); } Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-22 14:09:33 UTC (rev 412) @@ -153,13 +153,16 @@ loginAction.setToken(UUID.randomUUID().toString()); dao.saveToken(loginAction); token = loginAction.getToken(); - // FIXME session length - TimerService timerService = sessionContext.getTimerService(); - //timerService.createTimer(10 * 60 * 1000, token); } return token; } + public void closeSessionTimer(String token) { + // FIXME session length + TimerService timerService = sessionContext.getTimerService(); + timerService.createTimer(10 * 60 * 1000, token); + } + @Timeout public void timeoutHandler(Timer timer) { String token = (String) timer.getInfo(); Added: trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java =================================================================== --- trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java (rev 0) +++ trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java 2008-01-22 14:09:33 UTC (rev 412) @@ -0,0 +1,42 @@ +package fr.cemagref.simexplorer.is.security.test; + +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; + +import junit.framework.TestCase; +import fr.cemagref.simexplorer.is.security.entities.User; +import fr.cemagref.simexplorer.is.security.service.AuthenticationService; + +public class SecurityEqualsTestCase extends TestCase { + + AuthenticationService authenticationService = null; + + protected void setUp() throws Exception { + super.setUp(); + Properties properties = (Properties) System.getProperties().clone(); + properties.put("java.naming.provider.url", "jnp://localhost:1099"); + properties.put("java.naming.factory.initial", + "org.jnp.interfaces.NamingContextFactory"); + properties.put("java.naming.factory.url.pkgs", "org.jnp.interfaces"); + + Context context = new InitialContext(properties); + authenticationService = (AuthenticationService) context + .lookup("AuthenticationService"); + + } + + public void testHashCode() { + User[] users1 = authenticationService.getUsers(); + User[] users2 = authenticationService.getUsers(); + for (int i = 0; i < users1.length; i++) { + User user1 = users1[i]; + User user2 = users2[i]; + System.out.println("User " + i + " :"); + System.out.println(user1.hashCode() + " " + user2.hashCode()); + System.out.println(user1.equals(user2)); + } + } + +} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-01-22 14:09:33 UTC (rev 412) @@ -42,14 +42,14 @@ this.group = new Group(); this.group.setOwner(getUserLogged()); } else { - this.group = RemoteSecurityService.getSecurityService().getGroup( + this.group = RemoteSecurityService.getAuthentificationService().getGroup( groupId); - User[] users = RemoteSecurityService.getSecurityService() + User[] users = RemoteSecurityService.getAuthentificationService() .getUsersOfGroup(group); this.usersInGroup.addAll(Arrays.asList(users)); - Group[] groups = RemoteSecurityService.getSecurityService() + Group[] groups = RemoteSecurityService.getAuthentificationService() .getGroupsOfGroup(group); this.groupsInGroup.addAll(Arrays.asList(groups)); } @@ -57,10 +57,10 @@ public Object onSuccess() throws Exception { if (group.getId() == null) { - group = RemoteSecurityService.getSecurityService().saveGroup( + group = RemoteSecurityService.getAuthentificationService().saveGroup( group.getName(), getUserLogged()); } else { - group = RemoteSecurityService.getSecurityService().updateGroup( + group = RemoteSecurityService.getAuthentificationService().updateGroup( group); } @@ -70,7 +70,7 @@ usersIds[i] = user.getId(); i++; } - RemoteSecurityService.getSecurityService().setUsersOfGroup(group, + RemoteSecurityService.getAuthentificationService().setUsersOfGroup(group, usersIds); Integer[] groupsIds = new Integer[groupsInGroup.size()]; @@ -79,7 +79,7 @@ groupsIds[i] = group.getId(); i++; } - RemoteSecurityService.getSecurityService().setGroupsOfGroup(group, + RemoteSecurityService.getAuthentificationService().setGroupsOfGroup(group, groupsIds); return groupList; @@ -90,14 +90,14 @@ } public List<User> getUsers() throws Exception { - User[] users = RemoteSecurityService.getSecurityService().getUsers(); + User[] users = RemoteSecurityService.getAuthentificationService().getUsers(); List<User> result = new ArrayList<User>(); result.addAll(Arrays.asList(users)); return result; } public List<Group> getGroups() throws Exception { - Group[] groups = RemoteSecurityService.getSecurityService().getGroups(); + Group[] groups = RemoteSecurityService.getAuthentificationService().getGroups(); List<Group> result = new ArrayList<Group>(); result.addAll(Arrays.asList(groups)); return result; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-01-22 14:09:33 UTC (rev 412) @@ -47,16 +47,16 @@ public Group[] getGroups() throws Exception { Group[] groups; if (isUserSuperAdmin()) { - groups = RemoteSecurityService.getSecurityService().getGroups(); + groups = RemoteSecurityService.getAuthentificationService().getGroups(); } else { - groups = RemoteSecurityService.getSecurityService() + groups = RemoteSecurityService.getAuthentificationService() .getGroupsOwnedBy(getUserLogged()); } return groups; } public Object onActionFromDelete(Integer context) throws Exception { - RemoteSecurityService.getSecurityService().deleteGroup(context); + RemoteSecurityService.getAuthentificationService().deleteGroup(context); return null; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-01-22 14:09:33 UTC (rev 412) @@ -21,9 +21,10 @@ public Object onSuccess() throws Exception { Object result = null; - token = RemoteSecurityService.getSecurityService().loginUser(user, + token = RemoteSecurityService.getAuthentificationService().loginUser(user, password); if (token != null) { + RemoteSecurityService.getAuthentificationService().closeSessionTimer(token); result = elementList; } return result; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-01-22 14:09:33 UTC (rev 412) @@ -32,9 +32,9 @@ if (groupId == -1) { this.user = new User(); } else { - this.user = RemoteSecurityService.getSecurityService().getUser( + this.user = RemoteSecurityService.getAuthentificationService().getUser( groupId); - Group[] groups = RemoteSecurityService.getSecurityService() + Group[] groups = RemoteSecurityService.getAuthentificationService() .getGroupsOfUser(this.user); groupsOfUser.addAll(Arrays.asList(groups)); } @@ -43,10 +43,10 @@ public Object onSuccess() throws Exception { if (user.getId() == null) { - user = RemoteSecurityService.getSecurityService().saveUser( + user = RemoteSecurityService.getAuthentificationService().saveUser( user.getLogin(), user.getMail()); } else { - user = RemoteSecurityService.getSecurityService().updateUser(user); + user = RemoteSecurityService.getAuthentificationService().updateUser(user); } Integer[] groupsIds = new Integer[groupsOfUser.size()]; @@ -55,14 +55,14 @@ groupsIds[i] = group.getId(); i++; } - RemoteSecurityService.getSecurityService().setGroupsOfUser(user, + RemoteSecurityService.getAuthentificationService().setGroupsOfUser(user, groupsIds); return userList; } public List<Group> getGroups() throws Exception { - Group[] groups = RemoteSecurityService.getSecurityService().getGroups(); + Group[] groups = RemoteSecurityService.getAuthentificationService().getGroups(); List<Group> result = new ArrayList<Group>(); result.addAll(Arrays.asList(groups)); return result; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-01-22 14:09:33 UTC (rev 412) @@ -50,12 +50,12 @@ public User[] getUsers() throws Exception { User[] users; - users = RemoteSecurityService.getSecurityService().getUsers(); + users = RemoteSecurityService.getAuthentificationService().getUsers(); return users; } public Object onActionFromDelete(Integer context) throws Exception { - RemoteSecurityService.getSecurityService().deleteUser(context); + RemoteSecurityService.getAuthentificationService().deleteUser(context); return null; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-22 14:09:33 UTC (rev 412) @@ -21,7 +21,7 @@ User loggedUser = null; if (token != null) { try { - loggedUser = RemoteSecurityService.getSecurityService().getLoggedUser( + loggedUser = RemoteSecurityService.getAuthentificationService().getLoggedUser( token); } catch (Exception e) { // TODO: handle exception Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java 2008-01-22 14:09:33 UTC (rev 412) @@ -13,7 +13,7 @@ public Group toValue(String arg0) { Group group = null; try { - group = RemoteSecurityService.getSecurityService().getGroup(Integer.decode(arg0)); + group = RemoteSecurityService.getAuthentificationService().getGroup(Integer.decode(arg0)); } catch (Exception e) { // TODO: handle exception } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteSecurityService.java 2008-01-22 14:09:33 UTC (rev 412) @@ -4,7 +4,8 @@ public class RemoteSecurityService extends RemoteService { - public static AuthenticationService getSecurityService() throws Exception { + public static AuthenticationService getAuthentificationService() + throws Exception { return (AuthenticationService) getService("AuthenticationService"); } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java 2008-01-22 12:56:16 UTC (rev 411) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/UserValueEncoder.java 2008-01-22 14:09:33 UTC (rev 412) @@ -13,7 +13,7 @@ public User toValue(String arg0) { User user = null; try { - user = RemoteSecurityService.getSecurityService().getUser( + user = RemoteSecurityService.getAuthentificationService().getUser( Integer.decode(arg0)); } catch (Exception e) { // TODO: handle exception

1 0

r411 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 12:56:16 +0000 (Tue, 22 Jan 2008) New Revision: 411 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: suppression uuid dans i18n Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-22 12:55:35 UTC (rev 410) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-22 12:56:16 UTC (rev 411) @@ -1,4 +1,4 @@ -#Tue Jan 22 06:44:17 GMT 2008 +#Tue Jan 22 12:48:42 GMT 2008 simexplorer.action.about=About simexplorer.action.about.help= simexplorer.action.about.tooltip=Show About dialog @@ -110,7 +110,6 @@ simexplorer.common.ok=ok simexplorer.common.reset=reset simexplorer.common.type=type -simexplorer.common.uuid=uuid simexplorer.common.version=version simexplorer.config.i18n.menu=Language simexplorer.config.main.backupDirectory.description=Directory to put all SimExplorer backup files Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-22 12:55:35 UTC (rev 410) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-22 12:56:16 UTC (rev 411) @@ -1,4 +1,4 @@ -#Tue Jan 22 06:44:17 GMT 2008 +#Tue Jan 22 12:48:42 GMT 2008 simexplorer.action.about=A propos simexplorer.action.about.help= simexplorer.action.about.tooltip=Afficher les cr\u00E9dits @@ -110,7 +110,6 @@ simexplorer.common.ok=appliquer simexplorer.common.reset=r\u00E9initialiser simexplorer.common.type=type -simexplorer.common.uuid=uuid simexplorer.common.version=version simexplorer.config.i18n.menu=Langue simexplorer.config.main.backupDirectory.description=le r\u00E9pertoire des sauvegardes

1 0

r410 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . action/application action/tab model
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 12:55:35 +0000 (Tue, 22 Jan 2008) New Revision: 410 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.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/model/DetailTabModel.java Log: ajout listener sur le tableau : quand on double click, on affiche le d?\195?\169tail de l'application (dans l'unique onglet r?\195?\169serv?\195?\169 ?\195?\160 cette effet) ajout m?\195?\169thode de refresh ui pour le tab de detail ajout de deux propri?\195?\169t?\195?\169s dans le model de d?\195?\169tail pour conserver le temps du chargement du tab de la position de l'application ?\195?\160 affichier dans la liste ajout code de l'action d'affichage du tab de d?\195?\169tail Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 12:52:19 UTC (rev 409) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-22 12:55:35 UTC (rev 410) @@ -20,8 +20,10 @@ import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import org.codelutin.i18n.CountryEnum; import org.codelutin.i18n.LanguageEnum; @@ -64,6 +66,21 @@ } } + public void refreshDetailTabUI(final DetailTabModel model, final JApplicationDetailTab ui) { + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + ui.getTree().setToolTipText(model.getUuid()+" version "+model.getVersion()+" remote ?"+model.isRemote()); + + // tree data model may have changed, must revalidate + ui.getTree().invalidate(); + + // parent must be repaint (will revalidate layout for tree) + ui.repaint(); + } + }); + } + public void refreshListTabUI(final ListTabModel model, final JApplicationListTab ui) { SwingUtilities.invokeLater(new Runnable() { @@ -89,7 +106,7 @@ protected void refreshPagination(JApplicationListTab ui, PaginationModel pagination) { int page = pagination.getCurrentPage(); - boolean notLast = page + 1 < pagination.getNbPages(); + boolean notLast = page + 1 < pagination.getNbPages(); ui.getGoNextPage().setEnabled(notLast); ui.getGoLastPage().setEnabled(notLast); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-01-22 12:52:19 UTC (rev 409) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabFactory.java 2008-01-22 12:55:35 UTC (rev 410) @@ -20,6 +20,8 @@ import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabContentConfig; @@ -29,7 +31,10 @@ import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.AbstractAction; import java.awt.Component; +import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.lang.reflect.Field; @@ -60,6 +65,27 @@ protected void initTab(JComponent tab, String tabName, TabContentConfig config) { SimExplorerActionManager.loadActions((JAXXObject) tab, getTab(tabName)); + final SimExplorerTab def = getTab(tabName); + if (def == SimExplorerTab.local || def == SimExplorerTab.remote) { + // add a mouse listener on table + final JApplicationListTab comp = (JApplicationListTab) tab; + + comp.getTable().addMouseListener(new MouseAdapter() { + AbstractAction detailAction = SimExplorerActionManager.newAction("showTab_detail", (AbstractButton) null); + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + JTable table = (JTable) e.getSource(); + int selectRow = table.getSelectedRow(); + DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); + model.setRemote(def== SimExplorerTab.remote); + model.setIndex(selectRow); + detailAction.actionPerformed(new ActionEvent(table, ActionEvent.ACTION_FIRST, "showTab_detail")); + System.out.println("action detail " + selectRow + " : " + table.getValueAt(selectRow, 0)); + } + } + }); + } } protected SimExplorerTab getTab(String tabName) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-22 12:52:19 UTC (rev 409) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-22 12:55:35 UTC (rev 410) @@ -41,10 +41,5 @@ public ExpandAllAction(String name) { super(name); } - - @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO - } + } \ No newline at end of file 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-01-22 12:52:19 UTC (rev 409) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-22 12:55:35 UTC (rev 410) @@ -18,8 +18,16 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import java.awt.event.ActionEvent; + /** * Action pour afficher le tab local * @@ -38,7 +46,46 @@ private static final long serialVersionUID = 6643631041114311643L; + public ShowDetailTabAction(String name) { super(name); } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + + ListTabModel listModel; + DetailTabModel model = (DetailTabModel) getModel(); + if (model.isRemote()) { + listModel = (ListTabModel) SimExplorerTab.remote.getModel(); + + } else { + listModel = (ListTabModel) SimExplorerTab.local.getModel(); + } + MetaDataEntity data = listModel.get(model.getIndex()); + + model.setBean(data); + String uuid = data.getUuid(); + Version version = data.getVersion(); + log.info("show detail uuid:" + uuid + ", version:" + version); + return true; + } + + @Override + protected void afterAction(ActionEvent e) { + + DetailTabModel model = (DetailTabModel) getModel(); + + // push model into tree model + JApplicationDetailTab container = (JApplicationDetailTab) getUI(); + + // refresh ui + getMainUI().refreshDetailTabUI(model, container); + + } + + @Override + protected void clear() { + super.clear(); + } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-01-22 12:52:19 UTC (rev 409) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-01-22 12:55:35 UTC (rev 410) @@ -40,6 +40,12 @@ protected MetaDataEntity bean; + protected String uuid; + + protected boolean remote; + + protected int index; + protected Version[] versions; public String getName() { @@ -54,6 +60,22 @@ return bean; } + public boolean isRemote() { + return remote; + } + + public int getIndex() { + return index; + } + + public void setRemote(boolean remote) { + this.remote = remote; + } + + public void setIndex(int index) { + this.index = index; + } + public Version[] getVersions() { return versions; }

1 0

r409 - in trunk/simexplorer-is-swing/src: resources resources/icons/action uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 12:52:19 +0000 (Tue, 22 Jan 2008) New Revision: 409 Added: trunk/simexplorer-is-swing/src/resources/icons/action/collapseAll.png trunk/simexplorer-is-swing/src/resources/icons/action/expandAll.png Removed: trunk/simexplorer-is-swing/src/resources/icons/action/collapseall.png trunk/simexplorer-is-swing/src/resources/icons/action/expandall.png Modified: trunk/simexplorer-is-swing/src/resources/actions.properties trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: ajout arbe pour afficher la navigation d'une exploration normalisation icons Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-22 11:27:13 UTC (rev 408) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-22 12:52:19 UTC (rev 409) @@ -33,8 +33,8 @@ action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.action.pagination.GoLastPageAction action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.action.pagination.ChangeSizorAction -action.collapseAll=fr.cemagref.simexplorer.is.ui.swing.action.application.CollapseAllAction -action.expandAll=fr.cemagref.simexplorer.is.ui.swing.action.application.ExpandAllAction +action.collapseAllApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.CollapseAllAction +action.expandAllApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ExpandAllAction action.exportApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ExportApplicationAction action.importApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ImportApplicationAction Copied: trunk/simexplorer-is-swing/src/resources/icons/action/collapseAll.png (from rev 385, trunk/simexplorer-is-swing/src/resources/icons/action/collapseall.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/collapseAll.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Deleted: trunk/simexplorer-is-swing/src/resources/icons/action/collapseall.png =================================================================== (Binary files differ) Copied: trunk/simexplorer-is-swing/src/resources/icons/action/expandAll.png (from rev 385, trunk/simexplorer-is-swing/src/resources/icons/action/expandall.png) =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/expandAll.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Deleted: trunk/simexplorer-is-swing/src/resources/icons/action/expandall.png =================================================================== (Binary files differ) Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-22 11:27:13 UTC (rev 408) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-22 12:52:19 UTC (rev 409) @@ -1,6 +1,6 @@ <Table> <row> - <cell fill='both'> + <cell fill='vertical'> <JToolBar id='toolbar' floatable='false' opaque='false' margin='0,0,0,0' borderPainted='false'> <JButton id='collapseAllApplication' enabled='false'/> @@ -13,9 +13,7 @@ <cell> <JSplitPane orientation="horizontal" resizeWeight="0.5" oneTouchExpandable='true'> <JScrollPane width='100' columnHeaderView='{toolbar}'> - <JPanel id="tree"> - <JLabel text="TreePanel"/> - </JPanel> + <JTree id="tree"/> </JScrollPane> <JScrollPane id="scrollPane" horizontalScrollBarPolicy="horizontal_scrollbar_never"> <JSplitPane orientation="vertical" resizeWeight="0.5" oneTouchExpandable='true'>

1 0

r408 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 11:27:13 +0000 (Tue, 22 Jan 2008) New Revision: 408 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java Log: pra d?\195?\169faut les actions sur la recherche sont d?\195?\169sactiv?\195?\169s, car pas encore de recherche Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-22 11:26:43 UTC (rev 407) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ResetSearchApplicationAction.java 2008-01-22 11:27:13 UTC (rev 408) @@ -32,7 +32,8 @@ longDescription = "simexplorer.action.application.resetSearch.help", smallIcon = "action/reset-search.png", mnemonic = 'e', - hideActionText = true + hideActionText = true, + enabled = false ) public class ResetSearchApplicationAction extends SimExplorerAbstractAction { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-22 11:26:43 UTC (rev 407) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/SearchApplicationAction.java 2008-01-22 11:27:13 UTC (rev 408) @@ -32,7 +32,8 @@ longDescription = "simexplorer.action.application.search.help", smallIcon = "action/search.png", mnemonic = 'e', - hideActionText = true + hideActionText = true, + enabled = false ) public class SearchApplicationAction extends SimExplorerAbstractAction {

1 0

r407 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 11:26:43 +0000 (Tue, 22 Jan 2008) New Revision: 407 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: suppression fichier jaxx, utilisation JTable classique Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 11:26:11 UTC (rev 406) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-22 11:26:43 UTC (rev 407) @@ -24,7 +24,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationTable; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import javax.swing.AbstractAction; @@ -32,6 +31,7 @@ import javax.swing.Action; import javax.swing.JComboBox; import javax.swing.JComponent; +import javax.swing.JTable; import java.awt.event.ActionEvent; /** @@ -92,7 +92,7 @@ model.setList(data); JApplicationListTab container = (JApplicationListTab) getUI(); - JApplicationTable jApplicationTable = container.getTable(); + JTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); modelTab.setData(data); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 11:26:11 UTC (rev 406) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 11:26:43 UTC (rev 407) @@ -23,11 +23,11 @@ import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; -import fr.cemagref.simexplorer.is.ui.swing.panel.JApplicationTable; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import javax.swing.Action; import javax.swing.JComboBox; +import javax.swing.JTable; import java.awt.event.ActionEvent; /** @@ -90,7 +90,7 @@ // save in TableModel JApplicationListTab container = (JApplicationListTab) getUI(); - JApplicationTable jApplicationTable = container.getTable(); + JTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); modelTab.setData(data);

1 0

r406 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 11:26:11 +0000 (Tue, 22 Jan 2008) New Revision: 406 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java Log: formatage date 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-01-22 11:25:11 UTC (rev 405) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/JApplicationTableModel.java 2008-01-22 11:26:11 UTC (rev 406) @@ -29,6 +29,7 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -39,6 +40,7 @@ PropertyDescriptor[] descriptors; private static final long serialVersionUID = -105647814466295077L; + private SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss.SSS"); public JApplicationTableModel() { } @@ -56,7 +58,6 @@ } private final String[] columnNames = { - n_("simexplorer.common.uuid"), n_("simexplorer.common.name"), n_("simexplorer.common.type"), n_("simexplorer.common.description"), @@ -86,6 +87,9 @@ throw new RuntimeException(e); } } + if (columnIndex == columnNames.length - 1) { + result = DATE_FORMAT.format(result); + } return result; }

1 0