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

r813 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 15 Apr '11

15 Apr '11

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 15 Apr '11

15 Apr '11

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 15 Apr '11

15 Apr '11

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 15 Apr '11

15 Apr '11

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 14 Apr '11

14 Apr '11

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 14 Apr '11

14 Apr '11

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 14 Apr '11

14 Apr '11

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

r806 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 14 Apr '11

14 Apr '11

Author: mfortun Date: 2011-04-14 10:23:15 +0200 (Thu, 14 Apr 2011) New Revision: 806 Url: http://nuiton.org/repositories/revision/wikitty/806 Log: * migrate static value and method to the correct class 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-13 16:59:23 UTC (rev 805) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-14 08:23:15 UTC (rev 806) @@ -70,39 +70,18 @@ * static string for allias, wrong named attribut TODO mfortun-2011-04-06 * need to set better name */ + - /* - * FIXME mfortun-2011-04-11 need to migrate static value to another class ? - */ + static public String WITTY_SERVICE_KEY = "wikitty.service.server.url"; - static public String NO_RECURSION_KEY = "norecursion"; + static public String DIRECTORY_KEY = "directory"; + + static public String HESSIAN_PROTOCOL_KEY = "hessian"; - static public String DEFAULT_PROPERTY_NAME_SEP = "."; + static public String NO_RECURSION_KEY = "norecursion"; - static public String PROPERTY_DIRECTORY = ".wp"; - static public String WIKITTYPUBLICATION_PROPERTIES_FILE = "ws.properties"; - - /* - * Need a different file for id and meta information about wikittiesFiles - * because with this solution we can simply read the ids with props.keySet() - */ - static public String WIKITTY_ID_PROPERTIES_FILE = "ids.properties"; - static public String WIKITTY_FILE_META_PROPERTIES_FILE = "meta.properties"; - - /* - * 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_SUFFIX_KEY_CHECKSUM = "checksum"; - static public String META_SUFFIX_KEY_ID = "id"; - - static public String META_CURRENT_LABEL = "current.label"; - /** * @param args * @throws ArgumentsParserException @@ -132,9 +111,9 @@ applicationConfig = new ApplicationConfig(); // allias for the url of the wikitty service - applicationConfig.addAlias("--ws", "--option", WITTY_SERVICE_KEY); + applicationConfig.addAlias("--ws", "--option", WikittyPublication.WITTY_SERVICE_KEY); - applicationConfig.addAlias("--dir", "--option", DIRECTORY_KEY); + applicationConfig.addAlias("--dir", "--option", WikittyPublication.DIRECTORY_KEY); /* * TODO mfortun-2011-04-05 once application fixed setdefault value and @@ -143,11 +122,11 @@ // allias for norecursion applicationConfig.addAlias("--norecursion", "--option", - NO_RECURSION_KEY, "true"); + WikittyPublication.NO_RECURSION_KEY, "true"); // allias for the protocole applicationConfig.addAlias("--hessian", "--option", - HESSIAN_PROTOCOL_KEY, "true"); + WikittyPublication.HESSIAN_PROTOCOL_KEY, "true"); // allias for all the action applicationConfig.addAlias("wp import", "--option", "import"); @@ -194,9 +173,9 @@ static public void importToWikitty() throws Exception { boolean noRecur = applicationConfig - .getOptionAsBoolean(NO_RECURSION_KEY); - File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); - String wikittyService = applicationConfig.getOption(WITTY_SERVICE_KEY); + .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()); @@ -214,7 +193,7 @@ remoteWikittyService.clear(); // load the list of file - List<File> toTransfert = listFile(dir, !noRecur); + List<File> toTransfert = WikittyPublicationFileSystem.listFile(dir, !noRecur); List<Wikitty> listWikitty = new ArrayList<Wikitty>(); // transform file into wikitties @@ -238,7 +217,7 @@ System.out.println("<dir " + dir.getName() + ">"); for (File child : dir.listFiles()) { if (child.isDirectory() && recur - && !child.getName().equals(PROPERTY_DIRECTORY)) { + && !child.getName().equals(WikittyPublicationFileSystem.PROPERTY_DIRECTORY)) { printDirectory(child, recur); } else if (!child.isDirectory()) { System.out.println(child.getAbsolutePath()); @@ -248,45 +227,17 @@ } /** - * 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 protected 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 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(NO_RECURSION_KEY); - File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); - String wikittyService = applicationConfig.getOption(WITTY_SERVICE_KEY); + .getOptionAsBoolean(WikittyPublication.NO_RECURSION_KEY); + File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); + String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); + .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); log.info("checkout : wikittyservice: " + wikittyService + " noresursion=" + noRecur + " directory= " @@ -335,7 +286,7 @@ List<Wikitty> wikittiesToWrite = pageResult.getAll(); // write the proper properties file! - writeHomePropertyFile(dir); + WikittyPublicationFileSystem.writeHomePropertyFile(dir); // write the wikities localWikittyService.store("", wikittiesToWrite, true); @@ -366,10 +317,10 @@ * +"Label a checkout " +label+ "HessianProtocol="+hessianProtocole); */ - File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); - String wikittyService = applicationConfig.getOption(WITTY_SERVICE_KEY); + File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); + String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); + .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); File wpHomeDir; @@ -377,28 +328,28 @@ .println("search the directory of .wp file to write new properties file"); // search for the home directory if (null == dir || !dir.exists()) { - wpHomeDir = searchWikittyPublicationHomeDir(new File(".")); + wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(new File(".")); } else { wpHomeDir = new File(dir.getCanonicalFile() + File.separator - + PROPERTY_DIRECTORY); + + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); } Properties oldProperties = new Properties(); // TODO mfortun-2011-04-06 catch exception instead of throws File propertiesFile = new File(wpHomeDir + File.separator - + WIKITTYPUBLICATION_PROPERTIES_FILE); + + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin oldProperties.load(new FileReader(propertiesFile)); log.info("Try relocate :" + "wikitty service:" - + oldProperties.getProperty(WITTY_SERVICE_KEY) + " by " + + 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(WITTY_SERVICE_KEY, wikittyService); + props.put(WikittyPublication.WITTY_SERVICE_KEY, wikittyService); if (hessianProtocole) { props.put("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceHessianClient"); @@ -423,7 +374,7 @@ */ static public void commitToWikitty() throws Exception { - File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); + File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); File wpHomeDir; if (null == dir || !dir.exists()) { @@ -434,13 +385,13 @@ } // on va chercher le home dir - wpHomeDir = searchWikittyPublicationHomeDir(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 + WIKITTYPUBLICATION_PROPERTIES_FILE); + + File.separator + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin properties.load(new FileReader(propertiesFile)); @@ -448,11 +399,11 @@ applicationConfig.setOptions(properties); boolean noRecur = applicationConfig - .getOptionAsBoolean(NO_RECURSION_KEY); + .getOptionAsBoolean(WikittyPublication.NO_RECURSION_KEY); - String wikittyService = applicationConfig.getOption(WITTY_SERVICE_KEY); + String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); + .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); if (hessianProtocole) { applicationConfig.setOption("wikitty.WikittyService.components", @@ -517,7 +468,7 @@ File currentDir = new File(FileUtil.getCurrentDirectory() .getAbsolutePath()); - File wpHomeDir = searchWikittyPublicationHomeDir(currentDir); + File wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(currentDir); // search for the .wp home dir to load props // then load proxy @@ -525,13 +476,13 @@ // if toDelete is a directory do something different from usualy // recursivly remove labels - File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); + 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 + WIKITTYPUBLICATION_PROPERTIES_FILE); + + File.separator + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin properties.load(new FileReader(propertiesFile)); @@ -539,9 +490,9 @@ applicationConfig.setOptions(properties); String wikittyService = applicationConfig - .getOption(WITTY_SERVICE_KEY); + .getOption(WikittyPublication.WITTY_SERVICE_KEY); boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); + .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); if (hessianProtocole) { applicationConfig @@ -557,7 +508,7 @@ + " hessian Protocole :" + hessianProtocole + "file to delete : " + toDelete.getAbsolutePath()); // on va chercher le home dir - wpHomeDir = searchWikittyPublicationHomeDir(dir); + wpHomeDir = WikittyPublicationFileSystem.searchWikittyPublicationHomeDir(dir); WikittyProxy remoteWikittyService = new WikittyProxy( WikittyServiceFactory @@ -586,10 +537,10 @@ PropertiesExtended metaExtended = WikittyPublicationFileSystem .getWikittyPublicationProperties( wikittyFileParent, - WikittyPublication.WIKITTY_FILE_META_PROPERTIES_FILE); + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); String currentLabel = metaExtended - .getProperty(META_CURRENT_LABEL); + .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL); // remove label WikittyLabelHelper.removeLabels(wd, currentLabel); // save the wikitty @@ -609,13 +560,13 @@ PropertiesExtended metaProps = WikittyPublicationFileSystem .getWikittyPublicationProperties( parentFile, - WikittyPublication.WIKITTY_FILE_META_PROPERTIES_FILE); + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); String id = metaProps.getProperty(name - + DEFAULT_PROPERTY_NAME_SEP + META_SUFFIX_KEY_ID); + + WikittyPublicationFileSystem.DEFAULT_PROPERTY_NAME_SEP + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID); // his label String label = metaProps - .getProperty(WikittyPublication.META_CURRENT_LABEL); + .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL); // restore wikitty remote @@ -649,7 +600,7 @@ */ static public void updateFromWikitty() throws Exception { - File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); + File dir = applicationConfig.getOptionAsFile(WikittyPublication.DIRECTORY_KEY); File wpHomeDir; if (null == dir || !dir.exists()) { @@ -660,13 +611,13 @@ } // on va chercher le home dir - wpHomeDir = searchWikittyPublicationHomeDir(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 + WIKITTYPUBLICATION_PROPERTIES_FILE); + + File.separator + WikittyPublicationFileSystem.WIKITTYPUBLICATION_PROPERTIES_FILE); // load the old file just for loggin properties.load(new FileReader(propertiesFile)); @@ -674,11 +625,11 @@ applicationConfig.setOptions(properties); boolean noRecur = applicationConfig - .getOptionAsBoolean(NO_RECURSION_KEY); + .getOptionAsBoolean(WikittyPublication.NO_RECURSION_KEY); - String wikittyService = applicationConfig.getOption(WITTY_SERVICE_KEY); + String wikittyService = applicationConfig.getOption(WikittyPublication.WITTY_SERVICE_KEY); boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); + .getOptionAsBoolean(WikittyPublication.HESSIAN_PROTOCOL_KEY); if (hessianProtocole) { applicationConfig.setOption("wikitty.WikittyService.components", @@ -703,101 +654,7 @@ */ } - /** - * - * 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; - } - } - - static protected void writeHomePropertyFile(File homeDir) throws Exception { - - if (homeDir.exists()) { - File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); - String wikittyService = applicationConfig - .getOption(WITTY_SERVICE_KEY); - boolean hessianProtocole = applicationConfig - .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); - - // TODO mfortun-2011-04-11 find a better way to manage component - // property - String propertyCompo = applicationConfig - .getOption("wikitty.WikittyService.components"); - // write the proper properties file! - Properties props = new Properties(); - props.put(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), ""); - } - } - - /** - * Method that create a list of the properties directory - * - * @param starts - * harvested directory - * @param recursivly - * @return list of harvested file - */ - 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); - } else if (child.isDirectory() && recursivly) { - result.addAll(harvestPropertyDirectory(child, recursivly)); - } - } - return result; - - } - } 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-13 16:59:23 UTC (rev 805) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-14 08:23:15 UTC (rev 806) @@ -31,12 +31,9 @@ import java.io.FileWriter; 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; import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.logging.Log; @@ -74,6 +71,34 @@ protected boolean recursion; protected String label; + 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 WIKITTY_FILE_META_PROPERTIES_FILE = "meta.properties"; + + /* + * Need a different file for id and meta information about wikittiesFiles + * because with this solution we can simply read the ids with props.keySet() + */ + 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 * @@ -246,7 +271,7 @@ // create the propertie directory if necessary File propertieDirectory = new File(path + File.separator - + WikittyPublication.PROPERTY_DIRECTORY); + + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); if (!propertieDirectory.exists() || !propertieDirectory.isDirectory()) { propertieDirectory.mkdir(); @@ -255,7 +280,7 @@ File propertieFile = new File( propertieDirectory.getCanonicalPath() + File.separator - + WikittyPublication.WIKITTY_FILE_META_PROPERTIES_FILE); + + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); if (!propertieFile.exists()) { propertieFile.createNewFile(); } @@ -264,7 +289,7 @@ File idPropertieFile = new File( propertieDirectory.getCanonicalPath() + File.separator - + WikittyPublication.WIKITTY_ID_PROPERTIES_FILE); + + WikittyPublicationFileSystem.WIKITTY_ID_PROPERTIES_FILE); if (!idPropertieFile.exists()) { idPropertieFile.createNewFile(); } @@ -317,7 +342,7 @@ metaProperties.load(new FileReader(propertieFile)); // update metaProperties.setProperty( - WikittyPublication.META_CURRENT_LABEL, ourDir); + WikittyPublicationFileSystem.META_CURRENT_LABEL, ourDir); metaProperties.setProperty(name + "." + extension + ".version", w.getVersion()); @@ -444,19 +469,19 @@ File propsFile = new File( path + File.separator - + WikittyPublication.PROPERTY_DIRECTORY + + WikittyPublicationFileSystem.PROPERTY_DIRECTORY + File.separator - + WikittyPublication.WIKITTY_FILE_META_PROPERTIES_FILE); + + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); props.load(new FileReader(propsFile)); // re set the id wikitty.setVersion(props.getProperty(completeName - + WikittyPublication.META_SUFFIX_KEY_ID)); + + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID)); // set the current label WikittyLabelHelper .addLabels( wikitty, - props.getProperty(WikittyPublication.META_CURRENT_LABEL)); + props.getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL)); /* * TODO mfortun-2011-04-12 need to merge part of this code @@ -512,22 +537,22 @@ // load properties PropertiesExtended propsProperties = getWikittyPublicationProperties(new File( - path), WikittyPublication.WIKITTY_FILE_META_PROPERTIES_FILE); + path), WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); // update propsProperties.remove(fileName - + WikittyPublication.META_SUFFIX_KEY_CHECKSUM); + + WikittyPublicationFileSystem.META_SUFFIX_KEY_CHECKSUM); propsProperties.remove(fileName - + WikittyPublication.META_SUFFIX_KEY_ID); + + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID); propsProperties.remove(fileName - + WikittyPublication.META_SUFFIX_KEY_VERSION); + + WikittyPublicationFileSystem.META_SUFFIX_KEY_VERSION); // resave propsProperties.store(); // load properties PropertiesExtended idProperties = getWikittyPublicationProperties(new File( - path), WikittyPublication.WIKITTY_ID_PROPERTIES_FILE); + path), WikittyPublicationFileSystem.WIKITTY_ID_PROPERTIES_FILE); // update idProperties.remove(id); // resave @@ -766,9 +791,146 @@ } /** + * 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 + * + * @param starts + * harvested directory + * @param recursivly + * @return list of harvested file + */ + 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); + } else if (child.isDirectory() && recursivly) { + result.addAll(harvestPropertyDirectory(child, recursivly)); + } + } + return result; + + } + + + + + 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 + * 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 * @throws Exception */ @@ -776,14 +938,14 @@ throws Exception { BidiMap result = new DualHashBidiMap(); - List<File> propertiesDirectory = WikittyPublication + List<File> propertiesDirectory = WikittyPublicationFileSystem .harvestPropertyDirectory(starts, recursivly); for (File propsDir : propertiesDirectory) { Properties idProps = new Properties(); File idFile = new File(propsDir.getCanonicalPath() + File.separator - + WikittyPublication.WIKITTY_ID_PROPERTIES_FILE); + + WikittyPublicationFileSystem.WIKITTY_ID_PROPERTIES_FILE); if (idFile.exists()) { idProps.load(new FileReader(idFile)); } @@ -815,7 +977,7 @@ throws Exception { File propertieDirectory = new File(starts.getCanonicalPath() - + File.separator + WikittyPublication.PROPERTY_DIRECTORY); + + File.separator + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); // load/create meta propertie file File propertieFile = new File(propertieDirectory.getCanonicalPath()

1 0

13 Apr '11

Author: bpoussin Date: 2011-04-13 18:59:23 +0200 (Wed, 13 Apr 2011) New Revision: 805 Url: http://nuiton.org/repositories/revision/wikitty/805 Log: - Evolution #1459: Refactor WikittyConfig, don't herite from ApplicationConfig, but become factory Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/pom.xml 2011-04-13 16:59:23 UTC (rev 805) @@ -515,7 +515,7 @@  <eugeneVersion>2.3.1</eugeneVersion> - <nuitonUtilsVersion>2.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-04-13 16:59:23 UTC (rev 805) @@ -1,43 +1,37 @@ /* * #%L * Wikitty :: api - * + * * $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 + * 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 + * + * 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; -import org.nuiton.wikitty.services.XMPPNotifierTransporter; -import org.nuiton.wikitty.services.WikittyServiceInMemory; -import java.io.File; import java.util.Properties; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; 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.wikitty.services.WikittyCacheJCS; -import org.nuiton.wikitty.services.WikittyServiceAccessStat.AccessStatStorageWikitty; /** * Configuration de tous les modules Wikitty. La configuration par defaut doit @@ -65,36 +59,29 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyConfig extends ApplicationConfig { +public class WikittyConfig { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyConfig.class); - /** - * Create WikittyConfig with default value and load wikitty-config.properties - */ - public WikittyConfig() { - this((String[]) null); + private WikittyConfig() { } - public WikittyConfig(String [] args) { - super(); - init(); - try { - parse(args); - } catch (ArgumentsParserException eee) { - if (log.isErrorEnabled()) { - log.error("Can't load wikitty configuration", eee); - } - } + + static public ApplicationConfig getConfig() { + return getConfig(null, null); } + static public ApplicationConfig getConfig(String[] args) { + return getConfig(null, null, args); + } + /** * Create WikittyConfig and load particular configuration filename * @param configFilename name of wikitty config file */ - public WikittyConfig(String configFilename) { - this(new String[]{"--option", ApplicationConfig.CONFIG_FILE_NAME, configFilename}); + static public ApplicationConfig getConfig(String configFilename) { + return getConfig(null, configFilename); } /** @@ -102,363 +89,35 @@ * * @param props as default value */ - public WikittyConfig(Properties props) { - this(); - - // iterate with Properties method and not with Hashtable method to - // prevent missed value with chained Properties object - for (String key : props.stringPropertyNames()) { - setDefaultOption(key, props.getProperty(key)); - } + static public ApplicationConfig getConfig(Properties props) { + return getConfig(props, null); } - protected void init() { - // init configuration with default options - loadDefaultOptions(WikittyOption.class); - - // init actions - loadActions(WikittyAction.class); - } - - /** - * TODO poussin 20101219 extract this class from WikittyConfig - * Configuration option for all modules - */ - public static enum WikittyOption implements OptionDef { - - WIKITTY_CONFIG_FILE( - CONFIG_FILE_NAME, - n_("Main configuration wikitty file"), - "wikitty-config.properties", String.class, true, true), - - WIKITTY_DATA_DIR( - "wikitty.data.directory", - n_("Data directory where wikitty store data"), - "./target/data", String.class, false, false), - - WIKITTY_STORAGE_JDBC_QUERY_FILE( - "wikitty.storage.jdbc.queryfile", - n_("JDBC query configuration file. You can put more than one file" - + " to load specific SQL statement for your database." - + " Exemple: wikitty-jdbc-query.properties,wikitty-jdbc-query-mysql.properties"), - "wikitty-jdbc-query.properties", String.class, false, false), - - WIKITTY_STORAGE_JDBC_DRIVER( - "wikitty.storage.jdbc.driver", - n_("JDBC driver name"), - "org.h2.Driver", String.class, false, false), - WIKITTY_STORAGE_JDBC_URL( - "wikitty.storage.jdbc.host", - n_("JDBC url"), - "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", String.class, false, false), - WIKITTY_STORAGE_JDBC_LOGIN( - "wikitty.storage.jdbc.login", - n_("JDBC login name"), - "sa", String.class, false, false), - WIKITTY_STORAGE_JDBC_PASSWORD( - "wikitty.storage.jdbc.password", - n_("JDBC password"), - "", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE( - "wikitty.storage.jdbc.xadatasource", - n_("JDBC xadatasource driver"), - "org.h2.jdbcx.JdbcDataSource", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_URL( - "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL", - n_("JDBC xadatasource property h2 url"), - "${"+WIKITTY_STORAGE_JDBC_URL.getKey() + "}", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_USER( - "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user", - n_("JDBC xadatasource property h2 username"), - "${"+WIKITTY_STORAGE_JDBC_LOGIN.getKey() + "}", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_PASSWORD( - "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password", - n_("JDBC xadatasource property h2 password"), - "${"+WIKITTY_STORAGE_JDBC_PASSWORD.getKey() + "}", String.class, false, false), - - WIKITTY_SEARCHENGINE_SOLR_HOME( - "wikitty.searchengine.solr.home", - n_("SolR directory home. You can put solr.xml config file in. If" - + " not null, replace solr.solr.home environment vairable"), - null, String.class, false, false), - /* Solr config name are used directly in solr config file. If - * you change it, change too in module - * wikitty-solr-impl/src/main/resources/solrconfig.xml */ - WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( - "wikitty.searchengine.solr.directory.data", - n_("Solr data directory"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/solr", File.class, false, false), - WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( - "wikitty.searchengine.solr.directory.factory", - n_("SolR storage type possible value: solr.StandardDirectoryFactory" - + " or org.nuiton.wikitty.storage.solr.RAMDirectoryFactory" - + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), - "solr.StandardDirectoryFactory", String.class, false, false), - - - WIKITTY_WIKITTYSERVICE_COMPONENTS( - "wikitty.WikittyService.components", - n_("WikittyService to use (list must be in right order. " - + "ex: org.nuiton.wikitty.WikittyServiceStorage,org.nuiton.wikitty.WikittyServiceNotifier,org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceSecurity)"), - WikittyServiceInMemory.class.getName(), String.class, false, false), - - WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE( - "wikitty.WikittyServiceInMemory.persistence", - n_("Indique si les donnees sont stocker entre deux utilisations."), - "false", Boolean.class, false, false), - WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( - "wikitty.WikittyServiceInMemory.persistence.file", - n_("Fichier ou les donnees sont stocker"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/wikitty-inmemory.ser", File.class, false, false), - - - WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( - "wikitty.WikittyServiceStorage.components", - n_("WikittyServiceStorage component to use (ExtensionStorage, WikittyStorage, SearchEngine)"), - "org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC," - + "org.nuiton.wikitty.jdbc.WikittyStorageJDBC," - + "org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr", String.class, false, false), - - WIKITTY_WIKITTYSERVICENOTIFIER_COMPONENTS( - "wikitty.WikittyServiceNotifier.components", - n_("WikittyServiceNotifier component to use (transporter class" - + "to use for propagate or listen remote event)"), - XMPPNotifierTransporter.class.getName(), String.class, false, false), - - WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS( - "wikitty.transaction.WikittyService.components", - n_("WikittyService to use for transaction (must be in memory)" - + "ex: org.nuiton.wikitty.services.WikittyServiceInMemory" - + " or org.nuiton.wikitty.services.WikittyServiceInMemoryJdbcSolr)"), - WikittyServiceInMemory.class.getName(), String.class, false, false), - - WIKITTY_WIKITTYSERVICECACHED_COMPONENTS( - "wikitty.WikittyServiceCached.components", - n_("Indique le composant a utiliser pour le cache"), - WikittyCacheJCS.class.getName(), String.class, false, false), - - WIKITTY_CACHE_PRIORITY_EXTENSIONS( - "wikitty.service.cache.priority.extensions", - n_("Indique la liste des extensions qui doivent etre conservee prioritairement"), - "", String.class, false, false), - - WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE( - "wikitty.service.cache.simple.reference.type", - n_("Indique le type de reference a utiliser pour les extensions" - + " non prioritaires dans le WikittyCacheSimple (soft ou hard)"), - "soft", String.class, false, false), - - WIKITTY_WIKITTYSERVICEACCESSSTAT_COMPONENTS( - "wikitty.WikittyServiceAccessStat.components", - n_("Indique le composant a utiliser pour le stockage des acces"), - AccessStatStorageWikitty.class.getName(), String.class, false, false), - - WIKITTY_ACCESSSTAT_EXTENSIONS( - "wikitty.service.accessstat.extensions", - n_("Indique la liste d'extension dont il faut monitorer l'acces"), - "WikittyPubText,WikittyPubData", String.class, false, false), - - WIKITTY_SERVER_CONFIG( - "wikitty.service.server.config", - n_("Jetty server configuration file name"), - "wikitty-server-config.xml", String.class, false, false), - WIKITTY_SERVER_URL( - "wikitty.service.server.url", - n_("Hessian server url, use by server to know path and port to bind" - + " servlet and client to contact server"), - "http://service.codelutin.com/wikitty", String.class, false, false), - - WIKITTY_EXPORT_THREADNUMBER( - "wikitty.addon.export.threadnumber", - n_("number of thread used to export task"), - "1", Integer.class, false, false), - WIKITTY_EXPORT_DIRECTORY( - "wikitty.addon.export.directory", - n_("directory path where export asynchronous file are stored"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/export", String.class, false, false), - WIKITTY_EXPORT_PUBLICURL( - "wikitty.addon.export.publicurl", - n_("url used by client to retrieve export file when job is ended"), - "file://${" + WIKITTY_DATA_DIR.getKey() + "}/export/", String.class, false, false), - - WIKITTY_CACHE_RESTORE_COPIES( - "wikitty.service.cache.allwaysRestoreCopies", - n_("Indique si le cache retourne des copies des objets ou des proxies"), - "false", Boolean.class, false, false), - - WIKITTY_EVENT_PROPAGATE( - "wikitty.service.event.propagate", - n_("Indique si le service d'event propage sur le reseau les evenements"), - "false", Boolean.class, false, false), - WIKITTY_EVENT_LISTEN( - "wikitty.service.event.listen", - n_("Indique si le service d'event ecoute sur le reseau les evenements"), - "false", Boolean.class, false, false), - - WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER( - "wikitty.service.event.transporter.xmpp.server", - n_("XMPP server to use for XMPP transporter"), - "im.codelutin.com", String.class, false, false), - WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM( - "wikitty.service.event.transporter.xmpp.room", - n_("Room to use for XMPP transporter"), - "test(a)conference.im.codelutin.com", String.class, false, false), - - WIKITTY_SLAVE_SYNC_STATE_INTERVALE( - "wikitty.service.slave.sync.state.intervale", - n_("Intervale in second where slave service save state" - + " synchronisation time"), - "300", Integer.class, false, false), - WIKITTY_SLAVE_SYNC_STATE_FILE( - "wikitty.service.slave.sync.state.file", - n_("File path to store synchronisation state"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/syncState", String.class, false, false), - WIKITTY_SLAVE_MASTER_URL( - "wikitty.service.slave.master.hessian.endpoint", - n_("Master url service, where to delegate modification action"), - null, String.class, false, false), - WIKITTY_SLAVE_MASTER_XMPP_SERVER( - "wikitty.service.slave.master.xmpp.server", - n_("XMPP server to use for synchronization with master"), - "im.codelutin.com", String.class, false, false), - WIKITTY_SLAVE_MASTER_XMPP_ROOM( - "wikitty.service.slave.master.xmpp.room", - n_("Room to use for synchronization with master," - + " this room must have history activated"), - "test(a)conference.im.codelutin.com", String.class, false, false), - - WIKITTY_PROXY_TIME_TO_LOG_INFO( - "wikitty.proxy.timeToLog.info", - n_("maximum time before send log info with time consumed"), - "1000", Integer.class, false, false), - WIKITTY_PROXY_TIME_TO_LOG_WARN( - "wikitty.proxy.timeToLog.warn", - n_("maximum time before send log warn with time consumed"), - "3000", Integer.class, false, false), - - JCS_DEFAULT( - "jcs.default", - n_("jcs auxiliares to use"), - "", String.class, false, false), - - JCS_DEFAULT_CACHEATTRIBUTES_MAXOBJECTS( - "jcs.default.cacheattributes.MaxObjects", - n_("jcs maximum number of items allowed in memory"), - "1000", String.class, false, false); - - public String key; - public String description; - public String defaultValue; - public Class<?> type; - public boolean isTransient; - public boolean isFinal; - - private WikittyOption(String key, String description, String defaultValue, Class<?> type, boolean isTransient, boolean isFinal) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - this.isTransient = isTransient; - this.isFinal = isFinal; + static public ApplicationConfig getConfig( + Properties props, String configFilename, String ... args) { + ApplicationConfig conf = new ApplicationConfig( + WikittyConfigOption.class, WikittyConfigAction.class, + props, configFilename); + + try { + conf.parse(args); + } catch (ArgumentsParserException eee) { + if (log.isErrorEnabled()) { + log.error("Can't load wikitty configuration", eee); + } } + return conf; + } - @Override - public boolean isFinal() { - return isFinal; - } - - @Override - public boolean isTransient() { - return isTransient; - } - - @Override - public String getDefaultValue() { - return defaultValue; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return type; - } - - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - @Override - public void setTransient(boolean isTransient) { - this.isTransient = isTransient; - } - - @Override - public void setFinal(boolean isFinal) { - this.isFinal = isFinal; - } - } - - public static enum WikittyAction implements ActionDef { - - HELP(n_("Wikitty help"), - WikittyConfig.class.getName() + "#help", "-h", "--help"); - - public String description; - public String action; - public String[] aliases; - - private WikittyAction(String description, String action, String... aliases) { - this.description = description; - this.action = action; - this.aliases = aliases; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - @Override - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - @Override - public String[] getAliases() { - return aliases; - } - - public void setAliases(String[] aliases) { - this.aliases = aliases; - } - } - static public void help() { System.out.println("Wikitty configuration and action"); System.out.println("Options (set with --option <key> <value>:"); - for (WikittyOption o : WikittyOption.values()) { + for (WikittyConfigOption o : WikittyConfigOption.values()) { log.debug("\t" + o.key + "(" + o.defaultValue + "):" + _(o.description)); } log.debug("Actions:"); - for (WikittyAction a : WikittyAction.values()) { + for (WikittyConfigAction a : WikittyConfigAction.values()) { log.debug("\t" + java.util.Arrays.toString(a.aliases) + "(" + a.action + "):" + _(a.description)); } System.exit(0); Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java 2011-04-13 16:59:23 UTC (rev 805) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2011 poussin. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package org.nuiton.wikitty; + +import static org.nuiton.i18n.I18n.n_; + +import org.nuiton.util.ApplicationConfig.ActionDef; + +/** + * + * @author poussin + */ +public enum WikittyConfigAction implements ActionDef { + HELP(n_("Wikitty help"), WikittyConfig.class.getName() + "#help", "-h", "--help"); + public String description; + public String action; + public String[] aliases; + + private WikittyConfigAction(String description, String action, String... aliases) { + this.description = description; + this.action = action; + this.aliases = aliases; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + @Override + public String[] getAliases() { + return aliases; + } + + public void setAliases(String[] aliases) { + this.aliases = aliases; + } + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2011-04-13 16:59:23 UTC (rev 805) @@ -0,0 +1,338 @@ +/* + * Copyright (c) 2011 poussin. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package org.nuiton.wikitty; + +import static org.nuiton.i18n.I18n.n_; + +import java.io.File; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ApplicationConfig.OptionDef; +import org.nuiton.wikitty.services.WikittyCacheJCS; +import org.nuiton.wikitty.services.WikittyServiceAccessStat.AccessStatStorageWikitty; +import org.nuiton.wikitty.services.WikittyServiceInMemory; +import org.nuiton.wikitty.services.XMPPNotifierTransporter; + +/** + * + * @author poussin + */ +public enum WikittyConfigOption implements OptionDef { + + WIKITTY_CONFIG_FILE( + ApplicationConfig.CONFIG_FILE_NAME, + n_("Main configuration wikitty file"), + "wikitty-config.properties", + String.class, true, true), + WIKITTY_DATA_DIR( + "wikitty.data.directory", + n_("Data directory where wikitty store data"), + "./target/data", + String.class, false, false), + WIKITTY_STORAGE_JDBC_QUERY_FILE( + "wikitty.storage.jdbc.queryfile", + n_("JDBC query configuration file. You can put more than one file" + + " to load specific SQL statement for your database." + + " Exemple: wikitty-jdbc-query.properties,wikitty-jdbc-query-mysql.properties"), + "wikitty-jdbc-query.properties", + String.class, false, false), + WIKITTY_STORAGE_JDBC_DRIVER( + "wikitty.storage.jdbc.driver", + n_("JDBC driver name"), + "org.h2.Driver", + String.class, false, false), + WIKITTY_STORAGE_JDBC_URL( + "wikitty.storage.jdbc.host", + n_("JDBC url"), + "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", + String.class, false, false), + WIKITTY_STORAGE_JDBC_LOGIN( + "wikitty.storage.jdbc.login", + n_("JDBC login name"), + "sa", + String.class, false, false), + WIKITTY_STORAGE_JDBC_PASSWORD( + "wikitty.storage.jdbc.password", + n_("JDBC password"), + "", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE( + "wikitty.storage.jdbc.xadatasource", + n_("JDBC xadatasource driver"), + "org.h2.jdbcx.JdbcDataSource", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_URL( + "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL", + n_("JDBC xadatasource property h2 url"), + "${" + WIKITTY_STORAGE_JDBC_URL.getKey() + "}", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_USER( + "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user", + n_("JDBC xadatasource property h2 username"), + "${" + WIKITTY_STORAGE_JDBC_LOGIN.getKey() + "}", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_PASSWORD( + "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password", + n_("JDBC xadatasource property h2 password"), + "${" + WIKITTY_STORAGE_JDBC_PASSWORD.getKey() + "}", + String.class, false, false), + WIKITTY_SEARCHENGINE_SOLR_HOME("wikitty.searchengine.solr.home", + n_("SolR directory home. You can put solr.xml config file in. If" + + " not null, replace solr.solr.home environment vairable"), + null, + String.class, false, false), + /* Solr config name are used directly in solr config file. If + * you change it, change too in module + * wikitty-solr-impl/src/main/resources/solrconfig.xml */ + WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( + "wikitty.searchengine.solr.directory.data", + n_("Solr data directory"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/solr", + File.class, false, false), + WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( + "wikitty.searchengine.solr.directory.factory", + n_("SolR storage type possible value: solr.StandardDirectoryFactory" + + " or org.nuiton.wikitty.storage.solr.RAMDirectoryFactory" + + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), + "solr.StandardDirectoryFactory", + String.class, false, false), + WIKITTY_WIKITTYSERVICE_COMPONENTS( + "wikitty.WikittyService.components", + n_("WikittyService to use (list must be in right order. " + + "ex: org.nuiton.wikitty.WikittyServiceStorage,org.nuiton.wikitty.WikittyServiceNotifier," + + "org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceSecurity)"), + WikittyServiceInMemory.class.getName(), + String.class, false, false), + WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE( + "wikitty.WikittyServiceInMemory.persistence", + n_("Indique si les donnees sont stocker entre deux utilisations."), + "false", + Boolean.class, false, false), + WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( + "wikitty.WikittyServiceInMemory.persistence.file", + n_("Fichier ou les donnees sont stocker"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/wikitty-inmemory.ser", + File.class, false, false), + WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( + "wikitty.WikittyServiceStorage.components", + n_("WikittyServiceStorage component to use" + + " (ExtensionStorage, WikittyStorage, SearchEngine)"), + "org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC," + + "org.nuiton.wikitty.jdbc.WikittyStorageJDBC," + + "org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr", + String.class, false, false), + WIKITTY_WIKITTYSERVICENOTIFIER_COMPONENTS( + "wikitty.WikittyServiceNotifier.components", + n_("WikittyServiceNotifier component to use (transporter class" + + "to use for propagate or listen remote event)"), + XMPPNotifierTransporter.class.getName(), + String.class, false, false), + WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS( + "wikitty.transaction.WikittyService.components", + n_("WikittyService to use for transaction (must be in memory)" + + "ex: org.nuiton.wikitty.services.WikittyServiceInMemory" + + " or org.nuiton.wikitty.services.WikittyServiceInMemoryJdbcSolr)"), + WikittyServiceInMemory.class.getName(), + String.class, false, false), + WIKITTY_WIKITTYSERVICECACHED_COMPONENTS( + "wikitty.WikittyServiceCached.components", + n_("Indique le composant a utiliser pour le cache"), + WikittyCacheJCS.class.getName(), + String.class, false, false), + WIKITTY_CACHE_PRIORITY_EXTENSIONS( + "wikitty.service.cache.priority.extensions", + n_("Indique la liste des extensions qui doivent etre " + + "conservee prioritairement"), + "", + String.class, false, false), + WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE( + "wikitty.service.cache.simple.reference.type", + n_("Indique le type de reference a utiliser pour les extensions" + + " non prioritaires dans le WikittyCacheSimple (soft ou hard)"), + "soft", + String.class, false, false), + WIKITTY_WIKITTYSERVICEACCESSSTAT_COMPONENTS( + "wikitty.WikittyServiceAccessStat.components", + n_("Indique le composant a utiliser pour le stockage des acces"), + AccessStatStorageWikitty.class.getName(), + String.class, false, false), + WIKITTY_ACCESSSTAT_EXTENSIONS( + "wikitty.service.accessstat.extensions", + n_("Indique la liste d'extension dont il faut monitorer l'acces"), + "WikittyPubText,WikittyPubData", + String.class, false, false), + WIKITTY_SERVER_CONFIG( + "wikitty.service.server.config", + n_("Jetty server configuration file name"), + "wikitty-server-config.xml", + String.class, false, false), + WIKITTY_SERVER_URL( + "wikitty.service.server.url", + n_("Hessian server url, use by server to know path and port to bind" + + " servlet and client to contact server"), + "http://service.codelutin.com/wikitty", + String.class, false, false), + WIKITTY_EXPORT_THREADNUMBER( + "wikitty.addon.export.threadnumber", + n_("number of thread used to export task"), + "1", + Integer.class, false, false), + WIKITTY_EXPORT_DIRECTORY( + "wikitty.addon.export.directory", + n_("directory path where export asynchronous file are stored"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/export", + String.class, false, false), + WIKITTY_EXPORT_PUBLICURL( + "wikitty.addon.export.publicurl", + n_("url used by client to retrieve export file when job is ended"), + "file://${" + WIKITTY_DATA_DIR.getKey() + "}/export/", + String.class, false, false), + WIKITTY_CACHE_RESTORE_COPIES( + "wikitty.service.cache.allwaysRestoreCopies", + n_("Indique si le cache retourne des copies des objets ou des proxies"), + "false", + Boolean.class, false, false), + WIKITTY_EVENT_PROPAGATE("wikitty.service.event.propagate", + n_("Indique si le service d'event propage sur le reseau les evenements"), + "false", + Boolean.class, false, false), + WIKITTY_EVENT_LISTEN( + "wikitty.service.event.listen", + n_("Indique si le service d'event ecoute sur le reseau les evenements"), + "false", + Boolean.class, false, false), + WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER( + "wikitty.service.event.transporter.xmpp.server", + n_("XMPP server to use for XMPP transporter"), + "im.codelutin.com", + String.class, false, false), + WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM( + "wikitty.service.event.transporter.xmpp.room", + n_("Room to use for XMPP transporter"), + "test(a)conference.im.codelutin.com", + String.class, false, false), + WIKITTY_SLAVE_SYNC_STATE_INTERVALE( + "wikitty.service.slave.sync.state.intervale", + n_("Intervale in second where slave service save state" + + " synchronisation time"), + "300", + Integer.class, false, false), + WIKITTY_SLAVE_SYNC_STATE_FILE( + "wikitty.service.slave.sync.state.file", + n_("File path to store synchronisation state"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/syncState", + String.class, false, false), + WIKITTY_SLAVE_MASTER_URL("wikitty.service.slave.master.hessian.endpoint", + n_("Master url service, where to delegate modification action"), + null, + String.class, false, false), + WIKITTY_SLAVE_MASTER_XMPP_SERVER( + "wikitty.service.slave.master.xmpp.server", + n_("XMPP server to use for synchronization with master"), + "im.codelutin.com", + String.class, false, false), + WIKITTY_SLAVE_MASTER_XMPP_ROOM( + "wikitty.service.slave.master.xmpp.room", + n_("Room to use for synchronization with master," + + " this room must have history activated"), + "test(a)conference.im.codelutin.com", + String.class, false, false), + WIKITTY_PROXY_TIME_TO_LOG_INFO( + "wikitty.proxy.timeToLog.info", + n_("maximum time before send log info with time consumed"), + "1000", + Integer.class, false, false), + WIKITTY_PROXY_TIME_TO_LOG_WARN( + "wikitty.proxy.timeToLog.warn", + n_("maximum time before send log warn with time consumed"), + "3000", + Integer.class, false, false), + JCS_DEFAULT("jcs.default", + n_("jcs auxiliares to use"), + "", + String.class, false, false), + JCS_DEFAULT_CACHEATTRIBUTES_MAXOBJECTS( + "jcs.default.cacheattributes.MaxObjects", + n_("jcs maximum number of items allowed in memory"), + "1000", + String.class, false, false); + public String key; + public String description; + public String defaultValue; + public Class<?> type; + public boolean isTransient; + public boolean isFinal; + + private WikittyConfigOption(String key, String description, + String defaultValue, Class<?> type, boolean isTransient, boolean isFinal) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this.isTransient = isTransient; + this.isFinal = isFinal; + } + + @Override + public boolean isFinal() { + return isFinal; + } + + @Override + public boolean isTransient() { + return isTransient; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + public String getOptionValue(ApplicationConfig config) { + String result = config.getOption(getKey()); + return result; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean isTransient) { + this.isTransient = isTransient; + } + + @Override + public void setFinal(boolean isFinal) { + this.isFinal = isFinal; + } +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-04-13 16:59:23 UTC (rev 805) @@ -94,9 +94,9 @@ public WikittyProxy(ApplicationConfig config) { if (config != null) { - long timeToLogInfo = config.getOptionAsInt(WikittyConfig.WikittyOption. + long timeToLogInfo = config.getOptionAsInt(WikittyConfigOption. WIKITTY_PROXY_TIME_TO_LOG_INFO.getKey()); - long timeToLogWarn = config.getOptionAsInt(WikittyConfig.WikittyOption. + long timeToLogWarn = config.getOptionAsInt(WikittyConfigOption. WIKITTY_PROXY_TIME_TO_LOG_WARN.getKey()); timeLog.setTimeToLogInfo(timeToLogInfo); timeLog.setTimeToLogWarn(timeToLogWarn); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java 2011-04-13 16:59:23 UTC (rev 805) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; /** * Read wikitty config file and create WikittyService as asked in config. @@ -46,7 +47,7 @@ static private Log log = LogFactory.getLog(WikittyServerStart.class); static public void main(String ... args) { - WikittyConfig config = new WikittyConfig(args); + ApplicationConfig config = WikittyConfig.getConfig(args); WikittyService ws = WikittyServiceFactory.buildWikittyService(config); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2011-04-13 16:59:23 UTC (rev 805) @@ -43,6 +43,7 @@ import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; @@ -103,12 +104,12 @@ this.ws = ws; exportDirectory = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_EXPORT_DIRECTORY.getKey()); + WikittyConfigOption.WIKITTY_EXPORT_DIRECTORY.getKey()); exportPublicURL = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_EXPORT_PUBLICURL.getKey()); + WikittyConfigOption.WIKITTY_EXPORT_PUBLICURL.getKey()); int maxThread = config.getOptionAsInt( - WikittyConfig.WikittyOption.WIKITTY_EXPORT_THREADNUMBER.getKey()); + WikittyConfigOption.WIKITTY_EXPORT_THREADNUMBER.getKey()); this.importExportExecutor = Executors.newFixedThreadPool(maxThread); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2011-04-13 16:59:23 UTC (rev 805) @@ -67,7 +67,7 @@ * @return extension names */ public Collection<String> getExtensionNames(); - + /** * Return list of all field for this object. * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2011-04-13 16:59:23 UTC (rev 805) @@ -145,6 +145,11 @@ getWikitty().setField(ext, fieldName, value); } + /** + * Return list of all extension that this entity has by definition + * (design time) and not extension added during execution time + * @return static extension + */ public Collection<WikittyExtension> getStaticExtensions() { return Collections.emptyList(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2011-04-13 16:59:23 UTC (rev 805) @@ -38,6 +38,7 @@ import org.apache.jcs.engine.control.CompositeCacheManager; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.entities.WikittyExtension; @@ -79,7 +80,7 @@ public WikittyCacheJCS(ApplicationConfig config) { try { List<String> priorityExtensions = config.getOptionAsList( - WikittyConfig.WikittyOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); + WikittyConfigOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); getPriorityExtensions().addAll(priorityExtensions); CompositeCacheManager cacheMgr = CompositeCacheManager.getUnconfiguredInstance(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java 2011-04-13 16:59:23 UTC (rev 805) @@ -38,6 +38,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.entities.WikittyExtension; /** @@ -82,11 +83,11 @@ */ public WikittyCacheSimple(ApplicationConfig config) { List<String> priorityExtensions = config.getOptionAsList( - WikittyConfig.WikittyOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); + WikittyConfigOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); this.priorityExtensions.addAll(priorityExtensions); String refType = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE.getKey()); + WikittyConfigOption.WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE.getKey()); if ("soft".equalsIgnoreCase(refType)) { wikittyCache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); extensionCache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2011-04-13 16:59:23 UTC (rev 805) @@ -43,6 +43,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -102,7 +103,7 @@ this.statStorage = statStorage; if (statStorage == null) { if (log.isWarnEnabled()) { - String statSto = config.getOption(WikittyConfig.WikittyOption. + String statSto = config.getOption(WikittyConfigOption. WIKITTY_WIKITTYSERVICEACCESSSTAT_COMPONENTS.getKey()); log.warn(String.format( "No AccessStatStorage available, access stat can't work (%s)", @@ -110,7 +111,7 @@ } } else { // if no statStorage, make empty extensions to never call statStorage - List<String> exts = config.getOptionAsList(WikittyConfig.WikittyOption. + List<String> exts = config.getOptionAsList(WikittyConfigOption. WIKITTY_ACCESSSTAT_EXTENSIONS.getKey()).getOption(); if (log.isInfoEnabled()) { log.info(String.format("Monitor access to extensions %s", exts)); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.entities.WikittyCopyOnWrite; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.WikittyService; @@ -92,7 +93,7 @@ if (cache == null) { if (log.isWarnEnabled()) { - String cacheClassName = config.getOption(WikittyConfig.WikittyOption. + String cacheClassName = config.getOption(WikittyConfigOption. WIKITTY_WIKITTYSERVICECACHED_COMPONENTS.getKey()); log.warn(String.format( "No cache class implementation available (%s), use simple cache", @@ -118,7 +119,7 @@ // reading configuration and set allwaysRestoreCopies accordingly allwaysRestoreCopies = config.getOptionAsBoolean( - WikittyConfig.WikittyOption.WIKITTY_CACHE_RESTORE_COPIES.getKey()); + WikittyConfigOption.WIKITTY_CACHE_RESTORE_COPIES.getKey()); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java 2011-04-13 16:59:23 UTC (rev 805) @@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; @@ -49,7 +50,7 @@ public WikittyServiceCajoClient(ApplicationConfig config) { try { - String url = config.getOption(WikittyConfig.WikittyOption. + String url = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); // cajo url is not http or other protocol, url must start with // Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java 2011-04-13 16:59:23 UTC (rev 805) @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; @@ -58,7 +59,7 @@ setDelegate(ws); // port and path from hessian server url in config - String urlString = config.getOption(WikittyConfig.WikittyOption. + String urlString = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); // get port and path part of server url, only that is used for cajo Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * WARNING In memory implementation of WikittyService, currently used for test only. @@ -76,10 +77,10 @@ if (config != null) { boolean persist = config.getOptionAsBoolean( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey()); + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey()); if (persist) { persistenceFile = config.getOptionAsFile( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey()); + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey()); restoreFromPersistenceFile(persistenceFile); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.jivesoftware.smackx.muc.MultiUserChat; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; @@ -82,9 +83,9 @@ * @param props */ public XMPPNotifierTransporter(ApplicationConfig config) { - propagateEvent = config.getOptionAsBoolean(WikittyConfig.WikittyOption. + propagateEvent = config.getOptionAsBoolean(WikittyConfigOption. WIKITTY_EVENT_PROPAGATE.getKey()); - listenEvent = config.getOptionAsBoolean(WikittyConfig.WikittyOption. + listenEvent = config.getOptionAsBoolean(WikittyConfigOption. WIKITTY_EVENT_LISTEN.getKey()); initXMPP(config); @@ -108,10 +109,10 @@ // on verifie qu'on a besoin reellement de faire l'init if (propagateEvent || listenEvent) { String server = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey()); + WikittyConfigOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey()); // Keep them to verify that is not us notifications - room = config.getOption(WikittyConfig.WikittyOption. + room = config.getOption(WikittyConfigOption. WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey()); pseudo = WikittyUtil.getUniqueLoginName(); try { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -58,7 +59,7 @@ @Test public void testI18n() throws Exception { // creation d'un proxy sur un ws in memory - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyService ws = new WikittyServiceInMemory(config); WikittyProxy proxy = new WikittyProxy(ws); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.addons; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -42,8 +43,9 @@ @Test public void testFindAllByLabel() { - WikittyConfig config = new WikittyConfig(); - WikittyService ws = WikittyServiceFactory.buildWikittyService(config); + ApplicationConfig config = WikittyConfig.getConfig(); + WikittyService ws = WikittyServiceFactory.buildWikittyService( + config); WikittyProxy proxy = new WikittyProxy(ws); WikittyExtension ext = ExtensionFactory.create("test", "1").addField("toto", TYPE.NUMERIC).extension(); Wikitty w = new WikittyImpl(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.search.Criteria; @@ -69,7 +70,7 @@ @BeforeClass static public void loadWikittyService() throws Exception { - WikittyConfig config = new WikittyConfig(); // default config for in memory + ApplicationConfig config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); // log.info(msg); ws = WikittyServiceFactory.buildWikittyService(config); @@ -183,7 +184,7 @@ proxy.storeExtension(extensionTag); // declare import service - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyImportExportService wsImport = new WikittyImportExportService(config, null, ws); String[] importFiles = { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.api; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.services.WikittyServiceInMemory; @@ -40,7 +41,7 @@ public WikittyService getWikittyService() { if (service == null) { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); service = new WikittyServiceInMemory(config); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -518,7 +518,7 @@ Assert.assertEquals(wikittyId, labelWikitty.getId()); Assert.assertEquals(Collections.singleton("Test"),labelWikitty.getFieldAsObject(WikittyLabel.EXT_WIKITTYLABEL,WikittyLabel.FIELD_WIKITTYLABEL_LABELS)); - ApplicationConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyServiceInMemory ws = new WikittyServiceInMemory(config); ws.store(null, Collections.singleton(labelWikitty), false); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -65,7 +65,7 @@ @Override public ApplicationConfig getConfig() { if (config == null) { - config = new WikittyConfig(); // default config for in memory + config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); // log.info(msg); } @@ -79,8 +79,9 @@ protected WikittyImportExportService getImportExportService() { if (ieService == null) { - WikittyConfig config = new WikittyConfig(); - ieService = new WikittyImportExportService(config, null, getWikittyService()); + ApplicationConfig config = WikittyConfig.getConfig(); + ieService = new WikittyImportExportService( + config, null, getWikittyService()); } return ieService; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2011-04-13 16:59:23 UTC (rev 805) @@ -35,6 +35,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; @@ -64,7 +65,7 @@ @BeforeClass static public void loadWikittyService() throws Exception { - WikittyConfig config = new WikittyConfig(); // default config for in memory + ApplicationConfig config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); // log.info(msg); ws = WikittyServiceFactory.buildWikittyService(config); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -53,7 +53,7 @@ @Override public ApplicationConfig getConfig() { if (config == null) { - config = new WikittyConfig(); // default config for in memory + config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); // log.info(msg); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -33,8 +33,10 @@ import org.junit.Before; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.services.WikittyCacheJCS; import org.nuiton.wikitty.services.WikittyServiceCached; import org.nuiton.wikitty.services.WikittyServiceInMemory; @@ -44,7 +46,7 @@ @Before public void setUpWikittyServiceCachedTest() { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); setService(new WikittyServiceCached(config, new WikittyServiceInMemory(config), new WikittyCacheJCS(config))); @@ -94,9 +96,9 @@ @Test public void testRestoreAllwaysCopyPolicy() throws Exception { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); config.setOption( - WikittyConfig.WikittyOption.WIKITTY_CACHE_RESTORE_COPIES.getKey(), + WikittyConfigOption.WIKITTY_CACHE_RESTORE_COPIES.getKey(), "true"); setService(new WikittyServiceCached(config, Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyAuthorisation; @@ -68,7 +69,7 @@ @Before public void setUpWikittyServiceSecurityTest() { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyService inMemoryService = new WikittyServiceInMemory(config); WikittyServiceSecurity securityService = Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -37,10 +37,12 @@ import org.junit.Before; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.services.WikittyServiceEnhanced; @@ -53,7 +55,7 @@ @Before public void init() throws Exception { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); wikittyService = new WikittyServiceInMemory(config); } @@ -71,12 +73,12 @@ tempPersistFile.delete(); tempPersistFile.deleteOnExit(); - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); config.setOption( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey(), + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey(), "true"); config.setOption( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey(), + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey(), tempPersistFile.getPath()); wikittyService = new WikittyServiceInMemory(config); String extName = "MyExtName"; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -34,7 +34,9 @@ import org.jivesoftware.smackx.muc.DiscussionHistory; import org.jivesoftware.smackx.muc.MultiUserChat; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyServiceNotifier; @@ -57,9 +59,9 @@ public void testXMPP() throws Exception { String server = "im.codelutin.com"; String room = "test(a)conference.im.codelutin.com"; - WikittyConfig config = new WikittyConfig(); - config.setOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey(), server); - config.setOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey(), room); + ApplicationConfig config = WikittyConfig.getConfig(); + config.setOption(WikittyConfigOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey(), server); + config.setOption(WikittyConfigOption.WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey(), room); // Envoi d'un message avec le transporter normal WikittyServiceNotifier.RemoteNotifierTransporter transporteur = Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyImpl; @@ -47,7 +48,7 @@ @Test public void testPutGet() throws Exception { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyCacheJCS cache = new WikittyCacheJCS(config); Wikitty w = new WikittyImpl(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.List; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -52,14 +53,14 @@ static private Log log = LogFactory.getLog(WikittyServiceCachedTest.class); protected ApplicationConfig getConfig() { - WikittyConfig result = new WikittyConfig(); + ApplicationConfig result = WikittyConfig.getConfig(); return result; } @Test public void testCache() throws Exception { ApplicationConfig config = getConfig(); - config.setOption(WikittyConfig.WikittyOption + config.setOption(WikittyConfigOption .JCS_DEFAULT_CACHEATTRIBUTES_MAXOBJECTS.getKey(), "10"); WikittyServiceInMemory ws = new WikittyServiceInMemory(config); WikittyCache cache = new WikittyCacheJCS(config); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -32,7 +32,9 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; @@ -56,12 +58,12 @@ protected WikittyService startServer() throws Exception { Properties props = new Properties(); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_SERVER_URL.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), url); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemory.class.getName() + "," + WikittyServiceCajoServer.class.getName()); - WikittyConfig config = new WikittyConfig(props); + ApplicationConfig config = WikittyConfig.getConfig(props); WikittyService result = WikittyServiceFactory.buildWikittyService(config); return result; } @@ -74,11 +76,11 @@ protected WikittyService getClient() throws Exception { Properties props = new Properties(); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_SERVER_URL.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), url); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceCajoClient.class.getName()); - WikittyConfig config = new WikittyConfig(props); + ApplicationConfig config = WikittyConfig.getConfig(props); WikittyService result = WikittyServiceFactory.buildWikittyService(config); return result; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -29,7 +29,9 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.storage.WikittyExtensionStorageInMemory; @@ -52,11 +54,11 @@ @Test public void testBuild() throws Exception { Properties props = new Properties(); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemory.class.getName() + "," + WikittyServiceNotifier.class.getName() + "," + WikittyServiceCached.class.getName()); - WikittyConfig config = new WikittyConfig(props); + ApplicationConfig config = WikittyConfig.getConfig(props); WikittyService ws = WikittyServiceFactory.buildWikittyService(config); Assert.assertEquals(WikittyServiceCached.class, ws.getClass()); @@ -69,9 +71,10 @@ @Test public void testSampleConfig() throws Exception { { - WikittyConfig config = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + ApplicationConfig config = WikittyConfig.getConfig( + "wikitty-config-sample-inmemory.properties"); // surcharge certain option qui ont besoin d'autre module que api - config.setOption(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS.getKey(), + config.setOption(WikittyConfigOption.WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS.getKey(), WikittyStorageInMemory.class.getName() + "," + WikittyExtensionStorageInMemory.class.getName() + "," + WikittySearchEngineInMemory.class.getName()); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -50,7 +50,7 @@ static private Log log = LogFactory.getLog(WikittyServiceTransactionTest.class); protected ApplicationConfig getConfig() { - WikittyConfig result = new WikittyConfig(); + ApplicationConfig result = WikittyConfig.getConfig(); return result; } Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -31,6 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; @@ -46,7 +47,7 @@ @Before public void clear() throws Exception { - WikittyConfig config = new WikittyConfig("refcomp-test.properties"); + ApplicationConfig config = WikittyConfig.getConfig("refcomp-test.properties"); WikittyService ws = WikittyServiceFactory.buildWikittyService(config); ws.clear(null); Modified: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java 2011-04-13 16:59:23 UTC (rev 805) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyService; import org.wikitty.hessian.WikittyHessianFactory; @@ -46,7 +46,7 @@ static private Log log = LogFactory.getLog(WikittyServiceHessianClient.class); public WikittyServiceHessianClient(ApplicationConfig config) { - String url = config.getOption(WikittyConfig.WikittyOption. + String url = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); WikittyService ws = WikittyHessianFactory.getWikittyService(url); setDelegate(ws); Modified: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,7 +40,7 @@ import org.jivesoftware.smackx.muc.DiscussionHistory; import org.jivesoftware.smackx.muc.MultiUserChat; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; @@ -94,7 +94,7 @@ super(ws); this.config = config; - File file = config.getOptionAsFile(WikittyConfig.WikittyOption. + File file = config.getOptionAsFile(WikittyConfigOption. WIKITTY_SLAVE_SYNC_STATE_FILE.getKey()); if (!file.exists()) { throw new WikittyException(String.format( @@ -108,10 +108,10 @@ throw new WikittyException("Can't create file to store slave state", eee); } - syncIntervale = config.getOptionAsInt(WikittyConfig.WikittyOption. + syncIntervale = config.getOptionAsInt(WikittyConfigOption. WIKITTY_SLAVE_SYNC_STATE_INTERVALE.getKey()); - String masterURL = config.getOption(WikittyConfig.WikittyOption. + String masterURL = config.getOption(WikittyConfigOption. WIKITTY_SLAVE_MASTER_URL.getKey()); // creation du WikittyService master @@ -163,11 +163,11 @@ * @param props */ protected void initXMPP(ApplicationConfig config) { - String server = config.getOption(WikittyConfig.WikittyOption. + String server = config.getOption(WikittyConfigOption. WIKITTY_SLAVE_MASTER_XMPP_SERVER.getKey()); // Keep them to verify that is not us notifications - room = config.getOption(WikittyConfig.WikittyOption. + room = config.getOption(WikittyConfigOption. WIKITTY_SLAVE_MASTER_XMPP_ROOM.getKey()); pseudo = WikittyUtil.getUniqueLoginName(); try { Modified: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java =================================================================== --- trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java 2011-04-13 16:59:23 UTC (rev 805) @@ -39,7 +39,7 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -64,10 +64,10 @@ servlet.setHome(this); // create servlet container - String jettyConfig = config.getOption(WikittyConfig.WikittyOption. + String jettyConfig = config.getOption(WikittyConfigOption. WIKITTY_SERVER_CONFIG.getKey()); // port and path from hessian server url in config - String urlString = config.getOption(WikittyConfig.WikittyOption. + String urlString = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); int port = 80; Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-04-13 16:59:23 UTC (rev 805) @@ -51,7 +51,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; /** @@ -188,7 +188,7 @@ // list of all properties file to load List<String> wikittyQueryFiles = config.getOptionAsList( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_QUERY_FILE.getKey()) + WikittyConfigOption.WIKITTY_STORAGE_JDBC_QUERY_FILE.getKey()) .getOption(); for (String file : wikittyQueryFiles) { @@ -234,16 +234,16 @@ */ public static synchronized Connection getConnection(ApplicationConfig conf) { String driver = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); String host = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_URL.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_URL.getKey()); String username = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); String password = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); String xaDataSourceClassName = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); try { TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager(); @@ -267,10 +267,10 @@ for(Entry<Object, Object> properties : conf.getFlatOptions().entrySet()) { String propertyName = (String) properties.getKey(); if (propertyName.startsWith( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + "." + xaDataSourceClassName + ".")) { propertyName = propertyName.replaceFirst( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + "." + xaDataSourceClassName + ".", ""); if(fields.contains(propertyName)) { String propertyValue = (String) properties.getValue(); Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-04-13 16:59:23 UTC (rev 805) @@ -32,6 +32,7 @@ import org.apache.solr.core.RAMDirectoryFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; @@ -56,16 +57,16 @@ // we use unique db name (this permit to use simultaneously many // WikittyServiceInMemoryJdbcSolr) String dbName = "wikitty-tx-" + UUID.randomUUID().toString(); - ApplicationConfig config = new WikittyConfig(); - config.setOption(WikittyConfig.WikittyOption. + ApplicationConfig config = WikittyConfig.getConfig(); + config.setOption(WikittyConfigOption. WIKITTY_STORAGE_JDBC_URL.getKey(), "jdbc:h2:mem:" + dbName); // solr meme en RAMDirectoryFactory peut creer des fichiers si // la config est mauvaise, pour prevenir tous problemes on fixe un // repertoire unique si jamais ca arrive pour eviter les problemes - config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), config.getOption("java.io.tmpdir") + File.separator + dbName); - config.setOption(WikittyConfig.WikittyOption. + config.setOption(WikittyConfigOption. WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(), RAMDirectoryFactory.class.getName()); // others defaults value in config normaly is correct Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -30,6 +30,7 @@ import org.junit.Before; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.conform.StorageTest; @@ -50,8 +51,8 @@ @Override public ApplicationConfig getConfig() { if (config == null) { - config = new WikittyConfig("wikitty-config-sample-standalone.properties"); - config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + config = WikittyConfig.getConfig("wikitty-config-sample-standalone.properties"); + config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), "./target/data"); // String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); // log.info(msg); Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,6 +40,8 @@ import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; import java.util.Collections; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -56,11 +58,12 @@ @Test public void testProxyStoreRestoreTreeNode() throws Exception { - WikittyConfig config = new WikittyConfig("wikitty-config-sample-standalone.properties"); - config.setOption(WikittyConfig.WikittyOption. + ApplicationConfig config = WikittyConfig.getConfig( + "wikitty-config-sample-standalone.properties"); + config.setOption(WikittyConfigOption. WIKITTY_STORAGE_JDBC_URL.getKey(), "jdbc:h2:file:./target/data/db"); - config.setOption(WikittyConfig.WikittyOption. + config.setOption(WikittyConfigOption. WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(), "./target/data/solr"); Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -46,7 +47,7 @@ @Override protected ApplicationConfig getConfig() { ApplicationConfig result = super.getConfig(); - result.setOption(WikittyConfig.WikittyOption. + result.setOption(WikittyConfigOption. WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemoryJdbcSolr.class.getName()); log.info(result.getPrintableConfig("wikitty.*", 50)); Modified: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java =================================================================== --- trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import org.nuiton.util.ApplicationConfig; public class PerfTest { @@ -47,7 +48,7 @@ static private Log log = LogFactory.getLog(PerfTest.class); public static void main(String[] args) { - WikittyConfig config = new WikittyConfig(args); + ApplicationConfig config = WikittyConfig.getConfig(args); int threadsNb = 20; int researches = 2001; int loopsToAvg = 5; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2011-04-13 16:59:23 UTC (rev 805) @@ -45,6 +45,7 @@ import org.nuiton.util.ObjectUtil; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -273,13 +274,13 @@ log.info(String.format("Try to load config file '%s'", filename)); ApplicationConfig wsConfigDefault; - wsConfigDefault = new WikittyConfig(filename); + wsConfigDefault = WikittyConfig.getConfig(filename); // change juste data dir with context path String dataDir = wsConfigDefault.getOption( - WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey()); + WikittyConfigOption.WIKITTY_DATA_DIR.getKey()); wsConfigDefault.setOption( - WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), dataDir + File.separator + wsContext); // read specifique configuration with default config as default properties Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-04-13 16:59:23 UTC (rev 805) @@ -63,7 +63,7 @@ import org.apache.commons.lang.StringUtils; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.search.Search; @@ -105,7 +105,7 @@ if (config != null) { // choix du storage (file or Ram) String solrDirFactoryKey = - WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); + WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); String solrDirFactory = config.getOption(solrDirFactoryKey); if (solrDirFactory != null) { System.setProperty(solrDirFactoryKey, solrDirFactory); @@ -114,7 +114,7 @@ // on utilise le directory que si on est pas en Ram if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { String solrDataDirKey = - WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); + WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); String solrDataDir = config.getOption(solrDataDirKey); // make sure that dir exists if (solrDataDir != null) { Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-13 16:59:23 UTC (rev 805) @@ -25,17 +25,16 @@ package org.nuiton.wikitty.storage.solr; import org.junit.Before; -import org.junit.BeforeClass; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.services.WikittyServiceEnhanced; public abstract class AbstractTestSolr { protected WikittyProxy proxy = null; - protected static WikittyConfig instance = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); protected static WikittyServiceEnhanced ws; Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-13 16:59:23 UTC (rev 805) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.storage.solr; import org.junit.BeforeClass; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.api.AbstractSearchTest; @@ -37,7 +38,7 @@ WikittyService service; - static protected WikittyConfig config = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); @BeforeClass public static void initTests() { Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-13 16:59:23 UTC (rev 805) @@ -5,6 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * User: couteau @@ -29,7 +30,7 @@ } // set data dir configuration - config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.key, + config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.key, dataDirectory.getAbsolutePath()); } } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.*; @@ -62,7 +63,7 @@ protected static WikittyServiceSolr ws; - protected static WikittyConfig instance = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); protected WikittyProxy proxy = new WikittyProxy(ws);

1 0

r804 - trunk/wikitty-jdbc/src/test/resources
by echatellier＠users.nuiton.org 13 Apr '11

13 Apr '11

Author: echatellier Date: 2011-04-13 17:28:43 +0200 (Wed, 13 Apr 2011) New Revision: 804 Url: http://nuiton.org/repositories/revision/wikitty/804 Log: Remove file Removed: trunk/wikitty-jdbc/src/test/resources/postrges-wikitty-config.properties Deleted: trunk/wikitty-jdbc/src/test/resources/postrges-wikitty-config.properties =================================================================== --- trunk/wikitty-jdbc/src/test/resources/postrges-wikitty-config.properties 2011-04-13 15:28:26 UTC (rev 803) +++ trunk/wikitty-jdbc/src/test/resources/postrges-wikitty-config.properties 2011-04-13 15:28:43 UTC (rev 804) @@ -1,33 +0,0 @@ -### -# #%L -# Wikitty :: wikitty-jdbc-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% -### -wikitty.storage.jdbc.driver=org.postgresql.Driver -wikitty.storage.jdbc.host=jdbc:postgresql://localhost/test -wikitty.storage.jdbc.password=password -wikitty.storage.jdbc.login=test -wikitty.storage.jdbc.xadatasource=org.postgresql.xa.PGXADataSource -wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.serverName=localhost -wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.databaseName=test -wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.password=password -wikitty.storage.jdbc.xadatasource.org.postgresql.xa.PGXADataSource.user=test \ No newline at end of file

1 0