Author: glandais Date: 2008-02-07 16:26:14 +0000 (Thu, 07 Feb 2008) New Revision: 729 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/StorageServiceCommon.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: Commit removed from service interface Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:26:14 UTC (rev 729) @@ -36,14 +36,6 @@ public interface StorageService { /** - * Commit in storage. - * - * @throws SimExplorerServiceException - * the sim explorer service exception - */ - void commit() throws SimExplorerServiceException; - - /** * Login user onto system Not used for local usages. * * @param login Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:26:14 UTC (rev 729) @@ -72,16 +72,6 @@ throws SimExplorerStorageException; /** - * Close. - * - * @throws Exception - * the exception - */ - public void close() throws Exception { - getStorageEngine().close(); - } - - /** * Gets the xML attachment. * * @return the xML attachment @@ -96,17 +86,6 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#commit() - */ - public void commit() throws SimExplorerServiceException { - try { - getStorageEngine().commit(); - } catch (SimExplorerStorageException e) { - throw new SimExplorerServiceException(e); - } - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#saveElement(java.lang.String, com.healthmarketscience.rmiio.RemoteInputStream) */ public MetaData saveElement(String token, RemoteInputStream zipRemoteStream) @@ -592,6 +571,7 @@ throws SimExplorerServiceException { try { getStorageEngine().deleteElement(token, uuid, new Version(version)); + getStorageEngine().commit(); } catch (SimExplorerStorageException e) { throw new SimExplorerServiceException(e); } @@ -604,6 +584,7 @@ throws SimExplorerServiceException { try { getStorageEngine().deleteElements(token, uuid); + getStorageEngine().commit(); } catch (SimExplorerStorageException e) { throw new SimExplorerServiceException(e); } Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-07 16:26:14 UTC (rev 729) @@ -158,7 +158,6 @@ } } - storageService.commit(); } } Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-07 16:26:14 UTC (rev 729) @@ -59,7 +59,6 @@ RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( zipStream); storageService.saveElement(null, zipRemoteStream); - storageService.commit(); assertNotNull(storageService.getMetadata(null, "abcd")); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 16:14:32 UTC (rev 728) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 16:26:14 UTC (rev 729) @@ -44,13 +44,6 @@ base = new MockDatabase(); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#commit() - */ - public void commit() throws SimExplorerServiceException { - checkImplemented(); - } - /** * Check implemented. *