Author: glandais Date: 2008-02-08 09:28:00 +0000 (Fri, 08 Feb 2008) New Revision: 737 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java Log: Delegating processVersionRules Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-07 17:27:59 UTC (rev 736) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-08 09:28:00 UTC (rev 737) @@ -19,6 +19,7 @@ import static org.codelutin.i18n.I18n._; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SimExplorerStorageException; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; @@ -36,7 +37,8 @@ */ public String loginUser(String login, String password) throws SimExplorerServiceException { - throw new SimExplorerServiceException(_("simexplorer.service.nologonlocal")); + throw new SimExplorerServiceException( + _("simexplorer.service.nologonlocal")); } /* (non-Javadoc) @@ -52,4 +54,24 @@ return storageEngine; } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageServiceCommon#processVersionRules(java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.MetaData) + */ + @Override + protected void processVersionRules(String token, MetaData metaData) + throws Exception { + // Check existing version in storage + MetaData previousVersion = getStorageEngine().getMetadata(token, + metaData.getUuid(), metaData.getVersion()); + // Version rules + if (previousVersion != null) { + previousVersion.setLatest(false); + //getStorageEngine().update(previousVersion); + + metaData.setLatest(true); + metaData.setVersion(previousVersion.getVersion().incVersion(1) + .toString()); + } + } + } 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 17:27:59 UTC (rev 736) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-08 09:28:00 UTC (rev 737) @@ -527,29 +527,30 @@ * @throws Exception * the exception */ - private void processVersionRules(String token, MetaData metaData) - throws Exception { + protected abstract void processVersionRules(String token, MetaData metaData) + throws Exception; +// { +// +// // Check existing version in storage +// MetaData previousVersion = getStorageEngine().getMetadata(token, +// metaData.getUuid(), metaData.getVersion()); +// /* +// * MetaData parentData = getStorageEngine().getElementVersion(metaData +// * .getParentData().getUuid(), metaData.getParentData() .getVersion()); +// * MetaData parentVersion = +// * getStorageEngine().getElementVersion(metaData +// * .getParentVersion().getUuid(), metaData.getParentVersion() +// * .getVersion()); +// */ +// +// // Version rules +// if (previousVersion != null) { +// metaData.setVersion(previousVersion.getVersion().incVersion(0) +// .toString()); +// } +// +// } - // Check existing version in storage - MetaData previousVersion = getStorageEngine().getMetadata(token, - metaData.getUuid(), metaData.getVersion()); - /* - * MetaData parentData = getStorageEngine().getElementVersion(metaData - * .getParentData().getUuid(), metaData.getParentData() .getVersion()); - * MetaData parentVersion = - * getStorageEngine().getElementVersion(metaData - * .getParentVersion().getUuid(), metaData.getParentVersion() - * .getVersion()); - */ - - // Version rules - if (previousVersion != null) { - metaData.setVersion(previousVersion.getVersion().incVersion(0) - .toString()); - } - - } - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) */ Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-02-07 17:27:59 UTC (rev 736) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-02-08 09:28:00 UTC (rev 737) @@ -23,6 +23,7 @@ import org.jboss.annotation.ejb.RemoteBinding; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SimExplorerStorageException; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; @@ -61,4 +62,24 @@ return storageEngine; } + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageServiceCommon#processVersionRules(java.lang.String, fr.cemagref.simexplorer.is.entities.metadata.MetaData) + */ + @Override + protected void processVersionRules(String token, MetaData metaData) + throws Exception { + // Check existing version in storage + MetaData previousVersion = getStorageEngine().getMetadata(token, + metaData.getUuid(), metaData.getVersion()); + // Version rules + if (previousVersion != null) { + previousVersion.setLatest(false); + // getStorageEngine().update(previousVersion); + + metaData.setLatest(true); + metaData.setVersion(previousVersion.getVersion().incVersion(0) + .toString()); + } + } + }