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

r564 - in trunk: simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools simexplorer-is-web/src/main/webapp
by glandais＠users.labs.libre-entreprise.org 31 Jan '08

31 Jan '08

Author: glandais Date: 2008-01-31 13:31:00 +0000 (Thu, 31 Jan 2008) New Revision: 564 Added: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/ZipStreamEncoder.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ZipAttachment.java Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 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/StorageServiceCommon.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml Log: Removed ByteArray streams copy to piped streams Export element as zip Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Component.java 2008-01-31 13:31:00 UTC (rev 564) @@ -18,6 +18,8 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; import java.util.Set; public class Component extends LoggableElement implements Serializable { @@ -61,4 +63,11 @@ this.libraries = libraries; } + @Override + public List<LoggableElement> getDirectChildren() { + List<LoggableElement> directChildren = new ArrayList<LoggableElement>(); + directChildren.addAll(libraries); + return directChildren; + } + } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationApplication.java 2008-01-31 13:31:00 UTC (rev 564) @@ -18,6 +18,8 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; import java.util.Set; public class ExplorationApplication extends LoggableElement implements Serializable { @@ -43,4 +45,12 @@ this.components = components; } + @Override + public List<LoggableElement> getDirectChildren() { + List<LoggableElement> directChildren = new ArrayList<LoggableElement>(); + directChildren.addAll(explorations); + directChildren.addAll(components); + return directChildren; + } + } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/ExplorationData.java 2008-01-31 13:31:00 UTC (rev 564) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.List; import java.util.Set; public class ExplorationData extends LoggableElement implements Serializable { @@ -71,4 +72,9 @@ this.valuesMap = valuesMap; } + @Override + public List<LoggableElement> getDirectChildren() { + return null; + } + } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/Library.java 2008-01-31 13:31:00 UTC (rev 564) @@ -18,9 +18,15 @@ package fr.cemagref.simexplorer.is.entities.data; import java.io.Serializable; +import java.util.List; public class Library extends LoggableElement implements Serializable { private static final long serialVersionUID = -5635619075345573945L; + @Override + public List<LoggableElement> getDirectChildren() { + return null; + } + } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-01-31 13:31:00 UTC (rev 564) @@ -17,6 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.data; +import java.util.ArrayList; +import java.util.List; + import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; public abstract class LoggableElement extends DataEntity { @@ -41,9 +44,26 @@ @Override public String toString() { - if (metaData==null) { + if (metaData == null) { return super.toString(); } - return metaData.getName()+" ["+metaData.getVersion()+']'; + return metaData.getName() + " [" + metaData.getVersion() + ']'; } + + public abstract List<LoggableElement> getDirectChildren(); + + public List<LoggableElement> getChildren() { + List<LoggableElement> directChildren = getDirectChildren(); + + List<LoggableElement> children = new ArrayList<LoggableElement>(); + if (directChildren != null) { + for (LoggableElement element : directChildren) { + children.add(element); + children.addAll(element.getChildren()); + } + } + + return children; + } + } Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/factories/BaseEntityFactory.java 2008-01-31 13:31:00 UTC (rev 564) @@ -17,9 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.factories; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -171,7 +171,7 @@ */ public InputStream saveElement(String rootNodeName, E element) throws Exception { - ByteArrayOutputStream os = new ByteArrayOutputStream(); + PipedOutputStream os = new PipedOutputStream(); org.w3c.dom.Document xmlDocument = getXMLBuilder().newDocument(); // DOM properties @@ -189,7 +189,7 @@ Transformer transformer = tf.newTransformer(); transformer.transform(domSource, result); - InputStream is = new ByteArrayInputStream(os.toByteArray()); + InputStream is = new PipedInputStream(os); return is; } @@ -283,15 +283,14 @@ xmlDocument.appendChild(xmlDocument.importNode(node, true)); DOMSource domSource = new DOMSource(xmlDocument); - ByteArrayOutputStream os = new ByteArrayOutputStream(); + PipedOutputStream os = new PipedOutputStream(); StreamResult result = new StreamResult(os); TransformerFactory tf = TransformerFactory.newInstance(); Transformer transformer = tf.newTransformer(); transformer.transform(domSource, result); - ByteArrayInputStream inputStream; - inputStream = new ByteArrayInputStream(os - .toByteArray()); + PipedInputStream inputStream; + inputStream = new PipedInputStream(os); return inputStream; } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-01-31 13:31:00 UTC (rev 564) @@ -17,9 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -211,14 +211,14 @@ } public InputStream generateTextStream() throws Exception { - ByteArrayOutputStream os = new ByteArrayOutputStream(); + PipedOutputStream os = new PipedOutputStream(); int wordcount = 300 + r.nextInt(300); StringBuffer sb = new StringBuffer(); for (int i = 0; i < wordcount; i++) { sb.append(randomstrings[r.nextInt(cs)]).append(" "); } os.write(sb.toString().getBytes()); - InputStream is = new ByteArrayInputStream(os.toByteArray()); + InputStream is = new PipedInputStream(os); return is; } } 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-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-31 13:31:00 UTC (rev 564) @@ -25,7 +25,6 @@ import java.util.TreeMap; import com.healthmarketscience.rmiio.RemoteInputStream; -import com.healthmarketscience.rmiio.RemoteOutputStream; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; @@ -82,10 +81,14 @@ return mockData().get(uuid); } - public void exportElement(String token, RemoteOutputStream xmlOutputStream, String uuid, String version) throws SimExplorerServiceException { - checkImplemented(); + public RemoteInputStream exportElement(String token, String uuid, String version) throws SimExplorerServiceException { + return (RemoteInputStream) checkImplemented(); } + public RemoteInputStream exportFull(String token, String uuid, String version) throws SimExplorerServiceException { + return (RemoteInputStream) checkImplemented(); + } + public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws SimExplorerServiceException { return null; } @@ -158,4 +161,5 @@ // TODO Auto-generated method stub } + } 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-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-31 13:31:00 UTC (rev 564) @@ -22,7 +22,6 @@ import javax.ejb.Remote; import com.healthmarketscience.rmiio.RemoteInputStream; -import com.healthmarketscience.rmiio.RemoteOutputStream; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; @@ -107,19 +106,30 @@ throws SimExplorerServiceException; /** - * Export element to a remote stream + * Export XML of element to a remote stream * * @param token - * @param xmlOutputStream - * RMIIO stream where to save data * @param uuid * @param version + * @return RMIIO stream with data * @throws SimExplorerServiceException */ - void exportElement(String token, RemoteOutputStream xmlOutputStream, - String uuid, String version) throws SimExplorerServiceException; + RemoteInputStream exportElement(String token, String uuid, String version) + throws SimExplorerServiceException; /** + * Export full element to a remote stream as a zip + * + * @param token + * @param uuid + * @param version + * @return RMIIO stream with data + * @throws SimExplorerServiceException + */ + RemoteInputStream exportFull(String token, String uuid, String version) + throws SimExplorerServiceException; + + /** * Retrieve data related to an entity * * @param token 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-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-31 13:31:00 UTC (rev 564) @@ -17,19 +17,19 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; +import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; -import java.util.ArrayList; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.rmi.RemoteException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.zip.Deflater; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import java.rmi.RemoteException; +import java.util.zip.ZipOutputStream; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -37,8 +37,6 @@ import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; import com.healthmarketscience.rmiio.RemoteInputStreamServer; -import com.healthmarketscience.rmiio.RemoteOutputStream; -import com.healthmarketscience.rmiio.RemoteOutputStreamClient; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; import fr.cemagref.simexplorer.is.contenttype.ContentType; @@ -48,8 +46,9 @@ import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; import fr.cemagref.simexplorer.is.factories.MetaDataEntityFactory; import fr.cemagref.simexplorer.is.factories.XmlConstants; +import fr.cemagref.simexplorer.is.storage.StorageException; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; -import fr.cemagref.simexplorer.is.storage.StorageException; +import fr.cemagref.simexplorer.is.storage.util.ZipStreamEncoder; public abstract class StorageServiceCommon implements StorageService, XmlConstants { @@ -241,25 +240,52 @@ } } - public void exportElement(String token, RemoteOutputStream xmlOutputStream, - String uuid, String version) throws SimExplorerServiceException { + public RemoteInputStream exportElement(String token, String uuid, + String version) throws SimExplorerServiceException { MetaDataEntity mde = getMetadata(token, uuid, version); try { InputStream xmlStream = getStorageEngine().retrieveData(token, mde, KEY_XML); - OutputStream os = RemoteOutputStreamClient.wrap(xmlOutputStream); + RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( + xmlStream); + return remoteStream.export(); + } catch (StorageException e) { + throw new SimExplorerServiceException(e); + } catch (IOException e) { + throw new SimExplorerServiceException(e); + } - // 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; + } + + public RemoteInputStream exportFull(String token, String uuid, + String version) throws SimExplorerServiceException { + LoggableElement element = getElement(token, uuid, version); + MetaDataEntity mde = element.getMetaData(); + try { + PipedOutputStream pipedOut = new PipedOutputStream(); + Map<String, InputStream> files = new HashMap<String, InputStream>(); + + files.put(FILE_XML, getStorageEngine().retrieveData(token, mde, + KEY_XML)); + List<LoggableElement> children = element.getChildren(); + for (LoggableElement loggableElement : children) { + MetaDataEntity thisMde = loggableElement.getMetaData(); + Map<String, ContentType> attachments = loggableElement + .getMetaData().getAttachments(); + for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { + files.put(FILE_DATA_PREFIX + "/" + kv.getKey(), + getStorageEngine().retrieveData(token, thisMde, + kv.getKey())); } - bout.write(datum); } - bout.flush(); + + ZipStreamEncoder zse = new ZipStreamEncoder(files, pipedOut); + zse.start(); + + PipedInputStream pipedIn = new PipedInputStream(pipedOut); + RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( + pipedIn); + return remoteStream.export(); } catch (StorageException e) { throw new SimExplorerServiceException(e); } catch (IOException e) { Added: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/ZipStreamEncoder.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/ZipStreamEncoder.java (rev 0) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/ZipStreamEncoder.java 2008-01-31 13:31:00 UTC (rev 564) @@ -0,0 +1,67 @@ +/* +* ##% 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.storage.util; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PipedOutputStream; +import java.util.Map; +import java.util.zip.Deflater; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +public class ZipStreamEncoder extends Thread { + + static final int BUFFER = 2048; + + private Map<String, InputStream> files; + private PipedOutputStream os; + + private ZipOutputStream zos; + + public ZipStreamEncoder(Map<String, InputStream> files, PipedOutputStream os) { + super(); + this.files = files; + this.os = os; + + zos = new ZipOutputStream(this.os); + zos.setMethod(ZipOutputStream.DEFLATED); + zos.setLevel(Deflater.BEST_COMPRESSION); + } + + public void run() { + byte data[] = new byte[BUFFER]; + try { + for (Map.Entry<String, InputStream> kv : files.entrySet()) { + ZipEntry entry = new ZipEntry(kv.getKey()); + InputStream origin = kv.getValue(); + zos.putNextEntry(entry); + int count; + while ((count = origin.read(data, 0, BUFFER)) != -1) { + zos.write(data, 0, count); + } + origin.close(); + } + + zos.close(); + } catch (IOException e) { + // TODO + } + } + +} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-31 13:31:00 UTC (rev 564) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -32,8 +30,6 @@ import com.healthmarketscience.rmiio.RemoteInputStream; import com.healthmarketscience.rmiio.RemoteInputStreamClient; -import com.healthmarketscience.rmiio.RemoteOutputStreamServer; -import com.healthmarketscience.rmiio.SimpleRemoteOutputStream; import fr.cemagref.simexplorer.is.contenttype.ContentType; import fr.cemagref.simexplorer.is.entities.data.Component; @@ -45,8 +41,8 @@ import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; import fr.cemagref.simexplorer.is.ui.web.tools.AttachmentStreamResponse; -import fr.cemagref.simexplorer.is.ui.web.tools.DownloadableFile; import fr.cemagref.simexplorer.is.ui.web.tools.XMLAttachment; +import fr.cemagref.simexplorer.is.ui.web.tools.ZipAttachment; public class ElementExport extends ElementPageDetail { @@ -60,21 +56,36 @@ MetaDataEntity mde = getMetadata(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - RemoteOutputStreamServer xmlRemoteOutputStream = new SimpleRemoteOutputStream( - bos); try { - RemoteStorageService.getStorageService().exportElement(getToken(), - xmlRemoteOutputStream.export(), mde.getUuid(), - mde.getVersion().toString()); + RemoteInputStream ris = RemoteStorageService.getStorageService() + .exportElement(getToken(), mde.getUuid(), + mde.getVersion().toString()); + InputStream stream = RemoteInputStreamClient.wrap(ris); + response = new XMLAttachment(stream, mde.getType() + "." + + mde.getUuid() + ".v" + mde.getVersion()); } catch (Exception e) { throw new SimExplorerWebException(e); } - ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - response = new XMLAttachment(bis, mde.getType() + "." + mde.getUuid() - + ".v" + mde.getVersion()); + return response; + } + public Object onActionFromDownloadFull() { + Object response; + + MetaDataEntity mde = getMetadata(); + + try { + RemoteInputStream ris = RemoteStorageService.getStorageService() + .exportFull(getToken(), mde.getUuid(), + mde.getVersion().toString()); + InputStream stream = RemoteInputStreamClient.wrap(ris); + response = new ZipAttachment(stream, mde.getType() + "." + + mde.getUuid() + ".v" + mde.getVersion()); + } catch (Exception e) { + throw new SimExplorerWebException(e); + } + return response; } @@ -132,7 +143,7 @@ } if (getElement() instanceof Library) { node = generateLibrary((Library) getElement()); - } + } return node; } @@ -253,8 +264,8 @@ } node.setChildren(children); - node.setColumns(generateStringArray("Library", library - .getMetaData().getName())); + node.setColumns(generateStringArray("Library", library.getMetaData() + .getName())); return node; } Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ZipAttachment.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ZipAttachment.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/tools/ZipAttachment.java 2008-01-31 13:31:00 UTC (rev 564) @@ -0,0 +1,30 @@ +/* +* ##% 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.ui.web.tools; + +import java.io.InputStream; + +public class ZipAttachment extends AttachmentStreamResponse { + + public ZipAttachment(InputStream is, String filenameIn) { + super(is, filenameIn); + this.contentType = "application/zip"; + this.extension = "zip"; + } + +} Modified: trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-01-30 15:48:12 UTC (rev 563) +++ trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-01-31 13:31:00 UTC (rev 564) @@ -3,6 +3,8 @@ <p><t:actionlink t:id="downloadXML">${message:downloadxml}</t:actionlink> </p> + <p><t:actionlink t:id="downloadFull">${message:downloadfull}</t:actionlink> + </p> <p> <h2>${message:attachments}</h2>

1 0

r563 - trunk/simexplorer-is/src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org 30 Jan '08

30 Jan '08

Author: glandais Date: 2008-01-30 15:48:12 +0000 (Wed, 30 Jan 2008) New Revision: 563 Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst Log: Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-01-30 14:09:51 UTC (rev 562) +++ trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-01-30 15:48:12 UTC (rev 563) @@ -45,7 +45,7 @@ Lancer JBoss via son script de lancement : :: - bin/run.sh -c simexplorer + bin/run.sh -b 0.0.0.0 -c simexplorer Première connexion ================== @@ -60,5 +60,35 @@ Si la configuration du serveur n'a pas été modifiée, initialiser l'application via l'URL http://ADRESSE-DU-SERVEUR:8080/simexplorer-is-web/install en étant connecté en tant -que superadmin. Cette page permet de générer 20 explorations d'application aléatoires. - +que superadmin. Cette page permet de générer des explorations d'application aléatoires, cette +opération peut s'avérer assez longue (plus d'une minute). + +Récapitulatif +============= + +PC client +--------- + +:: + scp jboss-4.2.2.GA.zip USER at IPSERVEUR:~/ + scp simexplorer-is-ear-VERSION.ear USER at IPSERVER:~/ + +Serveur +------- + +:: + cd + unzip jboss-4.2.2.GA.zip + cd jboss-4.2.2.GA/server/ + cp -R default simexplorer + cd + cp simexplorer-is-ear-VERSION.ear jboss-4.2.2.GA/server/simexplorer/deploy/ + cd /var/local/ + sudo mkdir simexplorer + sudo chown USER simexplorer + cd simexplorer/ + mkdir h2 + cd + cd jboss-4.2.2.GA/bin + ./run.sh -b 0.0.0.0 -c simexplorer + \ No newline at end of file

1 0

r562 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 30 Jan '08

30 Jan '08

Author: glandais Date: 2008-01-30 14:09:51 +0000 (Wed, 30 Jan 2008) New Revision: 562 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java Log: Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-30 11:37:54 UTC (rev 561) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-30 14:09:51 UTC (rev 562) @@ -273,7 +273,7 @@ node.setColumns(generateStringArray("Library", library .getMetaData().getName(), library.getMetaData() - .getVersion().toString(), library.getMetaData(), false, + .getVersion().toString(), library.getMetaData(), true, "export")); return node; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-01-30 11:37:54 UTC (rev 561) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-01-30 14:09:51 UTC (rev 562) @@ -118,7 +118,6 @@ } if (security) { sb.append("<br>"); - // TODO add security sb.append(generateString("rights", "rights", element)); }

1 0

r561 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components
by glandais＠users.labs.libre-entreprise.org 30 Jan '08

30 Jan '08

Author: glandais Date: 2008-01-30 11:37:54 +0000 (Wed, 30 Jan 2008) New Revision: 561 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java Log: Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-01-30 11:13:19 UTC (rev 560) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-01-30 11:37:54 UTC (rev 561) @@ -19,6 +19,8 @@ import java.util.Locale; +import javax.servlet.http.HttpSession; + import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.IncludeStylesheet; @@ -29,6 +31,7 @@ import org.apache.tapestry.corelib.components.TextField; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.PersistentLocale; +import org.apache.tapestry.services.RequestGlobals; import fr.cemagref.simexplorer.is.ui.web.pages.ElementList; @@ -61,6 +64,9 @@ @InjectPage private ElementList elementList; + @Inject + private RequestGlobals requestGlobals; + /** * page title */ @@ -108,7 +114,8 @@ } public Object onActionFromLogout() { - token = null; + HttpSession session = requestGlobals.getHTTPServletRequest().getSession(); + session.invalidate(); return elementList; }

1 0

r560 - trunk/simexplorer-is/src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org 30 Jan '08

30 Jan '08

Author: glandais Date: 2008-01-30 11:13:19 +0000 (Wed, 30 Jan 2008) New Revision: 560 Added: trunk/simexplorer-is/src/site/fr/rst/todo.rst Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst Log: Doc update Modified: trunk/simexplorer-is/src/site/fr/rst/install.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-01-30 11:11:08 UTC (rev 559) +++ trunk/simexplorer-is/src/site/fr/rst/install.rst 2008-01-30 11:13:19 UTC (rev 560) @@ -50,7 +50,15 @@ Première connexion ================== -Si la configuration du serveur n'a pas été modifiée, se connecté à l'application +Si la configuration du serveur n'a pas été modifiée, se connecter à l'application via l'URL http://ADRESSE-DU-SERVEUR:8080/simexplorer-is-web -Se connecter avec le login superadmin et le mot de passe password. \ No newline at end of file +Se connecter avec le login superadmin et le mot de passe password. + +Initialisation +============== + +Si la configuration du serveur n'a pas été modifiée, initialiser l'application +via l'URL http://ADRESSE-DU-SERVEUR:8080/simexplorer-is-web/install en étant connecté en tant +que superadmin. Cette page permet de générer 20 explorations d'application aléatoires. + Added: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst (rev 0) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-01-30 11:13:19 UTC (rev 560) @@ -0,0 +1,39 @@ +===================== +SimExplorer SI - TODO +===================== + +Serveur central +=============== + + - Règles de gestion pour la journalisation d'un élément + - Règles de gestion pour la suppression d'élément (élément liés, etc) + - Règles de gestion pour la suppression d'un groupe/utilisateur (éléments liés) + - Génération mot de passe ("password" pour le moment) + - Export zip d'un élément + - Validation d'archive (checksum) + - Envoi de mail aux superadmins lors de la requête d'un compte + +Client léger +============ + + - Explication rejet login + - Internationalisation + - Gestion des exceptions + +Consultation +------------ + + - Interface utilisateur : CSS, mise en page + +Administration +-------------- + + - Gestion des utilisateurs : édition de certaines propriétés en fonction des droits (un admin + ne peut pas mettre un utilisateur superadmin, etc) + +Client lourd +============ + + - Synchronisation d'un élément avec le serveur + - Communication avec le serveur via SSL + \ No newline at end of file

1 0

r559 - in trunk/simexplorer-is-web/src: java/fr/cemagref/simexplorer/is/ui/web/pages java/fr/cemagref/simexplorer/is/ui/web/pages/security main/webapp main/webapp/WEB-INF
by glandais＠users.labs.libre-entreprise.org 30 Jan '08

30 Jan '08

Author: glandais Date: 2008-01-30 11:11:08 +0000 (Wed, 30 Jan 2008) New Revision: 559 Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java trunk/simexplorer-is-web/src/main/webapp/Install.tml Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties Log: Install page Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-30 10:44:10 UTC (rev 558) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-01-30 11:11:08 UTC (rev 559) @@ -87,6 +87,9 @@ if (getElement() instanceof Component) { node = generateComponent((Component) getElement()); } + if (getElement() instanceof Library) { + node = generateLibrary((Library) getElement()); + } return node; } @@ -257,19 +260,24 @@ List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; for (Library library : libraries) { - TreeNode node = new TreeNode(); - node.setType(TreeNode.TYPE_DOCUMENT); + TreeNode node = generateLibrary(library); - node.setColumns(generateStringArray("Library", library - .getMetaData().getName(), library.getMetaData() - .getVersion().toString(), component.getMetaData(), false, - "export")); - res.add(node); } return res; } + private TreeNode generateLibrary(Library library) { + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_DOCUMENT); + + node.setColumns(generateStringArray("Library", library + .getMetaData().getName(), library.getMetaData() + .getVersion().toString(), library.getMetaData(), false, + "export")); + return node; + } + private List<TreeNode> generateCodes(Set<Code> codes) { List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-30 10:44:10 UTC (rev 558) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-01-30 11:11:08 UTC (rev 559) @@ -130,6 +130,9 @@ if (getElement() instanceof Component) { node = generateComponent((Component) getElement()); } + if (getElement() instanceof Library) { + node = generateLibrary((Library) getElement()); + } return node; } @@ -232,25 +235,29 @@ List<TreeNode> res = new ArrayList<TreeNode>(); int i = 0; for (Library library : libraries) { - TreeNode node = new TreeNode(); - node.setType(TreeNode.TYPE_FOLDER); - - Map<String, ContentType> attachments = library.getMetaData() - .getAttachments(); - List<TreeNode> children = new ArrayList<TreeNode>(); - for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { - children.add(generateDownload(library, kv)); - } - node.setChildren(children); - - node.setColumns(generateStringArray("Library", library - .getMetaData().getName())); - + TreeNode node = generateLibrary(library); res.add(node); } return res; } + private TreeNode generateLibrary(Library library) { + TreeNode node = new TreeNode(); + node.setType(TreeNode.TYPE_FOLDER); + + Map<String, ContentType> attachments = library.getMetaData() + .getAttachments(); + List<TreeNode> children = new ArrayList<TreeNode>(); + for (Map.Entry<String, ContentType> kv : attachments.entrySet()) { + children.add(generateDownload(library, kv)); + } + node.setChildren(children); + + node.setColumns(generateStringArray("Library", library + .getMetaData().getName())); + return node; + } + private TreeNode generateDownload(LoggableElement explorationData, Entry<String, ContentType> kv) { TreeNode node = new TreeNode(); Added: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java (rev 0) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-01-30 11:11:08 UTC (rev 559) @@ -0,0 +1,127 @@ +/* +* ##% 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.ui.web.pages; + +import java.io.InputStream; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.Set; + +import org.apache.tapestry.annotations.InjectPage; + +import com.healthmarketscience.rmiio.RemoteInputStream; +import com.healthmarketscience.rmiio.RemoteInputStreamServer; +import com.healthmarketscience.rmiio.SimpleRemoteInputStream; + +import fr.cemagref.simexplorer.is.contenttype.ContentType; +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.ExplorationData; +import fr.cemagref.simexplorer.is.entities.data.Library; +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.ui.web.SimExplorerWebException; +import fr.cemagref.simexplorer.is.ui.web.pages.security.SuperAdminPage; +import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; + +public class Install extends SuperAdminPage { + + @InjectPage + private ElementList elementList; + + @Override + public String getWindowTitle() { + return ""; + } + + public Object onActionFromGenerateData() { + + ElementGenerator elementGenerator = new ElementGenerator(); + Random r = new Random(); + + int c = 20; + + try { + + for (int i = 0; i < c; i++) { + ExplorationApplication parentEa = null; + parentEa = elementGenerator.generateRandomEA(); + + int v = 2 + r.nextInt(5); + + 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().getVersion().incVersion(r.nextInt(3)); + + InputStream xmlStream = BaseEntityFactory.getFactory( + ExplorationApplication.class).saveElement( + XmlConstants.VALUE_METADATA_TYPE_EA, ea); + + Map<String, RemoteInputStream> attachments = new HashMap<String, RemoteInputStream>(); + + Map<String, ContentType> attachmentsKeys = new HashMap<String, ContentType>(); + + attachmentsKeys.putAll(ea.getMetaData().getAttachments()); + Set<Component> components = ea.getComponents(); + for (Component component : components) { + attachmentsKeys.putAll(component.getMetaData() + .getAttachments()); + Set<Library> libraries = component.getLibraries(); + for (Library library : libraries) { + attachmentsKeys.putAll(library.getMetaData() + .getAttachments()); + } + } + Set<ExplorationData> explorations = ea.getExplorations(); + for (ExplorationData explorationData : explorations) { + attachmentsKeys.putAll(explorationData.getMetaData() + .getAttachments()); + } + + for (Map.Entry<String, ContentType> kv : attachmentsKeys + .entrySet()) { + InputStream stream = elementGenerator + .generateTextStream(); + RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( + stream); + attachments.put(kv.getKey(), remoteStream.export()); + } + + RemoteInputStreamServer xmlRemoteStream = new SimpleRemoteInputStream( + xmlStream); + RemoteStorageService.getStorageService().saveElement( + getToken(), xmlRemoteStream.export(), attachments); + } + + } + } catch (Exception e) { + throw new SimExplorerWebException(e); + } + + return elementList; + } + +} Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-30 10:44:10 UTC (rev 558) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-01-30 11:11:08 UTC (rev 559) @@ -46,6 +46,8 @@ getUserRights(); if (!userLogged) return "Login"; + if (!hasAccessToPage()) + throw new SimExplorerWebException("simexplorer.security.norights"); return null; } Added: trunk/simexplorer-is-web/src/main/webapp/Install.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/Install.tml (rev 0) +++ trunk/simexplorer-is-web/src/main/webapp/Install.tml 2008-01-30 11:11:08 UTC (rev 559) @@ -0,0 +1,6 @@ +<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" + title="${windowtitle}"> + + <t:actionlink t:id="generatedata">${message:generatedata}</t:actionlink> + +</t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-01-30 10:44:10 UTC (rev 558) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-01-30 11:11:08 UTC (rev 559) @@ -1,3 +1,6 @@ +layout-install=Generate data +generatedata=Generate data + explorationapplication=Exploration application library=Library

1 0

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

30 Jan '08

Author: tchemit Date: 2008-01-30 10:44:10 +0000 (Wed, 30 Jan 2008) New Revision: 558 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java Log: pfffff, les imports dans eclispe, il existe un raccourci pour optimiser les imports Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-01-29 18:20:47 UTC (rev 557) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-01-30 10:44:10 UTC (rev 558) @@ -30,7 +30,6 @@ import org.apache.commons.lang.RandomStringUtils; -import fr.cemagref.simexplorer.is.contenttype.ContentType; import fr.cemagref.simexplorer.is.contenttype.ContentTypeFactory; import fr.cemagref.simexplorer.is.entities.data.Code; import fr.cemagref.simexplorer.is.entities.data.Component;

1 0

r557 - in trunk: simexplorer-is-ear simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine simexplorer-is-storage simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine simexplorer-is-web simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 29 Jan '08

29 Jan '08

Author: glandais Date: 2008-01-29 18:20:47 +0000 (Tue, 29 Jan 2008) New Revision: 557 Modified: trunk/simexplorer-is-ear/pom.xml trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.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/StorageServiceCommon.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java trunk/simexplorer-is-storage/pom.xml trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java trunk/simexplorer-is-web/pom.xml trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java Log: Security service & Tapestry 5.0.9 Modified: trunk/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is-ear/pom.xml 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-ear/pom.xml 2008-01-29 18:20:47 UTC (rev 557) @@ -40,13 +40,23 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>5.0.9</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> <version>5.0.9</version> </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>5.0.9</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>5.0.9</version> + </dependency> <dependency> <groupId>simexplorer-is</groupId> Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-01-29 18:20:47 UTC (rev 557) @@ -29,6 +29,7 @@ import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.Permission; +import fr.cemagref.simexplorer.is.security.entities.User; @Stateless(name = "CredentialManager") @Local(CredentialManager.class) @@ -42,34 +43,49 @@ int level = -1; if (actor.equals(permission.getActor())) { return 0; - } else { - List<Group> groups = actor.getGroups(); - for (Group group : groups) { - int levelGroup = getRelativeLevel(group, permission); - if (levelGroup >= 0) { - level = levelGroup + 1; - } + } + List<Group> groups = actor.getGroups(); + for (Group group : groups) { + int levelGroup = getRelativeLevel(group, permission); + if (levelGroup >= 0) { + level = levelGroup + 1; } } + return level; } public Permission getPermission(String token, String businessId) { Permission p = null; - Actor actor = dao.getLoggedUser(token); - List<Permission> permissions = dao.getPermissions(businessId); - int minLevel = 0; + User user = dao.getLoggedUser(token); - for (Permission permission : permissions) { - int relativeLevel = getRelativeLevel(actor, permission); - if (relativeLevel >= 0) { - if (p == null || minLevel > relativeLevel) { - p = permission; - minLevel = relativeLevel; + if (user.isSuperAdmin()) { + p = new Permission(); + p.setActor(user); + p.setBusinessId(businessId); + p.setOwner(true); + } else { + List<Permission> permissions = dao.getPermissions(businessId); + int minLevel = 0; + + for (Permission permission : permissions) { + int relativeLevel = getRelativeLevel(user, permission); + if (relativeLevel >= 0) { + if (p == null || minLevel > relativeLevel) { + p = permission; + minLevel = relativeLevel; + } } } } + + if (p != null && p.isOwner()) { + p.setCanAdmin(true); + p.setCanRead(true); + p.setCanWrite(true); + } + return p; } 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-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-29 18:20:47 UTC (rev 557) @@ -17,17 +17,26 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import fr.cemagref.simexplorer.is.storage.StorageException; +import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; public class StorageServiceClient extends StorageServiceCommon { - public StorageServiceClient() { - storageEngine = new StorageEngineImpl(); - super.firstOpen(); - } + private static StorageEngine storageEngine; - public String loginUser(String login, String password) throws SimExplorerServiceException { + public String loginUser(String login, String password) + throws SimExplorerServiceException { throw new SimExplorerServiceException("can not log to local service"); } + @Override + protected StorageEngine getStorageEngine() throws StorageException { + if (storageEngine == null) { + storageEngine = new StorageEngineImpl(); + storageEngine.open(); + } + return storageEngine; + } + } 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-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-29 18:20:47 UTC (rev 557) @@ -54,30 +54,17 @@ public abstract class StorageServiceCommon implements StorageService, XmlConstants { - protected StorageEngine storageEngine; - private static final String KEY_XML = "_xml"; - protected void firstOpen() { - try { - storageEngine.open(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + protected abstract StorageEngine getStorageEngine() throws StorageException; - public void open() throws Exception { - storageEngine.open(); - } - public void close() throws Exception { - storageEngine.close(); + getStorageEngine().close(); } public void commit() throws SimExplorerServiceException { try { - storageEngine.commit(); + getStorageEngine().commit(); } catch (StorageException e) { throw new SimExplorerServiceException(e); } @@ -118,7 +105,7 @@ public MetaDataEntity getMetadata(String token, String uuid) throws SimExplorerServiceException { try { - return storageEngine.getMetadata(token, uuid); + return getStorageEngine().getMetadata(token, uuid); } catch (StorageException e) { throw new SimExplorerServiceException(e); } @@ -127,7 +114,8 @@ public MetaDataEntity getMetadata(String token, String uuid, String version) throws SimExplorerServiceException { try { - return storageEngine.getMetadata(token, uuid, new Version(version)); + return getStorageEngine().getMetadata(token, uuid, + new Version(version)); } catch (StorageException e) { throw new SimExplorerServiceException(e); } @@ -137,7 +125,7 @@ boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException { try { - return storageEngine.findFullText(token, query, onlyLatest, + return getStorageEngine().findFullText(token, query, onlyLatest, indexStart, count, dateOrder); } catch (StorageException e) { throw new SimExplorerServiceException(e); @@ -147,7 +135,8 @@ public int findFullTextCount(String token, String query, boolean onlyLatest) throws SimExplorerServiceException { try { - return storageEngine.findFullTextCount(token, query, onlyLatest); + return getStorageEngine().findFullTextCount(token, query, + onlyLatest); } catch (StorageException e) { throw new SimExplorerServiceException(e); } @@ -156,7 +145,7 @@ public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerServiceException { try { - return storageEngine.findElementsByTypeCount(token, + return getStorageEngine().findElementsByTypeCount(token, VALUE_METADATA_TYPE_EA, onlyLatest); } catch (StorageException e) { throw new SimExplorerServiceException(e); @@ -167,7 +156,7 @@ int start, int count, int dateOrder) throws SimExplorerServiceException { try { - return storageEngine + return getStorageEngine() .findElementsByType(token, VALUE_METADATA_TYPE_EA, onlyLatest, start, count, dateOrder); } catch (StorageException e) { @@ -184,7 +173,7 @@ le = (LoggableElement) BaseEntityFactory.getFactory( LoggableElement.class.getPackage().getName() + "." + mde.getType()).loadElement( - storageEngine.retrieveData(token, mde, KEY_XML)); + getStorageEngine().retrieveData(token, mde, KEY_XML)); return le; } catch (Exception e) { @@ -205,12 +194,13 @@ if (!entry.isDirectory()) { String entryName = entry.getName(); if (entryName.equals(FILE_XML)) { - xmlFile = storageEngine.storeTempData(zis); + xmlFile = getStorageEngine().storeTempData(zis); } else { if (entryName.startsWith(FILE_DATA_PREFIX)) { String fileName = entryName.replace( FILE_DATA_PREFIX + "/", ""); - String idFile = storageEngine.storeTempData(zis); + String idFile = getStorageEngine().storeTempData( + zis); attachments.put(fileName, idFile); } } @@ -225,10 +215,11 @@ private MetaDataEntity saveElement(String token, InputStream xmlFile, Map<String, InputStream> attachments) throws Exception { // Store temporary data - String idxml = storageEngine.storeTempData(xmlFile); + String idxml = getStorageEngine().storeTempData(xmlFile); Map<String, String> idsattachment = new HashMap<String, String>(); for (Map.Entry<String, InputStream> entry : attachments.entrySet()) { - String idattachment = storageEngine.storeTempData(entry.getValue()); + String idattachment = getStorageEngine().storeTempData( + entry.getValue()); idsattachment.put(entry.getKey(), idattachment); } return saveElement(token, idxml, idsattachment); @@ -238,8 +229,8 @@ String version, String dataKey) throws SimExplorerServiceException { try { MetaDataEntity mde = getMetadata(token, uuid, version); - InputStream stream = storageEngine - .retrieveData(token, mde, dataKey); + InputStream stream = getStorageEngine().retrieveData(token, mde, + dataKey); RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( stream); return remoteStream.export(); @@ -254,7 +245,7 @@ String uuid, String version) throws SimExplorerServiceException { MetaDataEntity mde = getMetadata(token, uuid, version); try { - InputStream xmlStream = storageEngine.retrieveData(token, mde, + InputStream xmlStream = getStorageEngine().retrieveData(token, mde, KEY_XML); OutputStream os = RemoteOutputStreamClient.wrap(xmlOutputStream); @@ -292,7 +283,8 @@ MetaDataEntityFactory mdeFactory = MetaDataEntityFactory .getFactory(MetaDataEntity.class); MetaDataEntity metaData = mdeFactory - .loadElementFromParentXML(storageEngine.retrieveTempData(idxml)); + .loadElementFromParentXML(getStorageEngine().retrieveTempData( + idxml)); if (metaData.getType() != null && VALUE_METADATA_TYPE_EA.equals(metaData.getType())) { @@ -317,16 +309,16 @@ // Prepare saving Map<String, InputStream> attachments = new HashMap<String, InputStream>(); - attachments.put(KEY_XML, storageEngine.retrieveTempData(idxml)); + attachments.put(KEY_XML, getStorageEngine().retrieveTempData(idxml)); Map<String, ContentType> realAttachments = metaData.getAttachments(); for (Map.Entry<String, ContentType> entry : realAttachments.entrySet()) { - attachments.put(entry.getKey(), storageEngine + attachments.put(entry.getKey(), getStorageEngine() .retrieveTempData(idsattachment.get(entry.getKey()))); } - storageEngine.saveElement(token, metaData, attachments); - storageEngine.commit(); + getStorageEngine().saveElement(token, metaData, attachments); + getStorageEngine().commit(); return metaData; } @@ -339,7 +331,7 @@ .getFactory(MetaDataEntity.class); Document document = BaseEntityFactory.getXMLBuilder().parse( - storageEngine.retrieveTempData(idxml)); + getStorageEngine().retrieveTempData(idxml)); Element rootElement = (Element) document.getFirstChild(); @@ -349,8 +341,8 @@ Set<Element> entityElements = elementFactory.getXMLElementsByTagName( entitiesElement, entityNode); for (Element element : entityElements) { - saveElement(token, storageEngine.storeTempData(BaseEntityFactory - .serializeElement(element)), idsattachment); + saveElement(token, getStorageEngine().storeTempData( + BaseEntityFactory.serializeElement(element)), idsattachment); } } @@ -359,13 +351,13 @@ throws Exception { // Check existing version in storage - MetaDataEntity previousVersion = storageEngine.getMetadata(token, + MetaDataEntity previousVersion = getStorageEngine().getMetadata(token, metaData.getUuid(), metaData.getVersion()); /* - * MetaDataEntity parentData = storageEngine.getElementVersion(metaData + * MetaDataEntity parentData = getStorageEngine().getElementVersion(metaData * .getParentData().getUuid(), metaData.getParentData() .getVersion()); * MetaDataEntity parentVersion = - * storageEngine.getElementVersion(metaData + * getStorageEngine().getElementVersion(metaData * .getParentVersion().getUuid(), metaData.getParentVersion() * .getVersion()); */ @@ -381,8 +373,8 @@ public MetaDataEntity[] getVersions(String token, String uuid) throws SimExplorerServiceException { try { - Set<MetaDataEntity> versions = storageEngine.getElementVersions( - token, uuid); + Set<MetaDataEntity> versions = getStorageEngine() + .getElementVersions(token, uuid); return versions.toArray(new MetaDataEntity[versions.size()]); } catch (StorageException e) { throw new SimExplorerServiceException(e); @@ -392,7 +384,7 @@ public void deleteElement(String token, String uuid, String version) throws SimExplorerServiceException { try { - storageEngine.deleteElement(token, uuid, new Version(version)); + getStorageEngine().deleteElement(token, uuid, new Version(version)); } catch (StorageException e) { throw new SimExplorerServiceException(e); } @@ -401,7 +393,7 @@ public void deleteElement(String token, String uuid) throws SimExplorerServiceException { try { - storageEngine.deleteElements(token, uuid); + getStorageEngine().deleteElements(token, uuid); } catch (StorageException e) { throw new SimExplorerServiceException(e); } 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-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-29 18:20:47 UTC (rev 557) @@ -23,6 +23,8 @@ import org.jboss.annotation.ejb.RemoteBinding; +import fr.cemagref.simexplorer.is.storage.StorageException; +import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; @Stateless(name = "StorageService") @@ -33,16 +35,19 @@ @EJB private AuthenticationService authenticationService; - public StorageServiceServer() { - // FIXME - // storageEngine = new StorageEngineSecuImpl(); - storageEngine = new StorageEngineImpl(); - super.firstOpen(); - } + @EJB + private StorageEngine storageEngine; - public String loginUser(String login, String password) throws SimExplorerServiceException { + public String loginUser(String login, String password) + throws SimExplorerServiceException { String token = authenticationService.loginUser(login, password); return token; } + @Override + protected StorageEngine getStorageEngine() throws StorageException { + storageEngine.open(); + return storageEngine; + } + } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineSecuImpl.java 2008-01-29 18:20:47 UTC (rev 557) @@ -22,6 +22,8 @@ import java.util.Map; import javax.ejb.EJB; +import javax.ejb.Local; +import javax.ejb.Stateless; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; @@ -29,6 +31,8 @@ import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.storage.StorageException; + at Stateless(name = "StorageEngine") + at Local(StorageEngine.class) public class StorageEngineSecuImpl extends StorageEngineImpl { @EJB @@ -63,8 +67,8 @@ boolean onlyLatest, int start, int count, int dateOrder) throws StorageException { MetaDataEntity[] list; - list = super.findElementsByType(token, type, - onlyLatest, start, count, dateOrder); + list = super.findElementsByType(token, type, onlyLatest, start, count, + dateOrder); // TODO how to filter without losing pagination? return list; } @@ -97,7 +101,7 @@ throws StorageException { MetaDataEntity mde; Permission permission = credentialManager.getPermission(token, uuid); - if (permission.isCanRead()) { + if (permission != null && permission.isCanRead()) { mde = super.getMetadata(token, uuid, version); } else { throw new StorageException("Permission denied"); @@ -110,7 +114,7 @@ throws StorageException { MetaDataEntity mde; Permission permission = credentialManager.getPermission(token, uuid); - if (permission.isCanRead()) { + if (permission != null && permission.isCanRead()) { mde = super.getMetadata(token, uuid); } else { throw new StorageException("Permission denied"); @@ -123,7 +127,7 @@ throws StorageException { List<Version> versions; Permission permission = credentialManager.getPermission(token, uuid); - if (permission.isCanRead()) { + if (permission != null && permission.isCanRead()) { versions = super.getVersions(token, uuid); } else { throw new StorageException("Permission denied"); @@ -137,7 +141,7 @@ InputStream stream; Permission permission = credentialManager.getPermission(token, entity .getUuid()); - if (permission.isCanRead()) { + if (permission != null && permission.isCanRead()) { stream = super.retrieveData(token, entity, field); } else { throw new StorageException("Permission denied"); @@ -150,7 +154,7 @@ Map<String, InputStream> attachments) throws StorageException { Permission permission = credentialManager.getPermission(token, element .getUuid()); - if (permission.isCanWrite()) { + if (permission != null && permission.isCanWrite()) { super.saveElement(token, element, attachments); credentialManager.saveElement(token, element.getUuid()); } else { Modified: trunk/simexplorer-is-storage/pom.xml =================================================================== --- trunk/simexplorer-is-storage/pom.xml 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-storage/pom.xml 2008-01-29 18:20:47 UTC (rev 557) @@ -5,7 +5,7 @@ <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-storage</artifactId> <name>Storage</name> - + <version>0.0.1-SNAPSHOT</version> <description></description> <packaging>jar</packaging> @@ -28,6 +28,12 @@ <version>1.1</version> </dependency> <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <version>4.2.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-entities</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngine.java 2008-01-29 18:20:47 UTC (rev 557) @@ -22,10 +22,13 @@ import java.util.Map; import java.util.Set; +import javax.ejb.Local; + import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.StorageException; + at Local public interface StorageEngine { /** Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/engine/StorageEngineImpl.java 2008-01-29 18:20:47 UTC (rev 557) @@ -58,6 +58,8 @@ */ private MetaDataEntity mdTmp; + private boolean opened = false; + /** * Default constructor with default implementations of storage and indexing */ @@ -77,7 +79,10 @@ * @see fr.cemagref.simexplorer.is.storage.engine.StorageEngine#open() */ public void open() throws StorageException { - database.open(); + if (!opened) { + database.open(); + opened = true; + } } /* (non-Javadoc) Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-web/pom.xml 2008-01-29 18:20:47 UTC (rev 557) @@ -73,7 +73,7 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>0.0.4-SNAPSHOT</version> + <version>5.0.9</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> @@ -81,6 +81,16 @@ <version>5.0.9</version> </dependency> <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>5.0.9</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>5.0.9</version> + </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId> <version>4.2.2.GA</version> Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-01-29 09:29:17 UTC (rev 556) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-01-29 18:20:47 UTC (rev 557) @@ -53,6 +53,10 @@ if (simException != null) { unknown = false; this.exception = simException; + + unknown = true; + ExceptionAnalysis analysis = analyzer.analyze(exception); + stack = analysis.getExceptionInfos(); } else { unknown = true; ExceptionAnalysis analysis = analyzer.analyze(exception);

1 0

r556 - in trunk: simexplorer-is-ear simexplorer-is-web
by glandais＠users.labs.libre-entreprise.org 29 Jan '08

29 Jan '08

Author: glandais Date: 2008-01-29 09:29:17 +0000 (Tue, 29 Jan 2008) New Revision: 556 Modified: trunk/simexplorer-is-ear/debug.sh trunk/simexplorer-is-ear/pom.xml trunk/simexplorer-is-web/pom.xml Log: Tapestry 5.0.9 released Modified: trunk/simexplorer-is-ear/debug.sh =================================================================== --- trunk/simexplorer-is-ear/debug.sh 2008-01-28 19:04:37 UTC (rev 555) +++ trunk/simexplorer-is-ear/debug.sh 2008-01-29 09:29:17 UTC (rev 556) @@ -1 +1 @@ -/opt/jboss-4.2.2.GA/bin/rundebug.sh -c simexplorer +/opt/java/jboss-4.2.2.GA/bin/rundebug.sh -c simexplorer Modified: trunk/simexplorer-is-ear/pom.xml =================================================================== --- trunk/simexplorer-is-ear/pom.xml 2008-01-28 19:04:37 UTC (rev 555) +++ trunk/simexplorer-is-ear/pom.xml 2008-01-29 09:29:17 UTC (rev 556) @@ -45,7 +45,7 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> - <version>5.0.7</version> + <version>5.0.9</version> </dependency> <dependency> Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-01-28 19:04:37 UTC (rev 555) +++ trunk/simexplorer-is-web/pom.xml 2008-01-29 09:29:17 UTC (rev 556) @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> - <version>5.0.7</version> + <version>5.0.9</version> </dependency> <dependency> <groupId>jboss</groupId>

1 0

r555 - in trunk/simexplorer-is-web/src: java/fr/cemagref/simexplorer/is/ui/web java/fr/cemagref/simexplorer/is/ui/web/pages main/webapp
by glandais＠users.labs.libre-entreprise.org 28 Jan '08

28 Jan '08

Author: glandais Date: 2008-01-28 19:04:37 +0000 (Mon, 28 Jan 2008) New Revision: 555 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java trunk/simexplorer-is-web/src/main/webapp/GroupList.tml Log: Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java 2008-01-28 16:59:58 UTC (rev 554) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/SimExplorerWebException.java 2008-01-28 19:04:37 UTC (rev 555) @@ -37,9 +37,4 @@ super(message, cause); } - @Override - public String getMessage() { - return getMessage(); - } - } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-01-28 16:59:58 UTC (rev 554) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-01-28 19:04:37 UTC (rev 555) @@ -51,8 +51,6 @@ public void reportException(Throwable exception) { SimExplorerWebException simException = getException(exception); if (simException != null) { - // unknown = false; - // FIXME debug mode unknown = false; this.exception = simException; } else { Modified: trunk/simexplorer-is-web/src/main/webapp/GroupList.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-01-28 16:59:58 UTC (rev 554) +++ trunk/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-01-28 19:04:37 UTC (rev 555) @@ -1,6 +1,7 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> + <p> <table t:type="Grid" source="groups" row="group" model="model"> <t:parameter name="editCell"> <t:actionlink t:id="edit" context="group.id">${message:modify}</t:actionlink> @@ -9,7 +10,7 @@ <t:actionlink t:id="delete" context="group.id">${message:delete}</t:actionlink> </t:parameter> </table> - - <t:actionlink t:id="add">${message:addgroup}</t:actionlink> + </p> + <p><t:actionlink t:id="add">${message:addgroup}</t:actionlink></p> </t:layout>

1 0