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

r816 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org April 18, 2011

April 18, 2011

Author: mfortun Date: 2011-04-18 18:03:15 +0200 (Mon, 18 Apr 2011) New Revision: 816 Url: http://nuiton.org/repositories/revision/wikitty/816 Log: * correct bug with url construction for the wikittypublicationfilesystem * criteria search for wikittypublicationfilesystem beginning Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-18 14:19:45 UTC (rev 815) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-18 16:03:15 UTC (rev 816) @@ -24,8 +24,6 @@ */ package org.nuiton.wikitty.publication.synchro; -import gnu.cajo.Cajo; - import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -39,17 +37,12 @@ import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; -import org.nuiton.wikitty.entities.WikittyUser; -import org.nuiton.wikitty.entities.WikittyUserHelper; -import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.services.WikittyServiceCajoClient; /** * Main class of the sync part of wikitty publication, this class is the entry @@ -77,6 +70,8 @@ static public String IS_DELETE_OPTION = "delete"; static public String IS_EXISTING_OPTION = "existing"; + static public String LABEL_KEY = "working.label"; + /** * @param args * @throws ArgumentsParserException @@ -292,31 +287,42 @@ // transfert main properties to new application config result.setOptions(applicationConfig.getFlatOptions()); - + String url = uri.toASCIIString(); if (uri.getScheme().equals("file")) { result.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); } else if (uri.getScheme().equals("cajo")) { result.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceCajoClient"); + + // remove fragment from the uri. + url = url.replaceAll("\\#.*", ""); } else if (uri.getScheme().equals("hessian")) { result.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); + // remove fragment from the uri. + url = url.replaceAll("\\#.*", ""); } - String url = uri.toASCIIString(); - // remove fragment from the uri. - url = url.replaceAll("\\#.*", ""); - // set protocol to http no use finally + // set protocol to http, no use finally /* * url = url.replaceFirst("["+uri.getScheme()+"]", "http"); */ - - log.info("set url " + url + " with component :"+ result.getOption("wikitty.WikittyService.components")); + log.info("set url " + url + " with component :" + + result.getOption("wikitty.WikittyService.components")); + result.setOption("wikitty.service.server.url", url); return result; } + + /* + * TODO mfortun-2011-04-18 plus tard il faudra rajouter un fonctionnement + * commit update à la commande sync, en se servant de l'adresse du wikitty + * service que l'on aura enregitré quelque part. Un commit/update sera juste + * un alias sur le sync classique en se servant d'une adresse enregistré + * dans un fichier et une adresse en ligne de commande + */ } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-18 14:19:45 UTC (rev 815) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-18 16:03:15 UTC (rev 816) @@ -31,7 +31,9 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; import org.apache.commons.collections.BidiMap; @@ -55,7 +57,9 @@ import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyListener; @@ -171,7 +175,9 @@ @Override public String login(String login, String password) { - return "chausette"; + // TODO mfortun-2011-04-18 + throw new UnsupportedOperationException("not yet implemented"); + // } @@ -345,7 +351,8 @@ PropertiesExtended idProperties = getWikittyPublicationProperties( wikittyParenFile, WIKITTY_ID_PROPERTIES_FILE); // update - idProperties.setProperty(w.getId(), wikittyFile.getName()); + idProperties.setProperty(w.getId(), + wikittyFile.getName()); // save idProperties.store(); } @@ -577,19 +584,44 @@ @Override public List<PagedResult<String>> findAllByCriteria(String securityToken, List<Criteria> criteria) { - // TODO mfortun-2011-04-05 - throw new UnsupportedOperationException("not yet implemented"); - // return null; + List<PagedResult<String>> result = new ArrayList<PagedResult<String>>(); + List<String> rr= new ArrayList<String>(); + Map<String, List<FacetTopic>> map= new HashMap<String, List<FacetTopic>>(); + PagedResult<String> pp= new PagedResult<String>(0,0, + "", map, rr); + result.add(pp); + + /* + * TODO mfortun-2011-04-18 ici faire une vrai gestion des critérias + * pas simple histoire de comparaison avec critéria préconstruit. + * voir avec jcouteau comment lui à faire pour son implémentation + * des critérias. + * Dans un premier temps s'occuper uniquement des types pub et sur label + * name = machin + */ + + for (Criteria cr: criteria){ + System.out.println(cr.getName()); + + + + } + + + return result; + } @Override public List<String> findByCriteria(String securityToken, List<Criteria> criteria) { - // TODO mfortun-2011-04-05 - throw new UnsupportedOperationException("not yet implemented"); - // return null; + List<String> result = new ArrayList<String>(); + result.add(""); + + System.out.println(criteria.get(0).getRestriction()); + return result; } @Override @@ -788,8 +820,6 @@ return result; } - - /** * Method that create a list of the properties directory *

1 0

r815 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org April 18, 2011

April 18, 2011

Author: mfortun Date: 2011-04-18 16:19:45 +0200 (Mon, 18 Apr 2011) New Revision: 815 Url: http://nuiton.org/repositories/revision/wikitty/815 Log: * synchronisation between wikitty service works. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-18 08:59:39 UTC (rev 814) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-18 14:19:45 UTC (rev 815) @@ -39,9 +39,11 @@ import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.entities.WikittyUserHelper; import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; @@ -65,8 +67,6 @@ final static private Log log = LogFactory.getLog(WikittyPublication.class); static protected ApplicationConfig applicationConfig; - - /* * static string for allias, wrong named attribut TODO mfortun-2011-04-06 @@ -131,7 +131,6 @@ URI uriTarget = new URI(target); - boolean isDelete = applicationConfig .getOptionAsBoolean(IS_DELETE_OPTION); boolean isExisting = applicationConfig @@ -144,7 +143,7 @@ * the correct implementation of the wikitty service */ // once on the service origin - ApplicationConfig temp1 =setUpApplicationConfigServerConnector(uriOrigin); + ApplicationConfig temp1 = setUpApplicationConfigServerConnector(uriOrigin); WikittyProxy proxyOrigin = new WikittyProxy( WikittyServiceFactory.buildWikittyService(temp1)); @@ -154,20 +153,7 @@ WikittyProxy proxyTarget = new WikittyProxy( WikittyServiceFactory.buildWikittyService(temp2)); - - - WikittyUser test1= new WikittyUserImpl(); - test1.setLogin("chaussetteé"); - - WikittyUser test2= new WikittyUserImpl(); - test2.setLogin("chaussette"); - - proxyOrigin.store(test1); - System.out.println(test1.getWikittyVersion()); - test1.setLogin("ponay"); - proxyTarget.store(test1); - //proxyTarget.st - + /* * TODO mfortun-2011-04-14 voir comment on fait quand les deux uris * déclare des labels en fragment, si on les composent ensemble ou un @@ -179,8 +165,6 @@ Criteria critOrigin = constructCriteriaLabelRecur(labelOrigin, isRecur); Criteria critTarget = constructCriteriaLabelRecur(labelTarget, isRecur); - - List<String> listOrigin = proxyOrigin.findAllIdByCriteria(critOrigin) .getAll(); List<String> listTarget = proxyTarget.findAllIdByCriteria(critTarget) @@ -201,13 +185,11 @@ existOnlyOnTarget.addAll(listTarget); existOnlyOnTarget.removeAll(listOrigin); - - /* * if option is update send wikitty that are not in the target. */ if (isUpdate) { - + List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin); proxyTarget.storeWikitty(newWikitties); @@ -227,27 +209,33 @@ /* * case existing and update, update those which are on both location */ - for (String id : existInBoth){ + for (String id : existInBoth) { Wikitty fromTarget = proxyTarget.restore(id); Wikitty fromOrigin = proxyOrigin.restore(id); - - String idTarget = fromTarget.getId(); - String idOrigin = fromOrigin.getId(); - //check version for update - if (WikittyUtil.versionGreaterThan(idOrigin, idTarget)){ - Set<String> setLabelTarget= WikittyLabelHelper.getLabels(fromTarget); - //replace labels origins, by target - WikittyLabelHelper.setLabels(fromOrigin, setLabelTarget); - //send modified origin to target wikitty service - proxyTarget.store(fromOrigin); + + String versionTarget = fromTarget.getVersion(); + + String versionOrigin = fromOrigin.getVersion(); + + // check version for update + + /* + * TODO mfortun-2011-14-18 do something for labels at this time + * we replace origin labels y target's labels if we udpate. + */ + if (WikittyUtil + .versionGreaterThan(versionOrigin, versionTarget)) { + Set<String> setLabelTarget = WikittyLabelHelper + .getLabels(fromTarget); + // replace labels origins, by targets label + WikittyLabelHelper.setLabels(fromOrigin, setLabelTarget); + // send modified origin to target wikitty service + proxyTarget.store(fromOrigin); } } - - - } + }// */ - } /** @@ -297,41 +285,38 @@ * @param uri * of the targeted wikitty service */ - static protected ApplicationConfig setUpApplicationConfigServerConnector(URI uri) { + static protected ApplicationConfig setUpApplicationConfigServerConnector( + URI uri) { - - - ApplicationConfig result = new ApplicationConfig(); - - + + // transfert main properties to new application config result.setOptions(applicationConfig.getFlatOptions()); - if (uri.getScheme().equals("file")) { - result - .setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); - } - if (uri.getScheme().equals("cajo")) { + if (uri.getScheme().equals("file")) { result.setOption("wikitty.WikittyService.components", + "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); + } else if (uri.getScheme().equals("cajo")) { + result.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - } - - if (uri.getScheme().equals("hessian")) { + } else if (uri.getScheme().equals("hessian")) { result.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); } - - String url= uri.toASCIIString().replace("#wp", ""); - - //FIXME mfortun-2011-04-15 correct url by removing fragment - result.setOption("wikitty.service.server.url", - url); - + String url = uri.toASCIIString(); + // remove fragment from the uri. + url = url.replaceAll("\\#.*", ""); + // set protocol to http no use finally + /* + * url = url.replaceFirst("["+uri.getScheme()+"]", "http"); + */ + + log.info("set url " + url + " with component :"+ result.getOption("wikitty.WikittyService.components")); + + result.setOption("wikitty.service.server.url", url); + return result; - - } }

1 0

r814 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/synchro resources
by mfortun＠users.nuiton.org April 18, 2011

April 18, 2011

Author: mfortun Date: 2011-04-18 10:59:39 +0200 (Mon, 18 Apr 2011) New Revision: 814 Url: http://nuiton.org/repositories/revision/wikitty/814 Log: * need to debug store to see what going on and why two store on the wame wikitty by two different wikitty service won't work Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-15 15:54:11 UTC (rev 813) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-18 08:59:39 UTC (rev 814) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.publication.synchro; +import gnu.cajo.Cajo; + import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -39,10 +41,13 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; +import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.services.WikittyServiceCajoClient; /** * Main class of the sync part of wikitty publication, this class is the entry @@ -60,6 +65,8 @@ final static private Log log = LogFactory.getLog(WikittyPublication.class); static protected ApplicationConfig applicationConfig; + + /* * static string for allias, wrong named attribut TODO mfortun-2011-04-06 @@ -124,6 +131,7 @@ URI uriTarget = new URI(target); + boolean isDelete = applicationConfig .getOptionAsBoolean(IS_DELETE_OPTION); boolean isExisting = applicationConfig @@ -136,17 +144,30 @@ * the correct implementation of the wikitty service */ // once on the service origin - setUpApplicationConfigServerConnector(uriOrigin); + ApplicationConfig temp1 =setUpApplicationConfigServerConnector(uriOrigin); WikittyProxy proxyOrigin = new WikittyProxy( - WikittyServiceFactory.buildWikittyService(applicationConfig)); + WikittyServiceFactory.buildWikittyService(temp1)); // once on the service target - setUpApplicationConfigServerConnector(uriTarget); + ApplicationConfig temp2 = setUpApplicationConfigServerConnector(uriTarget); WikittyProxy proxyTarget = new WikittyProxy( - WikittyServiceFactory.buildWikittyService(applicationConfig)); - + WikittyServiceFactory.buildWikittyService(temp2)); + + + WikittyUser test1= new WikittyUserImpl(); + test1.setLogin("chaussetteé"); + + WikittyUser test2= new WikittyUserImpl(); + test2.setLogin("chaussette"); + + proxyOrigin.store(test1); + System.out.println(test1.getWikittyVersion()); + test1.setLogin("ponay"); + proxyTarget.store(test1); + //proxyTarget.st + /* * TODO mfortun-2011-04-14 voir comment on fait quand les deux uris * déclare des labels en fragment, si on les composent ensemble ou un @@ -158,6 +179,8 @@ Criteria critOrigin = constructCriteriaLabelRecur(labelOrigin, isRecur); Criteria critTarget = constructCriteriaLabelRecur(labelTarget, isRecur); + + List<String> listOrigin = proxyOrigin.findAllIdByCriteria(critOrigin) .getAll(); List<String> listTarget = proxyTarget.findAllIdByCriteria(critTarget) @@ -178,12 +201,12 @@ existOnlyOnTarget.addAll(listTarget); existOnlyOnTarget.removeAll(listOrigin); + + /* * if option is update send wikitty that are not in the target. */ if (isUpdate) { - - //FIXME mfortun-2011-04-15 something wrong it does not works List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin); proxyTarget.storeWikitty(newWikitties); @@ -274,28 +297,41 @@ * @param uri * of the targeted wikitty service */ - static protected void setUpApplicationConfigServerConnector(URI uri) { + static protected ApplicationConfig setUpApplicationConfigServerConnector(URI uri) { + + + + ApplicationConfig result = new ApplicationConfig(); + + + result.setOptions(applicationConfig.getFlatOptions()); if (uri.getScheme().equals("file")) { - applicationConfig + result .setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); } if (uri.getScheme().equals("cajo")) { - applicationConfig.setOption("wikitty.WikittyService.components", + result.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceCajoClient"); } if (uri.getScheme().equals("hessian")) { - applicationConfig.setOption("wikitty.WikittyService.components", + result.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); } + String url= uri.toASCIIString().replace("#wp", ""); + //FIXME mfortun-2011-04-15 correct url by removing fragment - applicationConfig.setOption("wikitty.service.server.url", - uri.toASCIIString()); + result.setOption("wikitty.service.server.url", + url); + + return result; + + } } Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties 2011-04-15 15:54:11 UTC (rev 813) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties 2011-04-18 08:59:39 UTC (rev 814) @@ -22,4 +22,4 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -wikitty.data.directory=/var/lib/wikitty-publication/codelutin +wikitty.data.directory=/var/lib/wikitty-publication/codelutin2 Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2011-04-15 15:54:11 UTC (rev 813) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2011-04-18 08:59:39 UTC (rev 814) @@ -22,7 +22,7 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -wikitty.data.directory=./target/data +wikitty.data.directory=./target2/data wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db

1 0

r813 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org April 15, 2011

April 15, 2011

Author: mfortun Date: 2011-04-15 17:54:11 +0200 (Fri, 15 Apr 2011) New Revision: 813 Url: http://nuiton.org/repositories/revision/wikitty/813 Log: * test with to local wikitty (cajo serveur) fail, must remove fragment from uri before instanciation, bug with application config used two time for instanciation Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-15 15:03:00 UTC (rev 812) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-15 15:54:11 UTC (rev 813) @@ -183,6 +183,8 @@ */ if (isUpdate) { + //FIXME mfortun-2011-04-15 something wrong it does not works + List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin); proxyTarget.storeWikitty(newWikitties); @@ -290,6 +292,8 @@ "org.nuiton.wikitty.services.WikittyServiceHessianClient"); } + + //FIXME mfortun-2011-04-15 correct url by removing fragment applicationConfig.setOption("wikitty.service.server.url", uri.toASCIIString());

1 0

r812 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org April 15, 2011

April 15, 2011

Author: mfortun Date: 2011-04-15 17:03:00 +0200 (Fri, 15 Apr 2011) New Revision: 812 Url: http://nuiton.org/repositories/revision/wikitty/812 Log: * remove unused method * complete constructor with application config Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-15 12:50:48 UTC (rev 811) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-15 15:03:00 UTC (rev 812) @@ -24,23 +24,16 @@ */ package org.nuiton.wikitty.publication.synchro; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.util.Properties; 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.ArgumentsParserException; -import org.nuiton.util.CollectionUtil; -import org.nuiton.util.FileUtil; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; @@ -49,7 +42,6 @@ import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; /** Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-15 12:50:48 UTC (rev 811) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-15 15:03:00 UTC (rev 812) @@ -28,7 +28,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileReader; -import java.io.FileWriter; +import java.net.URI; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -74,18 +74,16 @@ static public String META_CURRENT_LABEL = "current.label"; - static public String META_SUFFIX_KEY_ID = "id"; - - static public String META_SUFFIX_KEY_CHECKSUM = "checksum"; - /* * in the WIKITTY_FILE_META_PROP ERTIES_FILE the keys for version are: * filename + META_SUFFIX_KEY_VERSION we save the id too because with this * solution un case of delete we can easily read the id and make operation * on the wikitty */ - static public String META_SUFFIX_KEY_VERSION = "version"; + static public String META_PREFIX_KEY_VERSION = "version."; + static public String META_PREFIX_KEY_CHECKSUM = "checksum."; + static public String WIKITTY_FILE_META_PROPERTIES_FILE = "meta.properties"; /* @@ -94,12 +92,8 @@ */ static public String WIKITTY_ID_PROPERTIES_FILE = "ids.properties"; - static public String WIKITTYPUBLICATION_PROPERTIES_FILE = "ws.properties"; - static public String PROPERTY_DIRECTORY = ".wp"; - static public String DEFAULT_PROPERTY_NAME_SEP = "."; - /** * Constructor with the working directory * @@ -107,12 +101,30 @@ * the home directory */ - public WikittyPublicationFileSystem(ApplicationConfig app) { /* - * TODO mfortun-2011-04-14 use application config to initialize - * correctly the attribut homeFile, recursion and label + * load informations from the application config to correctly initialize + * this */ + try { + String url = app.getOption("wikitty.service.server.url"); + URI uri = new URI(url); + + this.label = uri.getFragment(); + + this.homeFile = new File(uri.getPath()); + + if (homeFile == null || !homeFile.exists()) { + File cur = FileUtil.getCurrentDirectory(); + homeFile = new File(cur.getAbsolutePath()); + } + + this.recursion = app + .getOptionAsBoolean(WikittyPublication.IS_RECURSION_OPTION); + + } catch (Exception e) { + e.printStackTrace(); + } } public File getHomeFile() { @@ -159,7 +171,7 @@ @Override public String login(String login, String password) { - return "chausette"; + return "chausette"; } @@ -260,6 +272,7 @@ path = path.replace(File.separator + File.separator, File.separator + "."); + File wikittyParenFile = new File(path); // create the propertie directory if necessary File propertieDirectory = new File(path + File.separator + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); @@ -267,24 +280,7 @@ || !propertieDirectory.isDirectory()) { propertieDirectory.mkdir(); } - // load/create meta propertie file - File propertieFile = new File( - propertieDirectory.getCanonicalPath() - + File.separator - + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); - if (!propertieFile.exists()) { - propertieFile.createNewFile(); - } - // load/create id propertie file - File idPropertieFile = new File( - propertieDirectory.getCanonicalPath() - + File.separator - + WikittyPublicationFileSystem.WIKITTY_ID_PROPERTIES_FILE); - if (!idPropertieFile.exists()) { - idPropertieFile.createNewFile(); - } - String name = ""; String extension = ""; @@ -329,30 +325,29 @@ String localMd5 = StringUtil.asHex(byt); // load meta properties - Properties metaProperties = new Properties(); - metaProperties.load(new FileReader(propertieFile)); + PropertiesExtended metaProperties = getWikittyPublicationProperties( + wikittyParenFile, + WIKITTY_FILE_META_PROPERTIES_FILE); // update metaProperties .setProperty( WikittyPublicationFileSystem.META_CURRENT_LABEL, ourDir); - metaProperties.setProperty(name + "." + extension - + ".version", w.getVersion()); - metaProperties.setProperty(name + "." + extension - + ".id", w.getId()); - metaProperties.setProperty(name + "." + extension - + ".checksum", localMd5); + metaProperties.setProperty(META_PREFIX_KEY_VERSION + + wikittyFile.getName(), w.getVersion()); + + metaProperties.setProperty(META_PREFIX_KEY_CHECKSUM + + wikittyFile.getName(), localMd5); // save - metaProperties.store(new FileWriter(propertieFile), ""); + metaProperties.store(); // load id properties - Properties idProperties = new Properties(); - idProperties.load(new FileReader(idPropertieFile)); + PropertiesExtended idProperties = getWikittyPublicationProperties( + wikittyParenFile, WIKITTY_ID_PROPERTIES_FILE); // update - idProperties.setProperty(w.getId(), name + "." - + extension); + idProperties.setProperty(w.getId(), wikittyFile.getName()); // save - idProperties.store(new FileWriter(idPropertieFile), ""); + idProperties.store(); } } } @@ -470,17 +465,13 @@ String mimeType = mimeTypeForExtension(extension); // load properties - Properties props = new Properties(); - File propsFile = new File( - path - + File.separator - + WikittyPublicationFileSystem.PROPERTY_DIRECTORY - + File.separator - + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); - props.load(new FileReader(propsFile)); - // re set the id - wikitty.setVersion(props.getProperty(completeName - + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID)); + File wikittyParentDir = new File(path); + PropertiesExtended props = getWikittyPublicationProperties( + wikittyParentDir, WIKITTY_FILE_META_PROPERTIES_FILE); + // re set the version + wikitty.setVersion(props + .getProperty(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION + + completeName)); // set the current label WikittyLabelHelper @@ -547,13 +538,11 @@ // update propsProperties - .remove(fileName - + WikittyPublicationFileSystem.META_SUFFIX_KEY_CHECKSUM); - propsProperties.remove(fileName - + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID); + .remove(WikittyPublicationFileSystem.META_PREFIX_KEY_CHECKSUM + + fileName); propsProperties - .remove(fileName - + WikittyPublicationFileSystem.META_SUFFIX_KEY_VERSION); + .remove(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION + + fileName); // resave propsProperties.store(); @@ -799,33 +788,7 @@ return result; } - /** - * Method that create the list of file needed to commit, delete, update - * import. It harvest file in order to transform them into wikitties - * - * @param starts - * harvested directory - * @param recursivly - * boolean id the directory have to be harvest - * @return list of harvested file - */ - static public List<File> listFile(File starts, boolean recursivly) { - List<File> result = new ArrayList<File>(); - if (!starts.isDirectory()) { - result.add(starts); - } - for (File child : starts.listFiles()) { - if (child.isDirectory() && recursivly - && !child.getName().equals(PROPERTY_DIRECTORY)) { - // Directory don't have to be harvest - // result.add(child); - result.addAll(listFile(child, recursivly)); - } else if (!child.isDirectory()) { - result.add(child); - } - } - return result; - } + /** * Method that create a list of the properties directory @@ -855,44 +818,6 @@ /** * - * Use to search in the file system the directory that containt the .wp dir - * that containt the properties file for the wikitty service's adresse - * - * @param start - * @return File the directory container of the master property file - * @throws Exception - */ - static protected File searchWikittyPublicationHomeDir(File start) - throws Exception { - - if (start != null && start.exists() && start.isDirectory()) { - // on va retourner le dossier .wp home - - // method récursiv qui remonte dans les parents pour retrouver. - - File propertyDirectory = new File(start.getCanonicalPath() - + File.separator + PROPERTY_DIRECTORY); - - if (propertyDirectory.exists()) { - File propertie = new File(propertyDirectory.getCanonicalPath() - + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); - if (propertie.exists()) { - return propertyDirectory; - } - } - - return searchWikittyPublicationHomeDir(start.getParentFile()); - } else { - // Exception - /* - * TODO mfortun-2011-04-06 write/set the appropriate exception here - */ - return null; - } - } - - /** - * * @param starts * @param recursivly * @return

1 0

r811 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org April 15, 2011

April 15, 2011

Author: mfortun Date: 2011-04-15 14:50:48 +0200 (Fri, 15 Apr 2011) New Revision: 811 Url: http://nuiton.org/repositories/revision/wikitty/811 Log: * sync operations completed Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-15 10:49:16 UTC (rev 810) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-15 12:50:48 UTC (rev 811) @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,6 +42,7 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; @@ -112,7 +114,6 @@ // parsing applicationConfig.parse(args); - System.out.println("ffff"); // execution applicationConfig.doAction(0); @@ -124,8 +125,6 @@ boolean isRecur = applicationConfig .getOptionAsBoolean(IS_RECURSION_OPTION); - applicationConfig.setOption("ponay", "george"); - /* * TODO mfortun-2011-04-14 handle exception if uri format does not match */ @@ -137,20 +136,22 @@ .getOptionAsBoolean(IS_DELETE_OPTION); boolean isExisting = applicationConfig .getOptionAsBoolean(IS_EXISTING_OPTION); + // update operation is the default operation + boolean isUpdate = !isDelete && !isExisting; /* - * TODO mfortun-2011-04-14 add setoption to application config to - * retrieve correct wikitty service with correct args e.g. for file : + * necessary to have property correctly initialize in order to obtaint + * the correct implementation of the wikitty service */ - if (uriOrigin.getScheme().equals("file")) { - applicationConfig - .setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); - } + // once on the service origin + setUpApplicationConfigServerConnector(uriOrigin); WikittyProxy proxyOrigin = new WikittyProxy( WikittyServiceFactory.buildWikittyService(applicationConfig)); + // once on the service target + setUpApplicationConfigServerConnector(uriTarget); + WikittyProxy proxyTarget = new WikittyProxy( WikittyServiceFactory.buildWikittyService(applicationConfig)); @@ -170,53 +171,66 @@ List<String> listTarget = proxyTarget.findAllIdByCriteria(critTarget) .getAll(); - /* - * Algo update origin, target: wikitty service quelconque: -on - * vachercher sur origin les wikitty avec le label ciblé (recur ou non) - * -on va chercher sur target les wikitty avec le label ciblé (recur ou - * non) - * - * Tout ceux qui sont dans origin et pas target on les envois sans se - * poser de question (c'est les nouveaux) - * - * Pour ceux en commun on va faire une différence sur les versions si - * version orign est plus récente que celle sur target on envoit gérer - * ici la problématique de merge ? - * - * sinon pas plus récente on fait rien. - */ + // construct list of wikitty contained in both location + List<String> existInBoth = new ArrayList<String>(); + existInBoth.addAll(listOrigin); + existInBoth.retainAll(listTarget); + // construct list of wikitty contained only in origin location + List<String> existOnlyOnOrigin = new ArrayList<String>(); + existOnlyOnOrigin.addAll(listOrigin); + existOnlyOnOrigin.removeAll(listTarget); + + // construct list of wikitty contained only in target location + List<String> existOnlyOnTarget = new ArrayList<String>(); + existOnlyOnTarget.addAll(listTarget); + existOnlyOnTarget.removeAll(listOrigin); + /* - * Algo delete - * - * origin, target: wikitty service quelconque: -on va chercher sur - * origin les wikitty avec le label ciblé (recur ou non) -on va chercher - * sur target les wikitty avec le label ciblé (recur ou non) - * - * Tout ceux qui sont dans origin et pas target on en fait rien. Ceux en - * commun on n'en fait rien non plus. - * - * Ceux qui sont uniquement dans target on les met à jour en virant le - * label correspondant + * if option is update send wikitty that are not in the target. */ + if (isUpdate) { + List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin); + proxyTarget.storeWikitty(newWikitties); + + } /* - * Algo existing - * - * origin, target: wikitty service quelconque: -on va chercher sur - * origin les wikitty avec le label ciblé (recur ou non) -on va chercher - * sur target les wikitty avec le label ciblé (recur ou non) - * - * Tout ceux qui sont dans origin et pas target on en fait rien, et pour - * le reste application du même algo que pour update classique - * - * Pour ceux en commun on va faire une différence sur les versions si - * version orign est plus récente que celle sur target on envoit gérer - * ici la problématique de merge ? - * - * sinon pas plus récente on fait rien. + * if option delete remove those who are on the target but not on origin */ + if (isDelete) { + for (String id : existOnlyOnTarget) { + Wikitty w = proxyTarget.restore(id); + WikittyLabelHelper.removeLabels(w, labelTarget); + + proxyTarget.store(w); + } + } else { + /* + * case existing and update, update those which are on both location + */ + for (String id : existInBoth){ + Wikitty fromTarget = proxyTarget.restore(id); + Wikitty fromOrigin = proxyOrigin.restore(id); + + String idTarget = fromTarget.getId(); + String idOrigin = fromOrigin.getId(); + //check version for update + if (WikittyUtil.versionGreaterThan(idOrigin, idTarget)){ + Set<String> setLabelTarget= WikittyLabelHelper.getLabels(fromTarget); + //replace labels origins, by target + WikittyLabelHelper.setLabels(fromOrigin, setLabelTarget); + //send modified origin to target wikitty service + proxyTarget.store(fromOrigin); + } + } + + + + } + + } /** @@ -259,4 +273,33 @@ } + /** + * Use to setup correct url property in the application config and correct + * component for the wikittyservice + * + * @param uri + * of the targeted wikitty service + */ + static protected void setUpApplicationConfigServerConnector(URI uri) { + + if (uri.getScheme().equals("file")) { + applicationConfig + .setOption("wikitty.WikittyService.components", + "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); + } + + if (uri.getScheme().equals("cajo")) { + applicationConfig.setOption("wikitty.WikittyService.components", + "org.nuiton.wikitty.services.WikittyServiceCajoClient"); + } + + if (uri.getScheme().equals("hessian")) { + applicationConfig.setOption("wikitty.WikittyService.components", + "org.nuiton.wikitty.services.WikittyServiceHessianClient"); + } + + applicationConfig.setOption("wikitty.service.server.url", + uri.toASCIIString()); + + } }

1 0

r810 - in trunk/wikitty-solr/src: main/resources test/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org April 15, 2011

April 15, 2011

Author: jcouteau Date: 2011-04-15 12:49:16 +0200 (Fri, 15 Apr 2011) New Revision: 810 Url: http://nuiton.org/repositories/revision/wikitty/810 Log: Use single Lock type Remove solrServerTest which goes b0rkz0r3d Removed: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java Modified: trunk/wikitty-solr/src/main/resources/solrconfig.xml Modified: trunk/wikitty-solr/src/main/resources/solrconfig.xml =================================================================== --- trunk/wikitty-solr/src/main/resources/solrconfig.xml 2011-04-14 15:56:28 UTC (rev 809) +++ trunk/wikitty-solr/src/main/resources/solrconfig.xml 2011-04-15 10:49:16 UTC (rev 810) @@ -87,7 +87,7 @@ (For backwards compatibility with Solr 1.2, 'simple' is the default if not specified.) --> - <lockType>simple</lockType> + <lockType>single</lockType> </indexDefaults> <mainIndex> Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java 2011-04-14 15:56:28 UTC (rev 809) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java 2011-04-15 10:49:16 UTC (rev 810) @@ -1,217 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.wikitty.storage.solr; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.core.CoreContainer; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Test behaviour SolrServer embedded. - * - * @author ruchaud - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class SolrServerTest { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static final Log log = LogFactory.getLog(SolrServerTest.class); - - public SolrServer newSolrServer() throws Exception { - CoreContainer.Initializer initializer = new CoreContainer.Initializer(); - CoreContainer coreContainer = initializer.initialize(); - SolrServer solrServer = new EmbeddedSolrServer(coreContainer, ""); - return solrServer; - } - - public void addDocument(SolrServer solrServer, String id, String value) throws Exception { - SolrInputDocument document = new SolrInputDocument(); - document.setField(WikittySolrConstant.SOLR_ID, id); - document.setField(WikittySolrConstant.SOLR_EXTENSIONS, value); - solrServer.add(document); - } - - public static class ThreadAddDocument extends Thread { - protected SolrServer solrServer; - protected String identifier; - protected boolean commit; - - public ThreadAddDocument(SolrServer solrServer, String identifier, boolean commit) { - this.solrServer = solrServer; - this.identifier = identifier; - this.commit = commit; - } - - @Override - public void run() { - try { - for (Integer index = 0; index < 10; index++) { - SolrInputDocument document = new SolrInputDocument(); - document.setField(WikittySolrConstant.SOLR_ID, identifier); - document.setField(WikittySolrConstant.SOLR_EXTENSIONS, index.toString()); - solrServer.add(document); - if(commit) { - solrServer.commit(); - } else { - solrServer.rollback(); - } - } - } catch (Exception eee) { - throw new RuntimeException(eee); - } - } - } - - @Before - public void clearIndex() throws Exception { - SolrServer solrServer = newSolrServer(); - solrServer.deleteByQuery("*:*"); - solrServer.commit(); - } - - @Test(expected=SolrServerException.class) - public void testLockObtainFailed() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - addDocument(solrServer1, "1", "1"); - addDocument(solrServer2, "2", "2"); - } - - /* - * FIXME le 21/02/2010 par sch - * Le test est mauvais par nature (je crois), car: - * - thread1 et thread2 ajoutent simultanement des documents - * - thread1 et thread2 commit ou rollback simultanement - * Il est impossible de savoir s'il y aura zero, un, ou deux documents à la fin. - * De plus ce test est la seule cause des erreurs de build de ces derniers temps. - * Et il y a un commentaire laissant planer le doute un peu plus bas. - */ - @Ignore - @Test - public void test2Threads1SolrServer() throws Exception { - SolrServer solrServer = newSolrServer(); - - ThreadAddDocument thread1 = new ThreadAddDocument(solrServer, "1", true); - ThreadAddDocument thread2 = new ThreadAddDocument(solrServer, "2", false); - - thread1.start(); - thread2.start(); - - Thread.sleep(3000); - - SolrDocument result = SolrUtil.findById(solrServer, "1"); - assertNotNull(result); - - // Normaly the value is null, if SolrServer is thread safe - result = SolrUtil.findById(solrServer, "2"); - assertNotNull(result); - } - - @Test - public void test2Threads1Writer2SolrServers() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); - ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", false); - - thread1.start(); - thread2.start(); - - Thread.sleep(3000); - - SolrDocument result = SolrUtil.findById(solrServer1, "1"); - assertNotNull(result); - - result = SolrUtil.findById(solrServer2, "2"); - assertNull(result); - - SolrServer solrServer3 = newSolrServer(); - result = SolrUtil.findById(solrServer3, "1"); - assertNotNull(result); - result = SolrUtil.findById(solrServer3, "2"); - assertNull(result); - } - - //FIXME poussin 2010 07 21 : regarder pourquoi meêm si on attend les threads, ils sont mal synchronises - @Ignore - @Test - public void test2Threads2Writers2SolrServers() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); - ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", true); - - thread1.start(); - thread2.start(); - -// Thread.sleep(3000); - thread1.join(); - thread2.join(); - - SolrDocument result = SolrUtil.findById(solrServer1, "1"); - assertNotNull(result); - - result = SolrUtil.findById(solrServer2, "2"); - assertNotNull(result); - - SolrServer solrServer3 = newSolrServer(); - result = SolrUtil.findById(solrServer3, "1"); - assertNotNull(result); - result = SolrUtil.findById(solrServer3, "2"); - assertNotNull(result); - } - - @Ignore // FIXME 20100806 bleny randomly fail - @Test - public void testReader() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - addDocument(solrServer1, "1", "1"); - solrServer1.commit(); - - SolrDocument result = SolrUtil.findById(solrServer2, "1"); - assertNull(result); - } - -}

1 0

r809 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org April 14, 2011

April 14, 2011

Author: mfortun Date: 2011-04-14 17:56:28 +0200 (Thu, 14 Apr 2011) New Revision: 809 Url: http://nuiton.org/repositories/revision/wikitty/809 Log: * resume migration to the new functional requirements * correct constructor in the wikitty publication file system * prepare algorythms : update, delete, existing in the publication sync entry point Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-14 15:21:24 UTC (rev 808) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-14 15:56:28 UTC (rev 809) @@ -27,11 +27,11 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; +import java.net.URI; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.apache.commons.collections.BidiMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -39,6 +39,7 @@ import org.nuiton.util.CollectionUtil; import org.nuiton.util.FileUtil; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabel; @@ -70,11 +71,10 @@ * static string for allias, wrong named attribut TODO mfortun-2011-04-06 * need to set better name */ - - - static public String HESSIAN_PROTOCOL_KEY = "hessian"; - static public String NO_RECURSION_KEY = "norecursion"; + static public String IS_RECURSION_OPTION = "isRecur"; + static public String IS_DELETE_OPTION = "delete"; + static public String IS_EXISTING_OPTION = "existing"; /** * @param args @@ -82,37 +82,181 @@ */ static public void main(String[] args) throws Exception { - applicationConfig = new ApplicationConfig(); - /* - * TODO mfortun-2011-04-05 once application fixed setdefault value and - * enumclass for initialisation + /* + * TODO mfortun-2011-04-14 construct option def instance to initialize + * correctly application config */ + applicationConfig.setDefaultOption(IS_DELETE_OPTION, "false"); + applicationConfig.setDefaultOption(IS_EXISTING_OPTION, "false"); + applicationConfig.setDefaultOption(IS_RECURSION_OPTION, "true"); + // allias for norecursion applicationConfig.addAlias("--norecursion", "--option", - WikittyPublication.NO_RECURSION_KEY, "true"); - - + WikittyPublication.IS_RECURSION_OPTION, "false"); + + applicationConfig.addAlias("--delete", "--option", IS_DELETE_OPTION, + "true"); + + applicationConfig.addAlias("--existing", "--option", + IS_EXISTING_OPTION, "true"); + // allias for all the action applicationConfig.addAlias("wp sync", "--option", "sync"); applicationConfig .addActionAlias("sync", - "org.nuiton.wikitty.publication.WikittyPublication#synchronisation"); + "org.nuiton.wikitty.publication.synchro.WikittyPublication#synchronisation"); - // parsing applicationConfig.parse(args); + System.out.println("ffff"); + // execution applicationConfig.doAction(0); } - static public void synchronisation ( String uriOrigin, String uriTarget){ - + static public void synchronisation(String origin, String target) + throws Exception { + boolean isRecur = applicationConfig + .getOptionAsBoolean(IS_RECURSION_OPTION); + + applicationConfig.setOption("ponay", "george"); + + /* + * TODO mfortun-2011-04-14 handle exception if uri format does not match + */ + URI uriOrigin = new URI(origin); + + URI uriTarget = new URI(target); + + boolean isDelete = applicationConfig + .getOptionAsBoolean(IS_DELETE_OPTION); + boolean isExisting = applicationConfig + .getOptionAsBoolean(IS_EXISTING_OPTION); + + /* + * TODO mfortun-2011-04-14 add setoption to application config to + * retrieve correct wikitty service with correct args e.g. for file : + */ + if (uriOrigin.getScheme().equals("file")) { + applicationConfig + .setOption("wikitty.WikittyService.components", + "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); + } + + WikittyProxy proxyOrigin = new WikittyProxy( + WikittyServiceFactory.buildWikittyService(applicationConfig)); + + WikittyProxy proxyTarget = new WikittyProxy( + WikittyServiceFactory.buildWikittyService(applicationConfig)); + + /* + * TODO mfortun-2011-04-14 voir comment on fait quand les deux uris + * déclare des labels en fragment, si on les composent ensemble ou un + * truc du genre ? + */ + String labelOrigin = uriOrigin.getFragment(); + String labelTarget = uriOrigin.getFragment(); + + Criteria critOrigin = constructCriteriaLabelRecur(labelOrigin, isRecur); + Criteria critTarget = constructCriteriaLabelRecur(labelTarget, isRecur); + + List<String> listOrigin = proxyOrigin.findAllIdByCriteria(critOrigin) + .getAll(); + List<String> listTarget = proxyTarget.findAllIdByCriteria(critTarget) + .getAll(); + + /* + * Algo update origin, target: wikitty service quelconque: -on + * vachercher sur origin les wikitty avec le label ciblé (recur ou non) + * -on va chercher sur target les wikitty avec le label ciblé (recur ou + * non) + * + * Tout ceux qui sont dans origin et pas target on les envois sans se + * poser de question (c'est les nouveaux) + * + * Pour ceux en commun on va faire une différence sur les versions si + * version orign est plus récente que celle sur target on envoit gérer + * ici la problématique de merge ? + * + * sinon pas plus récente on fait rien. + */ + + /* + * Algo delete + * + * origin, target: wikitty service quelconque: -on va chercher sur + * origin les wikitty avec le label ciblé (recur ou non) -on va chercher + * sur target les wikitty avec le label ciblé (recur ou non) + * + * Tout ceux qui sont dans origin et pas target on en fait rien. Ceux en + * commun on n'en fait rien non plus. + * + * Ceux qui sont uniquement dans target on les met à jour en virant le + * label correspondant + */ + + /* + * Algo existing + * + * origin, target: wikitty service quelconque: -on va chercher sur + * origin les wikitty avec le label ciblé (recur ou non) -on va chercher + * sur target les wikitty avec le label ciblé (recur ou non) + * + * Tout ceux qui sont dans origin et pas target on en fait rien, et pour + * le reste application du même algo que pour update classique + * + * Pour ceux en commun on va faire une différence sur les versions si + * version orign est plus récente que celle sur target on envoit gérer + * ici la problématique de merge ? + * + * sinon pas plus récente on fait rien. + */ + } + /** + * Used to construct criteria on wikittypubdata an pubtext on the + * wikittylabel extension + * + * @param label + * @param isRecur + * is recusion + * @return the constructed criteria + */ + static protected Criteria constructCriteriaLabelRecur(String label, + boolean isRecur) { + // Construct the criteria + Criteria labelCriteria; + Search mainRequest = Search.query(); + Search subRoqu = mainRequest.or(); + + // must have the type of wikittypubtext/wikittypubdata + subRoqu.exteq(WikittyPubText.EXT_WIKITTYPUBTEXT).exteq( + WikittyPubData.EXT_WIKITTYPUBDATA); + if (isRecur) { + + // and extension with the name that containt the label (recursivity) + labelCriteria = mainRequest.exteq(WikittyLabel.EXT_WIKITTYLABEL) + .sw(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS, label) + .criteria(); + + } else { + + // and extension with the name strictly equals to the label (no + // recursivity) + labelCriteria = mainRequest.exteq(WikittyLabel.EXT_WIKITTYLABEL) + .eq(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS, label) + .criteria(); + + } + return labelCriteria; + + } + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-14 15:21:24 UTC (rev 808) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-14 15:56:28 UTC (rev 809) @@ -38,6 +38,7 @@ import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; import org.nuiton.util.FileUtil; import org.nuiton.util.MD5InputStream; import org.nuiton.util.StringUtil; @@ -105,23 +106,15 @@ * @param home * the home directory */ - public WikittyPublicationFileSystem(File home, boolean recur, String label) { - this.setHomeFile(home); - this.setRecursion(recur); - this.setLabel(label); - } - - - - public WikittyPublicationFileSystem(File homeFile) { - this(homeFile, true, ""); - + + public WikittyPublicationFileSystem(ApplicationConfig app) { + /* + * TODO mfortun-2011-04-14 use application config to initialize + * correctly the attribut homeFile, recursion and label + */ } - - - public File getHomeFile() { return homeFile; } @@ -166,9 +159,7 @@ @Override public String login(String login, String password) { - // TODO mfortun-2011-04-05 - throw new UnsupportedOperationException("not yet implemented"); - // return null; + return "chausette"; } @@ -341,8 +332,10 @@ Properties metaProperties = new Properties(); metaProperties.load(new FileReader(propertieFile)); // update - metaProperties.setProperty( - WikittyPublicationFileSystem.META_CURRENT_LABEL, ourDir); + metaProperties + .setProperty( + WikittyPublicationFileSystem.META_CURRENT_LABEL, + ourDir); metaProperties.setProperty(name + "." + extension + ".version", w.getVersion()); @@ -429,6 +422,18 @@ @Override public List<Wikitty> restore(String securityToken, List<String> id) { + /* + * FIXME mfortun-2011-04-14 s'assurer que quand on restore on restore + * bien la version correctement, potentiellement si ya eut des + * modifications faites entre la version précédent et actuel on fasse + * gaffe à incrémenter la version "mineur" + * + * + * + * version d'un wikitty sous forme x.y, où x incrémenté par serveur y + * incrémenté à chaque set sur content. + */ + List<Wikitty> result = new ArrayList<Wikitty>(); try { BidiMap locations = harvestLocalWikitties(homeFile, recursion); @@ -536,23 +541,27 @@ String fileName = localisation.getFileName(); // load properties - PropertiesExtended propsProperties = getWikittyPublicationProperties(new File( - path), WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); + PropertiesExtended propsProperties = getWikittyPublicationProperties( + new File(path), + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); // update + propsProperties + .remove(fileName + + WikittyPublicationFileSystem.META_SUFFIX_KEY_CHECKSUM); propsProperties.remove(fileName - + WikittyPublicationFileSystem.META_SUFFIX_KEY_CHECKSUM); - propsProperties.remove(fileName + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID); - propsProperties.remove(fileName - + WikittyPublicationFileSystem.META_SUFFIX_KEY_VERSION); + propsProperties + .remove(fileName + + WikittyPublicationFileSystem.META_SUFFIX_KEY_VERSION); // resave propsProperties.store(); // load properties - PropertiesExtended idProperties = getWikittyPublicationProperties(new File( - path), WikittyPublicationFileSystem.WIKITTY_ID_PROPERTIES_FILE); + PropertiesExtended idProperties = getWikittyPublicationProperties( + new File(path), + WikittyPublicationFileSystem.WIKITTY_ID_PROPERTIES_FILE); // update idProperties.remove(id); // resave @@ -818,9 +827,6 @@ return result; } - - - /** * Method that create a list of the properties directory * @@ -831,11 +837,11 @@ */ static public List<File> harvestPropertyDirectory(File starts, boolean recursivly) { - + List<File> result = new ArrayList<File>(); - + for (File child : starts.listFiles()) { - + if (child.isDirectory() && child.getName().equals(PROPERTY_DIRECTORY)) { result.add(child); @@ -844,10 +850,9 @@ } } return result; - + } - /** * * Use to search in the file system the directory that containt the .wp dir @@ -859,15 +864,15 @@ */ static protected File searchWikittyPublicationHomeDir(File start) throws Exception { - + if (start != null && start.exists() && start.isDirectory()) { // on va retourner le dossier .wp home - + // method récursiv qui remonte dans les parents pour retrouver. - + File propertyDirectory = new File(start.getCanonicalPath() + File.separator + PROPERTY_DIRECTORY); - + if (propertyDirectory.exists()) { File propertie = new File(propertyDirectory.getCanonicalPath() + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); @@ -875,7 +880,7 @@ return propertyDirectory; } } - + return searchWikittyPublicationHomeDir(start.getParentFile()); } else { // Exception @@ -886,9 +891,6 @@ } } - - - /** * * @param starts @@ -919,7 +921,7 @@ String path = propsDir.getParent(); FileSystemWIkittyId value = new FileSystemWIkittyId(name, path); - result.put((String) id, value ); + result.put((String) id, value); } } @@ -935,16 +937,16 @@ return result; } - static public PropertiesExtended getWikittyPublicationProperties(File starts, String name) - throws Exception { + static public PropertiesExtended getWikittyPublicationProperties( + File starts, String name) throws Exception { File propertieDirectory = new File(starts.getCanonicalPath() - + File.separator + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); + + File.separator + + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); // load/create meta propertie file File propertieFile = new File(propertieDirectory.getCanonicalPath() - + File.separator - + name); + + File.separator + name); if (!propertieFile.exists()) { propertieFile.createNewFile(); } @@ -954,7 +956,4 @@ return result; } - - - }

1 0

r808 - in trunk: wikitty-api/src/main/resources/org/nuiton wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-solr/src/main/resources wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org April 14, 2011

April 14, 2011

Author: jcouteau Date: 2011-04-14 17:21:24 +0200 (Thu, 14 Apr 2011) New Revision: 808 Url: http://nuiton.org/repositories/revision/wikitty/808 Log: Remove stemming (lemmatisation) so that search with wildcards is functionnal (search is not stemmed when using wildcards whereas field have been indexed as stememd so nothing is returned) Modified: trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java trunk/wikitty-solr/src/main/resources/schema.xml trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java Modified: trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml =================================================================== --- trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2011-04-14 14:09:43 UTC (rev 807) +++ trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2011-04-14 15:21:24 UTC (rev 808) @@ -24,12 +24,14 @@ #L% --> -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6.4//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6.4//EN" + "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> <module> <source path="wikitty"> - <exclude name="WikittyConfig.java"/> + <exclude name="WikittyConfig*.java"/> <exclude name="WikittyServerStart.java"/> + <exclude name="ScriptEvaluator.java"/> <exclude name="*Abstract.java"/> <exclude name="*Impl.java"/> <exclude name="*Helper.java"/> Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2011-04-14 14:09:43 UTC (rev 807) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2011-04-14 15:21:24 UTC (rev 808) @@ -26,6 +26,7 @@ import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -367,18 +368,31 @@ Assert.assertEquals(4, results.getAll().size()); } + @Ignore @Test public void testUnlike() throws Exception { - /*Search query = Search.query().unlike("Product.name", "*dri*"); + Search query = Search.query().unlike("Product.name", "*dri*"); Criteria likeCriteria = query.criteria(); PagedResult<Wikitty> results = proxy.findAllByCriteria(likeCriteria); - Assert.assertEquals(4, results.getAll().size());*/ + Assert.assertEquals(4, results.getAll().size()); } + @Ignore @Test + public void testLike() throws Exception { + Search query = Search.query().like("Product.name", "*dri*"); + + Criteria likeCriteria = query.criteria(); + + PagedResult<Wikitty> results = proxy.findAllByCriteria(likeCriteria); + + Assert.assertEquals(1, results.getAll().size()); + } + + @Test public void testSw() throws Exception { Search query = Search.query().sw("Product.name", "Scre"); Modified: trunk/wikitty-solr/src/main/resources/schema.xml =================================================================== --- trunk/wikitty-solr/src/main/resources/schema.xml 2011-04-14 14:09:43 UTC (rev 807) +++ trunk/wikitty-solr/src/main/resources/schema.xml 2011-04-14 15:21:24 UTC (rev 808) @@ -80,36 +80,76 @@ compressThreshold="1000" positionIncrementGap="100"> <analyzer type="index"> + <filter class="solr.ASCIIFoldingFilterFactory"/> +  +  <tokenizer class="solr.WhitespaceTokenizerFactory"/> - <filter class="solr.ASCIIFoldingFilterFactory"/> - <filter class="solr.StopFilterFactory" - ignoreCase="true" - words="stopwords_fr.txt" - enablePositionIncrements="true" - /> - <filter class="solr.WordDelimiterFilterFactory" - generateWordParts="1" generateNumberParts="1" catenateWords="1" - catenateNumbers="1" catenateAll="0" splitOnCaseChange="1" - preserveOriginal="1"/> +  + <filter class="solr.PatternReplaceFilterFactory" + pattern="^(\p{Punct}*)(.*?)(\p{Punct}*)$" replacement="$2"/> +  + + <filter class="solr.LengthFilterFactory" min="1" max="100"/> + +  + <filter class="solr.LowerCaseFilterFactory"/> - <filter class="solr.SnowballPorterFilterFactory" - protected="protwords.txt"/> - <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> + +  +  +  + <filter class="solr.WordDelimiterFilterFactory" splitOnCaseChange="1" + splitOnNumerics="1" generateWordParts="1" + generateNumberParts="1" catenateWords="1" catenateNumbers="1" + catenateAll="1" preserveOriginal="1" protected="protwords.txt"/> +  + <filter class="solr.StopFilterFactory" ignoreCase="1" + words="stopwords_fr.txt" enablePositionIncrements="true"/> +  + <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" + ignoreCase="true" expand="true"/> +  + +  + <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> </analyzer> + <analyzer type="query"> + <filter class="solr.ASCIIFoldingFilterFactory"/> + +  +  <tokenizer class="solr.WhitespaceTokenizerFactory"/> - <filter class="solr.ASCIIFoldingFilterFactory"/> - <filter class="solr.SynonymFilterFactory" - synonyms="synonyms.txt" ignoreCase="true" expand="true"/> - <filter class="solr.StopFilterFactory" - ignoreCase="true" words="stopwords_fr.txt"/> - <filter class="solr.WordDelimiterFilterFactory" - generateWordParts="1" generateNumberParts="1" catenateWords="0" - catenateNumbers="0" catenateAll="0" splitOnCaseChange="1" - preserveOriginal="1"/> +  + <filter class="solr.PatternReplaceFilterFactory" + pattern="^(\p{Punct}*)(.*?)(\p{Punct}*)$" replacement="$2"/> +  + <filter class="solr.LengthFilterFactory" min="1" max="100"/> +  <filter class="solr.LowerCaseFilterFactory"/> - <filter class="solr.SnowballPorterFilterFactory" - protected="protwords.txt"/> +  +  +  + <filter class="solr.WordDelimiterFilterFactory" splitOnCaseChange="1" + splitOnNumerics="1" stemEnglishPossessive="1" + generateWordParts="1" + generateNumberParts="1" catenateWords="1" catenateNumbers="1" + catenateAll="1" preserveOriginal="1" protected="protwords.txt"/> +  + <filter class="solr.StopFilterFactory" ignoreCase="1" + words="stopwords_fr.txt" enablePositionIncrements="true"/> +  + <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" + ignoreCase="true" expand="true"/> +  +  + +  <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> </analyzer> </fieldType> Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-14 14:09:43 UTC (rev 807) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-14 15:21:24 UTC (rev 808) @@ -41,6 +41,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.CollectionUtil; import org.nuiton.wikitty.search.Criteria; @@ -449,8 +450,9 @@ assertEquals(3, result.size()); } - // on ignore ce test car le like toLowercase devrait disparaitre et pour l'instant il ne marche pas :( -// @Ignore + // on ignore ce test car le like ne fonctionne plus de la même manière + // depuis qu'on a enlevé la lemmatisation + @Ignore @Test public void testLikeSearch() throws Exception { Criteria criteria = Search.query().like("Category.name", "hArDwArE").criteria();

1 0

r807 - in trunk/wikitty-publication/src/main/java: . org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org April 14, 2011

April 14, 2011

Author: mfortun Date: 2011-04-14 16:09:43 +0200 (Thu, 14 Apr 2011) New Revision: 807 Url: http://nuiton.org/repositories/revision/wikitty/807 Log: * remove old methods that not match new requirement for the sync module Modified: trunk/wikitty-publication/src/main/java/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Property changes on: trunk/wikitty-publication/src/main/java ___________________________________________________________________ Modified: svn:ignore - tempTest + tempTest temp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-14 08:23:15 UTC (rev 806) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-14 14:09:43 UTC (rev 807) @@ -70,14 +70,8 @@ * static string for allias, wrong named attribut TODO mfortun-2011-04-06 * need to set better name */ + - - - static public String WITTY_SERVICE_KEY = "wikitty.service.server.url"; - - static public String DIRECTORY_KEY = "directory"; - - static public String HESSIAN_PROTOCOL_KEY = "hessian"; static public String NO_RECURSION_KEY = "norecursion"; @@ -88,34 +82,10 @@ */ static public void main(String[] args) throws Exception { - /* - * - */ - // on va creer un wikitty proxy pour le lien avec le wikitty qui stock - // mes trucs - // et on va avoir un wikittypublicationfilesystem pour stocker sur le - // local et tout - // soucis du wikittyFS c'est de savoir dans quel dossier il va taffer ? - // a moins qu'il prenne un directory de travail - - /* - * ws.properties :wikitty.service= http://www.adresse.com:8080 - * - * wikittypubs.properties script.js=numéroVersion7 id.script.js= id du - * wikitty scripttut.js=numéroVersion id.scripttut.js= id du wikitty - * image.png=numéroVersion id.image.png= id du wikitty label= - * racine.directory2, racine.directory22 - */ - applicationConfig = new ApplicationConfig(); - // allias for the url of the wikitty service - applicationConfig.addAlias("--ws", "--option", WikittyPublication.WITTY_SERVICE_KEY); - - applicationConfig.addAlias("--dir", "--option", WikittyPublication.DIRECTORY_KEY); - - /* + /* * TODO mfortun-2011-04-05 once application fixed setdefault value and * enumclass for initialisation */ @@ -123,43 +93,16 @@ // allias for norecursion applicationConfig.addAlias("--norecursion", "--option", WikittyPublication.NO_RECURSION_KEY, "true"); - - // allias for the protocole - applicationConfig.addAlias("--hessian", "--option", - WikittyPublication.HESSIAN_PROTOCOL_KEY, "true"); - + + // allias for all the action - applicationConfig.addAlias("wp import", "--option", "import"); - applicationConfig.addAlias("wp checkout", "--option", "checkout"); - applicationConfig.addAlias("wp relocate", "--option", "relocate"); - applicationConfig.addAlias("wp commit", "--option", "commit"); - applicationConfig.addAlias("wp delete", "--option", "delete"); - applicationConfig.addAlias("wp update", "--option", "update"); + applicationConfig.addAlias("wp sync", "--option", "sync"); applicationConfig - .addActionAlias("import", - "org.nuiton.wikitty.publication.WikittyPublication#importToWikitty"); + .addActionAlias("sync", + "org.nuiton.wikitty.publication.WikittyPublication#synchronisation"); - applicationConfig - .addActionAlias("checkout", - "org.nuiton.wikitty.publication.WikittyPublication#checkoutFromWikitty"); - - applicationConfig - .addActionAlias("relocate", - "org.nuiton.wikitty.publication.WikittyPublication#relocateWikitty"); - - applicationConfig - .addActionAlias("commit", - "org.nuiton.wikitty.publication.WikittyPublication#commitToWikitty"); - - applicationConfig - .addActionAlias("delete", - "org.nuiton.wikitty.publication.WikittyPublication#deleteFromWikitty"); - - applicationConfig - .addActionAlias("update", - "org.nuiton.wikitty.publication.WikittyPublication#updateFromWikitty"); - + // parsing applicationConfig.parse(args); // execution @@ -167,494 +110,9 @@ } - /** - * Method that import the content of a directory into a wikitty service - */ - static public void importToWikitty() throws Exception { - - boolean noRecur = applicationConfig - .getOptionAsBoolean(WikittyPublication.NO_RECURSION_KEY); - File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); - String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); - - log.info("import : wikittyservice: " + wikittyService + " noresursion=" - + noRecur + " directory= " + dir.getAbsolutePath()); - // usage: wp --norecursion --ws http://truc.com import --dir /home/Manou - - applicationConfig.setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - - System.out.println(applicationConfig - .getOption("wikitty.service.server.url")); - - // real code: - WikittyProxy remoteWikittyService = new WikittyProxy( - WikittyServiceFactory.buildWikittyService(applicationConfig)); - - remoteWikittyService.clear(); - // load the list of file - List<File> toTransfert = WikittyPublicationFileSystem.listFile(dir, !noRecur); - - List<Wikitty> listWikitty = new ArrayList<Wikitty>(); - // transform file into wikitties - - for (File fileToTransform : toTransfert) { - listWikitty.add(WikittyPublicationFileSystem.fileToWikitty( - fileToTransform, dir)); - } - - // send the wikitties - remoteWikittyService.storeWikitty(listWikitty); - + static public void synchronisation ( String uriOrigin, String uriTarget){ + } - /* - * TODO mfortun-2011-04-05 just prototyping, remove when really implements - * the method linked: importToWikitty - */ - static public void printDirectory(File dir, boolean recur) { - System.out.println("<dir " + dir.getName() + ">"); - for (File child : dir.listFiles()) { - if (child.isDirectory() && recur - && !child.getName().equals(WikittyPublicationFileSystem.PROPERTY_DIRECTORY)) { - printDirectory(child, recur); - } else if (!child.isDirectory()) { - System.out.println(child.getAbsolutePath()); - } - } - System.out.println("</dir " + dir.getName() + ">"); - } - - /** - * Method that checkout a label recursivly or not into a local directory - * from a wikitty service - */ - static public void checkoutFromWikitty(String label) throws Exception { - - boolean noRecur = applicationConfig - .getOptionAsBoolean(WikittyPublication.NO_RECURSION_KEY); - File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); - String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); - boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); - - log.info("checkout : wikittyservice: " + wikittyService - + " noresursion=" + noRecur + " directory= " - + dir.getAbsolutePath() + "Label a checkout " + label - + "HessianProtocol=" + hessianProtocole); - - if (hessianProtocole) { - applicationConfig.setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceHessianClient"); - } else { - applicationConfig.setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - } - - WikittyProxy remoteWikittyService = new WikittyProxy( - WikittyServiceFactory.buildWikittyService(applicationConfig)); - WikittyPublicationFileSystem localWikittyService = new WikittyPublicationFileSystem( - dir, !noRecur, label); - - // Construct the criteria - Criteria labelCriteria; - Search mainRequest = Search.query(); - Search subRoqu = mainRequest.or(); - - // must have the type of wikittypubtext/wikittypubdata - subRoqu.exteq(WikittyPubText.EXT_WIKITTYPUBTEXT).exteq( - WikittyPubData.EXT_WIKITTYPUBDATA); - if (noRecur) { - // and extension with the name strictly equals to the label (no - // recursivity) - labelCriteria = mainRequest.exteq(WikittyLabel.EXT_WIKITTYLABEL) - .eq(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS, label) - .criteria(); - - } else { - // and extension with the name that containt the label (recursivity) - labelCriteria = mainRequest.exteq(WikittyLabel.EXT_WIKITTYLABEL) - .sw(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS, label) - .criteria(); - } - - // request to the proxy - PagedResult<Wikitty> pageResult = remoteWikittyService - .findAllByCriteria(labelCriteria); - - List<Wikitty> wikittiesToWrite = pageResult.getAll(); - - // write the proper properties file! - WikittyPublicationFileSystem.writeHomePropertyFile(dir); - - // write the wikities - localWikittyService.store("", wikittiesToWrite, true); - - /* - * obtain the list of wikittypub and write then in the file system with - * the appropriate wikittyservice ! - */ - - /* - * on va commencer par vérifier les arguments ''wp checkout - * [--norecursion] [url du WikittyService] [Label à extraire] [directory - * local d'accueil]'' on doit avoir trois string dans le unparsed: url, - * label, directory et potentiellement quelque chose dans le getoption - * recursion - */ - - } - - /** - * Relocate the default url of the wikitty service - */ - static public void relocateWikitty() throws Exception { - - /* - * log.info("checkout : wikittyservice: " + wikittyService + - * " noresursion=" + noRecur + " directory= " + dir.getAbsolutePath() - * +"Label a checkout " +label+ "HessianProtocol="+hessianProtocole); - */ - - File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); - String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); - boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); - - File wpHomeDir; - - System.out - .println("search the directory of .wp file to write new properties file"); - // search for the home directory - if (null == dir || !dir.exists()) { - wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(new File(".")); - } else { - wpHomeDir = new File(dir.getCanonicalFile() + File.separator - + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); - } - - Properties oldProperties = new Properties(); - - // TODO mfortun-2011-04-06 catch exception instead of throws - File propertiesFile = new File(wpHomeDir + File.separator - + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); - // load the old file just for loggin - oldProperties.load(new FileReader(propertiesFile)); - - log.info("Try relocate :" + "wikitty service:" - + oldProperties.getProperty(WikittyPublication.WITTY_SERVICE_KEY) + " by " - + wikittyService + " HessianProtocol: " + hessianProtocole - + " File : " + propertiesFile.getCanonicalPath()); - - // Creation of the new properties file - Properties props = new Properties(); - props.put(WikittyPublication.WITTY_SERVICE_KEY, wikittyService); - if (hessianProtocole) { - props.put("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceHessianClient"); - } else { - props.put("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - } - - // save the new property file - props.store(new FileWriter(propertiesFile), ""); - - /* - * on va commencer par vérifier les arguments ''wp relocate [nouvelle - * url du WikittyService par defaut] [directory a relocaliser]'' on doit - * avoir trois string dans le unparsed: url et directory - */ - - } - - /** - * commit the current wikittyworkspace into a wikitty service - */ - static public void commitToWikitty() throws Exception { - - File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); - - File wpHomeDir; - if (null == dir || !dir.exists()) { - /* - * si pas de dir on commit le dossier courant - */ - dir = new File("."); - - } - // on va chercher le home dir - wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(dir); - - Properties properties = new Properties(); - - // TODO mfortun-2011-04-06 catch exception instead of throws - File propertiesFile = new File(wpHomeDir.getCanonicalPath() - + File.separator + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); - // load the old file just for loggin - properties.load(new FileReader(propertiesFile)); - - // on va rajouter les propriété de notre file - applicationConfig.setOptions(properties); - - boolean noRecur = applicationConfig - .getOptionAsBoolean(WikittyPublication.NO_RECURSION_KEY); - - String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); - boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); - - if (hessianProtocole) { - applicationConfig.setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceHessianClient"); - } else { - applicationConfig.setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - } - - log.info("commit " + " wikitty-service" + wikittyService - + "noRecurs : " + noRecur + " hessian Protocole :" - + hessianProtocole + "directory : " + dir.getAbsolutePath()); - - System.out.println("try to commit: "); - printDirectory(dir, !noRecur); - - // faire la liste des fichiers à commit - // avec récursivité si c'etransfert d'histoire entre svnst demandé. - // et les transformer en wikitty, vérifier les versions et tout. - - /* - * parcours l'arborescence des fichiers celon que on soit recursif ou - * non plutot que faire la liste fichier, on va aller lire les ids dans - * les fichiers de propriétés. - * - * Ensuite on creer le wikittyserviceFileSysteme avec le répertoire de - * travail et lui on lui donner les ids avec lesquels il va travailler - * et aller chercher les fichiers de propriétés pour retrouver les files - * et creer les wikittypub correspondant. - * - * Pour faire un commit il ne suffira pas de faire un restore - * finalement, il faudra faire un search aussi puisque on va se - * retrouver à faire des new wikitty p'etre éclaircir ce point plus - * tard. Pour le moment ne pas se poser de question trop, et faire sans - * nouveau fichier. - */ - - // création du proxy - - /* - * on va commencer par vérifier les arguments ''wp commit - * [--norecursion] [--ws (url du WikittyService)] [répertoire à - * pousser]'' on doit avoir deux string dans le unparsed et - * potentiellement quelque chose dans le getoption recursion - */ - - } - - /** - * delete a file or directory from the workspace it remove the label from - * the wikitty - * - * @throws Exception - */ - static public void deleteFromWikitty(File toDelete) throws Exception { - - // check args - if (null == toDelete || !toDelete.exists()) { - // Exception - - } else { - - File currentDir = new File(FileUtil.getCurrentDirectory() - .getAbsolutePath()); - File wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(currentDir); - // search for the .wp home dir to load props - - // then load proxy - - // if toDelete is a directory do something different from usualy - // recursivly remove labels - - File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); - - Properties properties = new Properties(); - - // TODO mfortun-2011-04-06 catch exception instead of throws - File propertiesFile = new File(wpHomeDir.getCanonicalPath() - + File.separator + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); - // load the old file just for loggin - properties.load(new FileReader(propertiesFile)); - - // on va rajouter les propriété de notre file - applicationConfig.setOptions(properties); - - String wikittyService = applicationConfig - .getOption(WikittyPublication.WITTY_SERVICE_KEY); - boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); - - if (hessianProtocole) { - applicationConfig - .setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceHessianClient"); - } else { - applicationConfig.setOption( - "wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - } - - log.info("Delete " + " wikitty-service" + wikittyService - + " hessian Protocole :" + hessianProtocole - + "file to delete : " + toDelete.getAbsolutePath()); - // on va chercher le home dir - wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(dir); - - WikittyProxy remoteWikittyService = new WikittyProxy( - WikittyServiceFactory - .buildWikittyService(applicationConfig)); - WikittyPublicationFileSystem localWikittyService = new WikittyPublicationFileSystem( - dir); - - if (toDelete.isDirectory()) { - - BidiMap deleteMap = WikittyPublicationFileSystem - .harvestLocalWikitties(toDelete, true); - List<String> ids = new ArrayList<String>(); - ids = new ArrayList<String>(); - ids.addAll(CollectionUtil.toGenericCollection( - deleteMap.keySet(), String.class)); - - for (String key : ids) { - // restore wikitty - Wikitty wd = remoteWikittyService.restore(key); - - // searh for the label to delete from the wikitty - FileSystemWIkittyId location = (FileSystemWIkittyId) deleteMap - .get(key); - - File wikittyFileParent = new File(location.getPath()); - PropertiesExtended metaExtended = WikittyPublicationFileSystem - .getWikittyPublicationProperties( - wikittyFileParent, - WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); - - String currentLabel = metaExtended - .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL); - // remove label - WikittyLabelHelper.removeLabels(wd, currentLabel); - // save the wikitty - remoteWikittyService.store(wd); - } - - localWikittyService.delete("", ids); - // if it was a directory the wikitty file service does not have - // delete it - - FileUtil.deleteRecursively(toDelete); - } else { - // infos about file about to delete - String name = toDelete.getName(); - File parentFile = toDelete.getParentFile(); - // search of it's id - PropertiesExtended metaProps = WikittyPublicationFileSystem - .getWikittyPublicationProperties( - parentFile, - WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); - - String id = metaProps.getProperty(name - + WikittyPublicationFileSystem.DEFAULT_PROPERTY_NAME_SEP + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID); - // his label - String label = metaProps - .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL); - - // restore wikitty remote - - Wikitty wd = remoteWikittyService.restore(id); - - // remove label - - WikittyLabelHelper.removeLabels(wd, label); - // save the wikitty remote - remoteWikittyService.store(wd); - - List<String> ids = new ArrayList<String>(); - ids.add(id); - // delete localy - localWikittyService.delete("", ids); - } - - } - - /* - * on va commencer par vérifier les arguments ''wp delete [--ws (url du - * WikittyService)] [répertoire ou fichier à supprimer]'' on doit avoir - * un string dans le unparsed et après pour pour le wikittyservice bah - * on tape dedans en fonction de si elle a été précisé en ligne de - * commande applicationConfig se débrouille - */ - } - - /** - * update the current workspace from a wikitty - */ - static public void updateFromWikitty() throws Exception { - - File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); - - File wpHomeDir; - if (null == dir || !dir.exists()) { - /* - * si pas de dir on update le dossier courant - */ - dir = new File("."); - - } - // on va chercher le home dir - wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(dir); - - Properties properties = new Properties(); - - // TODO mfortun-2011-04-06 catch exception instead of throws - File propertiesFile = new File(wpHomeDir.getCanonicalPath() - + File.separator + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); - // load the old file just for loggin - properties.load(new FileReader(propertiesFile)); - - // on va rajouter les propriété de notre file - applicationConfig.setOptions(properties); - - boolean noRecur = applicationConfig - .getOptionAsBoolean(WikittyPublication.NO_RECURSION_KEY); - - String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); - boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); - - if (hessianProtocole) { - applicationConfig.setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceHessianClient"); - } else { - applicationConfig.setOption("wikitty.WikittyService.components", - "org.nuiton.wikitty.services.WikittyServiceCajoClient"); - } - - log.info("update " + " wikitty-service" + wikittyService - + "noRecurs : " + noRecur + " hessian Protocole :" - + hessianProtocole + "directory : " + dir.getAbsolutePath()); - - System.out.println("try to update: "); - printDirectory(dir, !noRecur); - - /* - * on va commencer par vérifier les arguments * ''wp update - * [--norecursion] [--ws (url du WikittyService)] [répertoire à mettre à - * jour]'' normalement un string dans unparsed et potentiellement - * quelque chose dans le recursion - */ - } - - - - } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-14 08:23:15 UTC (rev 806) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-14 14:09:43 UTC (rev 807) @@ -848,44 +848,6 @@ } - - - static protected void writeHomePropertyFile(File homeDir) throws Exception { - - if (homeDir.exists()) { - File dir = WikittyPublication.applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); - String wikittyService = WikittyPublication.applicationConfig - .getOption(WikittyPublication.WITTY_SERVICE_KEY); - boolean hessianProtocole = WikittyPublication.applicationConfig - .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); - - // TODO mfortun-2011-04-11 find a better way to manage component - // property - String propertyCompo = WikittyPublication.applicationConfig - .getOption("wikitty.WikittyService.components"); - // write the proper properties file! - Properties props = new Properties(); - props.put(WikittyPublication.WITTY_SERVICE_KEY, wikittyService); - - props.put("wikitty.WikittyService.components", propertyCompo); - - // create the properties directory - File wpDirectory = new File(homeDir.getCanonicalPath() - + File.separator + PROPERTY_DIRECTORY + File.separator); - if (!wpDirectory.exists()) { - wpDirectory.mkdir(); - } - - File propertiesFiles = new File(wpDirectory.getCanonicalPath() - + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); - - props.store(new FileWriter(propertiesFiles), ""); - } - } - - - - /** * * Use to search in the file system the directory that containt the .wp dir

1 0