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

r525 - in trunk/simexplorer-is-swing/src/resources: . icons/action
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:51:53 +0000 (Thu, 24 Jan 2008) New Revision: 525 Added: trunk/simexplorer-is-swing/src/resources/icons/action/groups.png Modified: trunk/simexplorer-is-swing/src/resources/commandline.properties trunk/simexplorer-is-swing/src/resources/icons/action/users.png Log: icons pour admin (m?\195?\170me si cela ne servira pas tout de suite) + ajout propri?\195?\169t?\195?\169 dans config : autoConnect pour lancer une connexion au demarrage de l'appli avant affichage des tabs remote Modified: trunk/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-24 22:15:48 UTC (rev 524) +++ trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-24 22:51:53 UTC (rev 525) @@ -67,3 +67,6 @@ main.config.definition.showSynchTab=java.lang.Boolean:False main.config.modifiers.showSynchTab= + +main.config.definition.autoConnect=java.lang.Boolean:False +main.config.modifiers.autoConnect= Added: trunk/simexplorer-is-swing/src/resources/icons/action/groups.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/groups.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/simexplorer-is-swing/src/resources/icons/action/users.png =================================================================== (Binary files differ)

1 0

r524 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:15:48 +0000 (Thu, 24 Jan 2008) New Revision: 524 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: implantation loginUser metho dans le mock de service Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 22:15:29 UTC (rev 523) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 22:15:48 UTC (rev 524) @@ -136,7 +136,10 @@ } public String loginUser(String login, String password) throws SimExplorerServiceException { - return (String) checkImplemented(); + if (login==null) { + throw new SimExplorerServiceException(new NullPointerException("login can not be null")); + } + return "password"; } protected ElementGenerator getGenerator() {

1 0

r523 - in trunk/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui java/fr/cemagref/simexplorer/is/ui/swing/action/auth resources resources/icons/action
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 22:15:29 +0000 (Thu, 24 Jan 2008) New Revision: 523 Added: trunk/simexplorer-is-swing/src/resources/icons/action/connect.png trunk/simexplorer-is-swing/src/resources/icons/action/unconnect.png Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java trunk/simexplorer-is-swing/src/resources/commandline.properties Log: actions connect unconnect (todo rename it in disconnect) ajout propri?\195?\169t?\195?\169 de config password transient correction test de connexion invers?\195?\169! d?\195?\169but d'implantations des actions (reste ?\195?\160 faire l'ui de login reprendre celle d'Isis) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 21:46:09 UTC (rev 522) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 22:15:29 UTC (rev 523) @@ -94,7 +94,7 @@ * <code>false</code> sinon. */ public boolean isConnected() { - return token == null || token.isEmpty(); + return !(token == null || token.isEmpty()); } /** Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-24 21:46:09 UTC (rev 522) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/ConnectAction.java 2008-01-24 22:15:29 UTC (rev 523) @@ -18,8 +18,12 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.auth; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import java.awt.event.ActionEvent; + /** * Action de connexion au serveur distant * @@ -30,16 +34,60 @@ name = "simexplorer.action.connect", shortDescription = "simexplorer.action.connect.tooltip", longDescription = "simexplorer.action.connect.help", - //smallIcon = "action/connect.png", + smallIcon = "action/connect.png", mnemonic = 'C', - hideActionText = false + hideActionText = false, + enabled = true ) public class ConnectAction extends SimExplorerAbstractAction { private static final long serialVersionUID = -6172528731543675359L; + String login; + String password; + public ConnectAction(String name) { super(name); } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (getContext().isConnected()) { + return false; + } + + login = getContext().getConfig().getLogin(); + password = getContext().getConfig().getPassword(); + if (login == null || password == null) { + //TODO show login ui + password = "password"; + } + return true; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + StorageService service = getContext().getRemoteStorageService(); + + try { + service.loginUser(login, password); + } catch (SimExplorerServiceException e1) { + //TODO alert user of error + log.warn("could not connect user for reason " + e1.getMessage()); + throw e1; + } + } + + @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + } + + @Override + protected void clear() { + super.clear(); + login = null; + password = null; + } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-24 21:46:09 UTC (rev 522) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/auth/UnconnectAction.java 2008-01-24 22:15:29 UTC (rev 523) @@ -18,8 +18,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.auth; +import fr.cemagref.simexplorer.is.ui.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import javax.swing.JTabbedPane; +import java.awt.event.ActionEvent; + /** * Action pour se deconnecter du serveur distant * @@ -31,8 +37,9 @@ shortDescription = "simexplorer.action.unconnect.tooltip", longDescription = "simexplorer.action.unconnect.help", mnemonic = 'n', - //smallIcon = "action/unconnect.png", - hideActionText = false + smallIcon = "action/unconnect.png", + hideActionText = false, + enabled = false ) public class UnconnectAction extends SimExplorerAbstractAction { @@ -41,4 +48,39 @@ public UnconnectAction(String name) { super(name); } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + return getContext().isConnected(); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + getContext().setToken(null); + //TODO disconnect from server ? + + JTabbedPane container = SimExplorer.getUI().getContent(); + + if (SimExplorerTab.remote.isTabVisible(container)) { + // close tab + SimExplorerTab.remote.closeTab(container); + } + if (SimExplorerTab.synchronize.isTabVisible(container)) { + // close tab + SimExplorerTab.synchronize.closeTab(container); + } + if (SimExplorerTab.detail.isTabVisible(container)) { + DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel(); + if (model.isRemote()) { + // close tab + SimExplorerTab.detail.closeTab(container); + } + } + } + + @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-24 21:46:09 UTC (rev 522) +++ trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-24 22:15:29 UTC (rev 523) @@ -35,6 +35,9 @@ main.config.definition.login=java.lang.String:anonymous main.config.modifiers.login=mandatory +main.config.definition.password=java.lang.String +main.config.modifiers.password=transient + main.config.definition.serverURL=java.net.URL:http://www.codelutin.com main.config.modifiers.serverURL=mandatory Added: trunk/simexplorer-is-swing/src/resources/icons/action/connect.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/connect.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is-swing/src/resources/icons/action/unconnect.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/unconnect.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r522 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 21:46:09 +0000 (Thu, 24 Jan 2008) New Revision: 522 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java Log: ?\195?\160 mon avis il faudrait d?\195?\169clancher une exception Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 21:44:00 UTC (rev 521) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 21:46:09 UTC (rev 522) @@ -27,6 +27,8 @@ } public String loginUser(String login, String password) throws SimExplorerServiceException { + //TODO Should use this ? + //throw new SimExplorerServiceException("can not log to local service"); return null; }

1 0

r521 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 21:44:00 +0000 (Thu, 24 Jan 2008) New Revision: 521 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java Log: ajout exception sp?\195?\169cifique couche service Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 21:43:49 UTC (rev 520) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 21:44:00 UTC (rev 521) @@ -135,7 +135,7 @@ return new MetaDataEntity[0]; } - public String loginUser(String login, String password) { + public String loginUser(String login, String password) throws SimExplorerServiceException { return (String) checkImplemented(); } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-24 21:43:49 UTC (rev 520) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-24 21:44:00 UTC (rev 521) @@ -46,8 +46,9 @@ * @param login Login * @param password Password * @return Token as logon evidence + * @throws SimExplorerServiceException */ - String loginUser(String login, String password); + String loginUser(String login, String password) throws SimExplorerServiceException; /** * Save a remote element Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 21:43:49 UTC (rev 520) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 21:44:00 UTC (rev 521) @@ -26,7 +26,7 @@ super.firstOpen(); } - public String loginUser(String login, String password) { + public String loginUser(String login, String password) throws SimExplorerServiceException { return null; } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 21:43:49 UTC (rev 520) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 21:44:00 UTC (rev 521) @@ -40,7 +40,7 @@ super.firstOpen(); } - public String loginUser(String login, String password) { + public String loginUser(String login, String password) throws SimExplorerServiceException { String token = authenticationService.loginUser(login, password); if (token != null) { // FIXME datasource différent pour la secu et les timers =

1 0

r520 - trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 21:43:49 +0000 (Thu, 24 Jan 2008) New Revision: 520 Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java Log: ajout exception sp?\195?\169cifique couche service Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java 2008-01-24 21:32:03 UTC (rev 519) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java 2008-01-24 21:43:49 UTC (rev 520) @@ -45,8 +45,12 @@ } public void testLogin() { - String token = storageService.loginUser("superadmin", "password"); - System.out.println(token); + try { + String token = storageService.loginUser("superadmin", "password"); + System.out.println(token); + } catch (SimExplorerServiceException e) { + fail(); + } } }

1 0

r519 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 21:32:03 +0000 (Thu, 24 Jan 2008) New Revision: 519 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java Log: imports Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2008-01-24 21:31:50 UTC (rev 518) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ApplicationImport.java 2008-01-24 21:32:03 UTC (rev 519) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.upload.services.UploadedFile; import com.healthmarketscience.rmiio.RemoteInputStreamServer;

1 0

r518 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 21:31:50 +0000 (Thu, 24 Jan 2008) New Revision: 518 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java Log: imports Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-01-24 21:31:26 UTC (rev 517) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/grid/ElementDataSource.java 2008-01-24 21:31:50 UTC (rev 518) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.grid; -import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.beaneditor.PropertyModel; import org.apache.tapestry.grid.GridDataSource;

1 0

r517 - in trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service: . test
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 21:31:26 +0000 (Thu, 24 Jan 2008) New Revision: 517 Added: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java Removed: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java Log: paquetage redondant, un test unitaire par convention est dans le m?\195?\170me paquetage que la classe test?\195?\169e Copied: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java (from rev 506, trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java) =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java (rev 0) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-01-24 21:31:26 UTC (rev 517) @@ -0,0 +1,104 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.service; + +import java.io.InputStream; +import java.util.Date; +import java.util.HashMap; + +import junit.framework.TestCase; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; +import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.service.StorageServiceClient; +import fr.cemagref.simexplorer.is.service.StorageServiceCommon; +import fr.cemagref.simexplorer.is.service.ElementGenerator; + +public class StorageServiceMassInsert extends TestCase { + + private StorageServiceCommon storageService; + private ElementGenerator elementGenerator; + + @Override + protected void setUp() throws Exception { + super.setUp(); + elementGenerator = new ElementGenerator(); + + storageService = new StorageServiceClient(); + storageService.open(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + storageService.close(); + } + + /* + public void testExportXML() throws Exception { + ExplorationApplication ea = elementGenerator.generateRandomEA(); + InputStream xmlStream = BaseEntityFactory.getFactory( + ExplorationApplication.class).saveElement(ea); + + FileOutputStream os = new FileOutputStream( + "/var/local/simexplorer/test.xml"); + + // Buffer copy stream to stream + BufferedInputStream bin = new BufferedInputStream(xmlStream); + BufferedOutputStream bout = new BufferedOutputStream(os); + + while (true) { + int datum = bin.read(); + if (datum == -1) + break; + bout.write(datum); + } + bout.flush(); + } + */ + + public void testMassInsert() throws Exception { + int c = 350; + + Date begin = new Date(); + + ExplorationApplication ea = null; + for (int i = 0; i < c; i++) { + ea = elementGenerator.generateRandomEA(); + InputStream xmlStream = BaseEntityFactory.getFactory( + ExplorationApplication.class).saveElement( + XmlConstants.VALUE_METADATA_TYPE_EA, ea); + + storageService.saveElement(null, xmlStream, + new HashMap<String, InputStream>()); + + if (i > 0 && i % 100 == 0) { + Date end = new Date(); + long time = end.getTime() - begin.getTime(); + System.out.println("Insert " + i + " : Time taken : " + time + + "ms"); + double timePerElement = time / i; + System.out.println("Insert " + i + + " : Time taken per element : " + timePerElement + + "ms"); + } + + } + } + +} Copied: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java (from rev 506, trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java) =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java (rev 0) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceServerTest.java 2008-01-24 21:31:26 UTC (rev 517) @@ -0,0 +1,52 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.service; + +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; + +import junit.framework.TestCase; +import fr.cemagref.simexplorer.is.service.StorageService; + +public class StorageServiceServerTest extends TestCase { + + private StorageService storageService; + + @Override + 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); + storageService = (StorageService) context.lookup("StorageService"); + + } + + public void testLogin() { + String token = storageService.loginUser("superadmin", "password"); + System.out.println(token); + } + +} Copied: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java (from rev 506, trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java) =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java (rev 0) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-01-24 21:31:26 UTC (rev 517) @@ -0,0 +1,145 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.service; + +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.UUID; + +import junit.framework.TestCase; + +import com.healthmarketscience.rmiio.RemoteInputStream; +import com.healthmarketscience.rmiio.RemoteInputStreamServer; +import com.healthmarketscience.rmiio.SimpleRemoteInputStream; + +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.service.StorageServiceClient; + +public class StorageServiceTest extends TestCase { + + private StorageService storageService; + private Random r = new Random(); + + @Override + protected void setUp() throws Exception { + super.setUp(); + + storageService = new StorageServiceClient(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testInsertElementZip() throws Exception { + InputStream zipStream = new FileInputStream( + "./src/ressources/testImport/test.zip"); + RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( + zipStream); + storageService.saveElement(null, zipRemoteStream); + storageService.commit(); + assertNotNull(storageService.getMetadata(null, "abcd")); + } + + public void testInsertElementStreams() throws Exception { + String id = UUID.randomUUID().toString(); + String[] randomcontent = new String[2]; + for (int i = 0; i < randomcontent.length; i++) { + randomcontent[i] = Long.toHexString(r.nextLong()); + } + + StringBuffer xmlString = new StringBuffer( + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>"); + xmlString.append("<data>"); + xmlString.append("<metadata>"); + xmlString.append("<uuid>" + id + "</uuid>"); + xmlString.append("<version>1.0</version>"); + xmlString.append("<name>Test element</name>"); + xmlString.append("<type>TEST</type>"); + xmlString.append("<description>Element test</description>"); + xmlString.append("<creationdate>0</creationdate>"); + xmlString.append("<hash>AAAAA</hash>"); + /* + * xmlString.append("<parentdatauuid></parentdatauuid>"); + * xmlString.append("<parentdataversion></parentdataversion>"); + * xmlString.append("<parentversionuuid></parentversionuuid>"); + * xmlString.append("<parentversionversion></parentversionversion>"); + */ + xmlString.append("<descriptors>"); + xmlString + .append("<descriptor><name>a</name><value>1</value></descriptor>"); + xmlString + .append("<descriptor><name>b</name><value>2</value></descriptor>"); + xmlString + .append("<descriptor><name>c</name><value>3</value></descriptor>"); + xmlString.append("</descriptors>"); + xmlString.append("<attachments>"); + for (int i = 0; i < randomcontent.length; i++) { + xmlString.append("<attachment>"); + xmlString.append("<name>content" + i + + "</name><type>RawType</type>"); + xmlString.append("</attachment>"); + } + xmlString.append("</attachments>"); + xmlString.append("</metadata>"); + xmlString.append("</data>"); + + InputStream xmlStream = new ByteArrayInputStream(xmlString.toString() + .getBytes()); + RemoteInputStreamServer xmlRemoteStream = new SimpleRemoteInputStream( + xmlStream); + + Map<String, RemoteInputStream> attachmentsRemoteStream = new HashMap<String, RemoteInputStream>(); + + for (int j = 0; j < randomcontent.length; j++) { + + StringBuffer contentString = new StringBuffer(""); + for (int i = 0; i < 50; i++) { + contentString.append(Long.toHexString(r.nextLong())) + .append(" "); + } + contentString.append(randomcontent[j]).append(" "); + for (int i = 0; i < 100; i++) { + contentString.append(Long.toHexString(r.nextLong())) + .append(" "); + } + + InputStream contentStream = new ByteArrayInputStream(contentString + .toString().getBytes()); + RemoteInputStreamServer contentRemoteStream = new SimpleRemoteInputStream( + contentStream); + attachmentsRemoteStream.put("content" + j, contentRemoteStream); + + } + + storageService.saveElement(null, xmlRemoteStream, + attachmentsRemoteStream); + storageService.commit(); + assertNotNull(storageService.getMetadata(null, id)); + for (int i = 0; i < randomcontent.length; i++) { + assertTrue(storageService.findFullTextCount(null, randomcontent[i], + false) > 0); + } + } + +} Deleted: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java 2008-01-24 21:30:16 UTC (rev 516) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java 2008-01-24 21:31:26 UTC (rev 517) @@ -1,104 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.service.test; - -import java.io.InputStream; -import java.util.Date; -import java.util.HashMap; - -import junit.framework.TestCase; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; -import fr.cemagref.simexplorer.is.factories.XmlConstants; -import fr.cemagref.simexplorer.is.service.StorageServiceClient; -import fr.cemagref.simexplorer.is.service.StorageServiceCommon; -import fr.cemagref.simexplorer.is.service.ElementGenerator; - -public class StorageServiceMassInsert extends TestCase { - - private StorageServiceCommon storageService; - private ElementGenerator elementGenerator; - - @Override - protected void setUp() throws Exception { - super.setUp(); - elementGenerator = new ElementGenerator(); - - storageService = new StorageServiceClient(); - storageService.open(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - storageService.close(); - } - - /* - public void testExportXML() throws Exception { - ExplorationApplication ea = elementGenerator.generateRandomEA(); - InputStream xmlStream = BaseEntityFactory.getFactory( - ExplorationApplication.class).saveElement(ea); - - FileOutputStream os = new FileOutputStream( - "/var/local/simexplorer/test.xml"); - - // Buffer copy stream to stream - BufferedInputStream bin = new BufferedInputStream(xmlStream); - BufferedOutputStream bout = new BufferedOutputStream(os); - - while (true) { - int datum = bin.read(); - if (datum == -1) - break; - bout.write(datum); - } - bout.flush(); - } - */ - - public void testMassInsert() throws Exception { - int c = 350; - - Date begin = new Date(); - - ExplorationApplication ea = null; - for (int i = 0; i < c; i++) { - ea = elementGenerator.generateRandomEA(); - InputStream xmlStream = BaseEntityFactory.getFactory( - ExplorationApplication.class).saveElement( - XmlConstants.VALUE_METADATA_TYPE_EA, ea); - - storageService.saveElement(null, xmlStream, - new HashMap<String, InputStream>()); - - if (i > 0 && i % 100 == 0) { - Date end = new Date(); - long time = end.getTime() - begin.getTime(); - System.out.println("Insert " + i + " : Time taken : " + time - + "ms"); - double timePerElement = time / i; - System.out.println("Insert " + i - + " : Time taken per element : " + timePerElement - + "ms"); - } - - } - } - -} Deleted: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java 2008-01-24 21:30:16 UTC (rev 516) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java 2008-01-24 21:31:26 UTC (rev 517) @@ -1,52 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.service.test; - -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; - -import junit.framework.TestCase; -import fr.cemagref.simexplorer.is.service.StorageService; - -public class StorageServiceServerTest extends TestCase { - - private StorageService storageService; - - @Override - 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); - storageService = (StorageService) context.lookup("StorageService"); - - } - - public void testLogin() { - String token = storageService.loginUser("superadmin", "password"); - System.out.println(token); - } - -} Deleted: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java 2008-01-24 21:30:16 UTC (rev 516) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java 2008-01-24 21:31:26 UTC (rev 517) @@ -1,146 +0,0 @@ -/* -* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.service.test; - -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.UUID; - -import junit.framework.TestCase; - -import com.healthmarketscience.rmiio.RemoteInputStream; -import com.healthmarketscience.rmiio.RemoteInputStreamServer; -import com.healthmarketscience.rmiio.SimpleRemoteInputStream; - -import fr.cemagref.simexplorer.is.service.StorageService; -import fr.cemagref.simexplorer.is.service.StorageServiceClient; -import fr.cemagref.simexplorer.is.service.StorageServiceCommon; - -public class StorageServiceTest extends TestCase { - - private StorageService storageService; - private Random r = new Random(); - - @Override - protected void setUp() throws Exception { - super.setUp(); - - storageService = new StorageServiceClient(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - - public void testInsertElementZip() throws Exception { - InputStream zipStream = new FileInputStream( - "./src/ressources/testImport/test.zip"); - RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( - zipStream); - storageService.saveElement(null, zipRemoteStream); - storageService.commit(); - assertNotNull(storageService.getMetadata(null, "abcd")); - } - - public void testInsertElementStreams() throws Exception { - String id = UUID.randomUUID().toString(); - String[] randomcontent = new String[2]; - for (int i = 0; i < randomcontent.length; i++) { - randomcontent[i] = Long.toHexString(r.nextLong()); - } - - StringBuffer xmlString = new StringBuffer( - "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>"); - xmlString.append("<data>"); - xmlString.append("<metadata>"); - xmlString.append("<uuid>" + id + "</uuid>"); - xmlString.append("<version>1.0</version>"); - xmlString.append("<name>Test element</name>"); - xmlString.append("<type>TEST</type>"); - xmlString.append("<description>Element test</description>"); - xmlString.append("<creationdate>0</creationdate>"); - xmlString.append("<hash>AAAAA</hash>"); - /* - * xmlString.append("<parentdatauuid></parentdatauuid>"); - * xmlString.append("<parentdataversion></parentdataversion>"); - * xmlString.append("<parentversionuuid></parentversionuuid>"); - * xmlString.append("<parentversionversion></parentversionversion>"); - */ - xmlString.append("<descriptors>"); - xmlString - .append("<descriptor><name>a</name><value>1</value></descriptor>"); - xmlString - .append("<descriptor><name>b</name><value>2</value></descriptor>"); - xmlString - .append("<descriptor><name>c</name><value>3</value></descriptor>"); - xmlString.append("</descriptors>"); - xmlString.append("<attachments>"); - for (int i = 0; i < randomcontent.length; i++) { - xmlString.append("<attachment>"); - xmlString.append("<name>content" + i - + "</name><type>RawType</type>"); - xmlString.append("</attachment>"); - } - xmlString.append("</attachments>"); - xmlString.append("</metadata>"); - xmlString.append("</data>"); - - InputStream xmlStream = new ByteArrayInputStream(xmlString.toString() - .getBytes()); - RemoteInputStreamServer xmlRemoteStream = new SimpleRemoteInputStream( - xmlStream); - - Map<String, RemoteInputStream> attachmentsRemoteStream = new HashMap<String, RemoteInputStream>(); - - for (int j = 0; j < randomcontent.length; j++) { - - StringBuffer contentString = new StringBuffer(""); - for (int i = 0; i < 50; i++) { - contentString.append(Long.toHexString(r.nextLong())) - .append(" "); - } - contentString.append(randomcontent[j]).append(" "); - for (int i = 0; i < 100; i++) { - contentString.append(Long.toHexString(r.nextLong())) - .append(" "); - } - - InputStream contentStream = new ByteArrayInputStream(contentString - .toString().getBytes()); - RemoteInputStreamServer contentRemoteStream = new SimpleRemoteInputStream( - contentStream); - attachmentsRemoteStream.put("content" + j, contentRemoteStream); - - } - - storageService.saveElement(null, xmlRemoteStream, - attachmentsRemoteStream); - storageService.commit(); - assertNotNull(storageService.getMetadata(null, id)); - for (int i = 0; i < randomcontent.length; i++) { - assertTrue(storageService.findFullTextCount(null, randomcontent[i], - false) > 0); - } - } - -}

1 0

r516 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 21:30:16 +0000 (Thu, 24 Jan 2008) New Revision: 516 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: ajout exception sp?\195?\169cifique couche service Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 21:29:37 UTC (rev 515) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 21:30:16 UTC (rev 516) @@ -58,7 +58,7 @@ return mockData; } - public void commit() throws Exception { + public void commit() throws SimExplorerServiceException { checkImplemented(); } @@ -66,45 +66,45 @@ throw new IllegalStateException("not implemented"); } - public MetaDataEntity saveElement(String token, RemoteInputStream zipRemoteStream) throws Exception { + public MetaDataEntity saveElement(String token, RemoteInputStream zipRemoteStream) throws SimExplorerServiceException { return (MetaDataEntity) checkImplemented(); } - public MetaDataEntity saveElement(String token, RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) throws Exception { + public MetaDataEntity saveElement(String token, RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) throws SimExplorerServiceException { return (MetaDataEntity) checkImplemented(); } - public MetaDataEntity getMetadata(String token, String uuid) throws Exception { + public MetaDataEntity getMetadata(String token, String uuid) throws SimExplorerServiceException { return mockData().get(uuid); } - public MetaDataEntity getMetadata(String token, String uuid, String version) throws Exception { + public MetaDataEntity getMetadata(String token, String uuid, String version) throws SimExplorerServiceException { return mockData().get(uuid); } - public void exportElement(String token, RemoteOutputStream xmlOutputStream, String uuid, String version) throws Exception { + public void exportElement(String token, RemoteOutputStream xmlOutputStream, String uuid, String version) throws SimExplorerServiceException { checkImplemented(); } - public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { + public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws SimExplorerServiceException { return null; } - public int findFullTextCount(String token, String query, boolean onlyLatest) throws Exception { + public int findFullTextCount(String token, String query, boolean onlyLatest) throws SimExplorerServiceException { //TODO Changer return findApplicationsCount(token,onlyLatest); } - public MetaDataEntity[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws Exception { + public MetaDataEntity[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException { //TODO Changer return findApplications(token,onlyLatest,indexStart,count,dateOrder); } - public int findApplicationsCount(String token, boolean onlyLatest) throws Exception { + public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerServiceException { return mockData().size(); } - public MetaDataEntity[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) throws Exception { + public MetaDataEntity[] findApplications(String token, boolean onlyLatest, int start, int count, int dateOrder) throws SimExplorerServiceException { int last = start + count; System.out.println("ask data from " + start + " width:" + count); SortedMap<String, MetaDataEntity> map = mockData(); @@ -119,14 +119,18 @@ return result; } - public LoggableElement getElement(String token, String uuid, String version) throws Exception { - ExplorationApplication explorationApplication = getGenerator().generateRandomEA(); - explorationApplication.getMetaData().setUuid(uuid); - explorationApplication.getMetaData().setVersion(version); - return explorationApplication; + public LoggableElement getElement(String token, String uuid, String version) throws SimExplorerServiceException { + try { + ExplorationApplication explorationApplication = getGenerator().generateRandomEA(); + explorationApplication.getMetaData().setUuid(uuid); + explorationApplication.getMetaData().setVersion(version); + return explorationApplication; + } catch (Exception e) { + throw new SimExplorerServiceException(e); + } } - public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { + public MetaDataEntity[] getVersions(String token, String uuid) throws SimExplorerServiceException { //TODO return new MetaDataEntity[0]; } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-24 21:29:37 UTC (rev 515) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-24 21:30:16 UTC (rev 516) @@ -21,6 +21,7 @@ import java.io.BufferedOutputStream; import java.io.InputStream; import java.io.OutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -28,6 +29,7 @@ import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import java.rmi.RemoteException; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -46,6 +48,7 @@ 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.StorageException; public abstract class StorageServiceCommon implements StorageService, XmlConstants { @@ -70,95 +73,137 @@ storageEngine.close(); } - public void commit() throws Exception { - storageEngine.commit(); + public void commit() throws SimExplorerServiceException { + try { + storageEngine.commit(); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } public MetaDataEntity saveElement(String token, RemoteInputStream zipRemoteStream) - throws Exception { - InputStream zipStream = RemoteInputStreamClient.wrap(zipRemoteStream); - return saveElement(token, zipStream); + throws SimExplorerServiceException { + InputStream zipStream; + try { + zipStream = RemoteInputStreamClient.wrap(zipRemoteStream); + return saveElement(token, zipStream); + } catch (IOException e) { + throw new SimExplorerServiceException(e); + } } public MetaDataEntity saveElement(String token, RemoteInputStream xmlRemoteStream, Map<String, RemoteInputStream> attachmentsRemoteStream) - throws Exception { - InputStream xmlStream = RemoteInputStreamClient.wrap(xmlRemoteStream); - Map<String, InputStream> attachmentStreams = new HashMap<String, InputStream>(); - for (Map.Entry<String, RemoteInputStream> entry : attachmentsRemoteStream - .entrySet()) { - InputStream stream = RemoteInputStreamClient.wrap(entry.getValue()); - attachmentStreams.put(entry.getKey(), stream); + throws SimExplorerServiceException { + try { + InputStream xmlStream = RemoteInputStreamClient.wrap(xmlRemoteStream); + Map<String, InputStream> attachmentStreams = new HashMap<String, InputStream>(); + for (Map.Entry<String, RemoteInputStream> entry : attachmentsRemoteStream + .entrySet()) { + InputStream stream = RemoteInputStreamClient.wrap(entry.getValue()); + attachmentStreams.put(entry.getKey(), stream); + } + return saveElement(token, xmlStream, attachmentStreams); + } catch (Exception e) { + throw new SimExplorerServiceException(e); } - return saveElement(token, xmlStream, attachmentStreams); } - public MetaDataEntity getMetadata(String token, String uuid) throws Exception { - return storageEngine.getMetadata(token, uuid); + public MetaDataEntity getMetadata(String token, String uuid) throws SimExplorerServiceException { + try { + return storageEngine.getMetadata(token, uuid); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } public MetaDataEntity getMetadata(String token, String uuid, String version) - throws Exception { - return storageEngine.getMetadata(token, uuid, new Version(version)); + throws SimExplorerServiceException { + try { + return storageEngine.getMetadata(token, uuid, new Version(version)); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } public MetaDataEntity[] findFullText(String token, String query, boolean onlyLatest, - int indexStart, int count, int dateOrder) throws Exception { - return storageEngine.findFullText(token, query, onlyLatest, indexStart, count, - dateOrder); + int indexStart, int count, int dateOrder) throws SimExplorerServiceException { + try { + return storageEngine.findFullText(token, query, onlyLatest, indexStart, count,dateOrder); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } public int findFullTextCount(String token, String query, boolean onlyLatest) - throws Exception { - return storageEngine.findFullTextCount(token, query, onlyLatest); + throws SimExplorerServiceException { + try { + return storageEngine.findFullTextCount(token, query, onlyLatest); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } - public int findApplicationsCount(String token, boolean onlyLatest) throws Exception { - return storageEngine.findElementsByTypeCount(token, VALUE_METADATA_TYPE_EA, - onlyLatest); + public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerServiceException { + try { + return storageEngine.findElementsByTypeCount(token, VALUE_METADATA_TYPE_EA,onlyLatest); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } public MetaDataEntity[] findApplications(String token, boolean onlyLatest, int start, - int count, int dateOrder) throws Exception { - return storageEngine.findElementsByType(token, VALUE_METADATA_TYPE_EA, - onlyLatest, start, count, dateOrder); + int count, int dateOrder) throws SimExplorerServiceException { + try { + return storageEngine.findElementsByType(token, VALUE_METADATA_TYPE_EA,onlyLatest, start, count, dateOrder); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } public LoggableElement getElement(String token, String uuid, String version) - throws Exception { + throws SimExplorerServiceException { MetaDataEntity mde = getMetadata(token, uuid, version); - LoggableElement le = (LoggableElement) BaseEntityFactory.getFactory( - LoggableElement.class.getPackage().getName() + "." + mde.getType()) - .loadElement(storageEngine.retrieveData(token, mde, KEY_XML)); + try { + LoggableElement le; + le = (LoggableElement) BaseEntityFactory.getFactory( + LoggableElement.class.getPackage().getName() + "." + mde.getType()) + .loadElement(storageEngine.retrieveData(token, mde, KEY_XML)); - return le; + return le; + } catch (Exception e) { + throw new SimExplorerServiceException(e); + } } - private MetaDataEntity saveElement(String token, InputStream zipStream) throws Exception { + private MetaDataEntity saveElement(String token, InputStream zipStream) throws SimExplorerServiceException { String xmlFile = null; Map<String, String> attachments = new HashMap<String, String>(); ZipInputStream zis = new ZipInputStream(zipStream); - ZipEntry entry; - while ((entry = zis.getNextEntry()) != null) { - if (!entry.isDirectory()) { - String entryName = entry.getName(); - if (entryName.equals(FILE_XML)) { - xmlFile = storageEngine.storeTempData(zis); - } else { - if (entryName.startsWith(FILE_DATA_PREFIX)) { - String fileName = entryName.replace(FILE_DATA_PREFIX - + "/", ""); - String idFile = storageEngine.storeTempData(zis); - attachments.put(fileName, idFile); + try { + ZipEntry entry; + while ((entry = zis.getNextEntry()) != null) { + if (!entry.isDirectory()) { + String entryName = entry.getName(); + if (entryName.equals(FILE_XML)) { + xmlFile = storageEngine.storeTempData(zis); + } else { + if (entryName.startsWith(FILE_DATA_PREFIX)) { + String fileName = entryName.replace(FILE_DATA_PREFIX + + "/", ""); + String idFile = storageEngine.storeTempData(zis); + attachments.put(fileName, idFile); + } } } } + return saveElement(token, xmlFile, attachments); + } catch (Exception e) { + throw new SimExplorerServiceException(e); } - - return saveElement(token, xmlFile, attachments); } public MetaDataEntity saveElement(String token, InputStream xmlFile, @@ -174,30 +219,43 @@ } public RemoteInputStream retrieveData(String token, String uuid, - String version, String dataKey) throws Exception { - MetaDataEntity mde = getMetadata(token, uuid, version); - InputStream stream = storageEngine.retrieveData(token, mde, dataKey); - RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( - stream); - return remoteStream.export(); + String version, String dataKey) throws SimExplorerServiceException { + try { + MetaDataEntity mde = getMetadata(token, uuid, version); + InputStream stream = storageEngine.retrieveData(token, mde, dataKey); + RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( + stream); + return remoteStream.export(); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } catch (RemoteException e) { + throw new SimExplorerServiceException(e); + } } public void exportElement(String token, RemoteOutputStream xmlOutputStream, String uuid, - String version) throws Exception { + String version) throws SimExplorerServiceException { MetaDataEntity mde = getMetadata(token, uuid, version); - InputStream xmlStream = storageEngine.retrieveData(token, mde, KEY_XML); - OutputStream os = RemoteOutputStreamClient.wrap(xmlOutputStream); + try { + InputStream xmlStream = storageEngine.retrieveData(token, mde, KEY_XML); + OutputStream os = RemoteOutputStreamClient.wrap(xmlOutputStream); - // Buffer copy stream to stream - BufferedInputStream bin = new BufferedInputStream(xmlStream); - BufferedOutputStream bout = new BufferedOutputStream(os); - while (true) { - int datum = bin.read(); - if (datum == -1) - break; - bout.write(datum); + // Buffer copy stream to stream + BufferedInputStream bin = new BufferedInputStream(xmlStream); + BufferedOutputStream bout = new BufferedOutputStream(os); + while (true) { + int datum = bin.read(); + if (datum == -1) { + break; + } + bout.write(datum); + } + bout.flush(); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } catch (IOException e) { + throw new SimExplorerServiceException(e); } - bout.flush(); } @@ -213,8 +271,7 @@ private MetaDataEntity saveElement(String token, String idxml, Map<String, String> idsattachment) throws Exception { // Load metadata xml - MetaDataEntityFactory mdeFactory = (MetaDataEntityFactory) BaseEntityFactory - .getFactory(MetaDataEntity.class); + MetaDataEntityFactory mdeFactory = MetaDataEntityFactory.getFactory(MetaDataEntity.class); MetaDataEntity metaData = mdeFactory .loadElementFromParentXML(storageEngine.retrieveTempData(idxml)); @@ -303,8 +360,7 @@ Map<String, String> idsattachment, List<String> components, List<String[]> explorationDatas) throws Exception { - MetaDataEntityFactory<MetaDataEntity> elementFactory = (MetaDataEntityFactory) BaseEntityFactory - .getFactory(MetaDataEntity.class); + BaseEntityFactory<MetaDataEntity> elementFactory = MetaDataEntityFactory.getFactory(MetaDataEntity.class); Document document = BaseEntityFactory.getXMLBuilder().parse( storageEngine.retrieveTempData(idxml)); @@ -335,7 +391,7 @@ String result = elementFactory.getXMLProperty(element, KEY_RESULT_FILE); - String[] explorationDataArray = null; + String[] explorationDataArray; if (result != null) { explorationDataArray = new String[2]; explorationDataArray[1] = result; @@ -350,8 +406,12 @@ } - public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { - Set<MetaDataEntity> versions = storageEngine.getElementVersions(token, uuid); - return versions.toArray(new MetaDataEntity[versions.size()]); + public MetaDataEntity[] getVersions(String token, String uuid) throws SimExplorerServiceException { + try { + Set<MetaDataEntity> versions = storageEngine.getElementVersions(token, uuid); + return versions.toArray(new MetaDataEntity[versions.size()]); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } } }

1 0