Author: glandais Date: 2008-02-14 11:21:05 +0000 (Thu, 14 Feb 2008) New Revision: 959 Removed: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java Log: RMIIO update, serializable input stream integrated Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2008-02-14 11:21:05 UTC (rev 959) @@ -65,7 +65,7 @@ <dependency> <groupId>com.healthmarketscience.rmiio</groupId> <artifactId>rmiio</artifactId> - <version>2.0.0</version> + <version>2.0.1</version> </dependency> <dependency> <groupId>jboss</groupId> Deleted: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/SimExplorerServiceStream.java 2008-02-14 11:21:05 UTC (rev 959) @@ -1,186 +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; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; -import java.rmi.RemoteException; - -import com.healthmarketscience.rmiio.RemoteInputStream; -import com.healthmarketscience.rmiio.RemoteInputStreamClient; -import com.healthmarketscience.rmiio.SimpleRemoteInputStream; - -/** - * The Class SimExplorerServiceStream. - * - * Simplify usage of remote streams. - * - * To allow magic remoting, your stream has to encapsulated in a SimExplorerServiceStream with - * - * <code> - * SimExplorerServiceStream serviceStream = new SimExplorerServiceStream(myStream); - * service.method(serviceStream); - * </code> - * - * Stream will work, even through a RMI call. - * - * @author glandais - * - */ -public class SimExplorerServiceStream extends InputStream implements - Serializable { - - private static final long serialVersionUID = 1976003275577858320L; - - /** The remote output stream from RMIIO, used for serializing stream. */ - private RemoteInputStream ris; - - /** The local stream, set to null if stream is serialized. */ - transient private BufferedInputStream bis; - - /** true if stream is initialized. */ - private boolean initialized; - - /** - * Instantiates a new stream. - * - * @param bis the bis - */ - public SimExplorerServiceStream(InputStream bis) { - super(); - // Set local stream (null if this is serialized) - this.bis = new BufferedInputStream(bis); - try { - // Create a stub, used in init - ris = new SimpleRemoteInputStream(bis).export(); - } catch (RemoteException e) { - ris = null; - } - - initialized = false; - } - - /** - * Inits the local stream. - * - * Called before every delegated method - */ - private void init() { - if (!initialized) { - // Check is local stream is null (ie as been serialized) - if (bis != null) { - // remote stream is useless in that case - ris = null; - } else { - try { - // Otherwise use RMIIO to retrieve remote stream - bis = new BufferedInputStream(RemoteInputStreamClient - .wrap(ris)); - } catch (IOException e) { - // Something went wrong during transformation - throw new RuntimeException(e); - } - } - initialized = true; - } - } - - /* (non-Javadoc) - * @see java.io.InputStream#available() - */ - @Override - public int available() throws IOException { - init(); - return bis.available(); - } - - /* (non-Javadoc) - * @see java.io.InputStream#close() - */ - @Override - public void close() throws IOException { - init(); - bis.close(); - } - - /* (non-Javadoc) - * @see java.io.InputStream#mark(int) - */ - @Override - public synchronized void mark(int readlimit) { - init(); - bis.mark(readlimit); - } - - /* (non-Javadoc) - * @see java.io.InputStream#markSupported() - */ - @Override - public boolean markSupported() { - init(); - return bis.markSupported(); - } - - /* (non-Javadoc) - * @see java.io.InputStream#read() - */ - @Override - public int read() throws IOException { - init(); - return bis.read(); - } - - /* (non-Javadoc) - * @see java.io.InputStream#read(byte[]) - */ - @Override - public int read(byte[] b) throws IOException { - init(); - return bis.read(b); - } - - /* (non-Javadoc) - * @see java.io.InputStream#read(byte[], int, int) - */ - @Override - public int read(byte[] b, int off, int len) throws IOException { - init(); - return bis.read(b, off, len); - } - - /* (non-Javadoc) - * @see java.io.InputStream#reset() - */ - @Override - public synchronized void reset() throws IOException { - init(); - bis.reset(); - } - - /* (non-Javadoc) - * @see java.io.InputStream#skip(long) - */ - @Override - public long skip(long n) throws IOException { - init(); - return bis.skip(n); - } - -} Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-14 11:21:05 UTC (rev 959) @@ -22,6 +22,8 @@ import javax.ejb.Remote; +import com.healthmarketscience.rmiio.SerializableInputStream; + import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -58,7 +60,7 @@ * * @throws SimExplorerServiceException the sim explorer service exception */ - MetaData saveElement(String token, SimExplorerServiceStream zipStream) + MetaData saveElement(String token, SerializableInputStream zipStream) throws SimExplorerServiceException; /** @@ -72,8 +74,8 @@ * * @throws SimExplorerServiceException the sim explorer service exception */ - MetaData saveElement(String token, SimExplorerServiceStream xmlStream, - Map<Attachment, SimExplorerServiceStream> attachmentsStream) + MetaData saveElement(String token, SerializableInputStream xmlStream, + Map<Attachment, SerializableInputStream> attachmentsStream) throws SimExplorerServiceException; /** Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-14 11:21:05 UTC (rev 959) @@ -35,6 +35,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; +import com.healthmarketscience.rmiio.SerializableInputStream; + import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.DataEntity; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; @@ -171,7 +173,7 @@ * * @throws SimExplorerServiceException the sim explorer service exception */ - public MetaData saveElement(String token, SimExplorerServiceStream zipStream) throws SimExplorerServiceException { + public MetaData saveElement(String token, SerializableInputStream zipStream) throws SimExplorerServiceException { String xmlFile = null; Map<Attachment, String> attachments = new HashMap<Attachment, String>(); @@ -233,13 +235,13 @@ * * @throws SimExplorerServiceException the exception */ - public MetaData saveElement(String token, SimExplorerServiceStream xmlFile, - Map<Attachment, SimExplorerServiceStream> attachments) throws SimExplorerServiceException { + public MetaData saveElement(String token, SerializableInputStream xmlFile, + Map<Attachment, SerializableInputStream> attachments) throws SimExplorerServiceException { try { // Store temporary data String idxml = getStorageEngine().storeTempData(xmlFile); Map<Attachment, String> idsattachment = new HashMap<Attachment, String>(); - for (Map.Entry<Attachment, SimExplorerServiceStream> entry : attachments.entrySet()) { + for (Map.Entry<Attachment, SerializableInputStream> entry : attachments.entrySet()) { String idattachment = getStorageEngine().storeTempData(entry.getValue()); idsattachment.put(entry.getKey(), idattachment); } @@ -272,7 +274,7 @@ MetaData mde = getMetadata(token, uuid, version); InputStream stream = getStorageEngine().retrieveData(token, mde, attachment); - return new SimExplorerServiceStream(stream); + return new SerializableInputStream(stream); } catch (Exception e) { throw new SimExplorerServiceException(e); } @@ -293,7 +295,7 @@ MetaData mde = getMetadata(token, uuid, version); try { InputStream xmlStream = getStorageEngine().retrieveData(token, mde, getXMLAttachment()); - return new SimExplorerServiceStream(xmlStream); + return new SerializableInputStream(xmlStream); } catch (Exception e) { throw new SimExplorerServiceException(e); } @@ -335,7 +337,7 @@ ZipStreamEncoder zse = new ZipStreamEncoder(files, pipedOut); zse.start(); - return new SimExplorerServiceStream(pipedIn); + return new SerializableInputStream(pipedIn); } catch (Exception e) { throw new SimExplorerServiceException(e); } Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-02-14 11:21:05 UTC (rev 959) @@ -17,15 +17,18 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import java.io.IOException; import java.io.InputStream; +import com.healthmarketscience.rmiio.SerializableInputStream; + import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; public class StorageServiceHelper { public static final String STORAGE_SERVICE_LOOKUP_NAME = "StorageService"; - + /** * Export element to another service. * @@ -44,7 +47,12 @@ // Extract element from source service InputStream fromElement = fromService.retrieveElementFull(token, uuid, version); // Store element in remote service - MetaData toElement = toService.saveElement(token, new SimExplorerServiceStream(fromElement)); + MetaData toElement; + try { + toElement = toService.saveElement(token, new SerializableInputStream(fromElement)); + } catch (IOException e) { + throw new SimExplorerServiceException(e); + } // fromElement has to be updated if (!toElement.getUuid().equals(uuid) || !toElement.getVersion().equals(Version.valueOf(version))) { Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceLocalVersions.java 2008-02-14 11:21:05 UTC (rev 959) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -26,6 +25,9 @@ import java.util.Set; import junit.framework.TestCase; + +import com.healthmarketscience.rmiio.SerializableInputStream; + import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component; @@ -49,7 +51,7 @@ /** The r. */ private Random r = new Random(); - private Map<Attachment, SimExplorerServiceStream> attachments; + private Map<Attachment, SerializableInputStream> attachments; /* (non-Javadoc) * @see junit.framework.TestCase#setUp() @@ -66,7 +68,7 @@ boolean computeAttachments) throws Exception { if (computeAttachments) { - attachments = new HashMap<Attachment, SimExplorerServiceStream>(); + attachments = new HashMap<Attachment, SerializableInputStream>(); List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); @@ -91,13 +93,13 @@ RandomStream randomStream = elementGenerator .generateTextStream(); attachment.setDataHash(randomStream.getMd5()); - SimExplorerServiceStream stream = new SimExplorerServiceStream( + SerializableInputStream stream = new SerializableInputStream( randomStream.getStream()); attachments.put(attachment, stream); } } - SimExplorerServiceStream xmlStream = new SimExplorerServiceStream( + SerializableInputStream xmlStream = new SerializableInputStream( BaseEntityFactory.getFactory(ExplorationApplication.class) .saveElement(XmlConstants.VALUE_METADATA_TYPE_EA, ea)); Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceMassInsert.java 2008-02-14 11:21:05 UTC (rev 959) @@ -17,7 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import java.io.InputStream; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -32,9 +31,7 @@ import junit.framework.TestCase; -import com.healthmarketscience.rmiio.RemoteInputStream; -import com.healthmarketscience.rmiio.RemoteInputStreamServer; -import com.healthmarketscience.rmiio.SimpleRemoteInputStream; +import com.healthmarketscience.rmiio.SerializableInputStream; import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Component; @@ -69,8 +66,7 @@ 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.initial", "org.jnp.interfaces.NamingContextFactory"); properties.put("java.naming.factory.url.pkgs", "org.jnp.interfaces"); Context context = new InitialContext(properties); @@ -98,47 +94,37 @@ for (int j = 0; j < v; j++) { ExplorationApplication ea = elementGenerator.generateRandomEA(); ea.getMetaData().setUuid(parentEa.getMetaData().getUuid()); - ea.getMetaData().setVersion( - parentEa.getMetaData().getVersion().toString()); + ea.getMetaData().setVersion(parentEa.getMetaData().getVersion().toString()); - ea.getMetaData().setVersion( - ea.getMetaData().getVersion().incVersion(r.nextInt(3)) - .toString()); + ea.getMetaData().setVersion(ea.getMetaData().getVersion().incVersion(r.nextInt(3)).toString()); - Map<Attachment, SimExplorerServiceStream> attachments = new HashMap<Attachment, SimExplorerServiceStream>(); + Map<Attachment, SerializableInputStream> attachments = new HashMap<Attachment, SerializableInputStream>(); List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); attachmentsKeys.addAll(ea.getMetaData().getAttachments()); Set<Component> components = ea.getComponents(); for (Component component : components) { - attachmentsKeys.addAll(component.getMetaData() - .getAttachments()); + attachmentsKeys.addAll(component.getMetaData().getAttachments()); Set<Library> libraries = component.getLibraries(); for (Library library : libraries) { - attachmentsKeys.addAll(library.getMetaData() - .getAttachments()); + attachmentsKeys.addAll(library.getMetaData().getAttachments()); } } Set<ExplorationData> explorations = ea.getExplorations(); for (ExplorationData explorationData : explorations) { - attachmentsKeys.addAll(explorationData.getMetaData() - .getAttachments()); + attachmentsKeys.addAll(explorationData.getMetaData().getAttachments()); } for (Attachment attachment : attachmentsKeys) { - RandomStream randomStream = elementGenerator - .generateTextStream(); + RandomStream randomStream = elementGenerator.generateTextStream(); attachment.setDataHash(randomStream.getMd5()); - SimExplorerServiceStream stream = new SimExplorerServiceStream( - randomStream.getStream()); + SerializableInputStream stream = new SerializableInputStream(randomStream.getStream()); attachments.put(attachment, stream); } - SimExplorerServiceStream xmlStream = new SimExplorerServiceStream( - BaseEntityFactory.getFactory( - ExplorationApplication.class).saveElement( - XmlConstants.VALUE_METADATA_TYPE_EA, ea)); + SerializableInputStream xmlStream = new SerializableInputStream(BaseEntityFactory.getFactory( + ExplorationApplication.class).saveElement(XmlConstants.VALUE_METADATA_TYPE_EA, ea)); storageService.saveElement(token, xmlStream, attachments); } @@ -146,12 +132,9 @@ 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"); + System.out.println("Insert " + i + " : Time taken : " + time + "ms"); double timePerElement = time / i; - System.out.println("Insert " + i - + " : Time taken per element : " + timePerElement - + "ms"); + System.out.println("Insert " + i + " : Time taken per element : " + timePerElement + "ms"); } } Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/StorageServiceTest.java 2008-02-14 11:21:05 UTC (rev 959) @@ -17,13 +17,13 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import com.healthmarketscience.rmiio.RemoteInputStreamServer; -import com.healthmarketscience.rmiio.SimpleRemoteInputStream; -import junit.framework.TestCase; - import java.io.FileInputStream; import java.io.InputStream; +import junit.framework.TestCase; + +import com.healthmarketscience.rmiio.SerializableInputStream; + /** The Class StorageServiceTest. */ public class StorageServiceTest extends TestCase { @@ -56,7 +56,7 @@ public void testInsertElementZip() throws Exception { InputStream zipStream = new FileInputStream( "./src/ressources/testImport/test.zip"); - SimExplorerServiceStream zipRemoteStream = new SimExplorerServiceStream( + SerializableInputStream zipRemoteStream = new SerializableInputStream( zipStream); storageService.saveElement(null, zipRemoteStream); assertNotNull(storageService.getMetadata(null, "abcd")); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-14 11:21:05 UTC (rev 959) @@ -20,12 +20,10 @@ import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.upload.services.UploadedFile; -import com.healthmarketscience.rmiio.RemoteInputStreamServer; -import com.healthmarketscience.rmiio.SimpleRemoteInputStream; +import com.healthmarketscience.rmiio.SerializableInputStream; import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.service.SimExplorerServiceStream; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; @@ -52,32 +50,28 @@ * * @return the object */ - public Object onSuccess() { + public Object onSuccess() throws Exception { MetaData mde = null; if (_fileEA != null) { - SimExplorerServiceStream zipStream = new SimExplorerServiceStream( - _fileEA.getStream()); + SerializableInputStream zipStream = new SerializableInputStream(_fileEA.getStream()); // RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( // _fileEA.getStream()); try { // mde = RemoteStorageService.getStorageService().saveElement( // getToken(), zipRemoteStream.export()); - mde = RemoteStorageService.getStorageService().saveElement( - getToken(), zipStream); + mde = RemoteStorageService.getStorageService().saveElement(getToken(), zipStream); } catch (Exception e) { throw new SimExplorerWebException(e); } } else { if (_fileLib != null) { - SimExplorerServiceStream zipStream = new SimExplorerServiceStream( - _fileLib.getStream()); + SerializableInputStream zipStream = new SerializableInputStream(_fileLib.getStream()); // RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( // _fileLib.getStream()); try { // mde = RemoteStorageService.getStorageService().saveElement( // getToken(), zipRemoteStream.export()); - mde = RemoteStorageService.getStorageService().saveElement( - getToken(), zipStream); + mde = RemoteStorageService.getStorageService().saveElement(getToken(), zipStream); } catch (Exception e) { throw new SimExplorerWebException(); } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-14 08:45:58 UTC (rev 958) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-14 11:21:05 UTC (rev 959) @@ -27,6 +27,8 @@ import org.apache.tapestry.annotations.InjectPage; +import com.healthmarketscience.rmiio.SerializableInputStream; + import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; @@ -36,7 +38,6 @@ import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; import fr.cemagref.simexplorer.is.factories.XmlConstants; import fr.cemagref.simexplorer.is.service.ElementGenerator; -import fr.cemagref.simexplorer.is.service.SimExplorerServiceStream; import fr.cemagref.simexplorer.is.service.ElementGenerator.RandomStream; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.SuperAdminPage; @@ -78,55 +79,45 @@ parentEa = elementGenerator.generateRandomEA(); int v = 2 + r.nextInt(5); - Version version = new Version(parentEa.getMetaData() - .getVersion().toString()); + Version version = new Version(parentEa.getMetaData().getVersion().toString()); for (int j = 0; j < v; j++) { - ExplorationApplication ea = elementGenerator - .generateRandomEA(); + ExplorationApplication ea = elementGenerator.generateRandomEA(); ea.getMetaData().setUuid(parentEa.getMetaData().getUuid()); version = version.incVersion(r.nextInt(3)); ea.getMetaData().setVersion(version.toString()); - Map<Attachment, SimExplorerServiceStream> attachments = new HashMap<Attachment, SimExplorerServiceStream>(); + Map<Attachment, SerializableInputStream> attachments = new HashMap<Attachment, SerializableInputStream>(); List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); attachmentsKeys.addAll(ea.getMetaData().getAttachments()); Set<Component> components = ea.getComponents(); for (Component component : components) { - attachmentsKeys.addAll(component.getMetaData() - .getAttachments()); + attachmentsKeys.addAll(component.getMetaData().getAttachments()); Set<Library> libraries = component.getLibraries(); for (Library library : libraries) { - attachmentsKeys.addAll(library.getMetaData() - .getAttachments()); + attachmentsKeys.addAll(library.getMetaData().getAttachments()); } } Set<ExplorationData> explorations = ea.getExplorations(); for (ExplorationData explorationData : explorations) { - attachmentsKeys.addAll(explorationData.getMetaData() - .getAttachments()); + attachmentsKeys.addAll(explorationData.getMetaData().getAttachments()); } for (Attachment attachment : attachmentsKeys) { - RandomStream randomStream = elementGenerator - .generateTextStream(); + RandomStream randomStream = elementGenerator.generateTextStream(); attachment.setDataHash(randomStream.getMd5()); - SimExplorerServiceStream remoteStream = new SimExplorerServiceStream( - randomStream.getStream()); + SerializableInputStream remoteStream = new SerializableInputStream(randomStream.getStream()); attachments.put(attachment, remoteStream); } - InputStream xmlStream = BaseEntityFactory.getFactory( - ExplorationApplication.class).saveElement( + InputStream xmlStream = BaseEntityFactory.getFactory(ExplorationApplication.class).saveElement( XmlConstants.VALUE_METADATA_TYPE_EA, ea); - SimExplorerServiceStream xmlRemoteStream = new SimExplorerServiceStream( - xmlStream); - RemoteStorageService.getStorageService().saveElement( - getToken(), xmlRemoteStream, attachments); + SerializableInputStream xmlRemoteStream = new SerializableInputStream(xmlStream); + RemoteStorageService.getStorageService().saveElement(getToken(), xmlRemoteStream, attachments); } }