- Wikitty-commits - mailman.cloud.codelutin.com

r116 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: bpoussin Date: 2010-06-10 17:51:47 +0200 (Thu, 10 Jun 2010) New Revision: 116 Url: http://nuiton.org/repositories/revision/wikitty/116 Log: ajout d'une methode static pour ajouter les extensions a un wikitty Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-06-10 15:30:33 UTC (rev 115) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-06-10 15:51:47 UTC (rev 116) @@ -115,6 +115,15 @@ } /** + * ajout les extensions static de cette classe au wikitty en argument + *) + static public void addExtension(Wikitty w) { + for (WikittyExtension ext : extensions) { + w.addExtension(ext); + } + } + + /** * Check equality on all field of this extension, and only those. *) static public boolean equals(Wikitty w1, Wikitty w2) {

1 0

r115 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: bpoussin Date: 2010-06-10 17:30:33 +0200 (Thu, 10 Jun 2010) New Revision: 115 Url: http://nuiton.org/repositories/revision/wikitty/115 Log: utilisation du cache de la transaction lorsque necessaire Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-10 15:25:16 UTC (rev 114) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-10 15:30:33 UTC (rev 115) @@ -196,7 +196,8 @@ @Override public PagedResult<Wikitty> findAllByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { - // if we want to add cache for this method, we must clear cache when + // if we want to add cache for this method, we must use + // transaction.getCache(), and we must clear cache when // addLabel, store, storeExtension are called return ws.findAllByCriteria(securityToken, transaction, criteria); } @@ -369,6 +370,7 @@ public WikittyExtension restoreExtensionLastVersion( String securityToken, WikittyTransaction transaction, String name) { // TODO poussin 20100412: perhaps use cache for extension ? + // if use cache use transaction.getCache() return ws.restoreExtensionLastVersion(securityToken, transaction, name); } @@ -461,15 +463,13 @@ @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { - // FIXME poussin 2010 comment gerer le cache avec des transactions ???? - UpdateResponse result = ws.store(securityToken, transaction, wikitties, disableAutoVersionIncrement); for (Wikitty w : wikitties) { result.update(w); } - cache.putAllWikitty(wikitties); + transaction.getCache().putAllWikitty(wikitties); return result; } @@ -502,7 +502,7 @@ @Override public UpdateResponse storeExtension(String securityToken, WikittyTransaction transaction, Collection<WikittyExtension> exts) { - // FIXME poussin 2010 comment gerer le cache avec des transactions ???? + // si on implante le cache pour cette methode, utiliser transaction.getCache() //throw new UnsupportedOperationException("Not supported yet."); return ws.storeExtension(securityToken, transaction, exts); } @@ -510,7 +510,7 @@ @Override public WikittyExtension restoreExtension(String securityToken, WikittyTransaction transaction, String id) { - // FIXME poussin 2010 comment gerer le cache avec des transactions ???? + // si on implante le cache pour cette methode, utiliser transaction.getCache() //throw new UnsupportedOperationException("Not supported yet."); return ws.restoreExtension(securityToken, transaction, id); }

1 0

r114 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: bpoussin Date: 2010-06-10 17:25:16 +0200 (Thu, 10 Jun 2010) New Revision: 114 Url: http://nuiton.org/repositories/revision/wikitty/114 Log: le cache peut-etre instancier pour etre static ou soft le cache n'est plus un singleton (necessaire pour les transations) ajout d'un cache dans les transactions (il faut maintenant le prendre en compte dans WSCached) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-06-10 15:21:25 UTC (rev 113) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-06-10 15:25:16 UTC (rev 114) @@ -18,6 +18,7 @@ package org.nuiton.wikitty; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import org.apache.commons.collections.map.ReferenceMap; @@ -35,20 +36,27 @@ */ public class WikittyCache implements WikittyServiceListener { - /** Singleton wikitty cache instance. */ - static protected WikittyCache instance = null; - protected Map<String, Wikitty> wikittyCache; - protected WikittyCache() { - wikittyCache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + + /** + * create a soft cache + */ + public WikittyCache() { + this(true); } - public static synchronized WikittyCache getInstance() { - if (instance == null) { - instance = new WikittyCache(); + /** + * + * @param soft si vrai utilise un cache avec des reference Soft, sinon + * utilise des references static (utile pour les transactions) + */ + public WikittyCache(boolean soft) { + if (soft) { + wikittyCache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + } else { + wikittyCache = new HashMap<String, Wikitty>(); } - return instance; } public boolean existsWikitty(String id) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-10 15:21:25 UTC (rev 113) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-10 15:25:16 UTC (rev 114) @@ -72,7 +72,7 @@ */ public WikittyServiceCached(WikittyService ws, Properties props) { this.ws = ws; - cache = WikittyCache.getInstance(); + cache = new WikittyCache(); registerWikittyServiceListener(props); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-06-10 15:21:25 UTC (rev 113) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-06-10 15:25:16 UTC (rev 114) @@ -16,12 +16,29 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyTransaction.class); + /** permet d'attacher n'importe quoi a une transaction */ protected Map<Object, Object> tagValues; + /** cache static utilise par le WikittyServiceCached */ + transient protected WikittyCache cache = null; + public WikittyTransaction() { tagValues = new HashMap<Object, Object>(); } + /** + * visibilie 'default' car est uilise par WikittyServiceCached qui est dans + * le meme package et a priori seulement lui en a besoin + * + * @return + */ + WikittyCache getCache() { + if (cache == null) { + cache = new WikittyCache(); + } + return cache; + } + public Object getTagValue(Object tag) { return tagValues.get(tag); }

1 0

r113 - in trunk/wikitty-api/src/main: java/org/nuiton/wikitty uml/wikitty-api
by bpoussin＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: bpoussin Date: 2010-06-10 17:21:25 +0200 (Thu, 10 Jun 2010) New Revision: 113 Url: http://nuiton.org/repositories/revision/wikitty/113 Log: - gestion des AppAdmin - gestion de "l'heritage" entre autorisation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/main/uml/wikitty-api/wikitty-security.zargo Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-06-10 15:17:47 UTC (rev 112) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-06-10 15:21:25 UTC (rev 113) @@ -26,6 +26,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.search.Search; /** * @@ -40,6 +41,8 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceSecurity.class); + static final public String WIKITTY_APPADMIN_GROUP_NAME = "WikittyAppAdmin"; + protected WikittyService ws; public WikittyServiceSecurity(WikittyService ws) { @@ -96,8 +99,7 @@ // recuperation de l'utilisateur associe au securityToken Wikitty securityTokenWikitty = ws.restore(securityToken, securityToken); - String userId = securityTokenWikitty.getFieldAsWikitty( - SecurityToken.EXT_SECURITYTOKEN, SecurityToken.FIELD_USER); + String userId = SecurityTokenHelper.getUser(securityTokenWikitty); // on ajoute et on fixe les droits par defaut WikittyAuthorisation auth = new WikittyAuthorisationImpl(wikitty); @@ -169,8 +171,7 @@ public boolean canRead(String securityToken, String wikittyId) { // recuperation de l'utilisateur associe au securityToken Wikitty securityTokenWikitty = ws.restore(securityToken, securityToken); - String userId = securityTokenWikitty.getFieldAsWikitty( - SecurityToken.EXT_SECURITYTOKEN, SecurityToken.FIELD_USER); + String userId = SecurityTokenHelper.getUser(securityTokenWikitty); // // check security @@ -434,8 +435,7 @@ // recuperation de l'utilisateur associe au securityToken Wikitty securityTokenWikitty = ws.restore(securityToken, securityToken); if (securityTokenWikitty != null) { - result = securityTokenWikitty.getFieldAsWikitty( - SecurityToken.EXT_SECURITYTOKEN, SecurityToken.FIELD_USER); + result = SecurityTokenHelper.getUser(securityTokenWikitty); } return result; } @@ -450,10 +450,8 @@ */ protected boolean isOwner(String userId, Wikitty w) { boolean result = false; - if (w.hasExtension(WikittyAuthorisation.EXT_WIKITTYAUTHORISATION)) { - String owner = w.getFieldAsWikitty( - WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, - WikittyAuthorisation.FIELD_OWNER); + if (WikittyAuthorisationHelper.isExtension(w)) { + String owner = WikittyAuthorisationHelper.getOwner(w); result = userId.equals(owner); } return result; @@ -496,18 +494,26 @@ */ protected boolean isReader(String userId, Wikitty w) { boolean result = true; - if (w.hasExtension(WikittyAuthorisation.EXT_WIKITTYAUTHORISATION)) { - Set<String> groupOrUser = w.getFieldAsSet( - WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, - WikittyAuthorisation.FIELD_READER, - String.class); - if (!(groupOrUser == null || groupOrUser.size() == 0)) { + if (WikittyAuthorisationHelper.isExtension(w)) { + Set<String> groupOrUser = WikittyAuthorisationHelper.getReader(w); + if (groupOrUser == null || groupOrUser.size() == 0) { + // il n'y a pas de reader sur l'objet actuel, il faut regarder + // sur le parent s'il y en a + String parentId = WikittyAuthorisationHelper.getParent(w); + if (parentId != null) { + Wikitty parent = ws.restore(null, parentId); + result = isReader(userId, parent); + } + } else { + // il y a des readers sur l'objet actuel, il faut donc checker + // comme pour les autres droits en parent aussi les parents result = isMember(userId, w, WikittyAuthorisation.FIELD_READER); } } return result; } + transient protected String appAdminGroupId = null; /** * Verifie si l'utilisateur est considere comme un AppAdmin * @@ -515,8 +521,30 @@ * @return */ protected boolean isAppAdmin(String userId) { - // TODO poussin 20100607 verifier que l'utilisateur est un AppAdmin ou non - return false; + Wikitty group; + if (appAdminGroupId == null) { + // 1er fois, on le recherche + group = ws.findByCriteria(userId, Search.query().eq( + WikittyGroup.FQ_FIELD_NAME, WIKITTY_APPADMIN_GROUP_NAME).criteria()); + // group peut-etre null s'il n'existe pas + } else { + // on a deja fait la recherche precedement, on essaie de reutilise + // le meme id + group = ws.restore(userId, appAdminGroupId); + // group peut-etre null, si entre temps un admin a supprime le group + } + if (group == null) { + // il n'existe pas on le cree. + WikittyGroup appAdminGroup = new WikittyGroupImpl(); + appAdminGroup.setName(WIKITTY_APPADMIN_GROUP_NAME); + } + // on garde l'id pour ne plus faire la recherche, + // vu que le groupe doit etre unique cela ne pose pas de probleme + appAdminGroupId = group.getId(); + + Set<String> ids = WikittyGroupHelper.getMembers(group); + boolean result = isMember(userId, ids); + return result; } /** @@ -530,12 +558,20 @@ */ protected boolean isMember(String userId, Wikitty w, String field) { boolean result = false; - if (w.hasExtension(WikittyAuthorisation.EXT_WIKITTYAUTHORISATION)) { + if (WikittyAuthorisationHelper.isExtension(w)) { Set<String> groupOrUser = w.getFieldAsSet( WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, field, String.class); result = isMember(userId, groupOrUser); + if (!result) { + // user don't have right on current object, check parent right + String parentId = WikittyAuthorisationHelper.getParent(w); + if (parentId != null) { + Wikitty parent = ws.restore(null, parentId); + result = isMember(userId, parent, field); + } + } } return result; } @@ -554,10 +590,8 @@ return true; } else { Wikitty w = ws.restore(null, id); - if (w.hasExtension(WikittyGroup.EXT_WIKITTYGROUP)) { - Set<String> members = w.getFieldAsSet( - WikittyGroup.EXT_WIKITTYGROUP, - WikittyGroup.FIELD_MEMBERS, String.class); + if (WikittyGroupHelper.isExtension(w)) { + Set<String> members =WikittyGroupHelper.getMembers(w); if (isMember(userId, members)) { return true; } Modified: trunk/wikitty-api/src/main/uml/wikitty-api/wikitty-security.zargo =================================================================== (Binary files differ)

1 0

r112 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: bpoussin Date: 2010-06-10 17:17:47 +0200 (Thu, 10 Jun 2010) New Revision: 112 Url: http://nuiton.org/repositories/revision/wikitty/112 Log: ajout de la generation d'un helper qui contient les memes methodes que le BusinessEntity mais en static et avec comme premiere argument le wikitty Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-06-10 15:17:47 UTC (rev 112) @@ -0,0 +1,319 @@ +package org.nuiton.wikitty.generator; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import java.util.regex.Pattern; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; + +/** + * Possible enhancement: + * - generateParentMethod can generate attribut method access that call + * the same method on parent instance class. For that we must have one attribut + * instance by parent. This attribut we must be created in setWikitty method + * and used same wikitty object. + * + * @author poussin + */ +public class WikittyHelperGenerator extends WikengoCommonGenerator { + + private static final Log log = LogFactory.getLog(WikittyHelperGenerator.class); + + static protected Pattern extractTypeOnCollection = Pattern.compile("\\w*<(\\w+)>"); + + protected String EXT_NAME; + + @Override + public String getFilenameForClass(ObjectModelClass clazz) { + String fqn = clazz.getQualifiedName(); + log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); + return fqn.replace('.', File.separatorChar) + "Helper.java"; + } + + public void generateFromClass(Writer output, ObjectModelClass clazz) + throws IOException { + if (!EugengoUtils.isBusinessEntity(clazz)) { + log.info( clazz.getName() + " is not a business entity"); + return; + } + + log.info("Generate Business entity abstract" + clazz.getName() + "... "); + generateCopyright(output); + + EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); + + String packageName = clazz.getPackageName(); + String name = clazz.getName() + "Helper"; + String nameImpl = clazz.getName() + "Impl"; +/*{package <%=packageName%>; + +}*/ + ObjectModelClass superClass = findSuperClass(clazz); + + clearImports(); + addImport(clazz); + addImport(superClass); + addImport("org.nuiton.wikitty.WikittyUtil"); + addImport("org.nuiton.wikitty.Wikitty"); + addImport("org.nuiton.wikitty.BusinessEntityWikitty"); + addImport("org.nuiton.wikitty.WikittyExtension"); + addImport(Collection.class); + addImport(Collections.class); + addImport(List.class); + addImport(ArrayList.class); + + lookForAttributeImports(clazz); + generateImports(output, packageName); + + generateClazzDocumentation(output, clazz); + + // l'heritage sur le Impl n'est la que pour profiter des constantes deja definies +/*{public class <%=name%> extends <%=nameImpl%> { + +}*/ + + String svUID = GeneratorUtil.computeSerialVersionUID(clazz); +/*{ private static final long serialVersionUID = <%=svUID%>; + +}*/ + +/*{ + /** + * This class is not instanciable, it's just helper + *) + private <%=name%>() { + } + +}*/ + + generateAttributeAccessMethod(output, clazz); + + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + generateParentMethod(output, parent); + } + } + +/*{ + /** + * Check if wikitty has current extension + *) + static public boolean isExtension(Wikitty w) { + boolean result = w.hasExtension(<%=EXT_NAME%>); + return result; + } + + /** + * Check equality on all field of this extension, and only those. + *) + static public boolean equals(Wikitty w1, Wikitty w2) { + boolean result = true; +}*/ + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (attr.isNavigable() && !attr.isStatic() && + (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { +/*{ if (result) { + Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); + Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); + result = f1 == f2 || (f1 != null && f1.equals(f2)); + } +}*/ + } + } +/*{ + return result; + } + +} //<%=name%> +}*/ + + } + + + + // Utilitarian methods + + public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (attr.isNavigable() && !attr.isStatic() + && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { + if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { + //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! + generateCollectionAttributeAccessors(output, attr); + } else { + generateWikittyAttributeAccessors(output, attr); + } + } + } + } + + private void generateParentMethod(Writer output, + ObjectModelClass clazz) throws IOException { + + // we must generate method for parent of parent + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + generateParentMethod(output, parent); + } + } + + // generate method acces for parent attribut + generateAttributeAccessMethod(output, clazz); + } + + protected void generateWikittyAttributeAccessors(Writer output, + ObjectModelAttribute attr) throws IOException { + + EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); + + String attrType = computeType(attr); + if (EugengoUtils.notEmpty(attrType)) { + attrType = getType(attrType, true); + } else { + return; + } + + // FIXME EC-20100421 cette methode peut retourner List<String> + // et generer la methode getWikitty().getFieldAsList<String>() + // qui ne peut pas compiler + String methodAccessName = getFieldAccessMethodName(attr); + + String attrName = attr.getName(); + String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); + +/*{ + static public void set<%=attrNameCapitalized%>(Wikitty w, <%=attrType%> <%=attrName%>) { + w.setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); + } + + static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { + <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); + return result; + } + +}*/ + } + + /** + * Give the string to put after getFieldAs???, only some type is accepted + * and we must convert BusinessEntity to Wikitty string + * @param type + * @return + */ + protected String getFieldAccessMethodName(ObjectModelAttribute attr) { + String result = computeType(attr); + result = getType(result, true); + + boolean isCollection = (attr.getMaxMultiplicity() != 0 + && attr.getMaxMultiplicity() != 1); + if (isCollection) { + if (attr.isUnique()) { + result = "Set"; + } else { + result = "List"; + } + } else { + // test for Date + if ("java.util.Date".equals(result) || "Date".equals(result)) { + result = "Date"; + } else if (getModel().hasClass(result)) { // test for Wikitty object + ObjectModelClass fieldClass = getModel().getClass(result); + if (EugengoUtils.isBusinessEntity(fieldClass)) { + // for wikittyDto we use String for Id + result = "Wikitty"; + } + } else if (null != getModel().getEnumeration(result)) { + result = "String"; + } + } + result = EugengoUtils.toUpperCaseFirstLetter(result); + + return result; + } + + protected void generateCollectionAttributeAccessors(Writer output, + ObjectModelAttribute attr) throws IOException { + + EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); + + String attrType = computeType(attr); + if (EugengoUtils.notEmpty(attrType)) { + attrType = getType(attrType, true); + } else { + return; + } + + // get collection element type for add and remove method arguement type + String elementType = getType(attr.getType(), true); + + String methodAccessName = getFieldAccessMethodName(attr); + + String attrName = attr.getName(); + String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); +/*{ static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { + <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); + return result; + } + + static public void add<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { + w.addToField(<%=EXT_NAME%>, "<%=attrName%>", element); + } + + static public void remove<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { + w.removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); + } + + static public void clear<%=attrNameCapitalized%>(Wikitty w) { + w.clearField(<%=EXT_NAME%>, "<%=attrName%>"); + } + +}*/ + } + + private static Set<String> commonNumerics; + static { + commonNumerics = new HashSet<String>(); + commonNumerics.add("byte"); + commonNumerics.add("Byte"); + commonNumerics.add("short"); + commonNumerics.add("Short"); + commonNumerics.add("int"); + commonNumerics.add("Integer"); + commonNumerics.add("long"); + commonNumerics.add("Long"); + commonNumerics.add("float"); + commonNumerics.add("Float"); + commonNumerics.add("double"); + commonNumerics.add("Double"); + } + + private static Set<String> commonStrings; + static { + commonStrings = new HashSet<String>(); + commonStrings.add("char"); + commonStrings.add("Char"); + commonStrings.add("String"); + } + + private static Set<String> commonTypes; + static { + commonTypes = new HashSet<String>(); + commonTypes.addAll(commonNumerics); + commonTypes.addAll(commonStrings); + commonTypes.add("boolean"); + commonTypes.add("Boolean"); + commonTypes.add("Date"); + } + +} Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-06-10 10:09:16 UTC (rev 111) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-06-10 15:17:47 UTC (rev 112) @@ -33,6 +33,7 @@ BusinessEntityInterfaceGenerator.class, BusinessEntityAbstractGenerator.class, BusinessEntityImplGenerator.class, + WikittyHelperGenerator.class, BusinessEntityBeanGenerator.class ));

1 0

r111 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: echatellier Date: 2010-06-10 12:09:16 +0200 (Thu, 10 Jun 2010) New Revision: 111 Url: http://nuiton.org/repositories/revision/wikitty/111 Log: Add property change listener on fields and tag values. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-06-10 10:05:49 UTC (rev 110) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-06-10 10:09:16 UTC (rev 111) @@ -216,13 +216,13 @@ public void addField(String fieldName, FieldType type) { fields.put(fieldName, type); // TODO EC20100610 null for old value - getPropertyChangeSupport().firePropertyChange("fields", null, tagValues); + getPropertyChangeSupport().firePropertyChange("fields", null, fields); } public void removeField(String fieldName) { fields.remove(fieldName); // TODO EC20100610 null for old value - getPropertyChangeSupport().firePropertyChange("fields", null, tagValues); + getPropertyChangeSupport().firePropertyChange("fields", null, fields); } @Override

1 0

r110 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: echatellier Date: 2010-06-10 12:05:49 +0200 (Thu, 10 Jun 2010) New Revision: 110 Url: http://nuiton.org/repositories/revision/wikitty/110 Log: Add property change listener on fields and tag values. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-06-08 13:16:36 UTC (rev 109) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-06-10 10:05:49 UTC (rev 110) @@ -17,6 +17,8 @@ package org.nuiton.wikitty; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; @@ -37,6 +39,13 @@ /** serialVersionUID. */ private static final long serialVersionUID = -3598621577607442972L; + /** + * Property change support. + * + * Warning, this transient field is null after deserialization. + */ + protected transient PropertyChangeSupport propertyChangeSupport; + /** Name of this extension. */ protected String name; @@ -97,6 +106,31 @@ } } + protected PropertyChangeSupport getPropertyChangeSupport() { + if (propertyChangeSupport == null) { + propertyChangeSupport = new PropertyChangeSupport(this); + } + return propertyChangeSupport; + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + getPropertyChangeSupport().addPropertyChangeListener(listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + getPropertyChangeSupport().removePropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + getPropertyChangeSupport().addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + getPropertyChangeSupport().removePropertyChangeListener(propertyName, listener); + } + public WikittyExtension cloneForUpgrade() { String nextRevision = WikittyUtil.incrementMajorRevision(getVersion()); @@ -181,10 +215,14 @@ public void addField(String fieldName, FieldType type) { fields.put(fieldName, type); + // TODO EC20100610 null for old value + getPropertyChangeSupport().firePropertyChange("fields", null, tagValues); } public void removeField(String fieldName) { fields.remove(fieldName); + // TODO EC20100610 null for old value + getPropertyChangeSupport().firePropertyChange("fields", null, tagValues); } @Override @@ -194,6 +232,8 @@ public void addTagValue(String tag, String value) { tagValues.put(tag, value); + // TODO EC20100610 null for old value + getPropertyChangeSupport().firePropertyChange("tagValues", null, tagValues); } public String getTagValue(String tag) { @@ -210,7 +250,9 @@ } public void setTagValues(Map<String, String> tagValues) { + Map<String, String> oldValue = this.tagValues; this.tagValues = tagValues; + getPropertyChangeSupport().firePropertyChange("tagValues", oldValue, tagValues); } @Override

1 0

r109 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test
by bpoussin＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: bpoussin Date: 2010-06-08 15:16:36 +0200 (Tue, 08 Jun 2010) New Revision: 109 Url: http://nuiton.org/repositories/revision/wikitty/109 Log: avancement de l'implantation de la securite - (re)modif de PagedResult tout compile et les tests passent donc tout doit fonctionner comme avant Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-06-08 13:16:36 UTC (rev 109) @@ -50,8 +50,6 @@ protected List<T> results; /** facet asked or null if no facet */ protected Map<String, List<FacetTopic>> facets; - /** securityToken of user that generate this PagedResult */ - protected String securityToken; /** * we don't initialize securityToken @@ -72,35 +70,6 @@ } /** - * Create PagedResult and initialize securityToken - * - * @param secuirtyToken - * @param firstIndice - * @param numFound - * @param queryString - * @param facets - * @param results - */ - public PagedResult(String securityToken, int firstIndice, int numFound, String queryString, - Map<String, List<FacetTopic>> facets, List<T> results) { - this.securityToken = securityToken; - this.firstIndice = firstIndice; - this.numFound = numFound; - this.queryString = queryString; - this.facets = facets; - this.results = Collections.unmodifiableList(results); - } - - /** - * initialize/set securityToken - * - * @param securityToken - */ - public void setSecurityToken(String securityToken) { - this.securityToken = securityToken; - } - - /** * Convert all result to the wanted type and return new PagedResult with * this new result list. If some result don't have the right extension (clazz) * this extension is automatically added if autoconvert is true. Else @@ -117,7 +86,8 @@ * @return new PagedResult */ public <E extends BusinessEntityWikitty> PagedResult<E> cast( - WikittyService wikittyService, Class<E> clazz, boolean autoconvert) { + String securityToken, WikittyService wikittyService, + Class<E> clazz, boolean autoconvert) { List<E> castedResult = new ArrayList<E>(results.size()); E sample = WikittyUtil.newInstance(clazz); Collection<WikittyExtension> wantedExtension = sample.getStaticExtensions(); @@ -150,7 +120,7 @@ } } } - PagedResult<E> result = new PagedResult<E>(securityToken, + PagedResult<E> result = new PagedResult<E>( firstIndice, numFound, queryString, facets, castedResult); return result; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-06-08 13:16:36 UTC (rev 109) @@ -224,7 +224,7 @@ securityToken, criteria); // we can use autoconvert = true because search by example add automaticaly // restriction on extension - PagedResult<E> result = (PagedResult<E>)pagedResult.cast( + PagedResult<E> result = (PagedResult<E>)pagedResult.cast(securityToken, wikittyService, e.getClass(), true); return result; } @@ -302,7 +302,8 @@ // we can cast with autoconvert true because we have add restriction // on extension - PagedResult<E> result = (PagedResult<E>)pagedResult.cast(wikittyService, sample.getClass(), true); + PagedResult<E> result = (PagedResult<E>)pagedResult.cast(securityToken, + wikittyService, sample.getClass(), true); return result; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-06-08 13:16:36 UTC (rev 109) @@ -102,6 +102,44 @@ public void clear(String securityToken); /** + * Verifie si l'utilisateur lie au securityToken a le droit d'ecrire + * le Wikitty passe en argument + * + * @param securityToken le token de securite qui permet de retrouver + * l'utilisateur et ainsi verifier les droits + * @param wikitty le wikitty a sauver + * @return vrai si l'utilisateur peut sauver l'objet + */ + public boolean canWrite(String securityToken, Wikitty wikitty); + + /** + * Verifie que l'utilisateur associe au securityToken peut supprimer le + * wikitty dont on passe l'identifiant. Seul le propriétaire de l'objet + * ou un admin peut supprimer un objet. + * + * Si l'id de l'objet est invalide, la methode retourne true, car la + * suppression d'un id invalide ne fait rien + * + * @param securityToken + * @param wikittyId + * @return vrai le la suppression ne posera pas de probleme. + */ + public boolean canDelete(String securityToken, String wikittyId); + + /** + * Un utilisateur peu lire un objet, s'il est Reader ou a defaut: + * - owner + * - AppAdmin + * - Admin + * - Writer + * + * @param securityToken + * @param id + * @return vrai si l'utilisateur peut lire l'obbjet + */ + public boolean canRead(String securityToken, String wikittyId); + + /** * Manage Update and creation. * * @param wikitty contains an id all the time. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-08 13:16:36 UTC (rev 109) @@ -99,12 +99,36 @@ } @Override + public String login(String login, String password) { + return ws.login(login, password); + } + + @Override + public void logout(String securityToken) { + ws.logout(securityToken); + } + + @Override + public boolean canWrite(String securityToken, Wikitty wikitty) { + return ws.canWrite(securityToken, wikitty); + } + + @Override + public boolean canDelete(String securityToken, String wikittyId) { + return ws.canDelete(securityToken, wikittyId); + } + + @Override + public boolean canRead(String securityToken, String wikittyId) { + return ws.canRead(securityToken, wikittyId); + } + + @Override public void clear(String securityToken) { ws.clear(securityToken); cache.clearWikitty(); } - /** * Override to refresh wikitty after put label * @param wikittyId @@ -513,16 +537,6 @@ } @Override - public String login(String login, String password) { - return ws.login(login, password); - } - - @Override - public void logout(String securityToken) { - ws.logout(securityToken); - } - - @Override public UpdateResponse syncEngin(String securityToken) { return ws.syncEngin(securityToken); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-08 13:16:36 UTC (rev 109) @@ -116,6 +116,21 @@ } @Override + public boolean canWrite(String securityToken, Wikitty wikitty) { + return true; + } + + @Override + public boolean canDelete(String securityToken, String wikittyId) { + return true; + } + + @Override + public boolean canRead(String securityToken, String wikittyId) { + return true; + } + + @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { // update/store extension if necessary @@ -579,7 +594,6 @@ List<String> ids = resultIds.getAll(); List<Wikitty> wikitties = restore(securityToken, transaction, ids); PagedResult<Wikitty> result = new PagedResult<Wikitty>( - securityToken, resultIds.getFirstIndice(), resultIds.getNumFound(), resultIds.getQueryString(), Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-08 13:16:36 UTC (rev 109) @@ -172,6 +172,21 @@ ws.logout(securityToken); } + @Override + public boolean canWrite(String securityToken, Wikitty wikitty) { + return ws.canWrite(securityToken, wikitty); + } + + @Override + public boolean canDelete(String securityToken, String wikittyId) { + return ws.canDelete(securityToken, wikittyId); + } + + @Override + public boolean canRead(String securityToken, String wikittyId) { + return ws.canRead(securityToken, wikittyId); + } + public void clear(String securityToken) { ws.clear(securityToken); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-06-08 13:16:36 UTC (rev 109) @@ -17,6 +17,7 @@ package org.nuiton.wikitty; +import static org.nuiton.i18n.I18n._; import java.util.Collection; import java.util.List; @@ -61,17 +62,17 @@ Wikitty wToken = new Wikitty(token); // force add extension to wikitty SecurityToken securityToken = new SecurityTokenImpl(wToken); - // on passe null comme toke, car on est dans le service de secu - // normalement il ne devrait pas y en avoir d'autre - ws.store(null, wToken); + // on passe token comme securityToken, mais il ne me semble pas + // que ce soit tres utile, mais comme ca c'est uniform + ws.store(token, wToken); return token; } @Override public void logout(String securityToken) { - // on passe null comme toke, car on est dans le service de secu - // normalement il ne devrait pas y en avoir d'autre - ws.delete(null, securityToken); + // on passe securityToken comme token, mais il ne me semble pas + // que ce soit tres utile, mais comme ca c'est uniform + ws.delete(securityToken, securityToken); } @Override @@ -80,64 +81,219 @@ // seul les AppAdmin on le droit a cette method } + /** + * Prepare l'ecriture en ajoutant s'il le faut l'extension + * WikittyAuthorisation et en fixant l'owner a l'utilisateur courant + * + * @param securityToken le token de securite qui permet de retrouver + * l'utilisateur + * @param wikitty le wikitty a sauver + */ + protected void prepareWrite(String securityToken, Wikitty wikitty) { + Wikitty oldVersion = ws.restore(securityToken, wikitty.getId()); + if (oldVersion == null) { + // creation d'une nouvelle entity, on a des choses a faire + + // recuperation de l'utilisateur associe au securityToken + Wikitty securityTokenWikitty = ws.restore(securityToken, securityToken); + String userId = securityTokenWikitty.getFieldAsWikitty( + SecurityToken.EXT_SECURITYTOKEN, SecurityToken.FIELD_USER); + + // on ajoute et on fixe les droits par defaut + WikittyAuthorisation auth = new WikittyAuthorisationImpl(wikitty); + auth.setOwner(userId); + } + } + @Override + public boolean canWrite(String securityToken, Wikitty wikitty) { + boolean result = false; + + String userId = getUserId(securityToken); + // + // check security + // + + // recuperation de l'ancienne version de l'objet pour verifier les droits + Wikitty oldVersion = ws.restore(securityToken, wikitty.getId()); + if (oldVersion == null) { + // creation d'une nouvelle entity + + // on verifie que l'on a le droit de creer une entity avec cette extension + // TODO poussin 20100607 trouver ou mettre l'autorisation qui retient l'information de qui a le droit de cree une extension + result = true; + } else { + // modification d'une entity existante + + // si c'est le owner il a tous les droits, a defaut les admins + // peuvent aussi le modifier + result = + // owner et admin peuvent tout modifier + isOwner(userId, oldVersion) || isAppAdmin(userId) + || isAdmin(userId, oldVersion) + // un writer ne peut pas modifier l'extension d'autorisation + || (WikittyAuthorisationAbstract.equals(oldVersion, wikitty) + && isWriter(userId, oldVersion)); + } + return result; + } + + @Override + public boolean canDelete(String securityToken, String wikittyId) { + boolean result = false; + + // + // check security + // + + // recuperation de l'ancienne version de l'objet pour verifier les droits + Wikitty oldVersion = ws.restore(securityToken, wikittyId); + if (oldVersion == null) { + // l'objet n'existe pas donc la suppression retourne true + result = true; + } else { + // suppresion d'une entity existante + String userId = getUserId(securityToken); + + // si c'est le owner il a tous les droits, a defaut les admins + // peuvent aussi le supprimer + result = + // owner et admin peuvent tout modifier + isOwner(userId, oldVersion) || isAppAdmin(userId) + || isAdmin(userId, oldVersion); + } + return result; + } + + @Override + public boolean canRead(String securityToken, String wikittyId) { + // recuperation de l'utilisateur associe au securityToken + Wikitty securityTokenWikitty = ws.restore(securityToken, securityToken); + String userId = securityTokenWikitty.getFieldAsWikitty( + SecurityToken.EXT_SECURITYTOKEN, SecurityToken.FIELD_USER); + + // + // check security + // + + // recuperation de l'objet pour verifier les droits + Wikitty w = ws.restore(securityToken, wikittyId); + boolean result = isReader(userId, w) || isOwner(userId, w) + || isAppAdmin(userId) || isAdmin(userId, w) + || isWriter(userId, w); + return result; + } + + @Override public UpdateResponse store(String securityToken, Wikitty wikitty) { - throw new UnsupportedOperationException("Not supported yet."); + if (canWrite(securityToken, wikitty)) { + prepareWrite(securityToken, wikitty); + UpdateResponse result = ws.store(securityToken, wikitty); + return result; + } else { + throw new SecurityException(_("user %s can't modify object %s", + getUserId(securityToken), wikitty.getId())); + } } @Override public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties) { - throw new UnsupportedOperationException("Not supported yet."); + for (Wikitty w : wikitties) { + if (!canWrite(securityToken, w)) { + throw new SecurityException(_("user %s can't modify object %s", + getUserId(securityToken), w.getId())); + } + } + for (Wikitty w : wikitties) { + prepareWrite(securityToken, w); + } + UpdateResponse result = ws.store(securityToken, wikitties); + return result; } @Override public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { - throw new UnsupportedOperationException("Not supported yet."); + for (Wikitty w : wikitties) { + if (!canWrite(securityToken, w)) { + throw new SecurityException(_("user %s can't modify object %s", + getUserId(securityToken), w.getId())); + } + } + for (Wikitty w : wikitties) { + prepareWrite(securityToken, w); + } + UpdateResponse result = ws.store(securityToken, wikitties, disableAutoVersionIncrement); + return result; } @Override - public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { - throw new UnsupportedOperationException("Not supported yet."); - } + public UpdateResponse store(String securityToken, WikittyTransaction transaction, + Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + for (Wikitty w : wikitties) { + if (!canWrite(securityToken, w)) { + throw new SecurityException(_("user %s can't modify object %s", + getUserId(securityToken), w.getId())); + } + } + for (Wikitty w : wikitties) { + prepareWrite(securityToken, w); + } + UpdateResponse result = ws.store(securityToken, transaction, wikitties, + disableAutoVersionIncrement); + return result; + } @Override public List<String> getAllExtensionIds(String securityToken) { - throw new UnsupportedOperationException("Not supported yet."); + // All people can read extension + return ws.getAllExtensionIds(securityToken); } @Override - public List<String> getAllExtensionsRequires(String securityToken, String extensionName) { - throw new UnsupportedOperationException("Not supported yet."); + public List<String> getAllExtensionsRequires( + String securityToken, String extensionName) { + // All people can read extension + return ws.getAllExtensionsRequires(securityToken, extensionName); } @Override - public UpdateResponse storeExtension(String securityToken, WikittyExtension ext) { - throw new UnsupportedOperationException("Not supported yet."); + public UpdateResponse storeExtension( + String securityToken, WikittyExtension ext) { + // TODO poussin 20100607 check security + return ws.storeExtension(securityToken, ext); } @Override - public UpdateResponse storeExtension(String securityToken, Collection<WikittyExtension> exts) { - throw new UnsupportedOperationException("Not supported yet."); + public UpdateResponse storeExtension(String securityToken, + Collection<WikittyExtension> exts) { + // TODO poussin 20100607 check security + return ws.storeExtension(securityToken, exts); } @Override - public UpdateResponse storeExtension(String securityToken, WikittyTransaction transaction, Collection<WikittyExtension> exts) { - throw new UnsupportedOperationException("Not supported yet."); + public UpdateResponse storeExtension(String securityToken, + WikittyTransaction transaction, Collection<WikittyExtension> exts) { + // TODO poussin 20100607 check security + return ws.storeExtension(securityToken, transaction, exts); } @Override public WikittyExtension restoreExtension(String securityToken, String id) { - throw new UnsupportedOperationException("Not supported yet."); + // All people can read extension + return ws.restoreExtension(securityToken, id); } @Override - public WikittyExtension restoreExtension(String securityToken, WikittyTransaction transaction, String id) { - throw new UnsupportedOperationException("Not supported yet."); + public WikittyExtension restoreExtension(String securityToken, + WikittyTransaction transaction, String id) { + // All people can read extension + return ws.restoreExtension(securityToken, transaction, id); } @Override public WikittyExtension restoreExtensionLastVersion(String securityToken, String name) { - throw new UnsupportedOperationException("Not supported yet."); + // All people can read extension + return ws.restoreExtensionLastVersion(securityToken, name); } @Override @@ -147,82 +303,269 @@ @Override public Wikitty restore(String securityToken, String id) { - throw new UnsupportedOperationException("Not supported yet."); + Wikitty result = null; + if (canRead(securityToken, id)) { + result = ws.restore(securityToken, id); + } else { + throw new SecurityException(_("user %s can't read object %s", + getUserId(securityToken), id)); + } + return result; } @Override - public List<Wikitty> restore(String securityToken, List<String> id) { - throw new UnsupportedOperationException("Not supported yet."); + public List<Wikitty> restore(String securityToken, List<String> ids) { + for (String id : ids) { + if (!canRead(securityToken, id)) { + throw new SecurityException(_("user %s can't read object %s", + getUserId(securityToken), id)); + } + } + + return ws.restore(securityToken, ids); } @Override public void delete(String securityToken, String id) { - throw new UnsupportedOperationException("Not supported yet."); + if (canDelete(securityToken, id)) { + ws.delete(securityToken, id); + } } @Override public void delete(String securityToken, Collection<String> ids) { - throw new UnsupportedOperationException("Not supported yet."); + for (String id : ids) { + if (!canDelete(securityToken, id)) { + throw new SecurityException(_("user %s can't delete object %s", + getUserId(securityToken), id)); + } + } + + ws.delete(securityToken, ids); } @Override public PagedResult<Wikitty> findAllByCriteria(String securityToken, Criteria criteria) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.findAllByCriteria(securityToken, criteria); } @Override - public PagedResult<Wikitty> findAllByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { - throw new UnsupportedOperationException("Not supported yet."); + public PagedResult<Wikitty> findAllByCriteria(String securityToken, + WikittyTransaction transaction, Criteria criteria) { + // TODO poussin 20100607 check security + return ws.findAllByCriteria(securityToken, transaction, criteria); } @Override public Wikitty findByCriteria(String securityToken, Criteria criteria) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.findByCriteria(securityToken, criteria); } @Override public void addLabel(String securityToken, String wikittyId, String label) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + ws.addLabel(securityToken, wikittyId, label); } @Override - public PagedResult<Wikitty> findAllByLabel(String securityToken, String label, int firstIndex, int endIndex) { - throw new UnsupportedOperationException("Not supported yet."); + public PagedResult<Wikitty> findAllByLabel(String securityToken, + String label, int firstIndex, int endIndex) { + // TODO poussin 20100607 check security + return ws.findAllByLabel(securityToken, label, firstIndex, endIndex); } @Override public Wikitty findByLabel(String securityToken, String label) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.findByLabel(securityToken, label); } @Override public Set<String> findAllAppliedLabels(String securityToken, String wikittyId) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.findAllAppliedLabels(securityToken, wikittyId); } @Override public Tree restoreTree(String securityToken, String wikittyId) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.restoreTree(securityToken, wikittyId); } @Override public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.restoreNode(securityToken, wikittyId, filter); } @Override public Map<TreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.restoreChildren(securityToken, wikittyId, filter); } @Override public Wikitty restoreVersion(String securityToken, String wikittyId, String version) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.restoreVersion(securityToken, wikittyId, version); } @Override public UpdateResponse syncEngin(String securityToken) { - throw new UnsupportedOperationException("Not supported yet."); + // TODO poussin 20100607 check security + return ws.syncEngin(securityToken); } + + // + // Method helper to check right + // + + /** + * Recupere l'identifiant de l'utilisateur associe au securityToken + * + * @param securityToken + * @return l'identifiant de l'utilisateur, ou null si le token est invalide + */ + protected String getUserId(String securityToken) { + String result = null; + // recuperation de l'utilisateur associe au securityToken + Wikitty securityTokenWikitty = ws.restore(securityToken, securityToken); + if (securityTokenWikitty != null) { + result = securityTokenWikitty.getFieldAsWikitty( + SecurityToken.EXT_SECURITYTOKEN, SecurityToken.FIELD_USER); + } + return result; + } + + + /** + * Verifie que l'utilisateur est bien le proprietaire de l'objet + * + * @param userId + * @param w + * @return + */ + protected boolean isOwner(String userId, Wikitty w) { + boolean result = false; + if (w.hasExtension(WikittyAuthorisation.EXT_WIKITTYAUTHORISATION)) { + String owner = w.getFieldAsWikitty( + WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, + WikittyAuthorisation.FIELD_OWNER); + result = userId.equals(owner); + } + return result; + } + + /** + * verifie que l'utilisateur est dans la liste des admin + * + * @param userId + * @param w + * @return vrai si et seulement si l'utilisateur est dans la liste des + * admin + */ + protected boolean isAdmin(String userId, Wikitty w) { + boolean result = isMember(userId, w, WikittyAuthorisation.FIELD_ADMIN); + return result; + } + + /** + * verifie que l'utilisateur est dans la liste des writer + * + * @param userId + * @param w + * @return vrai si et seulement si l'utilisateur est dans la liste des + * writers + */ + protected boolean isWriter(String userId, Wikitty w) { + boolean result = isMember(userId, w, WikittyAuthorisation.FIELD_WRITER); + return result; + } + + /** + * Par defaut un objet est lisible par tous, sauf s'il a l'extension + * d'autorisation et que la liste des readers existe et n'est pas vide + * + * @param userId + * @param w + * @return true si l'utilisateur est dans la liste des reader (ou que cette + * liste n'existe pas ce qui indique que tout le monde est reader) + */ + protected boolean isReader(String userId, Wikitty w) { + boolean result = true; + if (w.hasExtension(WikittyAuthorisation.EXT_WIKITTYAUTHORISATION)) { + Set<String> groupOrUser = w.getFieldAsSet( + WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, + WikittyAuthorisation.FIELD_READER, + String.class); + if (!(groupOrUser == null || groupOrUser.size() == 0)) { + result = isMember(userId, w, WikittyAuthorisation.FIELD_READER); + } + } + return result; + } + + /** + * Verifie si l'utilisateur est considere comme un AppAdmin + * + * @param userId + * @return + */ + protected boolean isAppAdmin(String userId) { + // TODO poussin 20100607 verifier que l'utilisateur est un AppAdmin ou non + return false; + } + + /** + * verifie qu'un utilisateur est membre d'un groupe passe en parametre via + * l'arguement field + * + * @param userId + * @param w + * @param field must be WikittyAuthorisation field name: admin, writer, reader + * @return + */ + protected boolean isMember(String userId, Wikitty w, String field) { + boolean result = false; + if (w.hasExtension(WikittyAuthorisation.EXT_WIKITTYAUTHORISATION)) { + Set<String> groupOrUser = w.getFieldAsSet( + WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, + field, + String.class); + result = isMember(userId, groupOrUser); + } + return result; + } + + /** + * Verifie recursivement si un utilisateur est dans un groupe qui peut etre + * constitue d'autre groupe ou d'utilisateur + * + * @param userId l'utilisateur recherche + * @param groupOrUser la liste des id d'utilisateurs ou d'autres groupes + * @return vrai si userId est retrouve, false sinon + */ + protected boolean isMember(String userId, Set<String> groupOrUser) { + for (String id : groupOrUser) { + if (userId.equals(id)) { + return true; + } else { + Wikitty w = ws.restore(null, id); + if (w.hasExtension(WikittyGroup.EXT_WIKITTYGROUP)) { + Set<String> members = w.getFieldAsSet( + WikittyGroup.EXT_WIKITTYGROUP, + WikittyGroup.FIELD_MEMBERS, String.class); + if (isMember(userId, members)) { + return true; + } + } + } + } + // not found in groupOrUser + return false; + } + } Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-08 13:16:36 UTC (rev 109) @@ -686,7 +686,7 @@ int numFound = (int)resp.getResults().getNumFound(); // FIXME null security token PagedResult<String> result = new PagedResult<String>( - null, firstIndex, numFound, queryString, facets, ids); + firstIndex, numFound, queryString, facets, ids); return result; } catch (SolrServerException e) { Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-06-08 12:59:39 UTC (rev 108) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-06-08 13:16:36 UTC (rev 109) @@ -192,7 +192,9 @@ thread1.start(); thread2.start(); - Thread.sleep(3000); +// Thread.sleep(3000); + thread1.join(); + thread2.join(); SolrDocument result = findById(solrServer1, "1"); assertNotNull(result);

1 0

r108 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: echatellier Date: 2010-06-08 14:59:39 +0200 (Tue, 08 Jun 2010) New Revision: 108 Url: http://nuiton.org/repositories/revision/wikitty/108 Log: Add unimplemented code delegation. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-08 12:51:49 UTC (rev 107) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-08 12:59:39 UTC (rev 108) @@ -479,14 +479,16 @@ public UpdateResponse storeExtension(String securityToken, WikittyTransaction transaction, Collection<WikittyExtension> exts) { // FIXME poussin 2010 comment gerer le cache avec des transactions ???? - throw new UnsupportedOperationException("Not supported yet."); + //throw new UnsupportedOperationException("Not supported yet."); + return ws.storeExtension(securityToken, transaction, exts); } @Override public WikittyExtension restoreExtension(String securityToken, WikittyTransaction transaction, String id) { // FIXME poussin 2010 comment gerer le cache avec des transactions ???? - throw new UnsupportedOperationException("Not supported yet."); + //throw new UnsupportedOperationException("Not supported yet."); + return ws.restoreExtension(securityToken, transaction, id); } @Override Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-08 12:51:49 UTC (rev 107) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-08 12:59:39 UTC (rev 108) @@ -275,7 +275,7 @@ public WikittyExtension restoreExtensionLastVersion( String securityToken, WikittyTransaction transaction, String name) { // no notification - return ws.restoreExtensionLastVersion(securityToken, name); + return ws.restoreExtensionLastVersion(securityToken, transaction, name); } @Override

1 0

r107 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty: . importexport
by echatellier＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: echatellier Date: 2010-06-08 14:51:49 +0200 (Tue, 08 Jun 2010) New Revision: 107 Url: http://nuiton.org/repositories/revision/wikitty/107 Log: Add new method on wikitty proxy restoreExtensionLastVersion with a transaction as parameter (used by csv import/export) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-06-08 12:51:49 UTC (rev 107) @@ -186,7 +186,7 @@ /** * action is done in transaction passed in argument * - * @param transaction transaction used to do the action (must not be null) * + * @param transaction transaction used to do the action (must not be null) * @param id * @return the corresponding object, exception if no such object found. */ @@ -194,12 +194,23 @@ WikittyTransaction transaction, String id); /** - * Search extension with name in last version - * @param name + * Search extension with name in last version. + * + * @param name extension name * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtensionLastVersion( String securityToken, String name); + + /** + * Search extension with name in last version. + * + * @param transaction transaction used to do the action (must not be null) + * @param name extension name + * @return the corresponding object, exception if no such object found. + */ + public WikittyExtension restoreExtensionLastVersion( + String securityToken, WikittyTransaction transaction, String name); /** * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-08 12:51:49 UTC (rev 107) @@ -334,6 +334,19 @@ // TODO poussin 20100412: perhaps use cache for extension ? return ws.restoreExtensionLastVersion(securityToken, name); } + + /** + * just wrap service method + * + * @param name + * @return + */ + @Override + public WikittyExtension restoreExtensionLastVersion( + String securityToken, WikittyTransaction transaction, String name) { + // TODO poussin 20100412: perhaps use cache for extension ? + return ws.restoreExtensionLastVersion(securityToken, transaction, name); + } /** * just wrap service method Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-08 12:51:49 UTC (rev 107) @@ -326,7 +326,7 @@ } - protected WikittyExtension restoreExtensionLastVersion(String securityToken, + public WikittyExtension restoreExtensionLastVersion(String securityToken, WikittyTransaction transaction, String name) { String version = getExtensionStorage().getLastVersion(transaction, name); if(version == null) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-08 12:51:49 UTC (rev 107) @@ -272,6 +272,13 @@ } @Override + public WikittyExtension restoreExtensionLastVersion( + String securityToken, WikittyTransaction transaction, String name) { + // no notification + return ws.restoreExtensionLastVersion(securityToken, name); + } + + @Override public Wikitty restore(String securityToken, String id) { // no notification return ws.restore(securityToken, id); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-06-08 12:51:49 UTC (rev 107) @@ -141,6 +141,11 @@ } @Override + public WikittyExtension restoreExtensionLastVersion(String securityToken, WikittyTransaction transaction, String name) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override public Wikitty restore(String securityToken, String id) { throw new UnsupportedOperationException("Not supported yet."); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-06-08 12:51:49 UTC (rev 107) @@ -52,7 +52,7 @@ log.info("Export started"); } ImportExportMethod exporter = format.ieporter(); - exporter.exportWriter(securityToken, writer, ws, pageResult); + exporter.exportWriter(securityToken, writer, ws, transaction, pageResult); if (log.isInfoEnabled()) { time = System.currentTimeMillis() - time; log.info("Export in (ms)" + time); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-06-08 12:51:49 UTC (rev 107) @@ -36,6 +36,7 @@ import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; @@ -64,7 +65,8 @@ @Override public void importReader(String securityToken, Reader reader, - WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception { + WikittyService ws, WikittyTransaction transaction, + WikittyBatchUpdate batchUpdate) throws Exception { // get index of wikitty.id field int wikittyIdIndex = -1; @@ -114,7 +116,7 @@ if (StringUtils.isNotEmpty(value)) { // extension must exists on wikitty to set a field value - addMissingExtension(securityToken, ws, currentWikitty, extName); + addMissingExtension(securityToken, ws, transaction, currentWikitty, extName); // convert link values (if necessary) value = convertLinkValues(securityToken, ws, value); @@ -145,18 +147,19 @@ /** * Recusively add missing extension of not exist and required extension too. */ - protected void addMissingExtension(String securityToken, WikittyService ws, Wikitty currentWikitty, String extName) { + protected void addMissingExtension(String securityToken, WikittyService ws, + WikittyTransaction transaction, Wikitty currentWikitty, String extName) { // extension must exists on wikitty to set a field value if (!currentWikitty.hasExtension(extName)) { WikittyExtension extension = ws.restoreExtensionLastVersion( - securityToken, extName); + securityToken, transaction, extName); String requires = extension.getRequires(); if (StringUtils.isNotEmpty(requires)) { // add required extensions BEFORE current for (String require : requires.split(",")) { String localRequire = require.trim(); - addMissingExtension(securityToken, ws, currentWikitty, localRequire); + addMissingExtension(securityToken, ws, transaction, currentWikitty, localRequire); } } @@ -223,7 +226,8 @@ @Override public void exportWriter(String securityToken, Writer writer, - WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { + WikittyService ws, WikittyTransaction transaction, + PagedResult<Wikitty> pagedResult) throws Exception { CSVWriter csvWriter = new CSVWriter(writer); @@ -234,7 +238,7 @@ String extName = topic.getTopicName(); WikittyExtension extension = ws.restoreExtensionLastVersion( - securityToken, extName); + securityToken, transaction, extName); String ext = WikittyExtension.computeName(extName); for (String fieldName : extension.getFieldNames()) { extensionHeader.add(ext + "." + fieldName); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-06-08 12:51:49 UTC (rev 107) @@ -23,6 +23,7 @@ import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyTransaction; /** * Import / export interface. @@ -38,24 +39,30 @@ /** * Import data from reader. * + * @param securityToken security token * @param reader reader * @param ws wikitty service + * @param transaction current transaction * @param batchUpdate wikitty batch update helper * * @throws Exception */ public void importReader(String securityToken, Reader reader, - WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception; + WikittyService ws, WikittyTransaction transaction, + WikittyBatchUpdate batchUpdate) throws Exception; /** * Export data to writer. * + * @param securityToken security token * @param writer writer * @param ws wikitty service + * @param transaction current transaction * @param pagedResult paged result * * @throws Exception */ public void exportWriter(String securityToken, Writer writer, - WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception; + WikittyService ws, WikittyTransaction transaction, + PagedResult<Wikitty> pagedResult) throws Exception; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-06-08 12:51:49 UTC (rev 107) @@ -36,6 +36,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserFactory; @@ -55,7 +56,8 @@ @Override public void importReader(String securityToken, Reader reader, - WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception { + WikittyService ws, WikittyTransaction transaction, + WikittyBatchUpdate batchUpdate) throws Exception { XmlPullParserFactory factory = XmlPullParserFactory.newInstance( System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); factory.setNamespaceAware(true); @@ -132,7 +134,8 @@ @Override public void exportWriter(String securityToken, Writer result, - WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { + WikittyService ws, WikittyTransaction transaction, + PagedResult<Wikitty> pagedResult) throws Exception { // keep extension already done Set<String> extDone = new HashSet<String>(); result.write("<wikengo>\n"); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-06-08 08:03:44 UTC (rev 106) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-06-08 12:51:49 UTC (rev 107) @@ -43,7 +43,7 @@ log.info("Import in (ms)" + time); } ImportExportMethod importer = format.ieporter(); - importer.importReader(securityToken, reader, ws, batchUpdate); + importer.importReader(securityToken, reader, ws, transaction, batchUpdate); if (log.isInfoEnabled()) { time = System.currentTimeMillis() - time;

1 0