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

r1415 - in trunk/simexplorer-is: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:22:26 +0000 (Thu, 20 Mar 2008) New Revision: 1415 Added: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java Removed: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java Log: Will contain element generators Copied: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java (from rev 1414, trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2008-03-20 14:22:26 UTC (rev 1415) @@ -0,0 +1,389 @@ +/* +* ##% 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; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.Date; +import java.util.Random; +import java.util.UUID; + +import org.apache.commons.lang.RandomStringUtils; +import org.codelutin.util.MD5; + +import fr.cemagref.simexplorer.is.entities.Entity; +import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.composite.Codes; +import fr.cemagref.simexplorer.is.entities.composite.Components; +import fr.cemagref.simexplorer.is.entities.composite.ConstantValues; +import fr.cemagref.simexplorer.is.entities.composite.Constants; +import fr.cemagref.simexplorer.is.entities.composite.Descriptors; +import fr.cemagref.simexplorer.is.entities.composite.ExplorationDatas; +import fr.cemagref.simexplorer.is.entities.composite.Libraries; +import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; +import fr.cemagref.simexplorer.is.entities.composite.Structures; +import fr.cemagref.simexplorer.is.entities.data.Code; +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.Constant; +import fr.cemagref.simexplorer.is.entities.data.ConstantValue; +import fr.cemagref.simexplorer.is.entities.data.Descriptor; +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.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.data.Result; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.factories.ContentTypeFactory; + +/** + * The Class ElementGenerator. + */ +public class ElementGenerator { + + /** + * The Class RandomStream. + */ + public class RandomStream { + + /** The md5. */ + private String md5; + + /** The data. */ + private byte[] data; + + /** + * Gets the stream. + * + * @return the stream + */ + public InputStream getStream() { + InputStream is; + is = new ByteArrayInputStream(data); + return is; + } + + /** + * Gets the md5. + * + * @return the md5 + */ + public String getMd5() { + return md5; + } + + /** + * Sets the md5. + * + * @param md5 the new md5 + */ + public void setMd5(String md5) { + this.md5 = md5; + } + + /** + * Sets the data. + * + * @param bytes the new data + */ + public void setData(byte[] bytes) { + data = bytes; + } + + } + + /** The r. */ + private Random r = new Random(); + + /** Number of words. */ + private static int cs; + + /** The counter. */ + private static int counter = 0; + + /** The randomstrings. */ + private static String[] randomstrings; + + /** + * Instantiates a new element generator. + */ + public ElementGenerator() { + super(); + initializeStrings(); + } + + /** + * Short string. + * + * @return the string + */ + private String shortString() { + return RandomStringUtils.randomAlphabetic(r.nextInt(5) + 5); + } + + /** + * Hash. + * + * @return the string + */ + private String hash() { + return RandomStringUtils.randomAlphanumeric(32); + } + + /** + * Initialize strings. + */ + private void initializeStrings() { + cs = 150000; + randomstrings = new String[cs]; + for (int i = 0; i < randomstrings.length; i++) { + randomstrings[i] = shortString(); + } + } + + /** + * Update. + * + * @param element the element + * + * @throws Exception the exception + */ + private void update(LoggableElement element) throws Exception { + MetaData metaData = new MetaData(); + metaData.setUuid(UUID.randomUUID().toString()); + element.setName(element.getClass().getSimpleName() + "-" + counter++); + + StringBuffer sb = new StringBuffer(""); + + for (int i = 0, max = 3 + r.nextInt(5); i < max; i++) { + sb.append(randomstrings[r.nextInt(cs)]).append(" "); + } + element.setDescription(sb.toString()); + + Version v = new Version("0"); + + for (int i = 0, max = 2 + r.nextInt(2); i < max; i++) { + v.setVersion(i, r.nextInt(5)); + } + metaData.setVersion(v.toString()); + metaData.setCreationDate(new Date()); + metaData.setHash(shortString()); + metaData.setLatest(true); + + Descriptors descriptors = new Descriptors(); + for (int i = 0, max = 1 + r.nextInt(12); i < max; i++) { + descriptors.add(new Descriptor(shortString(), shortString())); + } + element.setDescriptors(descriptors); + + if (element instanceof Library || element instanceof ExplorationData) { + // generate attachments + for (int i = 0, max = r.nextInt(15); i < max; i++) { + element.getAttachments().add(generateAttachment()); + } + } + + element.setMetaData(metaData); + } + + /** + * Generate composite. + * + * @param <SC> Simple composite wanted + * @param <T> Class of simple composite children + * + * @param compositeClass the composite class + * + * @return the sC + * + * @throws Exception the exception + */ + public <T extends Entity, SC extends SimpleComposite<T>> SC generateComposite(Class<SC> compositeClass) throws Exception { + SC elements = compositeClass.newInstance(); + Class<T> elementClass = elements.getChildrenClass(); + int i = 3 + r.nextInt(2); + for (int j = 0; j < i; j++) { + T element = elementClass.newInstance(); + if (element instanceof LoggableElement) { + update((LoggableElement) element); + } + elements.add(element); + } + return elements; + } + + /** + * Generate random ea. + * + * @return the exploration application + * + * @throws Exception the exception + */ + public ExplorationApplication generateRandomEA() throws Exception { + ExplorationApplication ea = new ExplorationApplication(); + update(ea); + + ExplorationDatas explorationDatas = generateComposite(ExplorationDatas.class); + for (ExplorationData object : explorationDatas) { + processExplorationData(object); + } + ea.setExplorations(explorationDatas); + + Components components = generateComposite(Components.class); + for (Component object : components) { + processComponent(object); + } + ea.setComponents(components); + return ea; + } + + /** + * Process component. + * + * @param component the component + * + * @throws Exception the exception + */ + private void processComponent(Component component) throws Exception { + Constants constants = generateComposite(Constants.class); + for (Constant constant : constants) { + processConstant(constant); + } + component.setConstants(constants); + + component.setStructures(new Structures()); + + Codes codes = generateComposite(Codes.class); + for (Code code : codes) { + processCode(code); + } + component.setCodes(codes); + + Libraries libraries = generateComposite(Libraries.class); + for (Library library : libraries) { + processLibrary(library); + } + component.setLibraries(libraries); + + } + + /** + * Generate attachment. + * + * @return the attachment + * + * @throws Exception the exception + */ + private Attachment generateAttachment() throws Exception { + Attachment attachment = new Attachment(); + attachment.setContentType(ContentTypeFactory.getContentTypeInstance("RawType")); + attachment.setDataHash(hash()); + attachment.setFileName(shortString() + ".txt"); + return attachment; + } + + /** + * Process library. + * + * @param library the library + * + * @throws Exception the exception + */ + private void processLibrary(Library library) throws Exception { + // library.getMetaData().getAttachments().add(generateAttachment()); + } + + /** + * Process code. + * + * @param code the code + */ + private void processCode(Code code) { + code.setCode(shortString()); + code.setLanguage(shortString()); + } + + /** + * Process constant. + * + * @param constant the constant + */ + private void processConstant(Constant constant) { + constant.setName(shortString()); + constant.setType(String.class); + } + + /** + * Process exploration data. + * + * @param explorationData the exploration data + * + * @throws Exception the exception + */ + private void processExplorationData(ExplorationData explorationData) throws Exception { + Result result = new Result(); + explorationData.setResult(result); + // explorationData.getMetaData().getAttachments().add(generateAttachment()); + + ConstantValues constantValues = generateComposite(ConstantValues.class); + for (ConstantValue constantValue : constantValues) { + processConstantValue(constantValue); + } + explorationData.setConstantValues(constantValues); + + } + + /** + * Process constant value. + * + * @param constantValue the constant value + */ + private void processConstantValue(ConstantValue constantValue) { + Constant constant = new Constant(); + constant.setName(shortString()); + constant.setType(Integer.class); + + constantValue.setConstant(constant); + constantValue.setValue(Integer.toString(r.nextInt())); + } + + /** + * Generate text stream. + * + * @return the input stream + * + * @throws Exception the exception + */ + public RandomStream generateTextStream() throws Exception { + RandomStream rs = new RandomStream(); + + int wordcount = 300 + r.nextInt(300); + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < wordcount; i++) { + sb.append(randomstrings[r.nextInt(cs)]).append(" "); + } + + MD5 md5 = new MD5(); + md5.Update(sb.toString().getBytes()); + rs.setMd5(md5.asHex()); + + rs.setData(sb.toString().getBytes()); + + return rs; + } +} Deleted: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-03-20 14:21:56 UTC (rev 1414) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/ElementGenerator.java 2008-03-20 14:22:26 UTC (rev 1415) @@ -1,389 +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.storage; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.Date; -import java.util.Random; -import java.util.UUID; - -import org.apache.commons.lang.RandomStringUtils; -import org.codelutin.util.MD5; - -import fr.cemagref.simexplorer.is.entities.Entity; -import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.composite.Codes; -import fr.cemagref.simexplorer.is.entities.composite.Components; -import fr.cemagref.simexplorer.is.entities.composite.ConstantValues; -import fr.cemagref.simexplorer.is.entities.composite.Constants; -import fr.cemagref.simexplorer.is.entities.composite.Descriptors; -import fr.cemagref.simexplorer.is.entities.composite.ExplorationDatas; -import fr.cemagref.simexplorer.is.entities.composite.Libraries; -import fr.cemagref.simexplorer.is.entities.composite.SimpleComposite; -import fr.cemagref.simexplorer.is.entities.composite.Structures; -import fr.cemagref.simexplorer.is.entities.data.Code; -import fr.cemagref.simexplorer.is.entities.data.Component; -import fr.cemagref.simexplorer.is.entities.data.Constant; -import fr.cemagref.simexplorer.is.entities.data.ConstantValue; -import fr.cemagref.simexplorer.is.entities.data.Descriptor; -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.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.data.Result; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.factories.ContentTypeFactory; - -/** - * The Class ElementGenerator. - */ -public class ElementGenerator { - - /** - * The Class RandomStream. - */ - public class RandomStream { - - /** The md5. */ - private String md5; - - /** The data. */ - private byte[] data; - - /** - * Gets the stream. - * - * @return the stream - */ - public InputStream getStream() { - InputStream is; - is = new ByteArrayInputStream(data); - return is; - } - - /** - * Gets the md5. - * - * @return the md5 - */ - public String getMd5() { - return md5; - } - - /** - * Sets the md5. - * - * @param md5 the new md5 - */ - public void setMd5(String md5) { - this.md5 = md5; - } - - /** - * Sets the data. - * - * @param bytes the new data - */ - public void setData(byte[] bytes) { - data = bytes; - } - - } - - /** The r. */ - private Random r = new Random(); - - /** Number of words. */ - private static int cs; - - /** The counter. */ - private static int counter = 0; - - /** The randomstrings. */ - private static String[] randomstrings; - - /** - * Instantiates a new element generator. - */ - public ElementGenerator() { - super(); - initializeStrings(); - } - - /** - * Short string. - * - * @return the string - */ - private String shortString() { - return RandomStringUtils.randomAlphabetic(r.nextInt(5) + 5); - } - - /** - * Hash. - * - * @return the string - */ - private String hash() { - return RandomStringUtils.randomAlphanumeric(32); - } - - /** - * Initialize strings. - */ - private void initializeStrings() { - cs = 150000; - randomstrings = new String[cs]; - for (int i = 0; i < randomstrings.length; i++) { - randomstrings[i] = shortString(); - } - } - - /** - * Update. - * - * @param element the element - * - * @throws Exception the exception - */ - private void update(LoggableElement element) throws Exception { - MetaData metaData = new MetaData(); - metaData.setUuid(UUID.randomUUID().toString()); - element.setName(element.getClass().getSimpleName() + "-" + counter++); - - StringBuffer sb = new StringBuffer(""); - - for (int i = 0, max = 3 + r.nextInt(5); i < max; i++) { - sb.append(randomstrings[r.nextInt(cs)]).append(" "); - } - element.setDescription(sb.toString()); - - Version v = new Version("0"); - - for (int i = 0, max = 2 + r.nextInt(2); i < max; i++) { - v.setVersion(i, r.nextInt(5)); - } - metaData.setVersion(v.toString()); - metaData.setCreationDate(new Date()); - metaData.setHash(shortString()); - metaData.setLatest(true); - - Descriptors descriptors = new Descriptors(); - for (int i = 0, max = 1 + r.nextInt(12); i < max; i++) { - descriptors.add(new Descriptor(shortString(), shortString())); - } - element.setDescriptors(descriptors); - - if (element instanceof Library || element instanceof ExplorationData) { - // generate attachments - for (int i = 0, max = r.nextInt(15); i < max; i++) { - element.getAttachments().add(generateAttachment()); - } - } - - element.setMetaData(metaData); - } - - /** - * Generate composite. - * - * @param <SC> Simple composite wanted - * @param <T> Class of simple composite children - * - * @param compositeClass the composite class - * - * @return the sC - * - * @throws Exception the exception - */ - public <T extends Entity, SC extends SimpleComposite<T>> SC generateComposite(Class<SC> compositeClass) throws Exception { - SC elements = compositeClass.newInstance(); - Class<T> elementClass = elements.getChildrenClass(); - int i = 3 + r.nextInt(2); - for (int j = 0; j < i; j++) { - T element = elementClass.newInstance(); - if (element instanceof LoggableElement) { - update((LoggableElement) element); - } - elements.add(element); - } - return elements; - } - - /** - * Generate random ea. - * - * @return the exploration application - * - * @throws Exception the exception - */ - public ExplorationApplication generateRandomEA() throws Exception { - ExplorationApplication ea = new ExplorationApplication(); - update(ea); - - ExplorationDatas explorationDatas = generateComposite(ExplorationDatas.class); - for (ExplorationData object : explorationDatas) { - processExplorationData(object); - } - ea.setExplorations(explorationDatas); - - Components components = generateComposite(Components.class); - for (Component object : components) { - processComponent(object); - } - ea.setComponents(components); - return ea; - } - - /** - * Process component. - * - * @param component the component - * - * @throws Exception the exception - */ - private void processComponent(Component component) throws Exception { - Constants constants = generateComposite(Constants.class); - for (Constant constant : constants) { - processConstant(constant); - } - component.setConstants(constants); - - component.setStructures(new Structures()); - - Codes codes = generateComposite(Codes.class); - for (Code code : codes) { - processCode(code); - } - component.setCodes(codes); - - Libraries libraries = generateComposite(Libraries.class); - for (Library library : libraries) { - processLibrary(library); - } - component.setLibraries(libraries); - - } - - /** - * Generate attachment. - * - * @return the attachment - * - * @throws Exception the exception - */ - private Attachment generateAttachment() throws Exception { - Attachment attachment = new Attachment(); - attachment.setContentType(ContentTypeFactory.getContentTypeInstance("RawType")); - attachment.setDataHash(hash()); - attachment.setFileName(shortString() + ".txt"); - return attachment; - } - - /** - * Process library. - * - * @param library the library - * - * @throws Exception the exception - */ - private void processLibrary(Library library) throws Exception { - // library.getMetaData().getAttachments().add(generateAttachment()); - } - - /** - * Process code. - * - * @param code the code - */ - private void processCode(Code code) { - code.setCode(shortString()); - code.setLanguage(shortString()); - } - - /** - * Process constant. - * - * @param constant the constant - */ - private void processConstant(Constant constant) { - constant.setName(shortString()); - constant.setType(String.class); - } - - /** - * Process exploration data. - * - * @param explorationData the exploration data - * - * @throws Exception the exception - */ - private void processExplorationData(ExplorationData explorationData) throws Exception { - Result result = new Result(); - explorationData.setResult(result); - // explorationData.getMetaData().getAttachments().add(generateAttachment()); - - ConstantValues constantValues = generateComposite(ConstantValues.class); - for (ConstantValue constantValue : constantValues) { - processConstantValue(constantValue); - } - explorationData.setConstantValues(constantValues); - - } - - /** - * Process constant value. - * - * @param constantValue the constant value - */ - private void processConstantValue(ConstantValue constantValue) { - Constant constant = new Constant(); - constant.setName(shortString()); - constant.setType(Integer.class); - - constantValue.setConstant(constant); - constantValue.setValue(Integer.toString(r.nextInt())); - } - - /** - * Generate text stream. - * - * @return the input stream - * - * @throws Exception the exception - */ - public RandomStream generateTextStream() throws Exception { - RandomStream rs = new RandomStream(); - - int wordcount = 300 + r.nextInt(300); - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < wordcount; i++) { - sb.append(randomstrings[r.nextInt(cs)]).append(" "); - } - - MD5 md5 = new MD5(); - md5.Update(sb.toString().getBytes()); - rs.setMd5(md5.asHex()); - - rs.setData(sb.toString().getBytes()); - - return rs; - } -}

1 0

r1414 - in trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service: . random
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:21:56 +0000 (Thu, 20 Mar 2008) New Revision: 1414 Added: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java Removed: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceGenerator.java Log: Will contain element generators Deleted: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceGenerator.java 2008-03-20 14:19:27 UTC (rev 1413) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceGenerator.java 2008-03-20 14:21:56 UTC (rev 1414) @@ -1,156 +0,0 @@ -package fr.cemagref.simexplorer.is.service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.healthmarketscience.rmiio.SerializableInputStream; - -import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.data.Code; -import fr.cemagref.simexplorer.is.entities.data.Component; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.factories.LoggableElementFactory; -import fr.cemagref.simexplorer.is.storage.ElementGenerator; -import fr.cemagref.simexplorer.is.storage.VersionGenerator; -import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream; - -/** - * The Class StorageServiceGenerator. Aimed to generate random elements for a service. - */ -public class StorageServiceGenerator { - - /** The Constant log. */ - private static final Log log = LogFactory.getLog(StorageServiceGenerator.class); - - /** The element generator. */ - private static ElementGenerator elementGenerator = new ElementGenerator(); - - /** - * Save ea. - * - * @param ea - * the ea - * @param computeAttachments - * the compute attachments - * - * @return the meta data - * - * @throws Exception - * the exception - */ - private LoggableElement saveEa(StorageService storageService, String token, ExplorationApplication ea, - boolean computeAttachments, Map<Attachment, ElementGenerator.RandomStream> attachments) throws Exception { - - if (computeAttachments) { - List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); - - attachmentsKeys.addAll(ea.getAttachments()); - List<LoggableElement> children = ea.getLEChildren(); - for (LoggableElement child : children) { - attachmentsKeys.addAll(child.getAttachments()); - } - - for (Attachment attachment : attachmentsKeys) { - RandomStream randomStream = elementGenerator.generateTextStream(); - attachment.setDataHash(randomStream.getMd5()); - attachments.put(attachment, randomStream); - } - } - - SerializableInputStream xmlStream = new SerializableInputStream(LoggableElementFactory.getStream(ea)); - - Map<Attachment, SerializableInputStream> realAttachments = new HashMap<Attachment, SerializableInputStream>(); - for (Map.Entry<Attachment, ElementGenerator.RandomStream> element : attachments.entrySet()) { - realAttachments.put(element.getKey(), new SerializableInputStream(element.getValue().getStream())); - } - - return storageService.saveElement(token, xmlStream, realAttachments); - } - - /** - * Test version update. - * - * @param firstVersion - * the first version - * @param secondVersion - * the second version - * @param different - * the different - * @param versions - * the versions - * - * @return the string - * - * @throws Exception - * the exception - */ - public String generateTwoExplorationApplications(StorageService storageService, String token, String firstVersion, - String secondVersion, boolean different) throws Exception { - log.info("-----------------------------"); - - ExplorationApplication ea; - - Map<Attachment, ElementGenerator.RandomStream> attachments = new HashMap<Attachment, RandomStream>(); - - ea = elementGenerator.generateRandomEA(); - - StringBuffer task = new StringBuffer(); - task.append(firstVersion).append("A + ").append(secondVersion); - if (different) { - task.append("B"); - } else { - task.append("A"); - } - - log.info(task.toString()); - - log.info("UUID : " + ea.getMetaData().getUuid()); - log.info("Name : " + ea.getMetaData().getName()); - - ea.getMetaData().setVersion(firstVersion); - - log.info("Saving " + firstVersion + "A"); - LoggableElement le1 = saveEa(storageService, token, ea, true, attachments); - - ea.getMetaData().setVersion(secondVersion); - - if (different) { - Component component = ea.getComponents().iterator().next(); - Code code = new Code(); - code.setCode("regreg"); - code.setLanguage("regreg"); - component.getCodes().add(code); - } - - if (different) { - log.info("Saving " + secondVersion + "B"); - } else { - log.info("Saving " + secondVersion + "A"); - } - LoggableElement le2 = saveEa(storageService, token, ea, false, attachments); - - log.info("A : " + le1.getMetaData().getHash()); - if (different) { - log.info("B : " + le2.getMetaData().getHash()); - } - - return ea.getMetaData().getUuid(); - } - - public void generateLotsExplorationApplication(StorageService storageService, String token, int c) throws Exception { - Random r = new Random(); - for (int i = 0; i < c; i++) { - generateTwoExplorationApplications(storageService, token, VersionGenerator.getInstance().generateVersion().toString(), - VersionGenerator.getInstance().generateVersion().toString(), r.nextBoolean()); - } - } - -} Copied: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java (from rev 1413, trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceGenerator.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/StorageServiceGenerator.java 2008-03-20 14:21:56 UTC (rev 1414) @@ -0,0 +1,156 @@ +package fr.cemagref.simexplorer.is.service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.healthmarketscience.rmiio.SerializableInputStream; + +import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.data.Code; +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.factories.LoggableElementFactory; +import fr.cemagref.simexplorer.is.storage.ElementGenerator; +import fr.cemagref.simexplorer.is.storage.VersionGenerator; +import fr.cemagref.simexplorer.is.storage.ElementGenerator.RandomStream; + +/** + * The Class StorageServiceGenerator. Aimed to generate random elements for a service. + */ +public class StorageServiceGenerator { + + /** The Constant log. */ + private static final Log log = LogFactory.getLog(StorageServiceGenerator.class); + + /** The element generator. */ + private static ElementGenerator elementGenerator = new ElementGenerator(); + + /** + * Save ea. + * + * @param ea + * the ea + * @param computeAttachments + * the compute attachments + * + * @return the meta data + * + * @throws Exception + * the exception + */ + private LoggableElement saveEa(StorageService storageService, String token, ExplorationApplication ea, + boolean computeAttachments, Map<Attachment, ElementGenerator.RandomStream> attachments) throws Exception { + + if (computeAttachments) { + List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); + + attachmentsKeys.addAll(ea.getAttachments()); + List<LoggableElement> children = ea.getLEChildren(); + for (LoggableElement child : children) { + attachmentsKeys.addAll(child.getAttachments()); + } + + for (Attachment attachment : attachmentsKeys) { + RandomStream randomStream = elementGenerator.generateTextStream(); + attachment.setDataHash(randomStream.getMd5()); + attachments.put(attachment, randomStream); + } + } + + SerializableInputStream xmlStream = new SerializableInputStream(LoggableElementFactory.getStream(ea)); + + Map<Attachment, SerializableInputStream> realAttachments = new HashMap<Attachment, SerializableInputStream>(); + for (Map.Entry<Attachment, ElementGenerator.RandomStream> element : attachments.entrySet()) { + realAttachments.put(element.getKey(), new SerializableInputStream(element.getValue().getStream())); + } + + return storageService.saveElement(token, xmlStream, realAttachments); + } + + /** + * Test version update. + * + * @param firstVersion + * the first version + * @param secondVersion + * the second version + * @param different + * the different + * @param versions + * the versions + * + * @return the string + * + * @throws Exception + * the exception + */ + public String generateTwoExplorationApplications(StorageService storageService, String token, String firstVersion, + String secondVersion, boolean different) throws Exception { + log.info("-----------------------------"); + + ExplorationApplication ea; + + Map<Attachment, ElementGenerator.RandomStream> attachments = new HashMap<Attachment, RandomStream>(); + + ea = elementGenerator.generateRandomEA(); + + StringBuffer task = new StringBuffer(); + task.append(firstVersion).append("A + ").append(secondVersion); + if (different) { + task.append("B"); + } else { + task.append("A"); + } + + log.info(task.toString()); + + log.info("UUID : " + ea.getMetaData().getUuid()); + log.info("Name : " + ea.getMetaData().getName()); + + ea.getMetaData().setVersion(firstVersion); + + log.info("Saving " + firstVersion + "A"); + LoggableElement le1 = saveEa(storageService, token, ea, true, attachments); + + ea.getMetaData().setVersion(secondVersion); + + if (different) { + Component component = ea.getComponents().iterator().next(); + Code code = new Code(); + code.setCode("regreg"); + code.setLanguage("regreg"); + component.getCodes().add(code); + } + + if (different) { + log.info("Saving " + secondVersion + "B"); + } else { + log.info("Saving " + secondVersion + "A"); + } + LoggableElement le2 = saveEa(storageService, token, ea, false, attachments); + + log.info("A : " + le1.getMetaData().getHash()); + if (different) { + log.info("B : " + le2.getMetaData().getHash()); + } + + return ea.getMetaData().getUuid(); + } + + public void generateLotsExplorationApplication(StorageService storageService, String token, int c) throws Exception { + Random r = new Random(); + for (int i = 0; i < c; i++) { + generateTwoExplorationApplications(storageService, token, VersionGenerator.getInstance().generateVersion().toString(), + VersionGenerator.getInstance().generateVersion().toString(), r.nextBoolean()); + } + } + +}

1 0

r1413 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:19:27 +0000 (Thu, 20 Mar 2008) New Revision: 1413 Added: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/random/ Log: Will contain element generators

1 0

r1412 - trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:13:35 +0000 (Thu, 20 Mar 2008) New Revision: 1412 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java Log: Useless getter Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java 2008-03-20 14:12:42 UTC (rev 1411) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/database/lucene/LuceneDatabaseThread.java 2008-03-20 14:13:35 UTC (rev 1412) @@ -128,15 +128,6 @@ } /** - * Gets the id thread lucene. - * - * @return the idThreadLucene - */ - public int getIdThreadLucene() { - return idThreadLucene; - } - - /** * Sets the id thread lucene. * * @param idThreadLucene the idThreadLucene to set

1 0

r1411 - in trunk/simexplorer-is/src/site: . fr/rst
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:12:42 +0000 (Thu, 20 Mar 2008) New Revision: 1411 Modified: trunk/simexplorer-is/src/site/fr/rst/rules.rst trunk/simexplorer-is/src/site/site_fr.xml Log: Rules on site Modified: trunk/simexplorer-is/src/site/fr/rst/rules.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/rules.rst 2008-03-20 14:12:25 UTC (rev 1410) +++ trunk/simexplorer-is/src/site/fr/rst/rules.rst 2008-03-20 14:12:42 UTC (rev 1411) @@ -22,4 +22,6 @@ - les droits associés sont mis à jour via cette méthode - aucune permission n'est créée si l'utilisateur est super admin - - + - une permission est créée si et seulement si aucune permission n'existe avec cet utilisateur. + La permission créée a pour propriétaire l'utilisateur sauvant l'élément, donc tous les droits. + Modified: trunk/simexplorer-is/src/site/site_fr.xml =================================================================== --- trunk/simexplorer-is/src/site/site_fr.xml 2008-03-20 14:12:25 UTC (rev 1410) +++ trunk/simexplorer-is/src/site/site_fr.xml 2008-03-20 14:12:42 UTC (rev 1411) @@ -39,6 +39,10 @@ <item href="/todo.html" name="Reste à faire"></item> </menu> + <menu name="Règles métier"> + <item href="/rules.html" name="Liste"></item> + </menu> + <menu name="Développement"> <item href="/devel/index.html" name="Présentation">

1 0

r1410 - trunk/simexplorer-is/simexplorer-is-storage
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:12:25 +0000 (Thu, 20 Mar 2008) New Revision: 1410 Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml Log: Updating XStream Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-03-20 14:12:02 UTC (rev 1409) +++ trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-03-20 14:12:25 UTC (rev 1410) @@ -46,7 +46,7 @@ <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.2.2</version> + <version>1.3</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId>

1 0

r1409 - trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:12:02 +0000 (Thu, 20 Mar 2008) New Revision: 1409 Modified: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java Log: EJB3unit tests Modified: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java 2008-03-20 14:11:45 UTC (rev 1408) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/entities/SecurityEntityTest.java 2008-03-20 14:12:02 UTC (rev 1409) @@ -31,6 +31,7 @@ @SuppressWarnings("unchecked") public abstract class SecurityEntityTest extends BaseEntityFixture { + /** The Constant log. */ private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory .getLog(SecurityEntityTest.class); @@ -52,6 +53,7 @@ /** The Constant PERMISSION_GENERATORS. */ protected static final SingleBeanGenerator<Permission> PERMISSION_GENERATORS = new PermissionCreator(); + /** The Constant SPECIAL_GENERATORS. */ protected static final Generator<?>[] SPECIAL_GENERATORS = { ACTOR_GENERATORS, USER_GENERATORS, GROUP_GENERATORS, GROUPS_GENERATORS, LOGINACTION_GENERATORS, PERMISSION_GENERATORS }; @@ -124,7 +126,7 @@ * Instantiates a new user creator. */ protected ActorCreator() { - super(User.class); + super(Actor.class); } }

1 0

r1408 - trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:11:45 +0000 (Thu, 20 Mar 2008) New Revision: 1408 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java Log: Hidden bidirectionnal relations (for ejb3unit) Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-20 14:11:13 UTC (rev 1407) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-20 14:11:45 UTC (rev 1408) @@ -31,6 +31,7 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.ManyToMany; +import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; @@ -59,6 +60,11 @@ @Column(nullable = false) private boolean visible; + /** The permissions. */ + @SuppressWarnings("unused") + @OneToMany(mappedBy = "actor") + private Collection<Permission> permissions; + /** * Gets the actor id. * Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-20 14:11:13 UTC (rev 1407) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-20 14:11:45 UTC (rev 1408) @@ -22,6 +22,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; @@ -61,6 +62,11 @@ @OneToMany(mappedBy = "owner") private Collection<Group> groupsOwned; + /** The logins. */ + @SuppressWarnings("unused") + @OneToMany(mappedBy = "loggedUser") + private Collection<LoginAction> logins; + /** * Gets the login. *

1 0

r1407 - trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 14:11:13 +0000 (Thu, 20 Mar 2008) New Revision: 1407 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java Log: Refresh entities when loaded Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-20 11:30:17 UTC (rev 1406) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-20 14:11:13 UTC (rev 1407) @@ -60,6 +60,7 @@ Object o; try { o = query.getSingleResult(); + em.refresh(o); } catch (NoResultException e) { o = null; } @@ -78,6 +79,7 @@ T o; try { o = em.find(clazz, arg); + em.refresh(o); } catch (NoResultException e) { o = null; }

1 0

r1406 - in trunk/simexplorer-is: simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 20 Mar '08

20 Mar '08

Author: glandais Date: 2008-03-20 11:30:17 +0000 (Thu, 20 Mar 2008) New Revision: 1406 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java Log: JPA update Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-20 01:54:37 UTC (rev 1405) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-20 11:30:17 UTC (rev 1406) @@ -18,10 +18,11 @@ package fr.cemagref.simexplorer.is.security.entities; import java.io.Serializable; -import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -30,7 +31,6 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; @@ -52,17 +52,13 @@ protected Integer actorId; /** The groups with actor is member of. */ - @ManyToMany(fetch = FetchType.EAGER, targetEntity = Group.class) + @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL) private Collection<Group> memberOf; /** The visible. */ @Column(nullable = false) private boolean visible; - /** The permissions. */ - @OneToMany(targetEntity = Permission.class, mappedBy = "actor") - private Collection<Permission> permissions; - /** * Gets the actor id. * @@ -106,7 +102,7 @@ */ public Collection<Group> getMemberOf() { if (memberOf == null) { - return new ArrayList<Group>(); + return new HashSet<Group>(); } return memberOf; } @@ -121,27 +117,6 @@ } /** - * Gets the permissions. - * - * @return the permissions - */ - public Collection<Permission> getPermissions() { - if (permissions == null) { - return new ArrayList<Permission>(); - } - return permissions; - } - - /** - * Sets the permissions. - * - * @param permissions the new permissions - */ - public void setPermissions(Collection<Permission> permissions) { - this.permissions = permissions; - } - - /** * Hash code groups. * * @param hashedGroups the hashed groups @@ -165,7 +140,7 @@ public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + hashCodeGroups(memberOf); + result = prime * result + ((memberOf == null) ? 0 : hashCodeGroups(memberOf)); result = prime * result + ((actorId == null) ? 0 : actorId.hashCode()); return result; } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-03-20 01:54:37 UTC (rev 1405) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-03-20 11:30:17 UTC (rev 1406) @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; import javax.persistence.Table; @@ -44,11 +44,11 @@ private String name; /** The owner. */ - @ManyToOne(optional = false) + @ManyToOne(optional = false, fetch = FetchType.EAGER) private User owner; /** The members. */ - @ManyToMany(targetEntity = Actor.class, mappedBy = "memberOf") + @ManyToMany(mappedBy = "memberOf") private Collection<Actor> members; /** @@ -92,7 +92,7 @@ * * @return the members */ - public Collection<Actor> getMembers() { + public Collection<Actor> getMembersReadOnly() { if (members == null) { return new ArrayList<Actor>(); } @@ -100,12 +100,27 @@ } /** + * Adds the member. + * + * @param actor the actor + */ + public void addMember(Actor actor) { + actor.getMemberOf().add(this); + } + + /** * Sets the members. * - * @param members the new members + * @param newMembers the new members */ - public void setMembers(Collection<Actor> members) { - this.members = members; + public void setMembers(Collection<Actor> newMembers) { + for (Actor oldMember : getMembersReadOnly()) { + oldMember.getMemberOf().remove(this); + } + for (Actor newMember : newMembers) { + newMember.getMemberOf().add(this); + } + members = newMembers; } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-20 01:54:37 UTC (rev 1405) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-20 11:30:17 UTC (rev 1406) @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collection; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.OneToMany; @@ -59,13 +58,9 @@ private boolean superAdmin; /** The groups owned. */ - @OneToMany(targetEntity = Group.class, mappedBy = "owner") + @OneToMany(mappedBy = "owner") private Collection<Group> groupsOwned; - /** The logins. */ - @OneToMany(targetEntity = LoginAction.class, mappedBy = "loggedUser") - private Collection<LoginAction> logins; - /** * Gets the login. * @@ -161,43 +156,13 @@ * * @return the groups owned */ - public Collection<Group> getGroupsOwned() { + public Collection<Group> getGroupsOwnedReadOnly() { if (groupsOwned == null) { return new ArrayList<Group>(); } return groupsOwned; } - /** - * Sets the groups owned. - * - * @param groupsOwned the new groups owned - */ - public void setGroupsOwned(Collection<Group> groupsOwned) { - this.groupsOwned = groupsOwned; - } - - /** - * Gets the logins. - * - * @return the logins - */ - public Collection<LoginAction> getLogins() { - if (logins == null) { - return new ArrayList<LoginAction>(); - } - return logins; - } - - /** - * Sets the logins. - * - * @param logins the new logins - */ - public void setLogins(Collection<LoginAction> logins) { - this.logins = logins; - } - /* (non-Javadoc) * @see java.lang.Object#toString() */ Modified: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java 2008-03-20 01:54:37 UTC (rev 1405) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java 2008-03-20 11:30:17 UTC (rev 1406) @@ -18,7 +18,9 @@ package fr.cemagref.simexplorer.is.security.credentials; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; import javax.persistence.EntityManager; @@ -84,21 +86,13 @@ if (!tx.isActive()) tx.begin(); - List resultList = entityManager.createQuery("SELECT a FROM Actor a").getResultList(); + List<?> resultList = entityManager.createQuery("SELECT a FROM Actor a").getResultList(); for (Object object : resultList) { Actor actor = (Actor) object; - actor.getMemberOf().clear(); - actor.getPermissions().clear(); + actor.setMemberOf(new ArrayList<Group>()); entityManager.merge(actor); } - resultList = entityManager.createQuery("SELECT u FROM User u").getResultList(); - for (Object object : resultList) { - User user = (User) object; - user.getGroupsOwned().clear(); - user.getLogins().clear(); - entityManager.merge(user); - } tx.commit(); tx.begin(); @@ -125,8 +119,7 @@ User user = new User(); user.setAdmin(admin); user.setSuperAdmin(superadmin); - user.setGroupsOwned(new ArrayList<Group>()); - user.setMemberOf(new ArrayList<Group>()); + user.setMemberOf(new HashSet<Group>()); user.setLogin(login); user.setMail(login + "@user.user"); user.setVisible(true); @@ -152,8 +145,7 @@ */ private Group createGroup(String name, User owner) { Group group = new Group(); - group.setMemberOf(new ArrayList<Group>()); - group.setMembers(new ArrayList<Actor>()); + group.setMemberOf(new HashSet<Group>()); group.setName(name); group.setOwner(owner); group.setVisible(true); @@ -181,11 +173,28 @@ return p; } + private void commit() { + entityManager.getTransaction().commit(); + entityManager.getTransaction().begin(); + } + /* (non-Javadoc) * @see com.bm.testsuite.dataloader.InitialDataSet#create() */ @Override public void create() { + + User usera = createUser("usera", false, false); + + Group group1 = createGroup("group1", usera); + + group1.addMember(usera); + commit(); + + entityManager.refresh(usera); + entityManager.refresh(group1); + commit(); + User user1 = createUser("user1", false, false); User user2 = createUser("user2", false, false); user3 = createUser("user3", false, false); @@ -196,21 +205,15 @@ Group groupA = createGroup("groupA", admin); user1.getMemberOf().add(groupA); - entityManager.merge(user1); Group groupB = createGroup("groupB", admin); - groupB.getMembers().add(user2); - groupB.getMembers().add(user4); - entityManager.merge(groupB); user2.getMemberOf().add(groupB); user4.getMemberOf().add(groupB); - entityManager.merge(user2); - entityManager.merge(user4); Group groupC = createGroup("groupC", admin); + groupB.getMemberOf().add(groupC); - entityManager.merge(groupB); Permission[] p = new Permission[6]; int i = 0; @@ -227,10 +230,26 @@ i++; p[i] = createPermission("b" + i, user4); + Permission[] p3 = new Permission[N_PERMISSIONS_USER3]; for (int j = 0; j < N_PERMISSIONS_USER3; j++) { - createPermission("u3_" + j, user3); + p3[j] = createPermission("u3_" + j, user3); } + commit(); + entityManager.refresh(user1); + entityManager.refresh(user2); + entityManager.refresh(user3); + entityManager.refresh(user4); + entityManager.refresh(groupA); + entityManager.refresh(groupB); + entityManager.refresh(groupC); + for (Permission permission : p) { + entityManager.refresh(permission); + } + for (Permission permission : p3) { + entityManager.refresh(permission); + } + } /** Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-20 01:54:37 UTC (rev 1405) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-20 11:30:17 UTC (rev 1406) @@ -89,7 +89,7 @@ } else { this.group = RemoteSecurityService.getAuthentificationService().getGroup(getToken(), groupId); - Collection<Actor> members = this.group.getMembers(); + Collection<Actor> members = this.group.getMembersReadOnly(); for (Actor actor : members) { if (actor instanceof User) { this.usersInGroup.add((User) actor); Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-20 01:54:37 UTC (rev 1405) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-03-20 11:30:17 UTC (rev 1406) @@ -92,7 +92,7 @@ if (isUserSuperAdmin()) { groups = RemoteSecurityService.getAuthentificationService().getGroups(getToken()); } else { - Collection<Group> groupsOwned = getUserLogged().getGroupsOwned(); + Collection<Group> groupsOwned = getUserLogged().getGroupsOwnedReadOnly(); groups = groupsOwned.toArray(new Group[groupsOwned.size()]); } Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-20 01:54:37 UTC (rev 1405) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-20 11:30:17 UTC (rev 1406) @@ -183,7 +183,7 @@ if (user.getActorId() == null) { return new Group[0]; } - Collection<Group> groupsOwned = user.getGroupsOwned(); + Collection<Group> groupsOwned = user.getGroupsOwnedReadOnly(); Group[] result = groupsOwned.toArray(new Group[groupsOwned.size()]); return result; }

1 0