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

r676 - in trunk/wikitty-dto/src: main/java/org/nuiton/wikitty/dto test/java/org/nuiton/wikitty/dto
by jcouteau＠users.nuiton.org Jan. 3, 2011

Jan. 3, 2011

Author: jcouteau Date: 2011-01-03 17:01:30 +0100 (Mon, 03 Jan 2011) New Revision: 676 Url: http://nuiton.org/repositories/revision/wikitty/676 Log: Allow to transform from to dto to wikitty something that have not been stored in database previously Modified: trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java Modified: trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java =================================================================== --- trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java 2011-01-03 14:05:10 UTC (rev 675) +++ trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java 2011-01-03 16:01:30 UTC (rev 676) @@ -28,7 +28,10 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ObjectUtil; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; /** * User: couteau @@ -59,7 +62,22 @@ public static <E extends BusinessEntity> E fromDto(WikittyProxy proxy, Class<E> clazz, E dto) { E result = proxy.restore(clazz, dto.getWikittyId()); - result.copyFrom(dto); + + if (result == null){ + try { + String wikittyId = dto.getWikittyId(); + Wikitty wikitty = new WikittyImpl(wikittyId); + result = WikittyUtil.newInstance( proxy.getSecurityToken(), + proxy.getWikittyService(), clazz, wikitty); + } catch (Exception eee) { + log.error("Could not transform DTO to Wikitty", eee); + } + } + + if (result != null) { + result.copyFrom(dto); + } + return result; } Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-01-03 14:05:10 UTC (rev 675) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-01-03 16:01:30 UTC (rev 676) @@ -60,9 +60,6 @@ WikittyLabel label = new WikittyLabelImpl(); label.addLabels("Test"); - //store entity - label = proxy.store(label); - //make conversion WikittyLabel dto = DTOHelper.toDto(label);

1 0

r675 - trunk/src/site/rst
by jcouteau＠users.nuiton.org Jan. 3, 2011

Jan. 3, 2011

Author: jcouteau Date: 2011-01-03 15:05:10 +0100 (Mon, 03 Jan 2011) New Revision: 675 Url: http://nuiton.org/repositories/revision/wikitty/675 Log: Improve migration doc Modified: trunk/src/site/rst/migration.rst Modified: trunk/src/site/rst/migration.rst =================================================================== --- trunk/src/site/rst/migration.rst 2010-12-29 17:54:20 UTC (rev 674) +++ trunk/src/site/rst/migration.rst 2011-01-03 14:05:10 UTC (rev 675) @@ -50,9 +50,13 @@ store(myExtension); -Ensuite, vous devez ajouter au registre toutes les migrations spécifiques des -extensions:: +ou:: + store(myEntityImpl.extensionMyEntity) + +Si vous avez des migrations spécifiques à effectuer, ajoutez au registre toutes +les migrations spécifiques des extensions:: + WikittyExtensionMigration.migrationRegistry.put("myExtension", myMigrationClass); Vous pouvez maintenant utiliser vos données simplement, elles seront migrées

1 0

r674 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr
by sletellier＠users.nuiton.org Dec. 29, 2010

Dec. 29, 2010

Author: sletellier Date: 2010-12-29 18:54:20 +0100 (Wed, 29 Dec 2010) New Revision: 674 Url: http://nuiton.org/repositories/revision/wikitty/674 Log: Add quotes to escape ':' for solr Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2010-12-29 17:32:33 UTC (rev 673) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2010-12-29 17:54:20 UTC (rev 674) @@ -65,6 +65,7 @@ * Find solr document by id */ static public SolrDocument findById(SolrServer solrServer, String id) { + id = quoteForSolr(id); SolrQuery query = new SolrQuery(SOLR_ID + ":" + id); QueryResponse response; try { @@ -169,4 +170,14 @@ } return result; } + + /** + * Quote s for solr. Currently only ':' is escaped + * @param s to quote + * @return new string solr compliant + */ + static public String quoteForSolr(String s) { + String result = s.replaceAll(":", "\\\\:"); + return result; + } } Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2010-12-29 17:32:33 UTC (rev 673) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2010-12-29 17:54:20 UTC (rev 674) @@ -266,7 +266,9 @@ // Find all node contain is as attachment SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT - + SUFFIX_WIKITTY + ":" + id); + + SUFFIX_WIKITTY + ":" + + SolrUtil.quoteForSolr(id)); + QueryResponse response = solrServer.query(query); SolrDocumentList updateDocs = response.getResults(); @@ -331,12 +333,6 @@ // init system env solr.data.dir if (config != null) { - String solrHome = config.getOption(WikittyConfig.WikittyOption - .WIKITTY_SEARCHENGINE_SOLR_HOME.getKey()); - if (solrHome != null) { - System.setProperty("solr.solr.home", solrHome); - } - // choix du storage (file or Ram) String solrDirFactoryKey = WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); @@ -345,22 +341,16 @@ System.setProperty(solrDirFactoryKey, solrDirFactory); } - // on utilise le directory meme si on est en RAM, solr peut ecrire des fichiers :( - if (solrDirFactory != null) { + // on utilise le directory que si on est pas en Ram + if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { String solrDataDirKey = WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); String solrDataDir = config.getOption(solrDataDirKey); // make sure that dir exists if (solrDataDir != null) { File file = new File(solrDataDir); + file.mkdirs(); System.setProperty(solrDataDirKey, solrDataDir); - // si on est en RAM normalement on ne devrait pas ecrire - // de fichier, si SolR veut tout de meme le faire, c'est - // que la config est mauvaise. Mais dans ce cas on aide - // pas Solr en creant les repertoires pere - if (!solrDirFactory.contains("RAMDirectoryFactory")) { - file.mkdirs(); - } } } }

1 0

r673 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/entities wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org Dec. 29, 2010

Dec. 29, 2010

Author: bpoussin Date: 2010-12-29 18:32:33 +0100 (Wed, 29 Dec 2010) New Revision: 673 Url: http://nuiton.org/repositories/revision/wikitty/673 Log: Anomalie #1182: WikittyException when copying a wikitty with a lower bound > 0 bad set implementation,, we must use set that support correctly set for collection, and not clear + addAll Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2010-12-29 14:31:51 UTC (rev 672) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2010-12-29 17:32:33 UTC (rev 673) @@ -194,6 +194,14 @@ col.add( getContainedValidObject(o) ); } result = col; + + // check bound condition + if (!(getLowerBound() <= col.size() && col.size() <= getUpperBound())) { + // if upper bound reached, throw an exception + throw new WikittyException(String.format( + "Can't set collection value, bad size collection: %s <= %s <= %s is false", + getLowerBound(), col.size(), getUpperBound())); + } } else { result = getContainedValidObject(value); } 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-12-29 14:31:51 UTC (rev 672) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-12-29 17:32:33 UTC (rev 673) @@ -143,8 +143,7 @@ addParameter(setter, attributeTypeSimpleNameInSet, attributeName); String setterBody = "" /*{ - clear<%=attributeNameCapitalized%>(wikitty); - addAll<%=attributeNameCapitalized%>(wikitty, <%=attributeName%>); + wikitty.setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>); }*/; setOperationBody(setter, setterBody);

1 0

r672 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons
by sletellier＠users.nuiton.org Dec. 29, 2010

Dec. 29, 2010

Author: sletellier Date: 2010-12-29 15:31:51 +0100 (Wed, 29 Dec 2010) New Revision: 672 Url: http://nuiton.org/repositories/revision/wikitty/672 Log: - Prevent NPE when cache is not instanciate Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java 2010-12-29 10:01:53 UTC (rev 671) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java 2010-12-29 14:31:51 UTC (rev 672) @@ -119,9 +119,13 @@ parseAndCacheTranslations(); String result = null; - Map<String, String> l = translationsCache.get(lang); - if (l != null) { - result = l.get(field); + + // If cache is null, no translation is availlable + if (translationsCache != null) { + Map<String, String> l = translationsCache.get(lang); + if (l != null) { + result = l.get(field); + } } if (result == null) {

1 0

r671 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty: . services
by jcouteau＠users.nuiton.org Dec. 29, 2010

Dec. 29, 2010

Author: jcouteau Date: 2010-12-29 11:01:53 +0100 (Wed, 29 Dec 2010) New Revision: 671 Url: http://nuiton.org/repositories/revision/wikitty/671 Log: Add security methods on proxy. Deprecates WikittySecurityHelper (helpers should be generated). Use WikittySecurityUtil instead. Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-12-26 15:28:04 UTC (rev 670) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-12-29 10:01:53 UTC (rev 671) @@ -33,29 +33,24 @@ import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.WikittyGroup; +import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.operators.Element; import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.services.WikittySecurityUtil; import org.nuiton.wikitty.services.WikittyServiceEnhanced; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.TimeTrace; -import org.nuiton.wikitty.entities.WikittyTreeNode; /** * Wikitty proxy is used to transform wikitty object used by {@link WikittyService} @@ -826,4 +821,50 @@ return result; } + /** + * Check that the logged in user is in a group. A #SecurityException might + * be thrown at runtime if the #WikittyUser session timed out. + * @param groupName the name of the group to check + * @return true is the logged in user is in the group + */ + public boolean isMember(String groupName) { + long start = TimeTrace.getTime(); + boolean result = false; + + WikittyUser user = getLoggedInUser(); + + //Find the group from its name + Search search = Search.query() + .eq(Element.ELT_EXTENSION, WikittyGroup.EXT_WIKITTYGROUP) + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, groupName); + Criteria criteria = search.criteria(); + + Wikitty group = findByCriteria(criteria); + + if (group != null) { + result = WikittySecurityUtil.isMember(wikittyService, securityToken, + user.getWikittyId(), group.getId()); + } + + timeTrace.add(start, "isMember"); + return result; + } + + /** + * Get the #WikittyUser that is logged in. A #SecurityException might be + * thrown at runtime if the #WikittyUser session timed out. + * @return the logged in #WikittyUser + */ + public WikittyUser getLoggedInUser() { + long start = TimeTrace.getTime(); + + String userId = WikittySecurityUtil.getUserForToken(wikittyService, + securityToken); + + WikittyUser user = restore(WikittyUser.class, userId); + + timeTrace.add(start, "getLoggedInUser"); + return user; + } + } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java 2010-12-26 15:28:04 UTC (rev 670) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java 2010-12-29 10:01:53 UTC (rev 671) @@ -79,7 +79,10 @@ /** * create appAdminGroup and add current user as first member + * + * @deprecated Use #WikittySecurityUtil.createAppAdminGroup */ + @Deprecated static public WikittyGroup createAppAdminGroup(WikittyUser user) { WikittyGroup result = new WikittyGroupImpl(); result.setName(WIKITTY_APPADMIN_GROUP_NAME); Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java 2010-12-29 10:01:53 UTC (rev 671) @@ -0,0 +1,95 @@ +package org.nuiton.wikitty.services; + +import java.util.Set; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyGroup; +import org.nuiton.wikitty.entities.WikittyGroupHelper; +import org.nuiton.wikitty.entities.WikittyGroupImpl; +import org.nuiton.wikitty.entities.WikittyTokenHelper; +import org.nuiton.wikitty.entities.WikittyUser; + +/** + * + * Security utility methods. This class should replace #WikittySecurityHelper + * + * User: couteau + * Date: 22/12/10 + */ +public class WikittySecurityUtil { + + /** + * Name of the application administrators group + */ + static final public String WIKITTY_APPADMIN_GROUP_NAME = "WikittyAppAdmin"; + + /** + * Check on a WikittyService if a user is member of a group. A + * SecurityException might be thrown at runtime if the securityToken has + * expired. + * + * @param ws the wikitty service to do the check on + * @param securityToken the security token + * @param userId the user to check's wikitty id + * @param groupId the group to check the user is in's wikitty id + * @return true if the user is in the group, false otherwise + */ + public static boolean isMember(WikittyService ws, String securityToken, + String userId, String groupId) { + if (groupId != null) { + + Wikitty group = WikittyServiceEnhanced.restore(ws, securityToken, + groupId); + + if (WikittyGroupHelper.hasExtension(group)) { + Set<String> members = WikittyGroupHelper.getMembers(group); + return members.contains(userId); + } + } + + return false; + } + + /** + * Get a user corresponding to a securityToken + * @param ws the WikittyService to do the check on + * @param securityToken the token of the user to search for. + * @return the wikitty Id of the user corresponding to the securityToken + */ + public static String getUserForToken(WikittyService ws, + String securityToken) { + // recuperation de l'utilisateur associe au securityToken + // le securityToken est aussi l'id de l'objet + String userId = null; + if (securityToken != null) { + //Get the token + Wikitty securityTokenWikitty = WikittyServiceEnhanced.restore(ws, + securityToken, securityToken); + if (securityTokenWikitty == null) { + throw new SecurityException("bad (obsolete ?) token"); + } else { + //Get the user + userId = WikittyTokenHelper.getUser(securityTokenWikitty); + } + } + return userId; + } + + /** + * Create appAdminGroup and add current user as first member. The group has + * to be stored after as it is not persisted in this method. + * + * @param user the user that will be the first admin group member + * @return the admin group + */ + static public WikittyGroup createAppAdminGroup(WikittyUser user) { + WikittyGroup result = new WikittyGroupImpl(); + result.setName(WIKITTY_APPADMIN_GROUP_NAME); + + String firstUserId = user.getWikittyId(); + result.addMembers(firstUserId); + + return result; + } + +}

1 0

r670 - trunk/wikitty-solr-impl/src/main/resources
by bpoussin＠users.nuiton.org Dec. 26, 2010

Dec. 26, 2010

Author: bpoussin Date: 2010-12-26 16:28:04 +0100 (Sun, 26 Dec 2010) New Revision: 670 Url: http://nuiton.org/repositories/revision/wikitty/670 Log: - suppress suggestion config Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-26 15:19:52 UTC (rev 669) +++ trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-26 15:28:04 UTC (rev 670) @@ -47,7 +47,9 @@ org.apache.solr.(search|update|request|core|analysis) --> <directoryFactory name="DirectoryFactory" class="${wikitty.searchengine.solr.directory.factory:solr.StandardDirectoryFactory}"/> + <directoryFactory name="IndexReaderFactory" class="${wikitty.searchengine.solr.indexReader.factory:solr.StandardIndexReaderFactory}"/> + <indexDefaults>  <useCompoundFile>false</useCompoundFile> @@ -291,18 +293,21 @@  +  + - - > <str name="bq">incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2</str> </lst> -  + - - > <lst name="appends"> <str name="fq">inStock:true</str> </lst> -  + - - > <lst name="invariants"> <str name="facet.field">cat</str> <str name="facet.field">manu_exact</str> @@ -341,6 +346,7 @@ <str name="facet.query">price:[500 TO *]</str> </lst> </requestHandler> + -->  +  <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str> <str name="spellcheckIndexDir">./spellchecker2</str> @@ -405,20 +415,18 @@ </lst> </searchComponent> -  + < ! - - a request handler utilizing the spellcheck component - - > <requestHandler name="/spellCheckCompRH" class="solr.SearchHandler"> <lst name="defaults"> -  <str name="spellcheck.onlyMorePopular">false</str> -  <str name="spellcheck.extendedResults">false</str> -  <str name="spellcheck.count">1</str> </lst> <arr name="last-components"> <str>spellcheck</str> </arr> </requestHandler> + -->

1 0

r669 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Dec. 26, 2010

Dec. 26, 2010

Author: bpoussin Date: 2010-12-26 16:19:52 +0100 (Sun, 26 Dec 2010) New Revision: 669 Url: http://nuiton.org/repositories/revision/wikitty/669 Log: Anomalie #1167: In memory Solr, create directory and fail if reuse Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-26 15:00:45 UTC (rev 668) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-26 15:19:52 UTC (rev 669) @@ -174,6 +174,11 @@ _("JDBC xadatasource property h2 password"), "${"+WIKITTY_STORAGE_JDBC_PASSWORD.getKey() + "}", String.class, false, false), + WIKITTY_SEARCHENGINE_SOLR_HOME( + "wikitty.searchengine.solr.home", + _("SolR directory home. You can put solr.xml config file in. If" + + " not null, replace solr.solr.home environment vairable"), + null, String.class, false, false), /* Solr config name are used directly in solr config file. If * you change it, change too in module * wikitty-solr-impl/src/main/resources/solrconfig.xml */ Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-12-26 15:00:45 UTC (rev 668) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-12-26 15:19:52 UTC (rev 669) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.services; +import java.io.File; import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -54,11 +55,16 @@ // we use unique db name (this permit to use simultaneously many // WikittyServiceInMemoryJdbcSolr) - String dbName = UUID.randomUUID().toString(); + String dbName = "wikitty-tx-" + UUID.randomUUID().toString(); ApplicationConfig config = new WikittyConfig(); config.setOption(WikittyConfig.WikittyOption. WIKITTY_STORAGE_JDBC_URL.getKey(), "jdbc:h2:mem:" + dbName); + // solr meme en RAMDirectoryFactory peut creer des fichiers si + // la config est mauvaise, pour prevenir tous problemes on fixe un + // repertoire unique si jamais ca arrive pour eviter les problemes + config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + config.getOption("java.io.tmpdir") + File.separator + dbName); config.setOption(WikittyConfig.WikittyOption. WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(), RAMDirectoryFactory.class.getName()); Modified: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java =================================================================== --- trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2010-12-26 15:00:45 UTC (rev 668) +++ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2010-12-26 15:19:52 UTC (rev 669) @@ -49,6 +49,7 @@ result.setOption(WikittyConfig.WikittyOption. WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemoryJdbcSolr.class.getName()); + log.info(result.getPrintableConfig("wikitty.*", 50)); return result; } Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java 2010-12-26 15:00:45 UTC (rev 668) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java 2010-12-26 15:19:52 UTC (rev 669) @@ -20,6 +20,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; +import org.apache.lucene.store.LockFactory; import org.apache.solr.core.StandardDirectoryFactory; import java.io.IOException; @@ -27,6 +28,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; +import org.apache.lucene.store.SingleInstanceLockFactory; /** * Directory provider for using lucene RAMDirectory @@ -91,12 +93,33 @@ public RefCntRamDirectory(Directory dir) throws IOException { this(); + // CODELUTIN Directory.copy(dir, this, false); // for (String file : dir.listAll()) { // dir.copy(this, file, file); // } + // CODELUTIN } + // CODELUTIN + @Override + public void setLockFactory(LockFactory lockFactory) { + // on accept que SingleInstanceLockFactory, sinon on ecrit + // des locks sur disque ce qui cree le repertoire index + // et ensuite on croit que l'index existe et donc s'initialise mal + // puisque le repertoire est en fait vide + + // cela provient de la methode dans SolrIndexWriter + // public static Directory getDirectory(...) + // qui instancie bien un RAMDirectory, mais ensuite change le + // LockFactory avec celui trouve dans le fichier de config, fait + // pour les autre Directory de type FS + if (lockFactory instanceof SingleInstanceLockFactory) { + super.setLockFactory(lockFactory); + } + } + // CODELUTIN + public void incRef() { ensureOpen(); refCount.incrementAndGet(); Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2010-12-26 15:00:45 UTC (rev 668) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2010-12-26 15:19:52 UTC (rev 669) @@ -331,6 +331,12 @@ // init system env solr.data.dir if (config != null) { + String solrHome = config.getOption(WikittyConfig.WikittyOption + .WIKITTY_SEARCHENGINE_SOLR_HOME.getKey()); + if (solrHome != null) { + System.setProperty("solr.solr.home", solrHome); + } + // choix du storage (file or Ram) String solrDirFactoryKey = WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); @@ -339,16 +345,22 @@ System.setProperty(solrDirFactoryKey, solrDirFactory); } - // on utilise le directory que si on est pas en Ram - if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { + // on utilise le directory meme si on est en RAM, solr peut ecrire des fichiers :( + if (solrDirFactory != null) { String solrDataDirKey = WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); String solrDataDir = config.getOption(solrDataDirKey); // make sure that dir exists if (solrDataDir != null) { File file = new File(solrDataDir); - file.mkdirs(); System.setProperty(solrDataDirKey, solrDataDir); + // si on est en RAM normalement on ne devrait pas ecrire + // de fichier, si SolR veut tout de meme le faire, c'est + // que la config est mauvaise. Mais dans ce cas on aide + // pas Solr en creant les repertoires pere + if (!solrDirFactory.contains("RAMDirectoryFactory")) { + file.mkdirs(); + } } } } Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2010-12-26 15:00:45 UTC (rev 668) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2010-12-26 15:19:52 UTC (rev 669) @@ -237,7 +237,7 @@ Wikitty root = findNode("root"); String rootId = root.getId(); - WikittyTree tree = ws.restoreTree(null, rootId); + WikittyTree tree = getProxy().restoreTree(rootId); assertNotNull(tree); }

1 0

r668 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org Dec. 26, 2010

Dec. 26, 2010

Author: bpoussin Date: 2010-12-26 16:00:45 +0100 (Sun, 26 Dec 2010) New Revision: 668 Url: http://nuiton.org/repositories/revision/wikitty/668 Log: refactor restoreTree Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-26 15:00:24 UTC (rev 667) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-26 15:00:45 UTC (rev 668) @@ -833,32 +833,28 @@ txBeginHere = true; } + WikittyTree tree = null; Wikitty w = restore(securityToken, wikittyId); - if (w == null) { - if (txBeginHere) { - tx.commit(); + if (w != null) { + + if (!w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { + throw new WikittyException(String.format( + "Wikitty '%s' do not handle extension %s", + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE)); } - return null; - } + tree = new WikittyTree(); + WikittyTreeNode node = new WikittyTreeNodeImpl(w); + tree.setNode(node); - if (!w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { - throw new WikittyException(String.format( - "Wikitty '%s' do not handle extension %s", - wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE)); - } - WikittyTree tree = new WikittyTree(); - WikittyTreeNode node = new WikittyTreeNodeImpl(w); - tree.setNode(node); + WikittyTreeNodeImpl exempleNode = new WikittyTreeNodeImpl(); + exempleNode.setParent(wikittyId); - WikittyTreeNodeImpl exempleNode = new WikittyTreeNodeImpl(); - exempleNode.setParent(wikittyId); - - Criteria criteria = Search.query(exempleNode.getWikitty()) - .criteria().setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> childNodesId = findAllByCriteria( - securityToken, criteria); - for (String childNodeId : childNodesId.getAll()) { - tree.addChild(restoreTree(securityToken, childNodeId)); + Criteria criteria = Search.query(exempleNode.getWikitty()).criteria().setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult<String> childNodesId = findAllByCriteria( + securityToken, criteria); + for (String childNodeId : childNodesId.getAll()) { + tree.addChild(restoreTree(securityToken, childNodeId)); + } } if(txBeginHere) {

1 0

r667 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org Dec. 26, 2010

Dec. 26, 2010

Author: bpoussin Date: 2010-12-26 16:00:24 +0100 (Sun, 26 Dec 2010) New Revision: 667 Url: http://nuiton.org/repositories/revision/wikitty/667 Log: add small test for WikittyCacheJCS Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2010-12-26 15:00:24 UTC (rev 667) @@ -0,0 +1,38 @@ +package org.nuiton.wikitty.services; + + +import junit.framework.Assert; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyCacheJCSTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyCacheJCSTest.class); + + @Test + public void testPutGet() throws Exception { + WikittyConfig config = new WikittyConfig(); + WikittyCacheJCS cache = new WikittyCacheJCS(config); + + Wikitty w = new WikittyImpl(); + cache.putWikitty(w); + + Wikitty w2 = cache.getWikitty(w.getId()); + + Assert.assertEquals(w, w2); + } + +}

1 0